gentoo auto-resync : 15:07:2022 - 13:42:19

author: V3n3RiX <venerix@koprulu.sector> 2022-07-15 13:42:19 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-07-15 13:42:19 +0100
commit: bd8ca999980e9c0c9ae40a11789c858bb58769e3 (patch)
tree: 355d68a84921e04a81231e74fc062f229f76a733
parent: b3f2504c1d05b5999b74b2135860fc721e3adf68 (diff)
527 files changed, 4267 insertions, 3907 deletions
diff --git a/Manifest b/Manifest
index 70134d9118e4..c9874317b488 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29608 BLAKE2B ed094edb50b14aa645cb4743d54bf81175ab0e0f672aa042e8ea2b1c60904d9714d492d8bdfed2975a99a1c3d6e52dc5ac8b5ab4752bd74d448282b5920d0cc1 SHA512 d09316409a067336d914dd4f326b81a84a164165b981f16058eee4a47d8228ec73703d1b98a365ab63a32f1322a512619d95dc546c9af40eb0437754702339f4
-TIMESTAMP 2022-07-15T05:39:54Z
+MANIFEST Manifest.files.gz 29633 BLAKE2B f201893223eb7db24a50fc8b56f1132026f34280bc2590745e2b24a1c3445abd443e9bf9a05b92f252c895e671717bd74e2d14123743cba1a4a058bce939d2de SHA512 4ebfa414434cf61a9288093910e0cafa236a8a214be4fd60bdafc72c03d765c0fce18b03a1c465b014756179ff7fc95c64dec83b6f29b0555df6a9189240c6f4
+TIMESTAMP 2022-07-15T11:39:59Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLQ/apfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLRUg9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBKSA/+IasErpnF6Ito/URoeaX5iVlwtWTMVWX8Pu2n/C0Wow3V8TUjLICNRcNc
-6+U1Q9tqLfchCRa6Lg1KxrD0PF11S4++ftqWTUeMLh/hS1JIkoTqQfqNdCRlN33y
-VyWif7s9JgRtlZkK1ij2f2Vt4tSz33PmydNMTAXWODGG92JdVBbdLYpEH89nlUCf
-OY+um2tYvGyJhnqf6srCp/q2gDPws8CDHtPFKj7oy3NBWgy/l6aDW+z424y5gkJF
-D2q+Hylivh3GT/3A6z37qawIMhUUc6ogfGi8hwtAtpCe3spuXQWLnGBrMlo4O9Bm
-/4PdaxI0CQJoIfDOCUmRz19tlUfl2wCQfSmjEWyMnekx7yGtwMNCuliRE/wQazZb
-IHKivzhpOsHavPPvp5ZiuMU7XriWZoSqPGli331ZwvkbX1jWL+a9z1v8Tz2AJLpN
-shPiZCDxa/o+JU4QoRE/9vOFn3RaHVHkgMx85O1eotOHdEjbsdYG0+A6KpMHY2ic
-r6U26NlyggJEWCIFUiF6CgjLOZmuPTO/5IUudtzKkjMXG2r+DQwbmajJRwqe0n8o
-84VCy6P6CmnOn2LCT3CAvJpKcUqePP0AUgGEnKTyXUoynvDte3x7X5WncCC35vPg
-cM5pjhdXn2SlGQhSAGPzjAHebmkQ/uGFU9k8wsUcla+vyCYn+jk=
-=DaiS
+klDPqQ//Ya7B4mV/9zHWgHLymucb071grDbZ8n1wbGn3H87wW83K9GtTunO8rVhO
+wwa4X76508OqQdSjeoBi0PaHTsVOYChbgvpbTZZzV1c35dJt/HvWbXOkCKKPy35v
+UWsQt2vZmYzs8TzfecIR6RcWqtRkB5jFk0xUW1lR/q0RDmLTefFWHxfaxKVDSQKt
+q8Sj1ZScLbo/aEPui2wq6hxX4CZzrFWK5wMy1qoZO6DiKuUU4eviLj/FS4zgkio0
+H7nBi1k75y2mKnN3gSn2sg1xvDrZagsyUi9ChrA2sXFGAxHtTTx7kfBUCeIfTwpE
+lvFJxZmerxqd2HcVDCgpHLMR6TTnk4f5SIBPBPJIgnbIWBbyOv1CX6pJVfEmTIuL
+Luwz2gowhWmwq3SSnCBqpvjXRy8nktZwu/aMLwAoBCm1ZcHtd3WCiq5LJpo1O5uR
+ubI7VEnvcpefT8TtEjcoITHBBWI7iwZ+GlTyIWRDdGJszKiEelquRIMwLpWled3p
+TzDJKFnW0FI/GaDtM02z9WP/P6EU3aOkW6kJbifV6WwcASkIID6+n0Aaatclz8nJ
+4Qf1/oETKOfENP+KQTZze6gQY5Zq8sNRwt9xUavkiy/0fEyOw74JArNaoeUiduFx
+4bWom3dF1AYYOPg3IUCCNI7EnFcWz7io2nJPfB7d/qWFK776mQw=
+=NKL6
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 3e19c10d317d..73226c88bfe8 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 54923cc644c5..c7eea5cce8fe 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index f411ca3699f0..d1dd3564032c 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -4,10 +4,12 @@ DIST aws-cli-1.25.26.gh.tar.gz 2230449 BLAKE2B bb792fb2e4ba25870168e4fc3301d4b92
 DIST aws-cli-1.25.27.gh.tar.gz 2230639 BLAKE2B 80101fe2e2b58e7b626c546178ccab45108985d827db2b162d86e4271d5cb105dad2dfe36b807e88372af9cf14b706fda8928c0ccbbd97a49f2f1cf73bbff74f SHA512 2e88950c40dcf64b6911ca02ede7d9790a0ff3f3beb4c4fe3d4087b82100d49df00a90e254c9ff58e09132e4ab79ac3861480eeb1a3603c95aba0093fdb90554
 DIST aws-cli-1.25.28.gh.tar.gz 2231756 BLAKE2B b10d54b79bf16d88c4bd0256a970a640e9d64f903cdd250899f86a73cf6bb4de43d6ad83bddb24fa87684cb50b6c8f286553a609a0a04e8f18dd3428efa1f577 SHA512 a6a1f0ccefc4d9a6dde9efe8908f74b0ba72edcaec1955ebef7d0f7ce8cf4f3cc71fc298ce5120e02173553a22383bcc68fe965c77b77299fbc6e8353ec7cdb6
 DIST aws-cli-1.25.29.gh.tar.gz 2231889 BLAKE2B d487859c3b8ec6cc75f5c8ee54f9b0adf0bf0fdec8f36262533b98454c580692566f49daea867453a7f2b240228149e8d031d903b56809adf4d8f60525e25a08 SHA512 913273355f1907d08bac0b1c3f74aeb13966c1bc44c6499a1655c74048e6e711fe9442f5592344478ee4cf292b9fbe573a91c74c4fcf7481f24249e1001d9247
+DIST aws-cli-1.25.30.gh.tar.gz 2233472 BLAKE2B b12753046748b11a6067ad4c6e33827631ff1992fc7ffcd603dc048f39ab176208aae9028b473a87981c655445dfddfe77f10e37aafa3878b925668e375aa674 SHA512 e00acbec500294e05d89ae71ecff7cd9dc324b3576423c77c8038767ab115f2244ee64c1c529adce105c3055782341f4fe2ad7fc692f49cc757a7594c4cdeb65
 EBUILD awscli-1.25.17-r1.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
 EBUILD awscli-1.25.22.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.26.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.27.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.28.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.29.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.30.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.30.ebuild b/app-admin/awscli/awscli-1.25.30.ebuild
new file mode 100644
index 000000000000..9f176fa05cc8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.30.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(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.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+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/logrotate/Manifest b/app-admin/logrotate/Manifest
index dce189f18b15..cf59bbc941e1 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -6,5 +6,5 @@ DIST logrotate-3.19.0.tar.xz 166276 BLAKE2B bb19690ca092905e527f6a0a7915373a65b2
 DIST logrotate-3.20.1.tar.xz 166712 BLAKE2B 8481e0d746c6bcbe10f2686a921334c6f957c8d92520927de7bc8fb0b7631a444fedaa80f35bc2de7961b3d5833ce4ab885b1298b235b7f8b33cc3ae05438da6 SHA512 a9ed5796ab254f511d0029a8f29ef7557f62e12e3ea9af24e30b5b9f348b1c1a16df26d44314b78299916fb3b5000b9cd9eed7cee2cee8df11cfd8e40c79b092
 DIST logrotate-3.20.1.tar.xz.asc 833 BLAKE2B afc02177335bcd580e0617af8c50846b371c2d00ecd8fe329c2e298dc8c48823137625f455cea3d983a0d9971733297fa2c4d98ba3c6f72d2c07f8f21108cfe4 SHA512 2dd207feec431b223ff12f09f6cce14409d45e5bb3abaf2275dd773c7ee7c59ed7d32395e5869bfed70c970be4158fd299e6e269838378843dcb63ca5ebfa029
 EBUILD logrotate-3.19.0.ebuild 2257 BLAKE2B 0a66afed01ac2efcefccbb3abc5309ae27fcde5429368e13a17dc4672d06c6c67bd5546cf5e80da69eaa3f1cf36149409db004682e27d4e9995056deb0fe06df SHA512 f3d7b346b50e086bb50fa7d1b5d854d4c5fdf9a9700d9212eeb992da8a0dbf6c4a8b21ee0bf5a26d917ed2a581980952121d2c0c88f6fe1d3ca474db30a96d3f
-EBUILD logrotate-3.20.1-r1.ebuild 2521 BLAKE2B 814c1d7aeb75675dba26a3f3db7d64d0f9221ed8efc6085f19b4b6fb720528a26ba7236b108d48854606879d1b9f3e48c6f74423d1905512da241848c97bb7e9 SHA512 8101cf963a0a526b868516cb2846512ec1ac46e01005a2f80f278a97b4fbf5edc3d3023f5e495338de849c059370de5a1381b9d454e6688a705d2b9c2e3bc002
+EBUILD logrotate-3.20.1-r1.ebuild 2516 BLAKE2B 27f7fd48f37526fbe59f2e1913bbaecab61498a2d1e2f4993e3dc7d550d1a44f1f331aa410907511c94f17c4425c961ef2bea8cf9570c59dc8e527df43d070f4 SHA512 888f03b11ec607860aebc75de5155701efefdf91bdd95f07e2e2af88fa501c43d1bf85c30be8835f391c6aac64a04a7e6e3ab9ba97514a3c2a4cb5eb46606bcf
 MISC metadata.xml 1207 BLAKE2B 0d2ebf29e5ab5a01b2a8ac76ce1699e175d8fdba393ad97abad9cd3fbf9162042f253ab3551cde9273053c35b703e098d0501b67203da519b12258437d898f50 SHA512 3ac710f21ade3bb31767ea3e26b120a19a8ebfbfbcf5c66d30c888093428b0df026417e69d3823a2feaa27408b6015231f624b354df87ff50313edea39a0287b
diff --git a/app-admin/logrotate/logrotate-3.20.1-r1.ebuild b/app-admin/logrotate/logrotate-3.20.1-r1.ebuild
index 9023bd91b43b..f2b18ca713b5 100644
--- a/app-admin/logrotate/logrotate-3.20.1-r1.ebuild
+++ b/app-admin/logrotate/logrotate-3.20.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://github.com/${PN}/${PN}/releases/download/${PV}/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="acl +cron selinux"
 
 DEPEND=">=dev-libs/popt-1.5
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 02df24197ce3..5d20e45d2472 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -3,10 +3,7 @@ AUX logstash-plugin.eselect 1768 BLAKE2B 539246fb1c6e00fa0928af146d3c32ef69f61e3
 AUX logstash.confd-r2 767 BLAKE2B fa251570a13b2bc2d0779e0f00549f40bc957f211be0f4164829f7bf731221e5adabdb27341c703f1ea67b19455e8832f5d822fd41ffc64994007201690feff6 SHA512 83eecf30baa160041f33fd3dafce317c1692efaf676d0fdc9bee04965eafb15f1e01d07a09607d345665f6bebc4db90d17a0abd1c7fd4962d6926ac069f16768
 AUX logstash.initd-r2 1997 BLAKE2B 4a2e36bcd171950ddea636f9269708416536b4f54c620b36eca91839b894f0b4242775ec85aadbe93714b8aa7cd535774cd0558f4bc90096638d0640e4f3961f SHA512 23203f99610d1666247ee8584b1d1452216f65c6c06345007768eac494c9de755a79bd74b3fd241e62f2239d52394626a61e06100486f89b7f3a2b8282389d56
 AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa882023923967ebc012ef95185e06e33fbec60eaa949df650ebe4f9b18abaa7f4edab25d4e5b429f4 SHA512 9a9cff9472c7cd3164bdc73e37521489979106021b3d97fb2b005b74b150d2f2ee8df983219e01f8b5b00907008f4e9816fc303ace3b440a4b91dd178b6a098d
-DIST logstash-6.8.23.tar.gz 178007697 BLAKE2B d7ba85a141586b8ee6cf524b9ab39b6b9a0777df5357fb22f15770126023599d7b62eeafc55dc87e0ff401b5df8dab9084a9ea4ba98c850e2ee98d4988bf4ad2 SHA512 3ee0de55cca50c1ea5b8afbc618783c7e301ebdc570c34d590160468b0b7708afe83589669c08106ac006e64436903ccbb3b3322e2801332b921ea802a788d86
-DIST logstash-7.17.3-linux-x86_64.tar.gz 363469045 BLAKE2B 9817a18b0112f6abe4b4da47908db0543feb981e963d5283e0b0133f9f722f155b84592b7529c74b03ec48307e6797732abb3204e2206c26751414597a676c60 SHA512 bea8a6e4a3f5974739061d3f15ac76b705a5326b43bfb4b488edfefb6bb25b5f36e8734713d536386b03b6d45acbf739a3c9381e61cda344557a2acb4bbb65c4
-DIST logstash-oss-6.8.23.tar.gz 177876480 BLAKE2B d961c9073c1108b3a0e74ba763e0ce45b35a5767cd732e7ec756697c5f1526e01b23c0919acefa173b5410e9a4908920a24c1ce351dd7c09d998cb025ba05aef SHA512 87488767c6239878c1383c1f28ca17e8f330c10298542627c0c44a0620976737a1acbca55b8db6b6917d8b8bcb988ec4d84b2a840a4ef6362909b7e230a0e0b6
-DIST logstash-oss-7.17.3-linux-x86_64.tar.gz 363264492 BLAKE2B 11d8fde29d087fc6956731904bd113fab3d163e29bb302c29aa11ca1b77393e896332da3f6f939008d83b6035672b9e49ea609c734ae6fa7806eabfc968f7648 SHA512 5bc60cdb79b80a5c239c5cef375fb1336d1fa1595fa3556720cb86ee495cc48f9c57d19003de2b9c7717116069d487857c71bff1cc7a4c029841f702c831dc34
-EBUILD logstash-bin-6.8.23.ebuild 2099 BLAKE2B 5af2697d30b52e26c11bb5ec7f3fe11b30be7ac3e0b4c946cb024f46e19b92e99c078086cd64bbbdaddf0ac06b2291813a9b89a474978b9a0d5d5ee6c0d678dd SHA512 bba4fa4720b257d4a58198e0c145e5f88553c783bdd5e2214a9b685d922845803ff4b12e793f9732c29dd19daaa8bf35506a9f5809da0d7f03b1da93daa21b58
-EBUILD logstash-bin-7.17.3.ebuild 2532 BLAKE2B 926b1ee9b2a9699ed0de55bda4e608c0fd9b6eafa6b11b5c1e3fb5388e2e3997f89d367bbb7b95a4bd2dc6c30fe4a6d7719dbf0d3256b0ae09eaa0b78cf7ce66 SHA512 4afc83cfd148c5f24fe8301c5d7691b5f7e046b126afd766e20cec0d49521e4a137f7c3a503a8cd69e92b72d9ef82fdd54d45b3374e9f00ba42ddce0868e1177
+DIST logstash-7.17.5-linux-x86_64.tar.gz 363609474 BLAKE2B b6f6065a997a7401ad6e14d5f1fd6b2a924cf734cab0b7e07444cb800420f3c7b2634cd0be693ce0cddce909f49675b00764fa05ca4f3c3ab75a72387fffd629 SHA512 6508b9ba1a6672fd560773d2282501f9d022bf67a75f2b046ec31219cc78cbf8d35040827838948c69458089a9b30fdf21cbb5c2cc3f67c0812662265e9518dc
+DIST logstash-oss-7.17.5-linux-x86_64.tar.gz 363419923 BLAKE2B 7423ca08f5821439059be89be46df2a3927722ee48a7fcb95b1015f0539526c6ad99a4e11e85e5d6ff2aa340ad5421d1ce9ac26043dd70b1b4ebeeba8c4eaab3 SHA512 d86cc76f52975128c6e9ccec6217a1f289b88048b19cc6c19f8247c614c056532b960f7e4a9f3c7b7a4ea81596e9ca3b7df19249811445273668403f18af5c74
+EBUILD logstash-bin-7.17.5.ebuild 2532 BLAKE2B dfd8efa6e7fdc93820836f68a21bf02e4c0c1eb1c907c4d6a1005d6f253eb83012334d2a9ecd75ac569309d2579331b1e44c8738474f5fd9e071ae9ac81b79cc SHA512 4872a97be23d3276f5722d00e120d336136cd235cd4f10a5b2823baebb00f28e1a5775f0a9476723e8ff41feefde1d53c96fcf1fbdab6d6c1832428985bf73e3
 MISC metadata.xml 571 BLAKE2B 8fb52685ec095fe2a192d477c7e5737be2ab526fe5ee9c77f62c8aa1799dea7c471eb3ea073352b2d09e3f1ba82b0dea05dd03648eb810e32504a2707342832e SHA512 36de48dec06abe08515d48f2e2fb86e5125ab6e9331f989dea8fff9d2511b337afffc75a842bf85b051fbe968b220676a4610c0a4d1a6b2c3b83759f9c2ca199
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.23.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.23.ebuild
deleted file mode 100644
index 8388a11e7f88..000000000000
--- a/app-admin/logstash-bin/logstash-bin-6.8.23.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-RDEPEND="acct-group/logstash
-	acct-user/logstash
-	virtual/jre:1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample" agent.conf
-
-	rm -v config/{pipelines.yml,startup.options} || die
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	doins "${FILESDIR}/pipelines.yml"
-	rm -rv config data || die
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
-	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
-	ewarn "Install the plugins via eselect module that will automatically re-install"
-	ewarn "all self installed plugins after Logstash upgrades."
-	elog
-	elog "Installing plugins:"
-	elog "eselect logstash-plugin install logstash-output-gelf"
-	elog
-
-	elog "Reinstalling self installed plugins (installed via eselect module):"
-	eselect logstash-plugin reinstall
-
-	elog
-	elog "Sample configuration:"
-	elog "${EROOT}/usr/share/${MY_PN}"
-	elog
-	elog "The default pipeline configuration expects the configuration(s) to be found in:"
-	elog "${EROOT}/etc/logstash/conf.d/*.conf"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-7.17.3.ebuild b/app-admin/logstash-bin/logstash-bin-7.17.5.ebuild
index ddceca40f83c..bcfbba4ea846 100644
--- a/app-admin/logstash-bin/logstash-bin-7.17.3.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-7.17.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit java-pkg-2
 
diff --git a/app-admin/needrestart/Manifest b/app-admin/needrestart/Manifest
index 5767fb0abe2a..490009a75e7b 100644
--- a/app-admin/needrestart/Manifest
+++ b/app-admin/needrestart/Manifest
@@ -1,6 +1,6 @@
 DIST needrestart-3.5.tar.gz 67824 BLAKE2B 73af940efa578b145d89cb0724f7103edd0fe869bfb211596109b67fd16a8ddce83060942687c3ca0e861d9d545022845b64d90bc44e39997e8943b1575dd5f1 SHA512 e082ab92497cce7b65da9c625ba0bc2332cc7863c5b7d99a04593c646256da0302519fb7c9fc9823ce0058affdf7eb6a4587a1874881eda8aa4d07032093eb0b
 DIST needrestart-3.6.tar.gz 71159 BLAKE2B 76994ef0e77a4db0532dca2e17990097b2314f912fc3c32e67643eca7c44fff9611a42b49abd55f959a0e959d6ea69cfef36ad9008c86debfd125b64bdc673b5 SHA512 5c0f2f427c93e6f621fc1727f6abf42651e184e168b3f720708ac73b425bc7dfb94622c6cc2afad1161e3ffbfd36500eb99c375f2f5a525c9cd10d7142f1e365
 EBUILD needrestart-3.5.ebuild 913 BLAKE2B b7526899199daa72bb6d0c5d323dffc48bae329d6469f64c20e2a427b54508c03eed410d366aa0b78e666ff8a39095d48869e59a9e573927d564c5eb20c42f1b SHA512 6cd43d37250a15db77e143ee371f69a23b0aac8f2c8828f27cbb3b270cff20717262dd3cd0fc84f32c1d09d076efd6635b1a4e2e13f9ce23753575db821cfdd6
-EBUILD needrestart-3.6.ebuild 915 BLAKE2B 82577740e01939ca0e0104f3c2be796ae6bdc1e74e0d197057f6672ba9242785e4145ea578c6f236b00f7ab59e61364cbb874837eaa2c99c5c72fbc7752afb7a SHA512 983cfb758f1994a85a68c8a5a45b32218862ede337e7e3443c19133645efa0b691a078a54cc65787acc0608be2a99adfef745aa5f68d6d87f43ffd26a3545d79
+EBUILD needrestart-3.6.ebuild 914 BLAKE2B 1c7b7d839c4ea6a0f23288e97f8c9509a3acf81822e11755c26e23738d469d8b565040ddebbe7ff90fdf464e57eefc9f22362ae333bcff99634959121d571bd6 SHA512 0e172c1f2230d9244f15b07b97326ff85e4d926db18dcf46f21c4890f8543d15fe57166487920e439fc03902064fd1e4f7620e82bc9eaca46edd8a0e2021aedd
 EBUILD needrestart-9999.ebuild 915 BLAKE2B 82577740e01939ca0e0104f3c2be796ae6bdc1e74e0d197057f6672ba9242785e4145ea578c6f236b00f7ab59e61364cbb874837eaa2c99c5c72fbc7752afb7a SHA512 983cfb758f1994a85a68c8a5a45b32218862ede337e7e3443c19133645efa0b691a078a54cc65787acc0608be2a99adfef745aa5f68d6d87f43ffd26a3545d79
 MISC metadata.xml 361 BLAKE2B 32f60b794e1017b1b358c91737d3117fcca6e90b52b6b0dc611488262db98966ac2856341b7ba726dd167ca6f63bbb5b6165ac4d066ea49066c1b771447266d5 SHA512 4f21f03e0462da778f7b85ada6f1e8c4fb4f5d2e7ca8d227b0baebbb5922f06a6e3baae21e8bfc33d20bd33ddcbd9fec4cc2eb1711b3f8d8d8bd52b104cd5353
diff --git a/app-admin/needrestart/needrestart-3.6.ebuild b/app-admin/needrestart/needrestart-3.6.ebuild
index c773506fddc2..2c212a6353fb 100644
--- a/app-admin/needrestart/needrestart-3.6.ebuild
+++ b/app-admin/needrestart/needrestart-3.6.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Restart daemons after library updates"
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index a3b81c549d99..560d02ffe86f 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index c8feab63768c..fbce54a15a21 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,9 +1,4 @@
-AUX gpgme-1.16.0-fix-t-edit-sign-test.patch 3496 BLAKE2B 940ccb35979ff8de68461444e6a8643565d4c5715211459c13d9811b8cc152629c93f7c80715e3243e48a939c066f55d25e8f0c0bd0e3cc83352d381c1cb9236 SHA512 d136da51011bc18a3c4c0b51618633cc98658aa489e9f13e02b786d65a4d32ccd94eb08f8b4afc510aee9a2db0a274568c372d33219c8b8ab3792ef599ed3fd5
-AUX gpgme-1.16.0-glibc-2.34.patch 1259 BLAKE2B 28ced8db5bc6010eeb0b870b927dba3baca3c1c1beda563263ebbf938fee37d56599e6f4816d3e701bed3b2734e68ec4bff8c4134af5a3c7891c5cdc8f1678ca SHA512 46900e8d2f816b3c1cc9e222b7f11d2ef89684a6d43b2dd84cb0e7ed5becd539f28654a3d3c0bac83e970c66a2079dc5263ab5d131a52be0719cbc595cbf7a76
-DIST gpgme-1.16.0.tar.bz2 1718913 BLAKE2B da55e695b148e949a1c0770d0298d7a8c9f87d7a1f9e45d380f8c13c472bd44cb4266adb9a113e2b1dcc2596291744f48fdf998ff2de876059d89d184dc87f3a SHA512 69487be69612e9bf0221ff56ae687248bd13635db1b7087130e93c1670e38f3c810bbca17723555c04fe207976c35871bbc3da005179ce099504321cf33636e4
-DIST gpgme-1.16.0.tar.bz2.sig 119 BLAKE2B abf363142f67a005d1a4c13c2d3d944d0fd449e2297ad5a853fc145e106757e639b5bf5c23de6475055578633e12d8dc7d11ebb689ee6c74283c7cfe28058e65 SHA512 0c230b55bb0b24af85cd6df9e6be6ef8245d29af0fb8348fe044979ab75250987fafbd709d1898852a23df99fb16dd61b0b2bc6a821ed1c1b9aadd86182e5b9a
 DIST gpgme-1.17.1.tar.bz2 1747692 BLAKE2B 44cf9309cbad038f23aa7c5c77fd85be23faf3d8e1eb7abdb87a737ad1ade1ee269a95ce618dba327bbd06e6f4b2a91e2446744ee08f09ea6fb3b2dad44431c5 SHA512 e6399c3de1e430e38f2692bf5ec0c02ecb36ea3dbb56ff29dc3a438a5be4900a77a0559dc5b673dc1ffbff5e7f589e548e19176b2644fe8f63e00c6b9181b920
 DIST gpgme-1.17.1.tar.bz2.sig 119 BLAKE2B 31832424c0e029dc520d3302a71b086d9fcb044c74344cc0fb4b6c6a02d0dd840e62e7eb60acfaf004e6f3650d58436b58e645ef2a50b948ecaf3ca162bf577a SHA512 e1a4213d0d39f2efd0d5c007a0449c76bd650e76e002a9acb673eef0579912db06d844df11a4f7cb821e1d8468d2d6c1303f1c5d915a5c3c9cb5abacfbd004fc
-EBUILD gpgme-1.16.0.ebuild 3034 BLAKE2B c807335ac78d88b1170f57b3c4eb771b8dd78b02ea54a8df4aaa062334d3a430459a274ddbe7977c3e1fd66995582a3e30dc2e3deceefabc05db296afb51822d SHA512 06d033131be2310cc8e96b5e3b65ec3cb6f70c9f01fa35ea57ffb97b95c80237bbc27b4923d2e9a99b0c94f779a50a89b38c30ce31fd5684f7a0ec7db2bd378e
 EBUILD gpgme-1.17.1-r1.ebuild 3338 BLAKE2B a543da40826de9c27c4173e06755cce7c0bbc8a576e436a62721ff4adae0c9c020ab612392d7b0b1c722caf53ef394fe3c6ea6cb546fdd27a0f0ec37b6d43cbf SHA512 673cab923556e9087474171bf771baee76802e0c58fcabb29940619b89f449a85520b96e30257dc9bbb547839bab446f9a72b6405540aff5dfa09ceeafae8888
 MISC metadata.xml 333 BLAKE2B 6dd18b63ec1f7656ab8bd705242bec45d7820db8be31f326172cad400711e6d7268c156d6b81facfdfa79118c04728ac910a8f8de36a11454227a1399235a582 SHA512 21b8d7bf3f14b5ab7e2ea587027395cdd881ecddd5a4f70237cafc70dc904b396a33f70dd7ef37519df5a204f4e3a89d9ea6ffc221df41bd9cbf23e69863f12f
diff --git a/app-crypt/gpgme/files/gpgme-1.16.0-fix-t-edit-sign-test.patch b/app-crypt/gpgme/files/gpgme-1.16.0-fix-t-edit-sign-test.patch
deleted file mode 100644
index 6a5a7c0707c4..000000000000
--- a/app-crypt/gpgme/files/gpgme-1.16.0-fix-t-edit-sign-test.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff;h=81a33ea5e1b86d586b956e893a5b25c4cd41c969;hp=e8e055e682f8994d62012574e1c8d862ca72a35d
-https://dev.gnupg.org/T5509
-https://bugs.gentoo.org/827898
-
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Sat, 26 Jun 2021 18:02:47 +0200
-Subject: [PATCH 1/1] core: Fix use-after-free issue in test
-
-* tests/gpg/t-edit-sign.c (sign_key, verify_key_signature): New.
-(main): Factored out signing and verifying the result.
---
-
-Factoring the two steps of the test into different functions fixes the
-use-after-free issue that was caused by accidentaly using a variable
-of the first step in the second step.
-
-GnuPG-bug-id: 5509
---- a/tests/gpg/t-edit-sign.c
-+++ b/tests/gpg/t-edit-sign.c
-@@ -107,31 +107,19 @@ interact_fnc (void *opaque, const char *status, const char *args, int fd)
- }
- 
- 
--int
--main (int argc, char **argv)
-+void
-+sign_key (const char *key_fpr, const char *signer_fpr)
- {
-   gpgme_ctx_t ctx;
-   gpgme_error_t err;
-   gpgme_data_t out = NULL;
--  const char *signer_fpr = "A0FF4590BB6122EDEF6E3C542D727CC768697734"; /* Alpha Test */
-   gpgme_key_t signing_key = NULL;
--  const char *key_fpr = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"; /* Bravo Test */
-   gpgme_key_t key = NULL;
--  gpgme_key_t signed_key = NULL;
--  gpgme_user_id_t signed_uid = NULL;
--  gpgme_key_sig_t key_sig = NULL;
-   char *agent_info;
--  int mode;
--
--  (void)argc;
--  (void)argv;
--
--  init_gpgme (GPGME_PROTOCOL_OpenPGP);
- 
-   err = gpgme_new (&ctx);
-   fail_if_err (err);
- 
--  /* Sign the key */
-   agent_info = getenv("GPG_AGENT_INFO");
-   if (!(agent_info && strchr (agent_info, ':')))
-     gpgme_set_passphrase_cb (ctx, passphrase_cb, 0);
-@@ -159,8 +147,23 @@ main (int argc, char **argv)
-   gpgme_data_release (out);
-   gpgme_key_unref (key);
-   gpgme_key_unref (signing_key);
-+  gpgme_release (ctx);
-+}
-+
-+
-+void
-+verify_key_signature (const char *key_fpr, const char *signer_keyid)
-+{
-+  gpgme_ctx_t ctx;
-+  gpgme_error_t err;
-+  gpgme_key_t signed_key = NULL;
-+  gpgme_user_id_t signed_uid = NULL;
-+  gpgme_key_sig_t key_sig = NULL;
-+  int mode;
-+
-+  err = gpgme_new (&ctx);
-+  fail_if_err (err);
- 
--  /* Verify the key signature */
-   mode  = gpgme_get_keylist_mode (ctx);
-   mode |= GPGME_KEYLIST_MODE_SIGS;
-   err = gpgme_set_keylist_mode (ctx, mode);
-@@ -168,7 +171,7 @@ main (int argc, char **argv)
-   err = gpgme_get_key (ctx, key_fpr, &signed_key, 0);
-   fail_if_err (err);
- 
--  signed_uid = key->uids;
-+  signed_uid = signed_key->uids;
-   if (!signed_uid)
-     {
-       fprintf (stderr, "Signed key has no user IDs\n");
-@@ -180,7 +183,7 @@ main (int argc, char **argv)
-       exit (1);
-     }
-   key_sig = signed_uid->signatures->next;
--  if (strcmp ("2D727CC768697734", key_sig->keyid))
-+  if (strcmp (signer_keyid, key_sig->keyid))
-     {
-       fprintf (stderr, "Unexpected key ID in second user ID sig: %s\n",
-                 key_sig->keyid);
-@@ -196,6 +199,23 @@ main (int argc, char **argv)
- 
-   gpgme_key_unref (signed_key);
-   gpgme_release (ctx);
-+}
-+
-+
-+int
-+main (int argc, char **argv)
-+{
-+  const char *signer_fpr = "A0FF4590BB6122EDEF6E3C542D727CC768697734"; /* Alpha Test */
-+  const char *signer_keyid = signer_fpr + strlen(signer_fpr) - 16;
-+  const char *key_fpr = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"; /* Bravo Test */
-+
-+  (void)argc;
-+  (void)argv;
-+
-+  init_gpgme (GPGME_PROTOCOL_OpenPGP);
-+
-+  sign_key (key_fpr, signer_fpr);
-+  verify_key_signature (key_fpr, signer_keyid);
- 
-   return 0;
- }
diff --git a/app-crypt/gpgme/files/gpgme-1.16.0-glibc-2.34.patch b/app-crypt/gpgme/files/gpgme-1.16.0-glibc-2.34.patch
deleted file mode 100644
index f328e4540ae3..000000000000
--- a/app-crypt/gpgme/files/gpgme-1.16.0-glibc-2.34.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/803557
-https://dev.gnupg.org/T5587
-
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sun, 5 Sep 2021 00:05:00 +0200
-Subject: [PATCH] src/posix-io.c: fix build with glibc >= 2.34
-
-Fix the following build failure with glibc >= 2.34 raised because
-closefrom doesn't return an int but a void since its addition with
-https://github.com/bminor/glibc/commit/607449506f197cc9514408908f41f22537a47a8c
-
-```
-posix-io.c: In function '_gpgme_io_spawn':
-posix-io.c:577:23: error: void value not ignored as it ought to be
-  577 |             while ((i = closefrom (fd)) && errno == EINTR)
-      |                       ^
-```
-
-Fixes:
- - http://autobuild.buildroot.org/results/b11094ddd35263071b7dd453a6590c5b684026ff
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---- a/src/posix-io.c
-+++ b/src/posix-io.c
-@@ -570,7 +570,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags,
-               if (fd_list[i].fd > fd)
-                 fd = fd_list[i].fd;
-             fd++;
--#if defined(__sun) || defined(__FreeBSD__)
-+#if defined(__sun) || defined(__FreeBSD__) || (defined (__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 34)
-             closefrom (fd);
-             max_fds = fd;
- #else /*!__sun */
diff --git a/app-crypt/gpgme/gpgme-1.16.0.ebuild b/app-crypt/gpgme/gpgme-1.16.0.ebuild
deleted file mode 100644
index 7a84df5e6d29..000000000000
--- a/app-crypt/gpgme/gpgme-1.16.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_OPTIONAL=1
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
-
-inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs verify-sig
-
-DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
-HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
-SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2
-	verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips 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="common-lisp static-libs +cxx python qt5"
-
-# Note: On each bump, update dep bounds on each version from configure.ac!
-RDEPEND=">=app-crypt/gnupg-2
-	>=dev-libs/libassuan-2.5.3:=
-	>=dev-libs/libgpg-error-1.36:=
-	python? ( ${PYTHON_DEPS} )
-	qt5? ( dev-qt/qtcore:5 )"
-	#doc? ( app-doc/doxygen[dot] )
-DEPEND="${RDEPEND}
-	qt5? ( dev-qt/qttest:5 )"
-BDEPEND="python? ( dev-lang/swig )
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
-
-REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-glibc-2.34.patch
-	"${FILESDIR}"/${P}-fix-t-edit-sign-test.patch
-)
-
-do_python() {
-	if use python; then
-		pushd "lang/python" > /dev/null || die
-		top_builddir="../.." srcdir="." CPP="$(tc-getCPP)" distutils-r1_src_${EBUILD_PHASE}
-		popd > /dev/null
-	fi
-}
-
-pkg_setup() {
-	addpredict /run/user/$(id -u)/gnupg
-
-	local MAX_WORKDIR=66
-	if [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
-		ewarn "Disabling tests as WORKDIR '${WORKDIR}' is longer than ${MAX_WORKDIR} which will fail tests"
-		SKIP_TESTS=1
-	fi
-}
-
-src_prepare() {
-	default
-	elibtoolize
-
-	# Make best effort to allow longer PORTAGE_TMPDIR
-	# as usock limitation fails build/tests
-	ln -s "${P}" "${WORKDIR}/b"
-	S="${WORKDIR}/b"
-}
-
-src_configure() {
-	local languages=()
-	use common-lisp && languages+=( "cl" )
-	use cxx && languages+=( "cpp" )
-	if use qt5; then
-		languages+=( "qt" )
-		#use doc ||
-		export DOXYGEN=true
-		export MOC="$(qt5_get_bindir)/moc"
-	fi
-
-	econf \
-		$([[ -n "${SKIP_TESTS}" ]] && echo "--disable-gpg-test --disable-gpgsm-test") \
-		--enable-languages="${languages[*]}" \
-		$(use_enable static-libs static)
-
-	use python && make -C lang/python prepare
-
-	do_python
-}
-
-src_compile() {
-	default
-	do_python
-}
-
-src_test() {
-	[[ -z "${SKIP_TESTS}" ]] || return
-
-	default
-	if use python; then
-		test_python() {
-			emake -C lang/python/tests check \
-				PYTHON=${EPYTHON} \
-				PYTHONS=${EPYTHON} \
-				TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
-		}
-		python_foreach_impl test_python
-	fi
-}
-
-src_install() {
-	default
-	do_python
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	# backward compatibility for gentoo
-	# in the past we had slots
-	dodir /usr/include/gpgme
-	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
-}
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index e6045dd618c9..aaaff03b666c 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,5 +1,5 @@
 AUX tpm2-tools-5.1.1-no-efivar-automagic.patch 1083 BLAKE2B 10a8299a28ee54339ac73692dc54475da3044d3afcfe570d6c72f5d8ace2bbf3faf5242002be02c4a765ba9b9c37ba9777d9b4b8bac416e6721d9b8660d19bf2 SHA512 4622e235ef5202cc3448fbc67f362ce36396ca04892c340f275f67c93d5bb2857a14094329ec499c4f7215ac10002b70d18cfc2bdef1474d93f556c5759383ae
 AUX tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch 1380 BLAKE2B ffbbe59cbfd4a411544ef7f03ed04c73afc774edebaa2da8deb11e7fe4f321b88b686d3138fd5524b2279407518dda32de0e1cb96a5517ba87f8cc8c9ddb2be5 SHA512 557ad07048e288a9611222b920e8c82fab9852dde04da2b57981cb04ce3bb9d4ea40c57ba24fb2b3dc09cacc16ef731d11428d0603d757f7f7adc2023c5ca779
 DIST tpm2-tools-5.2.tar.gz 1072078 BLAKE2B 27d035e0f44029db57477a1fd10e1cee9b470ad54411297985cb7f33ba7bbb7a94ac392815e32287d69abf928dce0c361703542b812ae88b208ddca645bb3be2 SHA512 9fb5dc298717a8a57c89d286e3590370a096c81b14d2d8d4eb5fca140d66148a8e24727ee04fb02057bbfcc3ede50e93ba0ef22396888c9df48bf6f42a5d6e6b
-EBUILD tpm2-tools-5.2-r1.ebuild 1519 BLAKE2B 7a1c0e46ba009eaf435afd0ff14b0fd7c3ac14af1ce387fca2cc38fbb216e50cd29977cc97608bf114afced7d6186e3885d3f6577726690be75a8ce7b21e6c7a SHA512 dfca77861a50b7f2a486c358c14351357f4c7eae9062fe13eb9282a19033242bfdd32c43ce85572b3574200c0cb50a7ead7cc8110d20332e28f54667f0a79d5f
+EBUILD tpm2-tools-5.2-r1.ebuild 1518 BLAKE2B 94b0832fd9339490452191f81f3f36d7f269e3b2752e33dda6fb1713106e0243ce505b71d5730823add71d9f120d04ca1c890ccbd178d5e434a58688847ece41 SHA512 6c09c045c687f42ad9ae71f03e121610ccfd1767a201fae243b76576b014851c29391ac4a121861076f1b0444b799c2d0de943226986577505e3542d97f2514d
 MISC metadata.xml 560 BLAKE2B fe8daaba2a7586247537f8ed7b92769676b20f2c1377f7bb582dff49e06cf3f9beba4f79e28f10ea76d67d089eb152b060b091414dd9b47c5694ca153211421f SHA512 a744fcc50c7e44b1939190150404aee9054eab8e921e6f63cafa58dc80be5f20692632509de85399b6a9633701da72fd951e8bcfbe9e5177f315fa1dcbcc9ee5
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
index 7bb66768f35b..22e76e0b6bd7 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 0c283e8c9b98..10d3f2545961 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 6981131b18c3..b715ab01ab97 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -8,6 +8,6 @@ AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07f
 DIST neovim-0.7.0.tar.gz 10925354 BLAKE2B 0524d008ba1ebbe823406e94cfb048014b26bc394c686b2dd84bb7fae5a1f7f3acd42764b03b6efec10c0f25045c5838f624542b5125947e5f42d3b0d2ad1f84 SHA512 3597c54fb925a4d607bca9ba0fdb37df90ecb816da99f52baf46cc2ec79727a55048ba1d8d22c8e7d61f0e8e35546326b1d0d15c0a91de8bf5bc529c45fb1ce0
 DIST neovim-0.7.2.tar.gz 10933623 BLAKE2B c2db449a91f1685233da7125e3d4b49cb8fe26db5e498fd3a83340bd14842399474fcc7f2c78b88783195c6f7b0b8df196985b70387ed88972372a8866e2c721 SHA512 04d0fa5b23018531b70b53271821bf6944cde1bcec2210b99f5888e1339cd38f57feaa8e40874a3a504930e6614980947f31852185cbcd2ce106a0867896dd79
 EBUILD neovim-0.7.0.ebuild 3140 BLAKE2B 3b64420a63edd801b3a51fc23c2902e9aa57e3000dfda0979be57e7dbf61c690f0096e080dc6182f640a9400efbdfe99fcf3ae88468ff1081eff84d33e057fcb SHA512 69a13c372fa79a70b58419cd968f0ee325e73a00600fe17cdea8316d8062dc6b099e59db396fb99acefda62b0ef08ffdc2d9cd21b35ca18134ceba1766b2b7ba
-EBUILD neovim-0.7.2.ebuild 3142 BLAKE2B 31b19a9c5b03cb0222a2671acb6254f9e6201cb842424863ca402c229eb3ee18825d4424393c81e204420b75ff73af6c705a3e6b5d83690c0f704695fe0ac050 SHA512 05afe19f95a8490fa2a39e3880f1dc0761d2bfb0f1123193c3e23b6e6e62a7eee02033c159c2ca249cb34b487d9690032202d0448cf8d81efcd4563fd7742a42
+EBUILD neovim-0.7.2.ebuild 3141 BLAKE2B 049f177ac91890a12cf7d2cb13ae549cca9c31495fb110d1588a2e71bccba1755cd8adab2de65e786df54604489be36102ad1f64c482b1a4a4bb8b39c67c4e34 SHA512 7f887b4e1fc6f9f702dbcf090a55b4e32cd0a94c9ca3342384c29cfd7600112a55643a1e059e7cf32ec2f8db477ab6e147b105a38afdbc75384a905656973847
 EBUILD neovim-9999.ebuild 3309 BLAKE2B af43af4e917828b36914e73f6060a3e411921b66a55c1d8805b02cdb820562ffd0421b5359b00ab3ae29dc8a5217de12f6b23882f0b5bdca38313a0afa43d387 SHA512 3bf4fd433fbb60e6605fba82558602f87213d88876819a8fb680ec91c69570fb5beb3a87fbbc7a5da4aa6113cefce62f8a95ccaec4f899332c1c94ceea77e8df
 MISC metadata.xml 536 BLAKE2B 48c85cdbe749584904a6719545308b55f130375464c55d6f458171707a2b72586bca6780b52bab3b379a2e0c471ec47026c1203edd4696fe38639f5718cc4896 SHA512 114c7fe41230c2aade3de44b37e51ae84a907b6fcb899732991f8013126214540f4b72e60b44c0993312ec8d7c8cc8c96eae8b9e0f78bd0d2cefb7497e5d16e8
diff --git a/app-editors/neovim/neovim-0.7.2.ebuild b/app-editors/neovim/neovim-0.7.2.ebuild
index 0c951d155648..8b89b0ab4ae5 100644
--- a/app-editors/neovim/neovim-0.7.2.ebuild
+++ b/app-editors/neovim/neovim-0.7.2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86 ~x64-macos"
 fi
 
 LICENSE="Apache-2.0 vim"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 8e2da48019ed..ad008fc27299 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/abduco/Manifest b/app-misc/abduco/Manifest
index df5bd95ade3c..9ca500c0e744 100644
--- a/app-misc/abduco/Manifest
+++ b/app-misc/abduco/Manifest
@@ -1,3 +1,3 @@
 DIST abduco-0.6.tar.gz 15829 BLAKE2B fd6c1670e0a4cf95bfaa00734b981c23877b79ffc14dadae8c84fb198cb4f585cdacf874e127190b6f8c8b784cdfa403a8be0f4cae8bc442d43723967f4525d7 SHA512 3b70a5cc10f0a2743dcbdf6eebdcfcee0e4f4ff8c6ce0bf0aa9f55c3fa85ab43aa659997735e063eab36aba69f91be7bb5519f3f632bff1b9098f5179165c1f2
-EBUILD abduco-0.6.ebuild 839 BLAKE2B 0af65b0c9f0bd05b80511574bf67706a1eb6ddc33f35fd541d102847041d196356220a285c52ee8855aaa022388ce5d082f02bcf3d7a0fcc76e8fd0c18027611 SHA512 cdcdc9017752b118c7f38643048e3d73c28ceac9dd95c89a25530524fe3211c620af7e891fc0c3e07bb5481acf56b86313f8f4b302052ee69c285418106e84b1
-MISC metadata.xml 523 BLAKE2B ee767c2431d698d90cd03bea953fdeeaebce142b47926a23a77ef06f12673380aac0b95aa246bdac77a3dc2494012228808164f6efadf864da7ad40fb6482dcf SHA512 685664ce6dd586114df5caf5303c27f32a9d7f7f21d7ba960e882153c119b10b2149d01cb37eba2a3dcd1be437b3ceb94ed8ad040fb754eb1172e0f5282097c9
+EBUILD abduco-0.6.ebuild 809 BLAKE2B f7702294f66a21bbcf6532704b37bdbb3fe475995dada8519ef0a1d7d8a1a0857e2c1ae4be21a837b88bcaa769bdd85f43198f7981c8b8e7bae76cb904d972c3 SHA512 4421657ebc2e04bc3c1ff66e42d5ddd7a8073499da033c66d1c84666e04a11a69793dcf1d26f4b032b34c16461e55cee4624cc246cb85734a98e45cf41eba90a
+MISC metadata.xml 607 BLAKE2B 6ab74fcc8773f464fbbd18628dfc8bee8f7c894f9cdcac15e049232fa1c7902a3330d308d2868fef61bb8d26a28e1f539b9d6c9ee1d02effe87235d58b596952 SHA512 751daaf8ca0f586298a0677e0dbf249492c3e92fa797554f4e86b876ea0459c9ff17d575dc0becc721e33a4ab263afae1f0a17cf397274f6509b98aa41c2d44c
diff --git a/app-misc/abduco/abduco-0.6.ebuild b/app-misc/abduco/abduco-0.6.ebuild
index 636f2f8dd807..1baefae57e0b 100644
--- a/app-misc/abduco/abduco-0.6.ebuild
+++ b/app-misc/abduco/abduco-0.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit savedconfig toolchain-funcs
 
@@ -12,12 +12,10 @@ SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
 
 src_prepare() {
+	default
+
 	sed -e 's:^PREFIX.*:PREFIX = /usr:' \
 		-e 's/-Os//' \
 		-e '/^CC/d' \
@@ -33,8 +31,6 @@ src_prepare() {
 	restore_config config.def.h
 
 	tc-export CC
-
-	default
 }
 
 src_test() {
diff --git a/app-misc/abduco/metadata.xml b/app-misc/abduco/metadata.xml
index 87e7f1b6c908..95acca7ed192 100644
--- a/app-misc/abduco/metadata.xml
+++ b/app-misc/abduco/metadata.xml
@@ -8,4 +8,7 @@
     detached - run in the background - and then later reattached. Together 
     with dvtm it provides a simpler and cleaner alternative to tmux or screen.
   </longdescription>
+  <upstream>
+    <remote-id type="github">martanne/abduco</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-misc/astrolog-ephemeris/Manifest b/app-misc/astrolog-ephemeris/Manifest
index 94796967502a..fb76eb61fc63 100644
--- a/app-misc/astrolog-ephemeris/Manifest
+++ b/app-misc/astrolog-ephemeris/Manifest
@@ -1,4 +1,4 @@
 DIST ephemall.zip 4604012 BLAKE2B 0caee003272734a71a3f2d10871e1c034c9e9039f5cb0f09ed19d85122ba875794933d53624d6a379838a7f2c33728c2da9aaadbd91887fea018ecfc1c786557 SHA512 e7822cecb87466987107e84aae64d292dad31de9d2c268886869a37ea9e99bf81b2a530129c0f6538c6b55ad46b185e16ee0c5b0d8858acfe189f19e2595c6da
 EBUILD astrolog-ephemeris-5.40.ebuild 568 BLAKE2B 3a242b0e1a42141774fc58eac638cd8bee9f71d1dfee0de49369ffdd800aac01168956f30471246b25979de38dd0e3d752fbde7577a0f44ef964390941c31640 SHA512 58c9eb0512881ad47752e44d39d6bbef1f05f87b64229dce6be8e91370f290339190972d39d552e3ed29d0249b8dee13ee608b90be13257a7d97ffd02c863b12
-EBUILD astrolog-ephemeris-7.40.ebuild 574 BLAKE2B d3f444595f42f3cdb8e5fa36de985269d1c55ddb12af3bdc55fa888637489d64db9f074d83c8d371d14e795545e4d1d2032a851b6ade7de2b4bc60e74913427c SHA512 4202e6bdc4a562647e1c5f62e2a480ebbe776d992d2226342f3658ddf6be362f29d5111437b40b4132e01b1d0ad8be0ed74b79c610e7c385f529191449127562
+EBUILD astrolog-ephemeris-7.40.ebuild 610 BLAKE2B 9a2c387679bc06848cb50b83a6a94f541c7f466e4eb0a52671f56200ac9cc78ead962318162c3d4e5524fcf4a724ad1f432f672764e12aa9a9da8e4bf8245492 SHA512 64f61a643e0162f434d41eaa0c7b586768b1a57b08f2a716908007f76de64833fcf92130df2da83d98589e3744099755c725e6e3a7965db7cbf1e0c5abceb0cb
 MISC metadata.xml 250 BLAKE2B 53ce4a2ec047c91819ecc665bad106707e80e4fbd9bd20cca22843c536beea3d124922de22b9c7986e39d232fb8b1f4752d4c8ee09933fe16383b475db861126 SHA512 667b310c205f016e11407f3e3fb0ad6fb1e530651b32da15e034523b0138e5fdf93b29d64311146bfdfa5bc5108f75e238136641f366e1e0b01e995ddae36aa5
diff --git a/app-misc/astrolog-ephemeris/astrolog-ephemeris-7.40.ebuild b/app-misc/astrolog-ephemeris/astrolog-ephemeris-7.40.ebuild
index 7e24bdd3e783..ac55042311be 100644
--- a/app-misc/astrolog-ephemeris/astrolog-ephemeris-7.40.ebuild
+++ b/app-misc/astrolog-ephemeris/astrolog-ephemeris-7.40.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+# Please bump with app-misc/astrolog
+
 DESCRIPTION="ephemeris files for optional extended accuracy of astrolog's calculations"
 HOMEPAGE="https://www.astrolog.org/astrolog.htm"
 SRC_URI="https://www.astrolog.org/ftp/ephem/ephemall.zip"
@@ -10,7 +12,7 @@ SRC_URI="https://www.astrolog.org/ftp/ephem/ephemall.zip"
 LICENSE="astrolog"
 SLOT="0"
 # works fine on x86 - runs probably on other architectures, too
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ppc64 x86"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/app-misc/astrolog/Manifest b/app-misc/astrolog/Manifest
index d8053908a497..d2f9298b23a6 100644
--- a/app-misc/astrolog/Manifest
+++ b/app-misc/astrolog/Manifest
@@ -1,5 +1,5 @@
 DIST ast54unx.shr 1465432 BLAKE2B 9eec58fb66110a7fd072eee8b02dda109a22c1a1d59506943011041ab595e33eac39f5372ab55f587bcdfb447e599b16b8a9f0ccd04c54257b0dd38a85acde08 SHA512 824fcea1891dafc77692e84a36cc97a8afd90ad93d772edab8437e89869cdc912002f628fd86eecc8182ba4f1ad02cb98f42a30fde425bf94cf59f852b4eda1a
 DIST ast74src.zip 4483648 BLAKE2B d15d3e5d98337c5c5884973d079cffda9144a5c9f43ab48dd38f782eeef089d9fd5fb3f5a01f1d607bd2134e6a774494d4cf7d99e117d3092c8787626436e778 SHA512 540bda7ee10cde0723f6bd4afe410e4e9c59168e31dbdbd0b3b62a9e77ae83a971543fc812876258e2b7b9636f880c74b9be5497c54e7dd0e9b444bad2edbf6b
 EBUILD astrolog-5.40-r3.ebuild 2124 BLAKE2B 4d14b95dbbd64b513c95de7b9999d9706d7d59b73a54207e6768b0c49a1d468bc0c118d062936fba3132ff63dfb032819cd7acedbfa687af23875a2ec686fffa SHA512 5f24d1d927d3a18d6e8ae080135b9f6ef7a8093ebb3ba8eb1a4b6e7d3ec5e2c1bd74342c157cda7deab15733ed9c82a7837d1bbf545adc2c327cdaf36e4a052b
-EBUILD astrolog-7.40.ebuild 1820 BLAKE2B 40aa2aa3af7df61c70c9b46237648f31d946116e6c6c2adeacb5c6477d931c2e3a12d3f2fd2cf01b733b9023dda566586b597fd0774e8452164886d55ea51504 SHA512 bb5d550b49925a0210e2e567eb1cc0d19aa9f663277dc100da44023bc62455eab85fdf47fc6e3a2655698dea6eab611c415949c359c710f4a00afb122ccce548
+EBUILD astrolog-7.40.ebuild 1866 BLAKE2B cd66295c4eab867bb05cbba7491727931849c7c0c5f262a45c278e34ccaa339f812a5b27b562561615f7b7f1c1f5a1a72e767403557a7bee207fb713f429b5cf SHA512 335e51ab9a896568a30faeee3e4f1b95a89f34b298a185c52b9c1bec17879d0bfdd1abcea262762cd9c96c0a7845897336ff9f4a75d893be6c30b734cb62a14f
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/astrolog/astrolog-7.40.ebuild b/app-misc/astrolog/astrolog-7.40.ebuild
index ede487c65b7d..8dc440743c77 100644
--- a/app-misc/astrolog/astrolog-7.40.ebuild
+++ b/app-misc/astrolog/astrolog-7.40.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+# Please bump with app-misc/astrolog-ephemeris
+
 inherit toolchain-funcs
 
 DESCRIPTION="A many featured astrology chart calculation program"
@@ -11,7 +13,7 @@ SRC_URI="https://www.astrolog.org/ftp/ast74src.zip"
 
 LICENSE="astrolog"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ppc64 x86"
 IUSE="X"
 
 DEPEND="X? ( x11-libs/libX11 )"
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 8c7912b6798f..38efc1b54ded 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -2,10 +2,13 @@ AUX elasticsearch-env.patch 976 BLAKE2B f639b40304e2f4ba8c1bd52b86ed0cd6dbda2198
 AUX elasticsearch-systemd-pre-exec 369 BLAKE2B 18fae13aa27931cfc3952309ab76847790f4f785d14efa93bb24cfa66b3b0fc655c19a17d5a7a1b431b6c037cf3596a04eed8f650cf51beb1917560e8817bd2d SHA512 fae1d6e4e52df7d0d3111d6d6bbddf12182de931d461669d8784b524e5671ad40fb645dc6a6cf3de0de08f032c0327da8b25d7cbc4c4a49e3e3a7a791c6cfcdd
 AUX elasticsearch.conf.4 2199 BLAKE2B 0cc66acdc8ce76c4eba04e5fdb745d740bca2a1941535be054e99c33a208e0229609c0106b7f91c9a9f28c22ae8ebb73951dfe36fe2ca0ae51732f5fa1707a34 SHA512 91af72bf5272ed6152835c5e34408fa9e7245b09864613cd59c08da977d9130dbfe664d6aa6f11eac2ce07ebfdb3599e9f27ff219595f6d515c2c06f11f637bd
 AUX elasticsearch.init.8 2150 BLAKE2B 6187331fba1933ddf5fc967d77e818305c6719a838fc6fdac5b821fb2dd659eef3993ca88105b2c30eabf5c2185f3cdae9a58000134c0599a8219ea8933ba532 SHA512 91e7fb2d2eb4a2c85246daa30a28a5eae48972eec5fbae52f16c58ef432c1fabc415e0690052869c70ccc4b6b2a75a228e5aef4b5ee934bc0fb4d00d48303fe3
+AUX elasticsearch.service.3 1527 BLAKE2B 7f7bee9019de2814cdce1e4a66932a0a2a915cddce2d5d2bfde2263bf088001ba1dff9bbbc8eaafb4e1d9012176fbeb4964dcd6f25f6e49935bdda90cec52f6d SHA512 adcc3147ce8d52f64fa21e7cb377ba88d4ea32254eaea03c68d45296bac46d7ff084b93469ca9dbabe013bf8bd183a96a219117b68fb91648b595206b60cebbc
 AUX elasticsearch.service.4 1815 BLAKE2B 59fece95b40d45222c1c49aaae0ab3091e2a2d7a390c7629cbb69862e71e6c3230d35d6ea7a2730ee699ab3c2218de0e85026396f60df46fc7611048c9600ecf SHA512 bdcd91185dc720042e1c2fee38707b545b03b9e6393c5681fee4937d3fbe0288e124b4fa5de5176dda3baeead31150e15bcc9631f58d8cb50e1c63f27220c120
 AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed275b6c7a9f55e77fdcec1919d374818683403a2a7a7c2c2839db2b8afcd66f7667d5080ecb52cade853a400f972a6 SHA512 b300dbc1b3c341ebbcac68385c651133427f342dc0351501b47730b392cc176b7b8dc53877affc6ab384d2834d246a3d0c63b6015dddf2c90d4bcf41cee9968c
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
+DIST elasticsearch-7.17.5-no-jdk-linux-x86_64.tar.gz 167410729 BLAKE2B c6e68176705a1ae2c72a945b2a2b7542f2cb6ebc2420fb52cf26cafdc3045c6f82a5f707062d48142875bf1fbc4be65e473ed9515d65ec25d5a460cc2af991e9 SHA512 d8bc819c9ac5a9035d08e45abf8464275cc2cad7c2f091a3e112100ffbd2605759543e111d9e44c3352f92a08230287c2cba6a91f07ab3d92513682e56b97184
 DIST elasticsearch-8.2.2-linux-x86_64.tar.gz 526116807 BLAKE2B bc30d3532bb62bee88fdfc8e3406d32884add3601363d5bf91f66c110e05241beb6b73cf7a2f8104a843628f4841a313ed5bdf3098030eb5e4567c98b69ac703 SHA512 78d1315a47ae9f082297e049320c5a9787aa9fe44cd2967f3ea37ae954ad34aaa29ca7b3210ac96955be2838d0233b7f86a3e0c66d82dda3724753a0c24c78e8
+EBUILD elasticsearch-7.17.5.ebuild 2404 BLAKE2B b6ec81b233fb31f3fab38aa3aff9ebd05d6c4244e226fb6d7f27a526e3fec59a3ddb51587a358227d2450851512a8fa01c37534b109d1e568b049822d8ae7354 SHA512 697fa490f1092dac9a43006e4a9ac201ae3cbff8eee311cfb90783811ac422d9fdf52be5549695469cd4bdd65aeaa06d79ef21e06b4c4784ed1d9be78c1f7c52
 EBUILD elasticsearch-8.2.2.ebuild 2766 BLAKE2B 181b5480e23a105d046070c04c5fb4866e67c1edae3bb323d6fcc81d9414d37200486b6aa0927a5b30ccc925a033cd2cd1d1ec65e47d67b140c62a0f9635631b SHA512 2c2d3d1ac4dd199931c0017a38e71414af165726d1dee554703193624c23e28f4aec1e58566a5ca437d88d634241ec451fabc741d036062adc3b40006f47444e
 MISC metadata.xml 398 BLAKE2B c0e51fd139e20b21ce5c3eb70594d5a50189499af295f4caf4f1ba3d4d3af3e3ad33e9717330cfaed6db182ba45527416664c99c79411fcec369198cf2dabb20 SHA512 f189a42296460148d1c842bda2a91c97f7d9a9a51051361e364547173651b49377ce4c85c50c628f893fffda8c120680b078cce80e42523728eb5f32d3d9f927
diff --git a/app-misc/elasticsearch/elasticsearch-7.17.5.ebuild b/app-misc/elasticsearch/elasticsearch-7.17.5.ebuild
new file mode 100644
index 000000000000..e875083ef6b8
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-7.17.5.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd tmpfiles
+
+DESCRIPTION="Free and Open, Distributed, RESTful Search Engine"
+HOMEPAGE="https://www.elastic.co/elasticsearch/"
+SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz"
+LICENSE="Apache-2.0 BSD-2 Elastic-2.0 LGPL-3 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="acct-group/elasticsearch
+	acct-user/elasticsearch
+	sys-libs/zlib
+	virtual/jre"
+
+QA_PREBUILT="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+
+src_prepare() {
+	default
+
+	rm LICENSE.txt NOTICE.txt || die
+	rmdir logs || die
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins -r config/.
+	rm -r config || die
+
+	fowners root:${PN} /etc/${PN}
+	fperms 2750 /etc/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r .
+
+	exeinto /usr/share/${PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	fperms -R +x /usr/share/${PN}/bin
+	fperms -R +x /usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+	dodir /usr/share/${PN}/plugins
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}.conf.4" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.8" ${PN}
+
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.d ${PN}.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf
+
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/${PN} into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+	ewarn "Please make sure you have proper permissions on /etc/${PN}"
+	ewarn "prior to keystore generation or you may experience startup fails."
+	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
+	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
+}
diff --git a/app-misc/elasticsearch/files/elasticsearch.service.3 b/app-misc/elasticsearch/files/elasticsearch.service.3
new file mode 100644
index 000000000000..69d3550e7d98
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.service.3
@@ -0,0 +1,51 @@
+[Unit]
+Description=Elasticsearch
+Documentation=https://www.elastic.co
+Wants=network.target
+After=network.target
+
+[Service]
+Environment=ES_HOME=/usr/share/elasticsearch
+Environment=ES_PATH_CONF=/etc/elasticsearch
+Environment=DATA_DIR=/var/lib/elasticsearch
+Environment=LOG_DIR=/var/log/elasticsearch
+Environment=PID_DIR=/run/elasticsearch
+
+WorkingDirectory=/usr/share/elasticsearch
+
+User=elasticsearch
+Group=elasticsearch
+
+PermissionsStartOnly=true
+ExecStartPre=/usr/share/elasticsearch/bin/elasticsearch-systemd-pre-exec
+
+ExecStart=/usr/share/elasticsearch/bin/elasticsearch \
+                                                -p ${PID_DIR}/elasticsearch.pid \
+                                                -Epath.logs=${LOG_DIR} \
+                                                -Epath.data=${DATA_DIR}
+
+StandardOutput=journal
+StandardError=inherit
+
+# Specifies the maximum file descriptor number that can be opened by this process
+LimitNOFILE=65536
+
+# Specifies the maximum number of bytes of memory that may be locked into RAM
+# Set to "infinity" if you use the 'bootstrap.memory_lock: true' option
+# in elasticsearch.yml and 'MAX_LOCKED_MEMORY=unlimited' in /etc/conf.d/elasticsearch
+#LimitMEMLOCK=infinity
+
+# Disable timeout logic and wait until process is stopped
+TimeoutStopSec=0
+
+# SIGTERM signal is used to stop the Java process
+KillSignal=SIGTERM
+
+# Java process is never killed
+SendSIGKILL=no
+
+# When a JVM receives a SIGTERM signal it exits with code 143
+SuccessExitStatus=143
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 736eb677d544..532afa339162 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/unoconv/Manifest b/app-office/unoconv/Manifest
index e639e02e6b89..990a8565ebb7 100644
--- a/app-office/unoconv/Manifest
+++ b/app-office/unoconv/Manifest
@@ -1,5 +1,4 @@
 AUX timeout.patch 460 BLAKE2B 66cb2918b2ad85cb987ecae492626a0ca06344cac4e9fab1f6a141bcb7822356936439e2239ac586aed8a163e297a5b563e51d382e372c2435256933a4ca3612 SHA512 00ccee1c2040149432565abf4cc0bc8966801202a88c75f246d4b4c986dd43288f30045d4e966c973efa946532eec1f07a6bdff0b9307bd9c12475c9309f3fa5
 DIST unoconv-0.9.0.tar.gz 108493 BLAKE2B 36761f5cabd8cf0186ffa74202d8a9e0388ab9dc1a135b8e6b2275ed380de79da85d4955bca446810f4f71dff61bd38d7b131a91930729cbabfb10d656ba3891 SHA512 37d63ada32675fd0ebd089a74db453fdb7332a24e62cbf3e060d6d15cc503c76ede9ccc5e09467f4a38833a8358c09fde23cc8780a77c343268f20e0c37f2469
 EBUILD unoconv-0.9.0-r1.ebuild 763 BLAKE2B 013e6ba84e1bb8cdaa7f6d79b306848d0031110da4865ae9e9d53a8f99269918f25fa11d783355ce547e59a8c26bbea594991542ad65ca2134db4aa4f9ef319f SHA512 db0a805e6a5761ddc508645e435f53b0e65100560fea7e441a0fd54ce31644c4be51077a9b4a4e980d577576be7efd0b23f4825c7d0a575866d8d78afc0b79b8
-EBUILD unoconv-0.9.0.ebuild 762 BLAKE2B 4db20db39164e4179e19fd077b7e7e2722538df7026d30b3b9c2a14b2e6923c812f5ef5da9421924075c8c375fb38838c94b2767f161d86226807e3ce7c8f153 SHA512 c7bf4ddfd4dc26f611ce5c49c74936d437216c520607bdf064ae61a8fb8743de4cb3192f3e36781ee2fbe75688c820ad5e6411f52f63c66bbeab0b82f43c58ec
 MISC metadata.xml 430 BLAKE2B 389284b355ace7dd8290d21a17014d47055aee2b0639658779eef804b5596fd98ad8dcbac35a992f3e51027be32c7c510f3b164d6d27bccd9059e7108fed1a01 SHA512 c2980bbbb63eb4d75a1be788eccf6d0516bef672fb3e2653059a84582ee715b0a40fd63acd158be9a809abec6f6de76845963002476d9e577969aa2f3b57e960
diff --git a/app-office/unoconv/unoconv-0.9.0.ebuild b/app-office/unoconv/unoconv-0.9.0.ebuild
deleted file mode 100644
index 89c568fb1c05..000000000000
--- a/app-office/unoconv/unoconv-0.9.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
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit python-single-r1
-
-DESCRIPTION="Convert between document formats supported by LibreOffice"
-HOMEPAGE="http://dag.wiee.rs/home-made/unoconv/"
-SRC_URI="https://github.com/dagwieers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	!app-text/odt2txt
-	virtual/ooo
-"
-
-PATCHES=( "${FILESDIR}/timeout.patch" )
-
-src_prepare() {
-	default
-	python_fix_shebang .
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake -j1 doc-install install install-links DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog CHANGELOG.md README.adoc
-}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index a58e31f0bef7..f6bfc6656f49 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index 5508c3f3a437..1c9ee68dbf50 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1,6 +1,8 @@
 AUX mysql-connector-c-8.0.19-do-not-install-comp_err.patch 307 BLAKE2B 864c07e9d4fb9a38ac418476f4b7738caa1f2a5dc633ad5921859793983c7b42acd87263ce2703df5a8c7d3bc3d7a60efb28a3ff17c311d89cc7b12edd22574f SHA512 cbb9be24a67a649b68230fe3482063d2d16fb629233e070289eb1ab0011bd8c43b0c056e4b6ca430a62ce0e8f47bb9490cb6746b7dc3fe06a05670b078cd084f
 AUX mysql-connector-c-8.0.22-always-build-decompress-utilities.patch 534 BLAKE2B 15bef04f750b5f373d8c5f39690e90be482bfea66430234befc777e9d84d0060d20e1290798ddacbf0e9f0f8db45ba0318d88b61aec3fd1e859285cefff446ef SHA512 7ae81f4fe020c12e45eba041dcca921fa93f42a12d8c8d840b1bec819c00de8b780a792e99cdc3cae55eef74c911de3087b6583d6213913b36428b96f0e1c3af
 AUX mysql-connector-c-8.0.27-add-OpenSSL-3.0.0-support.patch 11508 BLAKE2B 1fe2341c938ce580611bb1f2ded279d02d4f1130b719c43d0c70942e9954214cc4392b86a18dfd0f88082c6b72fdf270e076647dd1600d7ebb8eb437ca10bb64 SHA512 1b7b1bf471ad6cab6c86dbfb7f6ffe506e3d20a51efcc1df503a9d65976fedb8dbcd67993897241fc0dd9e1f7356670bf3ec80c5b7f66c9246a44b4aa3eee3cc
+AUX mysql-connector-c-8.0.27-res_n.patch 1635 BLAKE2B f75811958a6415bf45aa571a8da14c371500216a197602dec19b8b565bc219f98e8feb9bc660d81e32c4af7f39abb626af405d33a7f478617c8ee96c5b4453b8 SHA512 bb6315f0ac540d0723dffd9f8c2bdad9b9b1c0a3d706f80fd3bbdc9c7f276a8dda2754df94f6cb4ffecb0c3b0e65edc96c90b171eb0a4e5032fe6583e56ade85
 DIST mysql-boost-8.0.27.tar.gz 292184025 BLAKE2B 177209f3c62b0326ca9d021c751a701dec84c1b15c946ab0a68b1b4cf0620468eb3a1df77a918284007a0fde1aaa6a9767d0baed57936612813ef583df51c35e SHA512 6ef2426c0bee46bdf8e2fa5cb159d5ae19f0bed4f7c9bea9b33e0dd922b568c3c68ca063dcbcd7ea6904aaea31877c10064ea10b4bc63fb40d9f31778e3a7891
+EBUILD mysql-connector-c-8.0.27-r1.ebuild 3269 BLAKE2B 7dd57e4dfd1136904170b50ce3310063ca8283cb2b188d9b4a3025bd449d62f59db76d8f3f143c51c7882b2affce51b15caa2907d4d058ae3fdb9708bf05ff25 SHA512 a54b8fe93d921a2e67efcf638014584eb33ffe234ec6ea7164d59ec2dc575e08e18c40536561705121c7467c9f26a45933cd5d0fdfa4a102ef2287ea7ba375d8
 EBUILD mysql-connector-c-8.0.27.ebuild 3222 BLAKE2B 3b8888fe231a27fd07f29ebe1fddabc215ccd9337af0b7f7b30cfab64f2c98b3af06d4840b19fb7a8dbe47fb3699bbfd7a2be39bf8d39ca9eb8d704e92eedc51 SHA512 60c9a2f43d481b51d1334dc92dc9f2f056efb8217f381503b8253ad8b54e570dda98f5b79c0b2ceb272a1b4de84157bbb14a99da3998bed428dce8196734d924
 MISC metadata.xml 240 BLAKE2B cc93ae4da8408b221c296e092d9db6ae3879754ade669d81c1218d53a5f007c6b7717bda6f92dbb0af38ff9b5e45f44e91503b12d3603d9955ec7d5a2a67399b SHA512 0f41c32ce3d736e061302252f14913d7425bc97e19d0c2f3b80c50637ab3521aa6cfc67f82e5f70f91174cddb36bb5622837dc18fd9db3bf75eb860359aade27
diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-res_n.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-res_n.patch
new file mode 100644
index 000000000000..34961b8ad9e2
--- /dev/null
+++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-res_n.patch
@@ -0,0 +1,49 @@
+# Musl doesn't have res_n* functions so we are falling back to the not
+# thread safe ones. Patch made with help from developer Fabian Groffen
+# <grobian@gentoo.org>.
+#
+# Closes: https://bugs.gentoo.org/761352
+# See also: https://github.com/mysql/mysql-server/pull/385
+# See also: https://bugs.mysql.com/bug.php?id=106034
+--- a/libmysql/CMakeLists.txt
++++ b/libmysql/CMakeLists.txt
+@@ -423,6 +423,19 @@ IF(HAS_WARN_FLAG)
+     )
+ ENDIF()
+
++check_symbol_exists(res_ninit "resolv.h" HAVE_RES_NINIT_FUNCTION)
++check_symbol_exists(res_nsearch "resolv.h" HAVE_RES_NSEARCH_FUNCTION)
++check_symbol_exists(res_nclose "resolv.h" HAVE_RES_NCLOSE_FUNCTION)
++IF (HAVE_RES_NINIT_FUNCTION)
++	add_compile_definitions(HAVE_RES_NINIT)
++ENDIF(HAVE_RES_NINIT_FUNCTION)
++IF (HAVE_RES_NSEARCH_FUNCTION)
++	add_compile_definitions(HAVE_RES_NSEARCH)
++ENDIF(HAVE_RES_NSEARCH_FUNCTION)
++IF (HAVE_RES_NCLOSE_FUNCTION)
++	add_compile_definitions(HAVE_RES_NCLOSE)
++ENDIF(HAVE_RES_NCLOSE_FUNCTION)
++
+ # Verify that libmysql_api_test runs OK
+ ADD_CUSTOM_COMMAND(TARGET libmysql_api_test POST_BUILD
+   COMMAND libmysql_api_test
+--- a/libmysql/dns_srv.cc
++++ b/libmysql/dns_srv.cc
+@@ -37,6 +37,17 @@
+ #include <netdb.h>
+ #include <resolv.h>
+
++/* we don't have anything else but the non-thread-safe variants */
++#if !defined(HAVE_RES_NINIT)
++#define res_ninit(X)              (void)X
++#endif
++#if !defined(HAVE_RES_NSEARCH)
++#define res_nsearch(X,D,I,S,B,L)  res_search(D,I,S,B,L)
++#endif
++#if !defined(HAVE_RES_NCLOSE)
++#define res_nclose(X)             (void)X
++#endif
++
+ // POSIX version
+
+ static bool get_dns_srv(Dns_srv_data &data, const char *dnsname, int &error) {
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild
new file mode 100644
index 000000000000..7058ba6c50ed
--- /dev/null
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic
+
+# wrap the config script
+MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/mysql/mysql-server.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+	S="${WORKDIR}/mysql-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/21"
+IUSE="ldap static-libs"
+
+RDEPEND="
+	>=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}]
+	app-arch/zstd:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
+	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+# Avoid file collisions, #692580
+RDEPEND+=" !<dev-db/mysql-5.6.45-r1"
+RDEPEND+=" !=dev-db/mysql-5.7.23*"
+RDEPEND+=" !=dev-db/mysql-5.7.24*"
+RDEPEND+=" !=dev-db/mysql-5.7.25*"
+RDEPEND+=" !=dev-db/mysql-5.7.26-r0"
+RDEPEND+=" !=dev-db/mysql-5.7.27-r0"
+RDEPEND+=" !<dev-db/percona-server-5.7.26.29-r1"
+
+DOCS=( README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch
+	"${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch
+	"${FILESDIR}"/${PN}-8.0.27-add-OpenSSL-3.0.0-support.patch
+	"${FILESDIR}"/${PN}-8.0.27-res_n.patch
+)
+
+src_prepare() {
+	sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "scripts/CMakeLists.txt" || die
+
+	# All these are for the server only.
+	# Disable rpm call which would trigger sandbox, #692368
+	sed -i \
+		-e '/MYSQL_CHECK_LIBEVENT/d' \
+		-e '/MYSQL_CHECK_RAPIDJSON/d' \
+		-e '/MYSQL_CHECK_ICU/d' \
+		-e '/MYSQL_CHECK_EDITLINE/d' \
+		-e '/MYSQL_CHECK_CURL/d' \
+		-e '/ADD_SUBDIRECTORY(man)/d' \
+		-e '/ADD_SUBDIRECTORY(share)/d' \
+		-e '/INCLUDE(cmake\/boost/d' \
+		-e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
+		CMakeLists.txt || die
+
+	# Skip building clients
+	echo > client/CMakeLists.txt || die
+
+	# Forcefully disable auth plugin
+	if ! use ldap ; then
+		sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die
+		echo > libmysql/authentication_ldap/CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# Code is now requiring C++17 due to https://github.com/mysql/mysql-server/commit/236ab55bedd8c9eacd80766d85edde2a8afacd08
+	append-cxxflags -std=c++17
+
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
+		-DINSTALL_LAYOUT=RPM
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DWITH_DEFAULT_COMPILER_OPTIONS=OFF
+		-DENABLED_LOCAL_INFILE=ON
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock"
+		-DWITH_LZ4=system
+		-DWITH_NUMA=OFF
+		-DWITH_SSL=system
+		-DWITH_ZLIB=system
+		-DWITH_ZSTD=system
+		-DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient
+		-DSHARED_LIB_PATCH_VERSION="0"
+		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
+		-DWITHOUT_SERVER=ON
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	doman \
+		man/my_print_defaults.1 \
+		man/perror.1 \
+		man/zlib_decompress.1
+
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/dev-db/sqldeveloper/Manifest b/dev-db/sqldeveloper/Manifest
index 121f9bd9440a..7054e5ad5b80 100644
--- a/dev-db/sqldeveloper/Manifest
+++ b/dev-db/sqldeveloper/Manifest
@@ -1,4 +1,4 @@
 AUX sqldeveloper-r1 407 BLAKE2B 26bf826e6ccf1cd45b52e7cdf6e694d88570118c0e98cab83f66f078ed79fea36fb3fa6df67dc271a74faad4307996c4968f6d316d9fc71d1a5360804f39782e SHA512 cf089f58c9de3677dbaa7b0c4bdd81e234bffac4c25f5a433c7854068ca33b5a4165d8a5d24188890d5d8c60c209adee5267a255505b978a5a7f73646fd1dfbe
-DIST sqldeveloper-21.4.3.063.0100-no-jre.zip 469919055 BLAKE2B 402fbb25c44c2205db1f8ecf3649028aee01d00f73c8f45cf4f415f42d1c507f9f4b5b23b6068165d7667897e1c314272f583dc6da02e70660c64422acee08c9 SHA512 4ab25d596ad383c4d09f315f3a9c43c285a36528e544b8052b8cc5cbed0c13fcd68ad12f660dc66ec087c7044accde6cdfac48518a86bc9c4cb2b89a8bb621fd
-EBUILD sqldeveloper-21.4.3.063.0100.ebuild 2955 BLAKE2B 7893bd2fc18ef046b472e1439f4d0215e1d5cefae041bde716bfa355119522a039a94aa37f834ce9b03522d16d01b2be39fbe31468afc1c0c2c11bfc0be5c948 SHA512 de14aa3347e6d1be732dc87be906a735b96da3a311cf9cc189ef67acefaeb31204b47af68c04657becab4f5d8e019094f548029a671b5dd6aa89699c3c86306a
+DIST sqldeveloper-22.2.0.173.2018-no-jre.zip 507930198 BLAKE2B 51c22825b7774d61ca5006150fa8566f35f03a64a755a2602c1aba9613f1d22e5efe9c46aa9b0d8295f349e980e9a0af115e39e8faa9bded4e154d8619f9b5f8 SHA512 daa3be1d20ed7a44e1f2a5e3e86166c6ea27050aceb0fe2ec46ade8557d68c8fc2c56c19e2d7a37c80005a0ac8040f3f7b0f9fd8345284e6615c616d36462627
+EBUILD sqldeveloper-22.2.0.173.2018.ebuild 2996 BLAKE2B a3942a8ebd42dc6d54192d188f2ba45312124784573b6e1d303f59d30cbba3ffdcf6262406299c64113a31cd8e659c5d322714149ec914c07c553651149d5fae SHA512 d650856919087b8e7d45a6e5bf9ac34f1dd4e8f35ec3c7e0e611dab1a72dc46387b752d7430e2020e869abf5f148cca5e3cd0003ebb0ca8a0e776c0ba73b683c
 MISC metadata.xml 496 BLAKE2B 46b421a2174ce825577a96c41ad103162b6b11127fa1512b12946e46e9698fbe24d1338e38e553ed49f28474497c4acfe2834dd70dee92ce4f34bad01f64ef5f SHA512 0cf75c543496d84e707cbfd146e95ba46ec3dc2779bfff990e2844200ff223d747fb30a6f90a988dd9d07efd060ecc27f9b5c3edcda15c51d3a23ccbd3abb3e8
diff --git a/dev-db/sqldeveloper/sqldeveloper-21.4.3.063.0100.ebuild b/dev-db/sqldeveloper/sqldeveloper-22.2.0.173.2018.ebuild
index a6c582ff187f..98ac3b355667 100644
--- a/dev-db/sqldeveloper/sqldeveloper-21.4.3.063.0100.ebuild
+++ b/dev-db/sqldeveloper/sqldeveloper-22.2.0.173.2018.ebuild
@@ -19,8 +19,8 @@ KEYWORDS="-* ~amd64"
 IUSE="mssql mysql postgres sybase"
 
 RDEPEND="
-	<dev-java/openjdk-17:*[javafx]
-	>=virtual/jre-1.8:*
+	dev-java/openjdk:11[javafx]
+	virtual/jre:11
 	mssql? ( dev-java/jtds:1.3 )
 	mysql? ( dev-java/jdbc-mysql:0 )
 	postgres? ( dev-java/jdbc-postgresql:0 )
@@ -36,7 +36,7 @@ QA_PREBUILT="
 
 pkg_nofetch() {
 	einfo "Please go to"
-	einfo " ${HOMEPAGE}"
+	einfo " https://www.oracle.com/tools/downloads/sqldev-downloads.html"
 	einfo "and download"
 	einfo " Oracle SQL Developer for other platforms"
 	einfo "         ${SRC_URI}"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index d879e83bb9c4..fea83424cd42 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 55d3a17ecf64..624a73e0e701 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -33,7 +33,7 @@ EBUILD python-3.10.5.ebuild 11702 BLAKE2B d24101e18a5cc846de6ab9ec1578a8fb520b11
 EBUILD python-3.11.0_beta3.ebuild 13176 BLAKE2B f3ff342908575b3e8651f5eba8b7428f60b8f799f44f46f5f04f98e82b82b5ac85127e90475b0d3d9653f9b56e15fa606437c0a8bf98c2affe5a4bc65845f24f SHA512 f9d84559aec861e6e1426914da6b0430878d2bb141def8c064f06d21431ffb8b915b905802505dfc1a98d555c4d3bb130ee45247b717b38c5ea9f7a9056da1ba
 EBUILD python-3.11.0_beta3_p1.ebuild 13176 BLAKE2B f3ff342908575b3e8651f5eba8b7428f60b8f799f44f46f5f04f98e82b82b5ac85127e90475b0d3d9653f9b56e15fa606437c0a8bf98c2affe5a4bc65845f24f SHA512 f9d84559aec861e6e1426914da6b0430878d2bb141def8c064f06d21431ffb8b915b905802505dfc1a98d555c4d3bb130ee45247b717b38c5ea9f7a9056da1ba
 EBUILD python-3.11.0_beta3_p2.ebuild 13272 BLAKE2B 658ba9c4c5454b17b5000b554af41f47f2b0b57284f8b2239cb9d290171d626e7201f62c6d8e8042dd2d417defed0f23723464b957aaaffb7794c16fb5671257 SHA512 6a0d31c7d39112ad9f5b1971ccd81088078f524d07888d06a52d6853d0b6e62944f6c0729977fea85e1e18220f56612a8909dc58e7dd319e21bd8309933625ed
-EBUILD python-3.11.0_beta4-r1.ebuild 13360 BLAKE2B 194f07eab45298a5d355312eb55647ab1a45c0d321fc9c402d8cc1b271b3e6c66a6b9d2411fe2a9b52428325009fda20c086f1a447c4fec6a08526ecfa5afb62 SHA512 f65578af6a1fa14c19beeca2d1c59bd31bd4f2cc6eed5c74db6dbd787d6dccd7274eeb3007fab4ccd23e0ac06b13e620d2df08a943d7346d144a4a301858e078
+EBUILD python-3.11.0_beta4-r2.ebuild 13637 BLAKE2B 230701d089c7e42f80b0666a1ac6c5d48ff6fe8a5b7822ee3d4cd41adfe6e50143ecde143e228416f97cc0886910b22bc0fbb83ffad3ad19006aebcc382516fc SHA512 ec7a302106654abefb0672e25e1f189506d35111be4a983ae5b51281bd195a452fe1fb7170b77f8048c880563664f8b9b3624c434594a4f3b36306a203e299e9
 EBUILD python-3.8.13.ebuild 10279 BLAKE2B dc700b2729f44840d33306fa0e50565d3c134ff74db39c83aebcc9994899479736bad15897e4135904bf7a6f4914c40e9b73caa64a0376aba10664d07c351227 SHA512 51b826ed0c99f777b684341141c83fca557942496a670aa4385f6c8c6379e445d7ec953c2f1b9562d5b4ee921038677f597c27fc8f355f076d72f66e6ae6ee9e
 EBUILD python-3.8.13_p2.ebuild 10220 BLAKE2B 2bdcd798eb692ea3965c397bdb85b9fa98cff275ec7bdd9e5ef75b86dcfc5cb74c4850ebfa8d3c46eded5cdae7a83f930f241ad09bc7ad103b83843a0ada8e1f SHA512 bcea714655f490fa8f816b3f969cd9079f69692fc86e74d52bfbfd06d9ea3076bb69eda64b4cf333139bf7b71c2372ceefcb3ba04c31d49737fb2b4388044725
 EBUILD python-3.9.12.ebuild 11522 BLAKE2B a1847835a23e863957ab089d1449a01c377ce9e1460ab3ed3453d863d6ad38824802bed23490dfa27c88615c1d70b8690d086997da143987657bf595d592ef2b SHA512 0e0d46e25e1f353152daddd3d67b870f393124a48e1cb9f9f464b3174d5254cba2580e7351dcba91558885cda7342e843a2e69631100bf6d15d791fadc3d8d2b
diff --git a/dev-lang/python/python-3.11.0_beta4-r1.ebuild b/dev-lang/python/python-3.11.0_beta4-r2.ebuild
index 648a47f45541..aab4bbbdc169 100644
--- a/dev-lang/python/python-3.11.0_beta4-r1.ebuild
+++ b/dev-lang/python/python-3.11.0_beta4-r2.ebuild
@@ -278,6 +278,9 @@ src_configure() {
 	for mod in "${disable_modules[@]}"; do
 		echo "MODULE_${mod}_STATE=disabled"
 	done >> Makefile || die
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
 }
 
 src_compile() {
@@ -424,25 +427,9 @@ src_install() {
 		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
 		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
 
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		cat > python.wrap <<-EOF || die
-			#!/bin/sh
-			export LD_LIBRARY_PATH=\${PWD}\${LD_LIBRARY_PATH+:\${LD_LIBRARY_PATH}}
-			exec ./python "\${@}"
-		EOF
-		chmod +x python.wrap || die
-		local -x PYTHON=./python.wrap
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
 	# python-exec wrapping support
 	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
 	local scriptdir=${D}$(python_get_scriptdir)
 	mkdir -p "${scriptdir}" || die
 	# python and pythonX
@@ -470,3 +457,19 @@ src_install() {
 			"${scriptdir}/idle" || die
 	fi
 }
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 3.11.0_beta4-r2; then
+			ewarn "Python 3.11.0b4 has changed its module ABI.  The .pyc files"
+			ewarn "installed previously are no longer valid and will be regenerated"
+			ewarn "(or ignored) on the next import.  This may cause sandbox failures"
+			ewarn "when installing some packages and checksum mismatches when removing"
+			ewarn "old versions.  To actively prevent this, rebuild all packages"
+			ewarn "installing Python 3.11 modules, e.g. using:"
+			ewarn
+			ewarn "  emerge -1v /usr/lib/python3.11/site-packages"
+		fi
+	done
+}
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index b57685346da2..7c345a0fddb0 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1,6 +1,6 @@
 AUX zig-0.9.1-fix-single-threaded.patch 390 BLAKE2B 443a5ab709aa90ed92636310c204a15cbb60a997ff39f7f7102fdd4f21f66e64bd79516653729ecbd719aeb39809457c3db2d1c3c9d0614d1fb637307cc2a892 SHA512 f4e6f87a3aae5380c3f3e1eda85f10914119a378dd08c8375d18dd038dc0b131234a62fd86f46f64cd2038e5abd787e4a7876929fceac85b01bd6e4bce3b3263
-AUX zig-9999-stage2-fix.patch 474 BLAKE2B aa88bf7e75482f540a5d18dbe8cdd1ab58cacf7f71ac0f66b334d63b9be697c6a7e9ca4e23cee9d2b82936502b8d8e150026873a3858bf5ccb49f4cd4f9632e6 SHA512 0637f6a4e86232df88097db4cd8670521a8bd3fa7378395c508ca5397425166988ad30f0e249347bc0e2f8473a96a81da54bf2ae0215d3b531a751c4bd3c8b8c
+AUX zig-9999-stage2-fix.patch 474 BLAKE2B c19bbe2200e4f2bdbc41af2ae303bd105ae728726fe77f90b21d0e16734ae5623e69ddd08e2e57f6b9215a4b319cae870da1e3d8a8d92fd909aac53ff7a3d062 SHA512 af7f7b00fda2492df643e0119aed1287580900eeccc0c03df3089e186a8797878da0a3ce6e7f2149d37454c0d1ea2fbd512c6885afa56939a677c06b5f624c9a
 DIST zig-0.9.1.tar.xz 13940828 BLAKE2B 996b0e945f61b01dddbb7c8674a9e2d2d01b93eb48fdfd2c986496330990ffa64cba15f8bd8518b90ef6f514759ba6cc3fd31d6044c5b11b92bf92e3f7f15303 SHA512 0b8a5f9b7e34e4252536f59bc91429f1e76b2bf8e01f024095919f6ecf34db56b5c86c554fbb94bdcb5255394c87f2c87519c8f34c631f53816927ec0882ae2d
 EBUILD zig-0.9.1.ebuild 1654 BLAKE2B 9ef9f83c3a69a6d7757c964a1f4b3e1109de98654bc40951e95bd99278ae0e20e80c5468a4b8156358e773478eccc3f536e896a95718f00ee6a8dcecf267f218 SHA512 622061b326afd67878d20385af2d06f50b475f1372f64668d85954adde9f5033313f44923877bf95e5bd99e85901d19e7ddc36f2bf4915250ca2bcd5885297c9
-EBUILD zig-9999.ebuild 2315 BLAKE2B d15c17c503357e35cdf2165b09564f0eb82c2f4abf550dce3535e71bab9cfbfae76c492ead7d255060bab48b06e74470f20da6ef2097f8dd91816f10ac1f952c SHA512 1d3c2d77b8abbc2979f80fa4af3c4c3524644b55a7afd3efbee58dfee6b031f43f6b7d9611e3a0abcdbdfbb4085380b0cfb37356a13ddc2b5c3e42919edf8fab
+EBUILD zig-9999.ebuild 1953 BLAKE2B cc493915fb9503bd158f5fd20537adc74ad9a33fb508098942dc47eb1d90091ff2dbcc2f84855d1e603a66c8ae67e15a2181878642e1d36611d65f2a442c5bf5 SHA512 b2e005745d20552a7cdbc27664903f946fd8e325a93b256f6c62d4439a905239f89ef1bc48a15714912211c0e8e8c93cdb63731585095c09b30883ba3add5e9c
 MISC metadata.xml 439 BLAKE2B 0284fd16d5ea4cf989e1558a5194d777c17ff976f8f69c97f3a245f5c412733ba0eaf4c9cdfea6b618988430e01e545d0a0016b6f3017614194a5152a66c2f59 SHA512 a7b020d023d41ac30bfc3cd2344ae176d49d3f7c43b284f4675588b089de388c4e631c4216758b6ba8b12497b28761a41165562cdf50a48cab15784bcb9c3396
diff --git a/dev-lang/zig/files/zig-9999-stage2-fix.patch b/dev-lang/zig/files/zig-9999-stage2-fix.patch
index 520be382c562..610ab6b86623 100644
--- a/dev-lang/zig/files/zig-9999-stage2-fix.patch
+++ b/dev-lang/zig/files/zig-9999-stage2-fix.patch
@@ -1,8 +1,8 @@
 diff --git a/build.zig b/build.zig
-index 4d3cf49..4601935 100644
+index ac0a161..12f7e15 100644
 --- a/build.zig
 +++ b/build.zig
-@@ -550,6 +550,7 @@ fn addCmakeCfgOptionsToExe(
+@@ -562,6 +562,7 @@ fn addCmakeCfgOptionsToExe(
                  else => |e| return e,
              };
              exe.linkSystemLibrary("unwind");
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 87dc59b0c0c7..c081a14b93c0 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LLVM_MAX_SLOT=13
+LLVM_MAX_SLOT=14
 inherit cmake llvm check-reqs
 
 DESCRIPTION="A robust, optimal, and maintainable programming language"
@@ -23,20 +23,12 @@ RESTRICT="!test? ( test )"
 
 BUILD_DIR="${S}/build"
 
-# According to zig's author, zig builds that do not support all targets are not
-# supported by the upstream project.
-ALL_LLVM_TARGETS=(
-	AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 NVPTX
-	PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-)
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]}"
-
 RDEPEND="
 	sys-devel/clang:${LLVM_MAX_SLOT}
 	>=sys-devel/lld-${LLVM_MAX_SLOT}
 	<sys-devel/lld-$((${LLVM_MAX_SLOT} + 1))
-	sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}]
+	sys-devel/llvm:${LLVM_MAX_SLOT}
+	>=sys-libs/zlib-1.2.12
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 92bceb272a3b..0b2bdeebfb77 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/OpenNI2/Manifest b/dev-libs/OpenNI2/Manifest
index 7c98c0d9d72a..d36287e80533 100644
--- a/dev-libs/OpenNI2/Manifest
+++ b/dev-libs/OpenNI2/Manifest
@@ -5,6 +5,6 @@ AUX pthread.patch 977 BLAKE2B ce3989613ea9672b67deecd0ca35f5f4bb31d8bcd6cd46985e
 AUX rpath.patch 569 BLAKE2B 5a9433fb5ef61c73c08b22d942f8f9a4b5340bf3e8f7fe834f56025dac0d4a65c17065a0e8151d36c2fbcd7651a3e6c4d4c7579ad1dfff6f552877197c619345 SHA512 86adda790d6814b0339ff969e262b78282c977ff4dc16268d4e7831e1086886aefee5c37c5bae9e97b7caf3e9f22e922f87e429e586fafc8e5503b4f99ef4adc
 AUX soname.patch 674 BLAKE2B ba4b8038016ced8d573e57257cbcc7a61f175ec29a720f2d86c04aeacbd5608d315ee54e8ef260daf1548788a59ebe2cafe0d911cedf58b7eae9f8c0b9c6dec6 SHA512 fec4ab17efd29e1fc05a880584aa63559d311a248ef6def36af9c7c652f93aa0ba77f600115f0e4093b7c5c0b446955a4d36d9663196882f5c460a26d99498be
 DIST OpenNI2-2.2_beta2.tar.gz 8681740 BLAKE2B b5191fefd93a5b10e43412d4f0c1ae095a5168ea788d0e2b325daff3ee0329a47f3341c0d712c3a186d23cb3f9fa03478f3342acbd634502cc92aaed0d97d185 SHA512 60a3a3043679f3069aea869e92dc5881328ce4393d4140ea8d089027321ac501ae27d283657214e2834d216d0d49bf4f29a4b3d3e43df27a6ed21f889cd0083f
-EBUILD OpenNI2-2.2_beta2-r1.ebuild 2464 BLAKE2B 0d417bdd0ae259a75a406e280a85ca0df85cb2cd37cb560b9177ffeeeaf4eb1de6e3d0edfa76cd8f09cd5ed691080fa63d8531bf32cb0d957456e63400e60781 SHA512 98f9f36fdb3cc785dc387c44faca6562eea72db988481d69831ac0e49108085b14593e02cdb2d97c5931db9e67d5f5c115f42572020caf47d07e8698fa0685eb
-EBUILD OpenNI2-9999.ebuild 2412 BLAKE2B 79170f9c10e8df722109df4d125be0f2ff21a02cf01ab955742b633e685bf4690a3e0f5d9a38da976f610e2ea653bc209d6ae5f2ab1779d5a94ff8509769f102 SHA512 b1e1777d2e221a54704afe0c016324aac677ec9a3cfbc3f13e8dfd985c079ac003e8322121667571563e7a9186999c05b2d18b82c45c8c9a0462a719c9ed7834
+EBUILD OpenNI2-2.2_beta2-r1.ebuild 2482 BLAKE2B 41b67ca67c5dc23355f21dfc71b5108491bd6499c0b8ce0481fa76bd6720d85829f90f7047ab0dee2362876d321f97492e19756a2ab09161640547388b567bc8 SHA512 e2adf0368ad8ec72a132fbfe3070af47f98c737b7372e6644f8738f5c2717c763468de2cdb739b6c3022ddd34a5082859d42dd8f251fee0545745736be6e92f5
+EBUILD OpenNI2-9999.ebuild 2430 BLAKE2B 6fe1670b9a78beef03572df83f5f1066dcbc3c99a3ce3155ed1e876c7c631639d9f898f7e2cb4646436868f6b53e604081ada08c02aa3aab5d903890e924eff0 SHA512 04c3737476321b93420ed4e7408e91b4ac5c248844a3c1ec501a3f6ca7443b1e23a577eaa375bbb8135ec97df1c4e7936d794d1da6c9baa5ff51f9c4c539ab6b
 MISC metadata.xml 342 BLAKE2B 79de2b17743b42d3994a610f70f25ee5b5a31b47c7b26a0e59bf0d3bfdede42785b35528bda8cc60197b7e83d0546d36a985dc1c96f5b2f9e35d541e3cb4077d SHA512 2bcf413ed30f3e964530038b75e9e1b01bc952e900a168ab614f1124218807e1293815787d4e7420ba354b26e70cf1676a2833576447cb909c8deb2f97e8c684
diff --git a/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild
index a74f713947b0..13ddc4a27916 100644
--- a/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild
+++ b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/occipital/openni2"
 fi
 
-inherit ${SCM} toolchain-funcs multilib java-pkg-opt-2 flag-o-matic
+inherit ${SCM} toolchain-funcs java-pkg-opt-2
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
@@ -23,12 +23,12 @@ DESCRIPTION="OpenNI2 SDK"
 HOMEPAGE="https://structure.io/openni"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="doc java neon opengl static-libs"
+IUSE="cpu_flags_arm_neon doc java opengl static-libs"
 
 RDEPEND="
+	media-libs/libjpeg-turbo:=
 	virtual/libusb:1
 	virtual/libudev
-	virtual/jpeg:0
 	opengl? ( media-libs/freeglut )
 	java? ( virtual/jre:1.8 )
 "
@@ -54,7 +54,7 @@ src_prepare() {
 }
 
 src_compile() {
-	use neon && export CFLAGS="${CFLAGS} -DXN_NEON"
+	use cpu_flags_arm_neon && export CFLAGS="${CFLAGS} -DXN_NEON"
 	emake \
 		CC="$(tc-getCC)" \
 		CXX="$(tc-getCXX)" \
diff --git a/dev-libs/OpenNI2/OpenNI2-9999.ebuild b/dev-libs/OpenNI2/OpenNI2-9999.ebuild
index 210a3efeea3a..ffd87acd6445 100644
--- a/dev-libs/OpenNI2/OpenNI2-9999.ebuild
+++ b/dev-libs/OpenNI2/OpenNI2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/occipital/openni2"
 fi
 
-inherit ${SCM} toolchain-funcs multilib java-pkg-opt-2 flag-o-matic
+inherit ${SCM} toolchain-funcs java-pkg-opt-2
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
@@ -23,12 +23,12 @@ DESCRIPTION="OpenNI2 SDK"
 HOMEPAGE="https://structure.io/openni"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="doc java neon opengl static-libs"
+IUSE="cpu_flags_arm_neon doc java opengl static-libs"
 
 RDEPEND="
+	media-libs/libjpeg-turbo:=
 	virtual/libusb:1
 	virtual/libudev
-	virtual/jpeg:0
 	opengl? ( media-libs/freeglut )
 	java? ( virtual/jre:1.8 )
 "
@@ -52,7 +52,7 @@ src_prepare() {
 }
 
 src_compile() {
-	use neon && export CFLAGS="${CFLAGS} -DXN_NEON"
+	use cpu_flags_arm_neon && export CFLAGS="${CFLAGS} -DXN_NEON"
 	emake \
 		CC="$(tc-getCC)" \
 		CXX="$(tc-getCXX)" \
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 89269f764fc1..3639e09dee71 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -3,5 +3,5 @@ DIST Botan-2.19.1.tar.xz.asc 488 BLAKE2B 36f27e294fed60ea4d9ee9d919a58fc431a1bf9
 DIST Botan-2.19.2.tar.xz 6063336 BLAKE2B a46fa49c61846e718197ab3a8431a5bdcab0f4cc5e42aec04fd22932ecdbfa2b755cae53c125eee8248ecae237671ec6f0533f99289068ed81e6cd34886d8b88 SHA512 52b9c80a240457e46a299480338472f7d0c0b56df7b1709fdef52c5be3afca5b474fe143801c9a332ae884eaf033e60461c9d3e0b2f7b069f4fe8b4c45932abf
 DIST Botan-2.19.2.tar.xz.asc 488 BLAKE2B 94d22dff9de02871560649b1d961f4c7ae5fa37a847141554f8da9f0a726d4497cd23e0d84197beb4d176f29aa3a478118d94cd52d2c04733d115828f85d400d SHA512 e25a03ac437a08737ecde541ead4b841ccb507d3198683a1755dab1d4f82e9ce0278473db7c7041a4b808f9dff9927106e30bbad79b1674615254ee78f0b6a06
 EBUILD botan-2.19.1.ebuild 4145 BLAKE2B c9f3428f8b5c3b163f5de138b5b72b2300b7d05f1e1ce321b2086676e872a9cda5470e117a57c0ff0c8ccd964fcc1bf3caa851856c656076713cc0736745aeb5 SHA512 aa89b9cab9813fd21f7c504725ff32fbad660441e373ca73f7329ac67fceacada5b228393146be151d409af8415e03155bfd74e7fca32e11c7f5e161147a2886
-EBUILD botan-2.19.2.ebuild 4390 BLAKE2B d9deeeb701b0e455bdbf65dfffec3f8383625b51b8dbda01f054b424e38838d6337ca9c6e22780ffc2c296d2bab42260888577bb9c0a6884ccea2def40f03bdc SHA512 9e23e56291805f94f06d971d4a86f3fa481a7facbe38d68492a9e32ac1c8f19f39908ccfb3d953f9191243a4eb953f64ef203d713efabcd227dea5ba9cff3aa0
+EBUILD botan-2.19.2.ebuild 4386 BLAKE2B f98ec10d9f5f564ee5c7bc41c6ca7ecd674af8ab92b023d7837a058b63f59b1fb1b9d93f4c251a26f7b34fa93c6f113f6bbd25251ed527060f370001305e0436 SHA512 997a8051d6de89c8ccd271f6b3872ab81954a0895d226500d3f72575fac82bb07852c8e12df7b8bcf2879880613436a4fbcf550ad6c4fe20bdf8e63479405983
 MISC metadata.xml 587 BLAKE2B 8d46466fee633fda0f81549a6e512e4ef5963eda31d7c882cee2fe2bfae8b0379509f046d0bdfdb1fe9481eea0585f1754753ed6b509c4f922b8fbf9ae089f39 SHA512 258e04098b9db5821a66e38d02ffb195b57378621fd2a549c8892744cf257be857ebf75c8e4a2f041cd267f07c2f1c3a5fca8df61db0538d8282507cf03a029d
diff --git a/dev-libs/botan/botan-2.19.2.ebuild b/dev-libs/botan/botan-2.19.2.ebuild
index f7dd41802cb6..c4186ab0ca1a 100644
--- a/dev-libs/botan/botan-2.19.2.ebuild
+++ b/dev-libs/botan/botan-2.19.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="2/$(ver_cut 1-2)" # soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~ppc-macos"
 IUSE="doc boost bzip2 lzma python static-libs sqlite test tools zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libmpack/Manifest b/dev-libs/libmpack/Manifest
index 93448f0fa283..cca539711836 100644
--- a/dev-libs/libmpack/Manifest
+++ b/dev-libs/libmpack/Manifest
@@ -1,5 +1,5 @@
 AUX libmpack-1.0.5-libtool.patch 2022 BLAKE2B 1b1104b35a79d1bd3595353ec238fd13ece6a369d10999a5c7b627a7c9a98a24fad880970cda5d324cd95e434ae4f31e044ff6702a307f7811bf0833372afbb9 SHA512 dcb0029018df34aa5530ef6f9f0c8ffec7d33288e8854273db98c823f03663d260837c80846acf5571400dd0f78588f26fe62b20a2f9469c09f22189b0a65fff
 DIST libmpack-1.0.5.tar.gz 32966 BLAKE2B 8ad01de11c740c3efc7b42046b89f7691dd32d228e126485bc49224e54789e7f12a611982c0fd9d2bbe8b06d1ce2df1ceea1b302e139e30d0a8c31f251129166 SHA512 6e30edafcacfb580b410bc6749ed7fe8f18b3be0cb98959339853e77bc3ec0cda6df08a0f1f22768cfc773458a2ea6bcef4f0421eea55cf56c58981d13711a04
-EBUILD libmpack-1.0.5-r2.ebuild 1298 BLAKE2B 105ad8baeabbc915a33cbbc2d2a62aa6e37b422f969533ca38293bf9299ad67d3b29be8ef20190ee692d56357c67d111a7b5ab0d989f74bf13bc7bb69ed8c6ca SHA512 a3395fa0d99cf4913040c0318e28115e8ade54fa44cdc76fcddc173744b054f646d0680fdb3a2f3e2ce46a44526787b5868c02b5552544dd2f8a9aed1c4cd46e
+EBUILD libmpack-1.0.5-r2.ebuild 1297 BLAKE2B 1951d5baec683136227db9de35d38b20ca631d43c6f469c8975d8e69ec87c5d4021545390c5cd8a36c2bb338dc8adbd251220b11d3bb27cd32188daf19565209 SHA512 2327333dbb8a5f5f333ca856f0dcde2fcc88b15e691533e8bc22c18e8a390b8bd6d2e356391af5c969ce99fa04b8ff5cd3928c635382833ff94083f98c458218
 EBUILD libmpack-1.0.5-r3.ebuild 1425 BLAKE2B de55dd8863d4180f24948ff3af832d5eec62f37c73e4a3786d0b5a21460f93d71f489b924f8367b030c8e37258609b4f89b24c15457b7a1e9cd7dc2768c815db SHA512 43ed6111acc2af7b7dab44177c27f121b70c2e60cce6a3810f769018dbad7734bea9f484dcd01e077a26f1a239b0b31c4775147931de822a61ea4ab2b11aec42
 MISC metadata.xml 333 BLAKE2B f3e54e3a241a85adad55693f7dd3cc47cc646d1432b4281c264c849fb2a2bfc050aee53f5ae766063335b72c3ca91ed9054bac758d82c969acb61913f7282940 SHA512 aa83f4113099ecf8b749a070014b9d9c09fc1c0d4836f2cf621b2966088cf3ee73e26ab4f365063713db353671ad5937f98ffe4c87762c6e196cd57c8eb595ea
diff --git a/dev-libs/libmpack/libmpack-1.0.5-r2.ebuild b/dev-libs/libmpack/libmpack-1.0.5-r2.ebuild
index b0bcd1ed763a..2168ecc4727e 100644
--- a/dev-libs/libmpack/libmpack-1.0.5-r2.ebuild
+++ b/dev-libs/libmpack/libmpack-1.0.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 src_prepare() {
 	default
diff --git a/dev-libs/libtermkey/Manifest b/dev-libs/libtermkey/Manifest
index 1c9860b2df32..2362a6269496 100644
--- a/dev-libs/libtermkey/Manifest
+++ b/dev-libs/libtermkey/Manifest
@@ -1,3 +1,3 @@
 DIST libtermkey-0.22.tar.gz 46147 BLAKE2B fddc00a1ae525e5ed8c9c6eaee46fe30a99dbbc76ca988f9f5301b3c5c13a6de4462d6cc612119409a21737176f67ac196109b11fb58f414b25db5b6a49f4982 SHA512 2e8242cd1e6acb8900125dcee9fd47f7554c359363f760b88858c82667e1f3871bdd87358b14c8a133ef3cd2699947a5045477e64cdf7f96d4ead1723e73a219
-EBUILD libtermkey-0.22.ebuild 991 BLAKE2B 603a7b0bc41525bd0b8e3b2ebd374e3b96b5f844224934903e8c9cad292bc5cb0e6f7ce8bf919318f03b054d43ca87cca46c778992335124561b2e9722606a75 SHA512 25432f5e2da375485e155dfddcffba3daa269bb6179535e59c9d6da309691b091ac17b70705ac61f8c0122b24d913ded2ae1c6ac8512e2a45eb3830a09eff11d
+EBUILD libtermkey-0.22.ebuild 990 BLAKE2B 2e669972ae881f4c4b9937d7f7ab2ffb7fb9956df9d72a823131ec2cee956912d5a97b1d06e04a47679d7a657bc095230bed45f4ab9ccf162f2f0ef8ab3fc3a7 SHA512 f5d755cfee4f18704157aba0668b2ed903b44391178ab6fb9b4a80280c532a6f53bc85048868b3b6ed8020fbbbad5ef128efe8c3a2bb2fc121853c645daf681b
 MISC metadata.xml 358 BLAKE2B 555dc6dc5edb485ded5e2fec2eef70426c2e693853954c5feb8d39914b1cc88aed79dae13df257df86193701e9f842fad8e4686941d3a143a261e289ebc0960c SHA512 1a9faab554e113b8c3c83ad7a6e24fa71ed7ea3838a11677465cc824c7181d512d58443b5ea2fbd52492345e62db5895e3f17a47dc7e413842b02cdad85c5411
diff --git a/dev-libs/libtermkey/libtermkey-0.22.ebuild b/dev-libs/libtermkey/libtermkey-0.22.ebuild
index 3f15192f8ff7..a94c8968b9fc 100644
--- a/dev-libs/libtermkey/libtermkey-0.22.ebuild
+++ b/dev-libs/libtermkey/libtermkey-0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~riscv x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos"
 IUSE="demos static-libs"
 
 RDEPEND="dev-libs/unibilium:="
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index d8d33caac211..10895f291f07 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -1,5 +1,5 @@
 DIST libvterm-0.1.4.tar.gz 69122 BLAKE2B 4f0acc9ec6755c4a840e5df6c32c44e12c5316b5c5918d0e8eada19d819736c3e5b9090b468e32b3141a7fbb5ba226e365be27d6d1d9ca22f9f5e365fc3971c2 SHA512 90b5d47417e3f469df5c6574a27d12bd6bd1571d17cab7c4ac0ee61b1dbcb6361987f6fdfd11e314ea32f8958ec165c319a34d0f77288947c7cbc11de697d524
 DIST libvterm-0.2.tar.gz 79712 BLAKE2B db17d15550a595652368edd7ee0ccab2a69effa79677a23d6ee94731fc05d685df0de843d2e953cd59d2077922e72834d7ab09eaf5260aed869d9511cfd224a7 SHA512 bc99ae4fbdc165ced92c10fb0168ae6da2ed702208064616fefcd42aba71c57b7d42a08bc5b0e7e1ebda8cc4b5682d16059bdd2edfb12fbd8ac97527e854b14c
-EBUILD libvterm-0.1.4.ebuild 883 BLAKE2B e96708137e44439705c4ab1ecdf581ab2087930b471d8f3cc7ef0b6196359ea6d23e2dec76e704a20c0eeaacaed9e22bd661ec2596bd6f64f4316ae038e6288e SHA512 c236cb937e9903748eca63dca6c8d72b822f20ef98b0cf5add266db8441e42f99087a207815338fae5497812fd888d14060e8e240ff6912d9394219cc7668b72
+EBUILD libvterm-0.1.4.ebuild 882 BLAKE2B e4f2e22e191ce35883e9fa2700222e55b8c5d482251aa5dd9f35d982fa18d20371ff3781a5962a07aeade487ee0c0e4df474023894c035154aa79425e477dc81 SHA512 70201223cdcad83064d87b949525040294d925002e4b12faf318353a211171a596d3992413731c8d71b377bc866095d9811a4bb110d03b414022b1bcf64b33e3
 EBUILD libvterm-0.2.ebuild 1098 BLAKE2B afaf31a7a3da3eb8817b796f70d8388a26f8006bbbed97d4906ff365e5f81864be7009e91c94aebfa0c76b56f396e7f3d58920733ad0108578b4acf9834be6c0 SHA512 ad3e3b00c078bf7d59682e8072058223cae92251e7fdbf9095efd37c4b4555a0c1da2f21f8712a4f712c17e8f3a0ba47001d9e5e9f8220e930f6496e1e455613
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/dev-libs/libvterm/libvterm-0.1.4.ebuild b/dev-libs/libvterm/libvterm-0.1.4.ebuild
index 7281e976e5b0..343e999b6fee 100644
--- a/dev-libs/libvterm/libvterm-0.1.4.ebuild
+++ b/dev-libs/libvterm/libvterm-0.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~x64-macos"
 
 BDEPEND="
 	dev-lang/perl
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
index 8c5869cc59f7..1a590f6ae44c 100644
--- a/dev-libs/msgpack/Manifest
+++ b/dev-libs/msgpack/Manifest
@@ -1,3 +1,3 @@
 DIST msgpack-3.3.0.tar.gz 508001 BLAKE2B 3017c44689f8afbf078b9c498449e21b4e3b87591c50a37bf9ae73869dab550819f24d6e5179a3600df297aa2c024e5a7fe1defcbab7c0f1aff826870de2ab32 SHA512 ad3e32edc8c6afd70282b3d4b493c2ffe74a697c41bd1f39030c5b4752cccefaa965bc049d4c2e63103a210bf714dc3bddd474691bc067d1475ae017593f55e6
-EBUILD msgpack-3.3.0.ebuild 1768 BLAKE2B b669aa0000a8b1dfda43f5894af551449b41899b2492072d9a8a72b4fdcc7987515950cbf0848daf9367facdd566b891cb0d7f860ce8b4e9eb5957902f221bdb SHA512 eeff49eccb4e97fa2d6f005b91224f0cf56df9c6decdb8a493914f45306ee95e9e1c440eefdec75d2c9046d7fbce9fa1081c40d50882308697ac6eb613bce8d1
+EBUILD msgpack-3.3.0.ebuild 1767 BLAKE2B 61db88d0d1eeaa11e214aa38fda95032fd224b23fa955e098f4b013a9779d43d1714d568da48c7ff2e8da4d5cdeeccc824c583abc83f41e87fe93cdeb39dfe71 SHA512 49751b9da364322395b44a9b28d5e9c6ce32aacb9df162eba7dad8c385a3193b33aa5cc6278c3682f6721fd55ab65a291ad718336e9ce0af56d1e818ecb1b4b9
 MISC metadata.xml 410 BLAKE2B 2d8ac30a8aa745f32a388a0d66860d2af8de8bdc0e558b713738def49ec87e96b5ee201c4b2cd01f43f213ffd9f107cfcf9679725637f43ec7eed707ada87c69 SHA512 2009980f9bd56a3932a9f0ce56745439c0d29241bc11f3b8c0b2e26fc5a3f74ef9c7784165ed25e6280de4d1ee27e57ff225a5986522e51f50cc03e793625b4a
diff --git a/dev-libs/msgpack/msgpack-3.3.0.ebuild b/dev-libs/msgpack/msgpack-3.3.0.ebuild
index 0d604bbbc06e..cb4acd49ba8b 100644
--- a/dev-libs/msgpack/msgpack-3.3.0.ebuild
+++ b/dev-libs/msgpack/msgpack-3.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 6cac6cee7d1e..ecef81b409a8 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -31,7 +31,7 @@ EBUILD openssl-1.1.1n.ebuild 9296 BLAKE2B 49772a36ac8fcb336c1b4b6effa42447c0d2b5
 EBUILD openssl-1.1.1o-r1.ebuild 10144 BLAKE2B 037eb29b40857eef4c2631912a6f60f9a7499dd7de402464d9cb3070d1247d3637aec4f1b2f45d1db7aa7b2c9d2832c2f4142cadef01706d087bfda9bd749fcf SHA512 b866690093cbf04de142cc27d29129fcfa4ffe93c9a167f76853eabeb957b35d6c50c42b7b77b89d3d301630eddc2100c78d7b61421dbf47eea7180d7ce3f0b6
 EBUILD openssl-1.1.1o.ebuild 10079 BLAKE2B 60f51f6b8f18b4ea8704c5d7e0cf9603fed7246c20daaa7cd29589fb5c92ff78cac6993bcbea08f156562dd981a2040be633276200840cc14787c73dd75268ad SHA512 d15574f89b552c8bd2a14591e6200431567e48ae889ebc0358ad92aa00fe79e45bba41e68581c6eeea9168a200374328d11a4b9ed881591c27ce29ce78402444
 EBUILD openssl-1.1.1p.ebuild 10051 BLAKE2B 758761b4a8e708e660f03e098eed362dfcdd197855a2ffe6492491408debc9d71b10968789e51b4e0feb6f66a73b809ee60b3c9a91b430253972519ed4a8395d SHA512 95014d8bbe6159bb50357d97797d809b06a30746e0e04873c62dd030ed2ff08a9ec19b97b0b81e5bf5402576b07641160ff7832149789d93bfaf6f65cd4b86b7
-EBUILD openssl-1.1.1q.ebuild 10061 BLAKE2B f3841a7baf1968ebee4bfe7f652b7e2782beb68e6c2aa61101d29d3c4f4a2c4efa90ca896eb3c77a7c5bad74ba3be85d28ad05c1363d83b54e6fb03baa8595b0 SHA512 589cfe21bc1a7a589d42a6a455af5abbc7b892af3dd4f8ab10354b813f6d15bd63488b718ff38ec9de149b775f9fdd47bd2ffa4ea3db5357b27538b5bac6d41e
+EBUILD openssl-1.1.1q.ebuild 10057 BLAKE2B bea4e46c1ef3dbba553343b4871543fe3f100536abc6986018de7afc2be1743c9f97abd57f2b53bfad6242c7a49bb6f38cd4340aa259337f0237dcc2ef6958d2 SHA512 ba66d7e79fa0ec0a8c59b09ea840210ee697b3b6d341a8101d6a6efb4b260ebc81e1346dff9b7e6bc9d2f6480ba5e8029020878c14116e2cf99508bdbe3be5bb
 EBUILD openssl-3.0.2.ebuild 8459 BLAKE2B 72e50467995c79e31fcfd3b40cf94d24bfaeb9c40f7e33ad3108bce95b41760f1423ad30b046f32cc6ed57ca5fdea056efa131b7ecf661b1cb58407b77ec3e7f SHA512 a16ab4538cf0cc7b772771c0784c7707e006f9635f4e6c7ee65b0789b1ab979eb713b0eb0d447d61de3a38ab9b9047abccb301f7c4e67e128cca57b47910725c
 EBUILD openssl-3.0.3.ebuild 9552 BLAKE2B d85584fb8d951c2aa841fc61e20ac2fb7191187c5a0388029f8e463a9a8e4618c31bca72c044eb5a1914f2deeb4bcde1ad3baa2c6389fe18be2386a282bafb2f SHA512 3b5c6f4e9966d5cfd38a583ebc0064c63b43c7c022722386e93328ace0e3331153eac9bb73454e5ea34a7922af3599f5d18ca76141bf5070c57909da3b01214b
 EBUILD openssl-3.0.4-r1.ebuild 9382 BLAKE2B 182208d9732124aae0b7331abae5713b889943718f8e3a4de2fe3b372c346318e2990778c3656dba55586930ce868cae72ce3deb1dea358577fb496efb62bf58 SHA512 aab5bc6399e042384622f6a112f72e7ebb62ecbd0c2855d63391cde73e9faf1ac676fb288730d2387410e90a3616c3e297420090fa2c6868bdd99d5eab4beefc
diff --git a/dev-libs/openssl/openssl-1.1.1q.ebuild b/dev-libs/openssl/openssl-1.1.1q.ebuild
index ff51db66bd0d..61c824a6ffe7 100644
--- a/dev-libs/openssl/openssl-1.1.1q.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1q.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 if [[ ${PV} != *_pre* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~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 ~loong ~m68k ~mips 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"
 fi
 IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/unibilium/Manifest b/dev-libs/unibilium/Manifest
index 0ed67bebec4a..f16b96170079 100644
--- a/dev-libs/unibilium/Manifest
+++ b/dev-libs/unibilium/Manifest
@@ -2,5 +2,5 @@ AUX unibilium-2.1.0-no-compress-man.patch 576 BLAKE2B a99123e8be6e229c0661b2ca9d
 AUX unibilium-2.1.1-libtool.patch 2273 BLAKE2B f6104f56510f2b876bf05f6985f1d8c8d0cf4282329999c3c2b911549f46bc4c4dc2a3b1e503dfa3146c8c1cb43f22f724a8dc4235a9a8d7a268c4ecbd8b18ab SHA512 8229eac14a6cf7859a08fd12eca00a2849a1872564d4313a751c4d618e1c784ff4ecb31f5a92c103c84a0ba9c96b98c7d73f30006ed51754170fdfd8cf23fa87
 DIST unibilium-2.1.1.tar.gz 121998 BLAKE2B 0bd032d0cc32011fa66604b39412116824b79aeb3cebb394efcad7591d5bd18031d465f7736ff1e65914f2fcf7beca1cbee4c7ad07426cdbf45e1c82e1894d94 SHA512 ebcdcddc6c3a540d086b113bb83470c1c17cf59056b28308a484b20dc3df71de0f5d6e5bf105f9e4a8347c78500c65ae46c2b53ec87692a898c321a047664ee2
 EBUILD unibilium-2.1.1-r1.ebuild 651 BLAKE2B 5273545f3c0ed05837ebe803eecdc87f4e02a83d6df4193c9e598d81a5ddd5419877821efbd2c151a60ef357b4a10c852557222927764d57fdad994002eb7a1c SHA512 c2e62a9855b1366decd890b2975c11c2217e5612d6a31292c5c93d32549f14b02b17f0ee6e39d52c647dba874531eeb30dd9d2c27b5b518a103252b84095c535
-EBUILD unibilium-2.1.1.ebuild 884 BLAKE2B 69f4bc4fac965583f21ba8ab1930caf70dce012a2070dca7a1e6d98d1282536042318c6e36f626b1474a272a2e022f2747dbb2958f2a48d35375fff5da7ce048 SHA512 b899ae21426d72f9ca53e210e232d5d21df9dbd2b0ab42029af9a32af8254a89fa08ce12aeed98d06ed46d7411c1b2d021db0c0973f499a1a9a698436298a919
+EBUILD unibilium-2.1.1.ebuild 883 BLAKE2B c3621a4920d75123cff0e4b1cffbdad962e52984f7c20d186a1b5c7203f83e11b66a5658c4c6f9438cd5f4d17a9d5efeab254151a62e8fc3f4febf40d148b757 SHA512 03746e24f81a6700a4dd72d18417bf1d795ee96464850491719cae7ac51e5f9398a98516e056de16854ad2bbf271dbf3f25a4ee68bbd2f32460e96b36eed46ef
 MISC metadata.xml 340 BLAKE2B fbc2fee17ce03a1aafb74a76eee00909ec9d6ab01a62bb0fc0fbf7a9e0e30fab6390ab964d908b9d3b3c22400e5720856da6aac6a3c5ac77a0f3c8e1493f7316 SHA512 bb01973af5dc1a5240f268e62428a227fc4f575bb2d359c4b1f9d129d5c5693a17054aca080a72dcb938b325c493d9690bcfc5e15feab675f02c50bc855f8dc9
diff --git a/dev-libs/unibilium/unibilium-2.1.1.ebuild b/dev-libs/unibilium/unibilium-2.1.1.ebuild
index a506295cb055..9ea0d6447cf8 100644
--- a/dev-libs/unibilium/unibilium-2.1.1.ebuild
+++ b/dev-libs/unibilium/unibilium-2.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/neovim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+ MIT"
 SLOT="0/4"
-KEYWORDS="amd64 arm ~arm64 ~riscv x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos"
 IUSE="static-libs"
 
 BDEPEND="dev-lang/perl
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 5a2ed5cbd0cc..9feba747952f 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/luv/Manifest b/dev-lua/luv/Manifest
index 1c70b8e8ebd0..3a7eb5085ef3 100644
--- a/dev-lua/luv/Manifest
+++ b/dev-lua/luv/Manifest
@@ -4,5 +4,5 @@ DIST luv-1.36.0.0.tar.gz 107196 BLAKE2B 31a02c3e928559037355186810187299a3cb1420
 DIST luv-1.43.0.0.tar.gz 122337 BLAKE2B 435334d869487de38215ce9b551f586d4017c7f83497bc90637fc8acb8e63d1c36f6678a3f2c4d5b24b76fd904b2fa8c364a31bc1bd544416f60f2b8290903d3 SHA512 f51d9b3c733dd5617fca49534fdd77dbb6a3d6f58263f453db8dcde21679f4a471e15d6f5b05bcb22a2552455df8beb238d33b0999306bf2a5ad6755da4044ff
 DIST luv-lua-compat-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
 EBUILD luv-1.36.0.0.ebuild 2303 BLAKE2B 516f7e876698b6b15639e648778d59f044d89ec216e2152fa607e24eaebeb0f3c6f5150de367aee211ac3c08b00407b325ab4c3289f873de3abe72f139ea9458 SHA512 732a3d8900cf3695a7ea65ab75c2f05c6cef120d43295a12413ea76c0a838dab4f18e64c815c38a634651af000b9219ee164d52814cf06c0ca5076945a45adeb
-EBUILD luv-1.43.0.0.ebuild 2303 BLAKE2B baf85e4f3509bfb0cca1dfaecd30b8e154167639eeb1e2b747fe29227c2d5aaa2931e47c69193d2224a645f68c9629fdabffddfc34bf19ffc2c859c702462246 SHA512 b415c62b94f1fcb8e85073a85badc8587fe35620aa683b6ecf59b216ead0c25c1a000666483e6d263e717b170949bfd8c2089a0c08efd8c4f13d3b6de992e983
+EBUILD luv-1.43.0.0.ebuild 2302 BLAKE2B ff752f24faf4d0939cd4954ba6e52beaa09bcd78da6d960ee01995554b6a1ea7019a9b991255fe7f1abc98c86d30055b7d2c6de25ace37155aca7a1243d8b107 SHA512 1b23f6a3c63e42895f9457c8676510a74130c3baf51dbc1b0c9294f510db3cc848c2b6addda3bd6fc9650efa2130873ec4b8956e7362ecc2e88e09fba783fcb6
 MISC metadata.xml 484 BLAKE2B eb035fd19fe978128b6742025f44fc233348a496de2628c80f67db2ae64717e4a3685eec1456f920052e406d15855e225987389a4e33d7caaa5b938418849ecf SHA512 4bf472b91b176e1af730ffb84fade9ab49590726107c73f6c37dac491df394b6779a50e658d062b1cedc0a05f1fb89463817945bc075df572e3e9d6adab04a2f
diff --git a/dev-lua/luv/luv-1.43.0.0.ebuild b/dev-lua/luv/luv-1.43.0.0.ebuild
index c54805a8ba66..ecf9d1005400 100644
--- a/dev-lua/luv/luv-1.43.0.0.ebuild
+++ b/dev-lua/luv/luv-1.43.0.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lua/mpack/Manifest b/dev-lua/mpack/Manifest
index 7d1f3251ac9a..e696d1d27c24 100644
--- a/dev-lua/mpack/Manifest
+++ b/dev-lua/mpack/Manifest
@@ -1,3 +1,3 @@
 DIST mpack-1.0.9.tar.gz 16087 BLAKE2B 062f0deaa9ea359486933b5736591ea3ee78886e31259b721d88ef44762403185b881d076ca35fe6e8c16ab756d36698fec1ca893ab3667635e388456a8ad417 SHA512 c663a6cb29c1ae3f88baf25d36b076c35b35b96a16f9df472f8063009dc70886071cc27bf9224aceb86afb5c590ac072fd484435f40ecc4961eabfb5df08f395
-EBUILD mpack-1.0.9-r1.ebuild 2300 BLAKE2B 04ad27050bddb53e569608744ad47f2d4073e61ca19112b91acdb84ceccd40212225c7f806ffae175601bcef0a44b009d689aa40c7340f98e336e1a9375fb49c SHA512 d0f07b48984f8c1354ba646920fbd1771c96db934259e81db383d207afc7929cf3c849092564184466a09731962f9609cc8845a3961ea01199da085aaae3dece
+EBUILD mpack-1.0.9-r1.ebuild 2299 BLAKE2B 81972f5a84aa553852c0c6fc59010e1f67116280ea0e2106d0dadd9bc1f6cb3e990367561c5790f8b646c65b49c8267a83d343021ff3c144f432ef94f0468ff1 SHA512 1c51651b30ff803991d706755ae64262e56c629b701d5487e6e9f5f73b3a9ca8278175cc772f916bc225541d6ca311af7412f87658abd91452ce5289c49efae5
 MISC metadata.xml 337 BLAKE2B 552e6b193055ff86ce3bc29ec14b7ba72bf99ba5458c8588af1d53b6d393759118103d95f9b3e3f4c8582b19f7daccf0a5b619a8b171f5c74e2a8ad4f0648875 SHA512 6cc2098e7e31232ff9b6aa2cecfe7f9cde61d1ee36efb190d87330a5b6088a9d43f999d3cbce632925c01e35806c09022170230934f526febe1bd24c384b3ce1
diff --git a/dev-lua/mpack/mpack-1.0.9-r1.ebuild b/dev-lua/mpack/mpack-1.0.9-r1.ebuild
index de1490be4bfc..b8990af4c813 100644
--- a/dev-lua/mpack/mpack-1.0.9-r1.ebuild
+++ b/dev-lua/mpack/mpack-1.0.9-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index df722b903800..d19948a4e31b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index 837e3c6c5bc9..c409f0b56af7 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,5 +1,3 @@
 DIST PyQt5_sip-12.10.1.tar.gz 121271 BLAKE2B 5f1720a85b8522f552259be990d1d27c0f40d8c0c3ca0395679da02851e73b45210a6390b66d899fc00cabfeeda57f2bac4c8d108cd05ebc179302343fbe0457 SHA512 a6336195d8d5a1b216a85461c5f7acf3563c6db2255079734e955a9412522cfdb82663dbff5d60574acc7bb29dd5ef11f98f2c0c3c3d3fcbf290b039cda31638
-DIST PyQt5_sip-12.9.0.tar.gz 103007 BLAKE2B 461973ce3563c27ce5a6e3a537cf9a8e53adc8ddde36ec1d2eb7abb986908151ece99ff8756f752d2c6e331a3e9b7b70813d35f8701cedd7f09e6edbcc435121 SHA512 ca6f3b18b64391fded88732a8109a04d85727bbddecdf126679b187c7f0487c3c1f69ada3e8c54051281a43c6f2de70390ac5ff18a1bed79994070ddde730c5f
 EBUILD PyQt5-sip-12.10.1.ebuild 662 BLAKE2B 1f4a204aeeae3780fb4886edc1a5ba07503ccf9558417d843895726fcfd344598f298d54b62b94b18ca870e304ec33fe0ddb256b938310cd72da2924bc27233b SHA512 93b1fa1e3944433a92ba8d5ae1c602a503ba3b1c9f9319f2f45ecb5d1c32b94db77165e5e034822239980aca2946cc60d636f7beb42ed45d9bd47d1064dab39f
-EBUILD PyQt5-sip-12.9.0.ebuild 628 BLAKE2B 1f5a1e25a8cb4eb063dbcffa8ac00353cb546f919d6599693062ce3e99ae888eaab1c8a4bf045bbe224e8a5a9f723f8905b95437b43a3ffbcc7dd23a42ebdb27 SHA512 4adefcd59ab8bcc9bf9f1fa928d46c7a552b2770c82968dec832a818793b41daf52dad190cb8db79b479ca98d3a9d73423d65d2321292ee832a4d79d4bdcbf04
 MISC metadata.xml 649 BLAKE2B 0a6faee65b39f122f65965490284b17856ba6d86537f3f3780f8604366739c346b01e29e933a91c7edb5ff898e5d51a10e4bf288228d1943a1c9e9970eac4c86 SHA512 3af9be87db6da5cb071f4025cd6fc1964a4b0629ebe93239f6c5a3734d4ef8ef06e652abbac5c9bd86f882a6235bf3b1f0fec6f0035c77ea42571e47c6045e29
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
deleted file mode 100644
index 4fd535eab6fe..000000000000
--- a/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="sip extension module for PyQt5"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/PyQt5-sip/"
-
-MY_P=${PN/-/_}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index f64338b5f8cc..ac05be46dd39 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,5 +1,3 @@
 DIST QtPy-2.1.0.tar.gz 46470 BLAKE2B 2e032d141ad134444143cd59b8952957b226d9519925083aecce82adf62eebd3f58803cf548c4142fb1ece6f0e2340043a82a7aef056f6e4a9ac8b9caf72d80d SHA512 052cab4218d23d46162d11bf038dccfe6200b05c1c8647bd1f9dcbdaa7af50c23d4ae85829e065c7bae57630d149d562d76cc78202b4f448cbf6547010c746ff
-EBUILD QtPy-2.1.0-r1.ebuild 5166 BLAKE2B 1058583029d29a6575a198b2dc0085916fc2f3e8347ae308e41c8d35e14e3d56c478b96b3e22a42c464d242551880780e6ab260ca56642209092c3d56c1d711e SHA512 d10ee8366b3ffafd1af0011aa11cbe4b1c2dbf2a87079d901b79fe88bc206b850b9f8083229e378a42ab1c7bd8f8548b7b695d18bd0fcd487aa85b0ac740c66e
 EBUILD QtPy-2.1.0-r3.ebuild 5006 BLAKE2B d3b4364cdf95e28dc89634ffa13591bea56ebda184a81e310c41b4a85824f0cc5c5c2c364fc2d9a3a1c621ef9df07102386f17a2fc5f756b28f25b8976bf1812 SHA512 c51f0f703eef82ba2699dac7083842274c1b64b58ca777b881d6378b694457c286b92b05fe0bde4f4c0d87d76773fb0ed51a8fa9d8584f67adee541a077f4066
-EBUILD QtPy-2.1.0.ebuild 5003 BLAKE2B 60931695b10ab9f9bbabb0cb53025ac1a10412c82f1f51b2c828d266222fddefe5acad3bfc02542897366b48bb7738364cd50344e95d2eca61f9c96695f2f495 SHA512 082b96730ba1b6c138cb78cbcff47d7b882017c7133f8de4256cbbb213bddd709a7f9067a9590a79bc9ebda7528a823e3c7bbbdd8edb44d1a6490b109c1842ed
 MISC metadata.xml 2904 BLAKE2B f951ee9cfb1e57da9c1b528015cf56bf72e36fbcea6973f5bd237e86c8039d82d9700166ab76773b9bfbc8e499df492994e5dd73aee0bb2d35914d36bcf1bd78 SHA512 e6e13d0c24f16379ac03711f02c5201d1ab28bcbbddd7063f0487bbaaeda99e5a2ef87f00d8df834d822c9230a50ddead93b44affccf07b80bfc275140f4e9ff
diff --git a/dev-python/QtPy/QtPy-2.1.0-r1.ebuild b/dev-python/QtPy/QtPy-2.1.0-r1.ebuild
deleted file mode 100644
index 41ec2ce12760..000000000000
--- a/dev-python/QtPy/QtPy-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
-HOMEPAGE="
-	https://github.com/spyder-ide/qtpy/
-	https://pypi.org/project/QtPy/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-_IUSE_QT_MODULES="
-	declarative designer gui help location multimedia network opengl
-	positioning printsupport sensors serialport speech sql svg testlib
-	webchannel webengine websockets widgets x11extras xml xmlpatterns
-"
-IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
-unset _IUSE_QT_MODULES
-
-REQUIRED_USE="
-	|| ( pyqt5 pyside2 )
-	python_targets_python3_11? ( pyqt5 !pyside2 )
-"
-
-# These flags are currently *not* common to both the PySide2 and PyQt5 ebuild
-# Disable them for now, please check periodically if this is still up to date.
-# 	bluetooth? ( pyqt5 )
-# 	dbus? ( pyqt5 )
-#
-# 	3d? ( pyside2 )
-# 	charts? ( pyside2 )
-# 	concurrent? ( pyside2 )
-# 	datavis? ( pyside2 )
-# 	scxml? ( pyside2 )
-# 	script? ( pyside2 )
-# 	scripttools? ( pyside2 )
-
-# WARNING: the obvious solution of using || for PyQt5/pyside2 is not going
-# to work. The package only checks whether PyQt5/pyside2 is installed, it does
-# not verify whether they have the necessary modules (i.e. satisfy the USE dep).
-#
-# Webengine is a special case, because PyQt5 provides this in a separate package
-# while PySide2 ships it in the same package.
-#
-# declarative/qml/quick is a special case, because PyQt5 bundles the bindings
-# for qml and quick in one flag: declarative PySide2 does not.
-#
-# The PyQt5 ebuild currently enables xml support unconditionally, the flag is
-# added anyway with a (+) to make it future proof if the ebuild were to change
-# this behaviour in the future.
-#
-# The PySide2 ebuild currently enables opengl and serialport support
-# unconditionally, the flag is added anyway with a (+) to make it future proof
-# if the ebuild were to change this behaviour in the future.
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	pyqt5? (
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-		dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
-		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
-		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
-		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
-		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
-		webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
-	)
-	pyside2? (
-		$(python_gen_cond_dep '
-			dev-python/pyside2[${PYTHON_USEDEP}]
-			dev-python/pyside2[designer?,gui?,help?,location?,multimedia?]
-			dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?]
-			dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?]
-			dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?]
-			dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?]
-			declarative? ( dev-python/pyside2[qml,quick] )
-		' python3_{8..10})
-	)
-"
-
-# The QtPy testsuite skips tests for bindings that are not installed, so here we
-# ensure that everything is available and all tests are run. Note that not
-# all flags are available in PyQt5/PySide2, so some tests are still skipped.
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		pyqt5? (
-			dev-python/PyQt5[${PYTHON_USEDEP}]
-			dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location]
-			dev-python/PyQt5[multimedia,network,opengl,positioning,printsupport]
-			dev-python/PyQt5[sensors,serialport,speech(-),sql,svg,testlib,webchannel]
-			dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
-			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		)
-		pyside2? (
-			$(python_gen_cond_dep '
-				dev-python/pyside2[${PYTHON_USEDEP}]
-				dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help]
-				dev-python/pyside2[location,multimedia,network,opengl(+),positioning]
-				dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml]
-				dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
-				dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
-				dev-python/pyside2[xml,xmlpatterns]
-			' python3_{8..10})
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i -e 's:--cov=qtpy --cov-report=term-missing::' pytest.ini || die
-	# Disable Qt for Python implementations that are not selected
-	if ! use pyqt5; then
-		sed -i -e "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-	if ! use pyside2; then
-		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-		sed -i -e "s/from PySide2.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-}
-
-python_test() {
-	if use pyqt5; then
-		QT_API="pyqt5" virtx epytest
-	fi
-	if use pyside2; then
-		QT_API="pyside2" virtx epytest
-	fi
-}
-
-pkg_postinst() {
-	if use pyqt5 && use pyside2; then
-		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
-		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
-	fi
-}
diff --git a/dev-python/QtPy/QtPy-2.1.0.ebuild b/dev-python/QtPy/QtPy-2.1.0.ebuild
deleted file mode 100644
index 42c74bba738e..000000000000
--- a/dev-python/QtPy/QtPy-2.1.0.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
-HOMEPAGE="
-	https://github.com/spyder-ide/qtpy/
-	https://pypi.org/project/QtPy/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-_IUSE_QT_MODULES="
-	declarative designer gui help location multimedia network opengl
-	positioning printsupport sensors serialport speech sql svg testlib
-	webchannel webengine websockets widgets x11extras xml xmlpatterns
-"
-IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
-unset _IUSE_QT_MODULES
-
-REQUIRED_USE="|| ( pyqt5 pyside2 )"
-
-# These flags are currently *not* common to both the PySide2 and PyQt5 ebuild
-# Disable them for now, please check periodically if this is still up to date.
-# 	bluetooth? ( pyqt5 )
-# 	dbus? ( pyqt5 )
-#
-# 	3d? ( pyside2 )
-# 	charts? ( pyside2 )
-# 	concurrent? ( pyside2 )
-# 	datavis? ( pyside2 )
-# 	scxml? ( pyside2 )
-# 	script? ( pyside2 )
-# 	scripttools? ( pyside2 )
-
-# WARNING: the obvious solution of using || for PyQt5/pyside2 is not going
-# to work. The package only checks whether PyQt5/pyside2 is installed, it does
-# not verify whether they have the necessary modules (i.e. satisfy the USE dep).
-#
-# Webengine is a special case, because PyQt5 provides this in a separate package
-# while PySide2 ships it in the same package.
-#
-# declarative/qml/quick is a special case, because PyQt5 bundles the bindings
-# for qml and quick in one flag: declarative PySide2 does not.
-#
-# The PyQt5 ebuild currently enables xml support unconditionally, the flag is
-# added anyway with a (+) to make it future proof if the ebuild were to change
-# this behaviour in the future.
-#
-# The PySide2 ebuild currently enables opengl and serialport support
-# unconditionally, the flag is added anyway with a (+) to make it future proof
-# if the ebuild were to change this behaviour in the future.
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	pyqt5? (
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-		dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
-		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
-		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
-		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
-		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
-		webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
-	)
-	pyside2? (
-		dev-python/pyside2[${PYTHON_USEDEP}]
-		dev-python/pyside2[designer?,gui?,help?,location?,multimedia?]
-		dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?]
-		dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?]
-		dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?]
-		dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?]
-		declarative? ( dev-python/pyside2[qml,quick] )
-	)
-"
-
-# The QtPy testsuite skips tests for bindings that are not installed, so here we
-# ensure that everything is available and all tests are run. Note that not
-# all flags are available in PyQt5/PySide2, so some tests are still skipped.
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		pyqt5? (
-			dev-python/PyQt5[${PYTHON_USEDEP}]
-			dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location]
-			dev-python/PyQt5[multimedia,network,opengl,positioning,printsupport]
-			dev-python/PyQt5[sensors,serialport,speech(-),sql,svg,testlib,webchannel]
-			dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
-			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		)
-		pyside2? (
-			dev-python/pyside2[${PYTHON_USEDEP}]
-			dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help]
-			dev-python/pyside2[location,multimedia,network,opengl(+),positioning]
-			dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml]
-			dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
-			dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
-			dev-python/pyside2[xml,xmlpatterns]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i -e 's:--cov=qtpy --cov-report=term-missing::' pytest.ini || die
-	# Disable Qt for Python implementations that are not selected
-	if ! use pyqt5; then
-		sed -i -e "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-	if ! use pyside2; then
-		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-		sed -i -e "s/from PySide2.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-}
-
-python_test() {
-	if use pyqt5; then
-		QT_API="pyqt5" virtx epytest
-	fi
-	if use pyside2; then
-		QT_API="pyside2" virtx epytest
-	fi
-}
-
-pkg_postinst() {
-	if use pyqt5 && use pyside2; then
-		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
-		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
-	fi
-}
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index e299082eb5e0..8b241183bcb8 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,4 +1,4 @@
 DIST aiohttp-3.8.1.tar.gz 7324180 BLAKE2B 99f85b8510782a31de2d2f6c8efa65ef5c5cde600a5c5f49d6362d5833a0443b9adcaed9beb27c5d8502aca37af154b06017f48836b73d4c61d78204b62b7f05 SHA512 3611549393e50c8d30426aee9ddd23794a71ddefe4384eb549049b93e452fafb38de7ad900737213b61fbe717bd85035a780c1622593eae250328f17d484a0a7
-EBUILD aiohttp-3.8.1-r1.ebuild 3651 BLAKE2B 9aafea16a283bee999d8ad6eab67cac2d223fee7caf3894b3609fd033a602b0b6b410202ff2198bc99e9f9aa30263aabe4264cab76ff607d73d5d7d9bc15922f SHA512 07521a8bb23f309732fcfec67c1701cc95ba2e2b313257aeeabad6ae27ff475de907ad8eb6a9ef6caf252459ef185e4214b3222b9301ffbc802b2b6e175694f2
+EBUILD aiohttp-3.8.1-r1.ebuild 3648 BLAKE2B b40888b9b3f7474a6854ec7df5e1f8eab454f75441a0fb29da0e2b13c7c529b3784869c8d0d84043d2384cc740e092e49eb8cb4e0a3d90a84c472947c09636ee SHA512 409129c145af53135e72d8421b7deb4a622901078b1509cb8314cf4a36a2cc70e7010544c0a990792ce9391f1b86727cdd85c406eb7087c41d9f036abdf5a9c2
 EBUILD aiohttp-3.8.1.ebuild 2650 BLAKE2B 59267e4e988f46b73e4d0d4318721f55c2b25a42c9987f9e3e43db9cacfa9ac4fcd55f2bff1c67696247d3e185298162dcd4cea7695d87dbae9216b469775892 SHA512 1ffa222b52861e48a85f9164e38d6edb554bcd247779603b4130a07156faafdc186e5a2dd37cee0e11ed1086a46d559bcc3c9189286e6b3977890856c5fff0aa
 MISC metadata.xml 490 BLAKE2B 5233af0b5e2668b1eb62278b05b62f24f1ab90f6d05b20dd9f1c5b54b846919c3fa28b843df28f5bfa320996d46de0e74c7a28bd0bef02aaaca14b1cec52baba SHA512 9b701c5c5a22b6aa94977a67bc40f3dc9df8337556952658a2a17ecaaa471cd7f7b5b8bf3a0088208087677555f0cbb8760c091b03b96ee70affe3e2b84cf6d5
diff --git a/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild b/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild
index cd370ea0806b..951309a1adf6 100644
--- a/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	app-arch/brotli[python,${PYTHON_USEDEP}]
diff --git a/dev-python/apipkg/Manifest b/dev-python/apipkg/Manifest
index 4c67f2eb07d1..bc45220cf5b4 100644
--- a/dev-python/apipkg/Manifest
+++ b/dev-python/apipkg/Manifest
@@ -1,5 +1,3 @@
-DIST apipkg-2.1.1.gh.tar.gz 13541 BLAKE2B bba34b21d967512e2b08a1726dd97dfb432c3f4083661fd9f237948e5c962ebacf7ddf73ef7a34b24ee0a8481d203496504146b5b7627b195f1654fad338061e SHA512 be403398361bd88e04a676346e92df51fb410340858ca446a6a50af565183f15a88efd3d3bdcaa4d042680db35633c780466f4e8b4c9523cd0956fd04f84947a
 DIST apipkg-3.0.1.gh.tar.gz 14026 BLAKE2B da16bea557cf870c96d44a383232344d10cfbb682c483468e20755dd378c64e64d72b379901eb59ed0df590b5c3b577c882beb882377f7d759b181cf1b672b50 SHA512 89251f02a49b5191879bcf6e35c6a8755d6b29f1ca1c6061eab004385b11433ec86e2968ab23994c6a74515d6a673e445b3bcf8cbdd21b2ec644fcef0d19b419
-EBUILD apipkg-2.1.1.ebuild 705 BLAKE2B 1403fab60cee9db5d4e445d5116cd7a78fff6e3458a3a18424f4478677b3045fb8e370ab30a8d36cd6ca9fbf13afcd3abda0d831336bebceb78b90fb92b2d812 SHA512 2999588e5c4d38c573bdad872d311a82a55e14a2b31c7c4d7ebfc868e06bd0e5b05bfcd46c66643bf0fd34fb99725a238db25767ceab58752da1b8234c385a82
 EBUILD apipkg-3.0.1.ebuild 699 BLAKE2B 898bf370f86d97f508ab7a4c82d3ee37e23ec85195317f67ba48f577fb93a866c87d8b96a5e2348cc12c55719d4db280f2d7511ee49b61d50b3b198a11d49938 SHA512 45741ad11b1f880d49a4295f11785675c4126eac8d3681926db573a0152a191d641586ee1cd8060a9c24e1bb1710f93681fd36f70a17299bab5fff97eb36c438
 MISC metadata.xml 334 BLAKE2B 7b3573186acb7b108054095d3cc12f73e1cafe1d4c9d7045a9ad7ee31f69b35991a5f958e745cb1561d373b8be441c037578c2954fdd2a4e6b9695477f91e026 SHA512 b397fd16a42820122aea8c0f4eae08d135eaf21bff99b7c0d5499505f03cad03d280a1b35770f54b2ec26388565a33d8762cbef879755dd81f00a2eff7f9f49d
diff --git a/dev-python/apipkg/apipkg-2.1.1.ebuild b/dev-python/apipkg/apipkg-2.1.1.ebuild
deleted file mode 100644
index ac0bb3e00372..000000000000
--- a/dev-python/apipkg/apipkg-2.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_/}
-DESCRIPTION="Namespace control and lazy-import mechanism"
-HOMEPAGE="
-	https://github.com/pytest-dev/apipkg/
-	https://pypi.org/project/apipkg/
-"
-SRC_URI="
-	https://github.com/pytest-dev/apipkg/archive/v${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}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 2ff0bbf35890..c81b1be326c9 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,11 +4,13 @@ DIST boto3-1.24.26.gh.tar.gz 515531 BLAKE2B 34f99c4dd224731e07c2f0b175d6d172661c
 DIST boto3-1.24.27.gh.tar.gz 516237 BLAKE2B 968d48e9f1bf888df5dfc2ebb2d926d918121f96246e8d36ff872e93e347db3d97db42304e148cd21845bc3904977e0000a0e846bb104990cee23343c5995776 SHA512 3ff77f52a5236b12a7344ee9279cbfd53d6847f5afd980820f46971e62ebfa0f2639634c23cd962dfd087af1176596484dbedda6dee3674816a7a569f528caf5
 DIST boto3-1.24.28.gh.tar.gz 516274 BLAKE2B 846de56cdd94cb63f855086b051bf8a282cde2dcfb7e581cd35bbe684f71aec3a8c8c451163814f66d7935a8947da4573b9283de8a24a4b1d6b543d7bf5a9323 SHA512 135ffb89fd008d41eb0054b4d746b32f2861520573604714240ccf15d6a2563e3a03179daa13bf153e047e0239ffa1c1884a0f4ee71cf5ca595c5f1ddc521477
 DIST boto3-1.24.29.gh.tar.gz 516486 BLAKE2B 0850ca719fe367fc25ae96fae20a341e5f95d30dc47c7b4176d14516202f54036ff0195520c314c24ee09db8a00a880ab4c8d4146ff4c6570aa56c055bf64dd2 SHA512 9d286d25ab9093778b4027c43d0909630b9b8685fb92b498bcca71ab7ca0406985b7a117e74cf41e3f13923eec3152d6b8142c92b398f3244b4fc78649d5fdd0
+DIST boto3-1.24.30.gh.tar.gz 518030 BLAKE2B 35861845c59854bc98f5d3063cc72c2100b00689b44f512a5496508274cdfefe2cdbaa2b27f3fa0418649170c3d046d98ccc77dd722c5aedafb186808412c47a SHA512 358429bcc4a5f8984d207628ce41b3d57a8c3976fba77c12e46dfb56a3549c09ef613974658a7d94f041c859ac965520f8083aec3aec9991b18ee1fb29138f87
 EBUILD boto3-1.24.17.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.22.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.26.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.27.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.28.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.29.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.30.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.24.30.ebuild b/dev-python/boto3/boto3-1.24.30.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.30.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/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/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~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.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${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
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index fa08e0706295..56e23b75b79d 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,11 +4,13 @@ DIST botocore-1.27.26.tar.gz 9167551 BLAKE2B 9e95c1e6e5261b08247615446a589318d92
 DIST botocore-1.27.27.tar.gz 9168895 BLAKE2B 71cc1d94a570110305a37c6813e626bf2c06189692af6a0c1c751f63b329fb13c41e048103b1938f680cf00d08b2c16d253fcee0d559716ccc411be4635f8741 SHA512 d974824a5f1d6bdf332c49682fede28b1b2c464928595929c5f7e8c2cbcdc8216cd590dfdf2dadffbd4cd21e1aeefc89744424e09eab876ad77280e6023b362f
 DIST botocore-1.27.28.tar.gz 9170693 BLAKE2B 9efecb772f0a84edf61f9556bc3c2081fc4681b922c176ba56a42a951e18959ab135d80183e3667df6b21a1a129bc09b5e223d69081c45f33f3aebf7599e03e3 SHA512 22286e962a6e2f90d37e004e78b8b55cd446141f0c0dd2e21ac54b9ee2eb2a00dd791f10eaf511b0f31d93795fee042985cea431a7ced4ded2de5f174cfe9c8b
 DIST botocore-1.27.29.tar.gz 9172216 BLAKE2B 9ebf2594a21d3b48ce13bac6901884db14ef1216cbb73783a30390ef67973cca24aa50e1226e836124c97512a8f3307b2c18dbfcd52cbf01e69c44046d1f572a SHA512 8897209c8edef1f8e1f5a877e62809760b62a2009f8c0bf59922fde7193fe60b49a15d9eecb6d6bf647418d35b580e277eff2bb14152be301ce67b4dc8dd6f1d
+DIST botocore-1.27.30.tar.gz 9181239 BLAKE2B a9076ee8dfd19f3d29f4dee028af9ec7e49b5888b4655e32cb38428cd29abd44435e51f45d5be64f45715899ebb72046dd99ded3e76351903d83cc674632f2d3 SHA512 be3cff0e0482fe6f6b981da6b523b78cab5727956b19d6cce3cad8748766253ede38522f1ce93f17726481c16d54eb87fb1aae5514c6eb1690a143fc42e61cd2
 EBUILD botocore-1.27.17.ebuild 1572 BLAKE2B d019098e9bd4f40cfe93307947813ffe3e880e9462b25ff6eaa16caf3ffad2ea5c6db9e482b7b3dc995ca174bde48e90ecd8861a86291c1d454dcf6212bbe7d8 SHA512 db12020b9130b5b940a44ae7fca5a6b0e4c3d84fa2efcff156099d355cab185ea52cb3c4740ebbea25d865d6af8d64ae58ea1e4c6129b1c1026fe8bce6f0580d
 EBUILD botocore-1.27.22.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
 EBUILD botocore-1.27.26.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
 EBUILD botocore-1.27.27.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
 EBUILD botocore-1.27.28.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
 EBUILD botocore-1.27.29.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.30.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
 EBUILD botocore-9999.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.27.30.ebuild b/dev-python/botocore/botocore-1.27.30.ebuild
new file mode 100644
index 000000000000..830c713f6036
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.30.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+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
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 1acb38b4596e..cb19be111ba4 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -4,6 +4,6 @@ DIST dask-2022.6.1.gh.tar.gz 8729249 BLAKE2B 211beeb3960569aa1cb68a4fd9b261a4172
 DIST dask-2022.7.0.gh.tar.gz 8748843 BLAKE2B ae0e63c883e6542aefd29a619168b1e86e9b20d43e7966ecb8a92a90b72952acd7e08ce53fdbc146b47bcb7f65190f2d0cbe19966c52f94b0d52eb63e53778d9 SHA512 11fe292134dac14e30068b98d88e622af2941b7fffa2c667b39b87e4d28ac6388001e18a8628bd22bbd48a2a10ee707dc25618a960a401e40cb73b2231fd2dfc
 EBUILD dask-2022.05.2.ebuild 1525 BLAKE2B e3a0a84144604df9d5a12ecfb37026b255e588c1b3a22d668338074f0af832ad66043aafd77576a962f69249624d318ea8372a0cfec55ed342bbd7a3651bed6f SHA512 546b309ee34fbdcd72eec139df6be0d87fd98a99f70e8a12dbebeeef844bf81084e3d38889f1f0109c20ad473ec785f42b6d5eb22f2f38b4080f98554092cc6d
 EBUILD dask-2022.6.0.ebuild 1530 BLAKE2B 891e358cd393bc2c162f180f340d3d1e235135d5d81c1332ef2eb47499d394c384536ce049f82cbd93930cba66306282c61f0240cdc08e64395be7c57bd077c1 SHA512 f2ffde23fdc7e4e95936fe135d13c305c321cf7794b6fc81bb238d5cae3b02d6735f14a1ccf315c0b627d779dd6fcc2efe41cd904701f183040a9d113da901f1
-EBUILD dask-2022.6.1.ebuild 1530 BLAKE2B 891e358cd393bc2c162f180f340d3d1e235135d5d81c1332ef2eb47499d394c384536ce049f82cbd93930cba66306282c61f0240cdc08e64395be7c57bd077c1 SHA512 f2ffde23fdc7e4e95936fe135d13c305c321cf7794b6fc81bb238d5cae3b02d6735f14a1ccf315c0b627d779dd6fcc2efe41cd904701f183040a9d113da901f1
+EBUILD dask-2022.6.1.ebuild 1529 BLAKE2B 2d5cca7791d756366609a99633f22a27762b3c70bd44cbff2bb5f412168074158687c1ad4be28021b158b6ced47f0c74d71d833f5eba6f5df83ef5568987578c SHA512 f5ed94346c2b01b0b8550a04e68af63865087db0a9b4b67fdbffc9db95819bf3821bcd26a6601e9b60674028035473da1aa529ebed7df16c36331f782043b926
 EBUILD dask-2022.7.0.ebuild 1530 BLAKE2B 891e358cd393bc2c162f180f340d3d1e235135d5d81c1332ef2eb47499d394c384536ce049f82cbd93930cba66306282c61f0240cdc08e64395be7c57bd077c1 SHA512 f2ffde23fdc7e4e95936fe135d13c305c321cf7794b6fc81bb238d5cae3b02d6735f14a1ccf315c0b627d779dd6fcc2efe41cd904701f183040a9d113da901f1
 MISC metadata.xml 722 BLAKE2B f5ef083408180a71a3f997ab61bba6770b08018e3d0737a17a99827edd486c2d10fc8bf17c70c8d5a431bc40bdd685d2a6ce6e8e1784a2c1d89152b167f51648 SHA512 1e1a79bf0d919a2a7a0840e77f239b3aa3bcd57666a06f18113c39c9b075d03e380b37c2e9c96dfe8ba864a94e98fe52fc0b6b16e69009364374020729b261ef
diff --git a/dev-python/dask/dask-2022.6.1.ebuild b/dev-python/dask/dask-2022.6.1.ebuild
index ce906c8679d6..710040987184 100644
--- a/dev-python/dask/dask-2022.6.1.ebuild
+++ b/dev-python/dask/dask-2022.6.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest
index 02fa184285c8..86392bae0b72 100644
--- a/dev-python/debugpy/Manifest
+++ b/dev-python/debugpy/Manifest
@@ -6,7 +6,7 @@ DIST debugpy-1.6.0.gh.tar.gz 6366079 BLAKE2B 134d2adcae6ec926dcdb7161f0874b830a1
 DIST debugpy-1.6.1.gh.tar.gz 6684941 BLAKE2B 113ad9670cb9c80a28670be22265e110e5857d7093438db6ea531719de012a66c53ed9914c859c17f3bb5e03b88b11317173d261c9327e5434b5105396fac057 SHA512 28619e8e07265a8d983eccde28cc693b96ca5b94674ab0d512775a9c261f54baaa72e7bb8632b49b3715c2eb3626997cb967b5edb1b53672c6777493f0a46e50
 DIST debugpy-1.6.2.gh.tar.gz 6684477 BLAKE2B ab1bdf394d3447ba347db149e5c4c36820df6df24c5d0984fe862419a490cea21b240322d76644bc9ebadbdf9a6d6c8709ae28452828d42b45d65edd2d2e58cb SHA512 64ecd9f8290588358abcff538f2c68025f14efc38ac5b406f32cd40a580aab90e0b2f145de90ca81943872c70969d6294ac51b3151bc4e03f18370ddfbb9ac6c
 EBUILD debugpy-1.5.1.ebuild 1105 BLAKE2B 443f52671ea9fa4f25ff0aebbe9e3efaeeb08f3f01480550a7debc59df9724c9b5e9d14a5f110e77a95b5d74ae6fcccd790cfa676493f3b21efd33ceb03c39bd SHA512 d67ec0188c85b933f97c9a54bc4e6f70cf2686364419b20cba0aa90dd42bb90ea126d58b4cbde7a6029baf1eabb6ac4a1c98d6729a58e85d174f26dbcaf85938
-EBUILD debugpy-1.6.0.ebuild 1105 BLAKE2B 09836afd1956ce29b5768b3227a68439d227ae3036af9df2fd0202b6ac4bb157c18ff72729ddcb47e5fa205e7d6298124784d8aeee2d2d25a2218c63049a64fa SHA512 6dfa6766155f409b5ce0f2d30941c3461382d3d25675b8f5d5e184d077ec26b4df9f839093bccc83804e683530c92cb3597ab91549418199395fc6d39185f034
+EBUILD debugpy-1.6.0.ebuild 1102 BLAKE2B 7d06281e8ef9398df0abec8a4f80343164406d12309612b11c2427354cbc10c7ad87eb6c2b69cda51238d3747d7f67abe70a6112feba12571316e5521f56fe2c SHA512 bdc106ee170b4d9b72a7e85da442ea64d5dc25b668fad251c4d9ad494d09b40c6fe58e047dc4707aa3439bfeb90ef98d6a78838c56aee06504ea2eef94a9f27f
 EBUILD debugpy-1.6.1.ebuild 1140 BLAKE2B c7f27f9699c7f841bd6dd862161b21cefce64591e0804e95d57bdae70a0f0f7c5b31abe85ba688b7386918dd9026f9fcc0740208bcaff4d49254f7d8163f690d SHA512 cd4e41d850a93ea169fa20542c38bac0c280ca8dbb0f186a48105c63a7ab96f067c6c60696c76189b90e264b45b1d58e62db4bb9e167680b46c672011f5d9fd5
 EBUILD debugpy-1.6.2.ebuild 1140 BLAKE2B c7f27f9699c7f841bd6dd862161b21cefce64591e0804e95d57bdae70a0f0f7c5b31abe85ba688b7386918dd9026f9fcc0740208bcaff4d49254f7d8163f690d SHA512 cd4e41d850a93ea169fa20542c38bac0c280ca8dbb0f186a48105c63a7ab96f067c6c60696c76189b90e264b45b1d58e62db4bb9e167680b46c672011f5d9fd5
 MISC metadata.xml 451 BLAKE2B 671153316362e0394ae59824e67f5ea897615d3853552aa92fb273d4a41a88916cfe03650ab42248ffee557cb95149b21160395e0fcb2f1fd69bb3bc2c97ea55 SHA512 393d4898c3555b425c34dad5f540f42fc8e281f6299360d1192d099e73486467c92ed16ca710e34d2868aec63fca2eab4775b86e95e6dea79b8721ff70e1db87
diff --git a/dev-python/debugpy/debugpy-1.6.0.ebuild b/dev-python/debugpy/debugpy-1.6.0.ebuild
index 985184de11a3..deb729af9f44 100644
--- a/dev-python/debugpy/debugpy-1.6.0.ebuild
+++ b/dev-python/debugpy/debugpy-1.6.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 # This is completely broken
 RESTRICT="test"
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
index eb09daef8c8e..62050de3d598 100644
--- a/dev-python/dj-database-url/Manifest
+++ b/dev-python/dj-database-url/Manifest
@@ -1,4 +1,3 @@
 DIST dj-database-url-0.5.0.gh.tar.gz 6309 BLAKE2B 72647f8651d595b4020161b15364836b8483bf8a12ec72e434bc9d0583878ee9f4e4c76110581f285adddac3e7c2d7bc071f720a7fde91c84c3ea53b6c979300 SHA512 541d5177bff0fcc21372d2d9dc699ba11de1b1cabf10d61fb9f1e844a6dd4d46df5c7fdb6ccb4505cf984e41d7a2ae4e3af5e7d05072b0ed6982499eac5aac66
 EBUILD dj-database-url-0.5.0-r1.ebuild 600 BLAKE2B c646cba05e301646b5caeb739ff0303a798aebc74a7138b4169fa486d30ef6cf2cb5931f8cb307330aeb80a83b2e1895cf296a5ee09684006c8a7f1024c605f2 SHA512 81b8af28ca78737c0b190566a9f113b5c7450fa900d5492a879f0755d45d7be7f674590a7c33572ecf1e3a6e28b2f847f85150d1a1e182aa4f778f57b518c7d7
-EBUILD dj-database-url-0.5.0.ebuild 565 BLAKE2B df312b685b2ea17b13176100e0601a4a4378422f67492a2e28efe93706b97c2453a9ab1bf72faff4b2f53f48f7726241a51c0a4c4d47cd54b01e689ca30909bf SHA512 ce6ea354ce091e5f5c8f71785861e2e6febe2b8edde348513d7c2009159ac505c09d59922afd5e2786bbd599585abd3bc20f1d8f3396fb9d315c382401d983c1
 MISC metadata.xml 407 BLAKE2B 0a3736cc0034297f64b77b9b795e8cd339ed58c5b213e730f1d3dccabe7cde10570222626b2b520bc0e51a0195cd99baf4ebf7028cc73b7e507603874b1f4143 SHA512 ec842e583cd4e0b632731e395f6e70e519077bfeaeb58bb88b9ad297368443fc06a182c120635eeb1dedb76b166829c6f414925d3061e55d49d7053a72c739eb
diff --git a/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild b/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
deleted file mode 100644
index 5892f0d17d7e..000000000000
--- a/dev-python/dj-database-url/dj-database-url-0.5.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_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Use Database URLs in your Django Application"
-HOMEPAGE="
-	https://pypi.org/project/dj-database-url/
-	https://github.com/jacobian/dj-database-url"
-SRC_URI="
-	https://github.com/jacobian/dj-database-url/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests unittest
diff --git a/dev-python/dj-search-url/Manifest b/dev-python/dj-search-url/Manifest
index 13598e3e811f..c8f0ca620eb3 100644
--- a/dev-python/dj-search-url/Manifest
+++ b/dev-python/dj-search-url/Manifest
@@ -1,4 +1,3 @@
 DIST dj-search-url-0.1.tar.gz 2815 BLAKE2B 75abd5bcd0d4b39a40c2c1a28eb02e903a40198f111364774af53375c21424ce170dc4d5f2fe7b51e884849d7700efeb3c99d534272002f60397099ea27da898 SHA512 9b233a8dc1ec8d6a81154ddbf6966beeb8fe4b62c1c7faf5e623409403dc2d64db1749552878b2a1edab1d3264820840bf14e7fcc2e54fafe5ca4d68a207fa5d
-EBUILD dj-search-url-0.1-r1.ebuild 501 BLAKE2B 35156c8dd7da36e335c104a5928efe39647fb71d92c22a00a975c47a6e6c3fbdb2dec6cb135da855814a4415497db1a8e37de76e5844cd004183ad5ffaba5d97 SHA512 d6993a72ddac0e148f33816e98247de011c6f62b6c49de1feb9e81ee74a9cbefceadca6400b7bbd7e6b873aa13df5bfd85433382c0fe9c3ec305cb98b0a16d7b
-EBUILD dj-search-url-0.1.ebuild 460 BLAKE2B 9144fb814241b607907c1d48a2eaed41c53bf065f85be67fc0d41b232b3674f549d58d8d281fe3355237c42dfea0c946c2a786652f750e88fd945367173599ec SHA512 c2f3aad09da9d9471af908db7d1d731e467de8252d43c53d3feaa411778873e64a558ba54b63311f34769aa7da26f701545064b49cfe20ecf4366685b17d00f0
-MISC metadata.xml 356 BLAKE2B a228b653ba8ae4238b7165c6d097e88f27a2823f2b3a1a800e11ed567784a342cdc3a82593ebe17b30a9caeb8ac547b8d71f0777a5f5d89ee5cd8f3006badc33 SHA512 ecbf4e29540c8fa424f985fae965e8174ff4da6742c55f6522b79fa4bb10c908975267f460e4e089ddc8bb343dfff48cdf5241d60439867a8408b2a7074f8025
+EBUILD dj-search-url-0.1-r1.ebuild 499 BLAKE2B da9cda423f8eee20b51fd4299df7823f89870951d95eefccf4a7a758dcaaef59194336a920c2d88a0008ddc0d096162cf084cef7b5e04318137acd848fbd23d9 SHA512 d3c5525575c0e7b456e461f237f98309df85fa5def735d73821f058f53a51e4b925e098f735ad8c7d37c9e63b583989b88ff9feb19a61101127e0c6619f509cd
+MISC metadata.xml 380 BLAKE2B 7a9b7eca520f86c5a047286b9556513d719043b71f58266ae247e0477fdf01c7a11db14acd3a8769763f0044fb4aac14c1d6c542a3a1e64a4e26d8101a4ef823 SHA512 987cebd87fff24b8900502450523c6218b7d7c10a48ccbbb1b36fce6adc404d8d865503c10b2dbfc9872deeaf5ab1583db79034d091ddb08575c44baedfdea19
diff --git a/dev-python/dj-search-url/dj-search-url-0.1-r1.ebuild b/dev-python/dj-search-url/dj-search-url-0.1-r1.ebuild
index 48863d1f359b..bab46f497d02 100644
--- a/dev-python/dj-search-url/dj-search-url-0.1-r1.ebuild
+++ b/dev-python/dj-search-url/dj-search-url-0.1-r1.ebuild
@@ -17,4 +17,4 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
diff --git a/dev-python/dj-search-url/dj-search-url-0.1.ebuild b/dev-python/dj-search-url/dj-search-url-0.1.ebuild
deleted file mode 100644
index 3d98438004a4..000000000000
--- a/dev-python/dj-search-url/dj-search-url-0.1.ebuild
+++ /dev/null
@@ -1,17 +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
-
-DESCRIPTION="Use Search URLs in your Django Haystack Application"
-HOMEPAGE="
-	https://pypi.org/project/dj-search-url/
-	https://github.com/dstufft/dj-search-url/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
diff --git a/dev-python/dj-search-url/metadata.xml b/dev-python/dj-search-url/metadata.xml
index 59b50ff01bd6..3525a43ea09a 100644
--- a/dev-python/dj-search-url/metadata.xml
+++ b/dev-python/dj-search-url/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">dj-search-url</remote-id>
 		<remote-id type="github">dstufft/dj-search-url</remote-id>
diff --git a/dev-python/django-cache-url/Manifest b/dev-python/django-cache-url/Manifest
index de26df957eb4..0dc85843b2c7 100644
--- a/dev-python/django-cache-url/Manifest
+++ b/dev-python/django-cache-url/Manifest
@@ -1,5 +1,3 @@
-DIST django-cache-url-3.4.0.tar.gz 8455 BLAKE2B 91780a053a90decbffd3d9a6fc0b9043dee74b6b6b265b9ef4b035c5679a4955582b3a3b831ff9670fceb89d5729b9ac607b6f318543d437eb35e7d1a1c1c638 SHA512 17fb8aff3b65f4860b2d2c7c765341f17c13a0f78453f627f62f40894d3e83281ecbde1d1ddcbeff7de8fe55189ce9504d03281353d227f9e7b1678af4c423ec
 DIST django-cache-url-3.4.2.gh.tar.gz 8664 BLAKE2B f97bfed1b4be0919d79304242baf7af0c092b440a1888f05c781e70cb4674a83c4f18077c1b3c9ce7dc99223ebe13527e5575af0993446d273cc387ed0e2d8d5 SHA512 7b12ff97c399cd52eef1465a504bf8edd7d422a76af5ead0157a3b52615501b7f152bf58f693255a3ccb81880123ec0efd2ec3590e07f38378e5e812c2ef3799
-EBUILD django-cache-url-3.4.0.ebuild 720 BLAKE2B 9f3753e9ce4d829e3ebb43215a3552ce13facd5b4aa7668dff545b0b5f59fa3a994d3a75cb465fdd0b1be7c1fb023dbace9745a71387293ba1c752460e0fd640 SHA512 40fe32f741ce0a6d796e00048caa86f3e458f64e03bbfe328fb0017a5e8b6b04c486ac6734c07f2cc6f9d6ce7a40be022c8feb41b2499cecc9ddd82e785e33ae
 EBUILD django-cache-url-3.4.2.ebuild 770 BLAKE2B 6a8cd60bac6ce9106941ddeb022ef24a836096964ad5aaa53e508893cc751c2101db74d551777e8f9371496fbd02676260950522f17461b80c342b1a77a29fe4 SHA512 5af456743181946e13c5b6b474f63cdd2daffbfa40921f4b2dddd358f24b149f0f0ee4828ef66a7dd63ae3f45d3853b14d05730ddf32293f8ea4360ebd7d5384
 MISC metadata.xml 515 BLAKE2B 0933720797d254031a1a8b134cbede61196f6f6bba8e09decb144c0db328e42faab7cbd3015dcc682711ce45cfe3466fb4c4ffa65bb18305be06937460e61822 SHA512 d6be30d34de3601f3c364094d23a3d322e3fed2f3badf28f132cc6464996bf7bda32cf970b397997554649232d72af747ebc1d4f4815397a6a32e2008438d18f
diff --git a/dev-python/django-cache-url/django-cache-url-3.4.0.ebuild b/dev-python/django-cache-url/django-cache-url-3.4.0.ebuild
deleted file mode 100644
index 0918c1f0744b..000000000000
--- a/dev-python/django-cache-url/django-cache-url-3.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Use Cache URLs in your Django application"
-HOMEPAGE="https://github.com/epicserve/django-cache-url"
-SRC_URI="
-	https://github.com/epicserve/django-cache-url/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	dev-python/django[${PYTHON_USEDEP}]
-"
-
-DOCS=( AUTHORS.rst CHANGELOG.rst README.rst )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e '/--cov/d' -i setup.cfg || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index 45401a92fd10..38c95561fdc2 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,9 +1,5 @@
-DIST dogpile.cache-1.1.5.tar.gz 392536 BLAKE2B 062392cda9b06da889f924bc04743faa133b978a908ffdbc1e9cc9a2a9a69db22ee26b27c7cb2ec2dedee20786cf90c6d02d163731224956091b2d3baa25774b SHA512 b6d453121ef8e58da60478e2e1e2db57804dfa3b17cceeace930ba75d159629dfba4b5d63c50fbbc2eafeadbfcd6e1e4cbe22c8da1f54c90473f8ee677d764f8
 DIST dogpile.cache-1.1.6.tar.gz 393076 BLAKE2B 62c16ee7cc00608432d45fa7cb068300a4417a494e4580a2af5c3f7c5a0bf40a54e1b6f4924bbd7b40a0efc1cb9afb42f361811c257fa77eabcd64cc35fbcf51 SHA512 179246abf598675cdef988b463df4997c7eed8e7a110c22704052f905b65ad537b22ba28d7c96a28b2aa85b3e83ac42beb36843dc78ad503d41225ea1f9e7e77
-DIST dogpile.cache-1.1.7.tar.gz 393572 BLAKE2B 307aa89ae7814b5703cb32bfc703152b0aa8c80c7cc5be8341ae02c39fb5b27d5b650e02597ee5e07f5994d9dc95bc344422b54d8d431d9c0ad678d64ddd398f SHA512 2c7e8dfc252241ad075a073ad1c1688865943f6e33a317618a47e95132b65ac891b00d5aa0bf3bcced005a6157b50754b086192470b3ce867461bf183947d603
 DIST dogpile.cache-1.1.8.tar.gz 394499 BLAKE2B 3371e6ffceb6629200a18095a20a313952b8a246d2ec7580e6409bde0f16851f8332922647b92383b47276933cfeb818dde6df48efd2534df0f94cbbc511e01c SHA512 2bacc111e17ecc706b3389f5c40ded888cc893f6d01c34a4e1e0d8d94c4592369b0c283aa80eb6ebec90dde7a89fd3b7fb9bbcbdd8010f90ad7de4501db13ace
-EBUILD dogpile-cache-1.1.5.ebuild 764 BLAKE2B eddcf9fc01c3942cc1292bd2dc4e5ab10abd6162a20824f4b6ddd8c6c26fe34f974750e5a6acd853fd36f039f8c70d9121cc08ac7125e45c4f43556996568e4c SHA512 029b30a4b8233841b577755fe1fd516161afc08900d2d8131ceb761e27237274ab206bd7ddaaa599bf9758fecf0641f8f1bd76fd01de2078f692be76fc92fc96
 EBUILD dogpile-cache-1.1.6.ebuild 764 BLAKE2B eddcf9fc01c3942cc1292bd2dc4e5ab10abd6162a20824f4b6ddd8c6c26fe34f974750e5a6acd853fd36f039f8c70d9121cc08ac7125e45c4f43556996568e4c SHA512 029b30a4b8233841b577755fe1fd516161afc08900d2d8131ceb761e27237274ab206bd7ddaaa599bf9758fecf0641f8f1bd76fd01de2078f692be76fc92fc96
-EBUILD dogpile-cache-1.1.7.ebuild 767 BLAKE2B 8a10baf236407ea9d8adbbdd7186988b19975bf7936d5f9659979d8b08544b1afbe7e01fab23f7c11870c6379340fc82fe0108e3f841f35e3c089ceebfc7d797 SHA512 d127e8914e8ca20c90aaf4ab54a742ba91dbff71f10041d4591a447637d5186b8a02177fe6e4a5092868d9ff9f6df2d16fe473170cf564db03d1fa3d5df6be2b
 EBUILD dogpile-cache-1.1.8.ebuild 765 BLAKE2B 74e7a3620be0721533785ed14f4f0fe32c74e9a653c49fd48e5cf829a15fcdaba9886ef9719aba6b86211c10fa39b487e199363bf45099dce69d7c5bebed5869 SHA512 8c4ba3f8f0a3b2701ab59492bd58306951f9ab72087e969feaa56f97f2ae5015dda333da80f2291a5cc7f92b525aea229d91bd214cb9e692a021c3e674a8f25f
 MISC metadata.xml 843 BLAKE2B e0b6ed26300c658bb3f9bdc500bd24c38f26821d3a32ce448c56e5fd129f211efd58ef0faab1a6a9114a96991514de5fb9cf53b26601cb68fedb4c43aab3cdb2 SHA512 992ae84d983cbc06969e888e298cf8124dcf6068871bd5e12dd479a70ca00f5422d8c3cc178a842a340bffc5f72a5b203ce307ccbe49a0a60c0c52a5091052d9
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.5.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.5.ebuild
deleted file mode 100644
index 945f0f2ad5a4..000000000000
--- a/dev-python/dogpile-cache/dogpile-cache-1.1.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1
-
-DESCRIPTION="A locking API for expiring values while a single thread generates a new value"
-HOMEPAGE="https://github.com/sqlalchemy/dogpile.cache"
-SRC_URI="mirror://pypi/${PN:0:1}/dogpile.cache/dogpile.cache-${PV}.tar.gz"
-S="${WORKDIR}/dogpile.cache-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.7.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.7.ebuild
deleted file mode 100644
index cebd949d705e..000000000000
--- a/dev-python/dogpile-cache/dogpile-cache-1.1.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1
-
-DESCRIPTION="A locking API for expiring values while a single thread generates a new value"
-HOMEPAGE="https://github.com/sqlalchemy/dogpile.cache"
-SRC_URI="mirror://pypi/${PN:0:1}/dogpile.cache/dogpile.cache-${PV}.tar.gz"
-S="${WORKDIR}/dogpile.cache-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/html2text/Manifest b/dev-python/html2text/Manifest
index 1f5a5bf26b4e..bfed8d22ce78 100644
--- a/dev-python/html2text/Manifest
+++ b/dev-python/html2text/Manifest
@@ -1,3 +1,4 @@
 DIST html2text-2020.1.16.tar.gz 49464 BLAKE2B f0331daa63b9e5d7508e0446e19b4dd4d05e5f7af0279efd71dc43b633f8273666189899a27cb598e8afdd5bd8ffb3d566b97327d82870ef44a81310d8e7e7c9 SHA512 14453c98e81d05afb3241b04a9e50caf63e4b6f857337b4bd9f53e6b8fa7146aa6a1f4f64777db9fa350316b19fe62a0033dce5748191ca9fbd17a8757002855
 EBUILD html2text-2020.1.16-r1.ebuild 697 BLAKE2B a60d2cc00a4af95494784763d4e0d1d7c1548c85112d53d38e641ddb2128636c99dff3a2d64c9da348fb46967db574a462db644247e1edbd196b5838390a1670 SHA512 67925501194270fd7bf0d998cc3f2d699c7b7c7bb22eda8df57880d46ee6d5c8931354863a2c6cd96ad36268378777e404428839f6b46a9f9d74a857cf701710
+EBUILD html2text-2020.1.16-r2.ebuild 721 BLAKE2B ead89f9c484a74297430595480517072f114c0fc09d10e4326970056eb69c9d9e1bb7bfce37388639e44580e278321d6a1211469df7a9c0b92947d3a340e94cd SHA512 78ecc057095fd70320731cb9335b4b47f2b0228de605c860375f282782f85e1bc8a3b71b610c2c7ef857e9d0122ee5d8352c065a050ef1d0eef51bfa7908863b
 MISC metadata.xml 370 BLAKE2B 7f1ca31270b32232fdb07a3f87c051db987b727c2753fc38889141db09df1a5c637d64b4263890a41dae2a086a30ab46c36a32e83da6517854a9bf4d356c3b96 SHA512 962ce64fd69c10d7a1be71f2d9927c5f44867822e4a58e45e566b7a515ad2273dcc17ae9eb05c12ffc951fb824c76081abfd3a02a8e02d9a59e29d521011fef6
diff --git a/dev-python/html2text/html2text-2020.1.16-r2.ebuild b/dev-python/html2text/html2text-2020.1.16-r2.ebuild
new file mode 100644
index 000000000000..9356b7ef1320
--- /dev/null
+++ b/dev-python/html2text/html2text-2020.1.16-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
+HOMEPAGE="https://github.com/Alir3z4/html2text
+	https://pypi.org/project/html2text/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+
+DOCS=( AUTHORS.rst ChangeLog.rst README.md )
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# naming conflict with app-text/html2text, bug 421647
+	sed -e 's/html2text = html2text.cli:main/py\0/' -i setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/http-parser/Manifest b/dev-python/http-parser/Manifest
index 268996a2adc7..687dcac1a372 100644
--- a/dev-python/http-parser/Manifest
+++ b/dev-python/http-parser/Manifest
@@ -1,4 +1,3 @@
 DIST http-parser-0.9.0.gh.tar.gz 101174 BLAKE2B 92b74dffd2c35672bc383ccda59f93723c0f83ecb0fbf0470f5daacdd37f68d4d63de7d4ea53f86d2109349a793b7535cc864f014311dee6ac5e67d0ca751931 SHA512 75e51bef43d9d7698aad69f8bfe651e24784b97603cac55f33bf4c12c86792c8c71d6206f31847d052e4d8621a5ea65a7b34eca5bebdb8189f58e6d98d33139d
 EBUILD http-parser-0.9.0-r1.ebuild 884 BLAKE2B 78c66d15b5a6124842150951352ec114fb0e4bb5ed35d0c2520e6ba28b07b00c93541fff10f261a4615facb837de444c600c73499d3a76ecf40fac2f33c5ae1b SHA512 2a5bc6714a7d96dae342f98b1aacad5d04e687904bedccdfb76be02ec45d79b9f0e86c7cdabcd2b2a1ab6465a39bf3d3db13fe4a5b6743f693f66d272aefad10
-EBUILD http-parser-0.9.0.ebuild 882 BLAKE2B 0d22312cda71a086751e2ef98caaf0139296a01c07ae01be1d09f0d65a23e4ae46ff91263976e428bb0e15fd98b6b00e4f2e1499d47c9a4eb54592a97e019877 SHA512 5607df8cbf9ade92104565db3dfa14b8f4f59f7f64b0560d9c02432f33d0c6d0236f6823963801aa7ef8258b50cff816e809b20544145aa629e6ecb983a03466
 MISC metadata.xml 386 BLAKE2B 219fa172d766a86094b7a37a8f5d47f6f503d14fe96ec42a7deb64e2a9865754eafcebe3514595718c54f7ad3224bd4ab227c0ff3eea9190052bf6b75712ed9a SHA512 1d6b4e4529ab169d2773199a10d994f92a638fd962bada0791c95c009ccb706a95089f9ea943e4851daa56a690319bf10cce3c77618fa1461c7c4606db2818f0
diff --git a/dev-python/http-parser/http-parser-0.9.0.ebuild b/dev-python/http-parser/http-parser-0.9.0.ebuild
deleted file mode 100644
index dc270dee7e5c..000000000000
--- a/dev-python/http-parser/http-parser-0.9.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="HTTP request/response parser for python in C"
-HOMEPAGE="https://github.com/benoitc/http-parser"
-SRC_URI="
-	https://github.com/benoitc/http-parser/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86"
-IUSE="examples"
-
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	if [[ ${EPYTHON} != python3* ]]; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_install_all() {
-	local DOCS=( README.rst )
-	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/iniparse/Manifest b/dev-python/iniparse/Manifest
index 016377cb2667..f29cb1700ddd 100644
--- a/dev-python/iniparse/Manifest
+++ b/dev-python/iniparse/Manifest
@@ -1,4 +1,3 @@
 DIST iniparse-0.5.tar.gz 32233 BLAKE2B 3da99f9d828318f78ddb8789afe63a7fdec017eaf41df5f420b0f358a9724eb787f312c9964238d9e42ebecce143d37f72858c7935cafbcf0221229b89033026 SHA512 b3f10d1b36497c3c5c71cb0a1ac73d74d8944f4ad3b7acc4a4b0246c2f1a20c184d9af20bbb3cb8ec4f57fddfb5e103b92688847debb4200ef0583353d7f9556
 EBUILD iniparse-0.5-r1.ebuild 698 BLAKE2B 3cdd7b5b799646a08f7b3641680aa3b64ad60e966ad933ad6dbc2e2d3e2fd7da28800ce8dd8af1ad22493560e3c023593fbbbe9a430374c128497bd4a376506f SHA512 fe2c71515fa4d9cd746c4a5187e64b94d51695d751fd7181e63b139b37cf8aad2c342b8fd51ba6e35e6a54d51340f21a0d2036be873fd83c47785fb75ce27cb1
-EBUILD iniparse-0.5.ebuild 506 BLAKE2B 478ae4558779c9c63352145d0a707cdd9ad2911a0dc98cb8e3d9d5b2b01b2b66c70805d20087adc219e5850efcfbc4c138f62555e80112c4eeb67663644cf5b0 SHA512 af48c2c8fe961ed28a9382420e165d8909b87970593f912a9905a1621bb6c920c933298fcae7be3491280568abb7c023b722d554fe452e653bd1a5fa96a04ad6
 MISC metadata.xml 336 BLAKE2B dfe7c6dd67edf1dda2403035f6540398e5797b261d0cabe768365e3b51a6a1d0a3475aa6066f5fbb53d9ae2fd7de4e13d0f4754554f095cc758fae8ccce52305 SHA512 9a2b6d0733ac64106e9c376dca4b6832de44bea2ec4d96d68b9cf39fb1e13f28bad14065aef33e525d496c1c57a0ab3d31feb643ddb8caa2dc6cff125de2c679
diff --git a/dev-python/iniparse/iniparse-0.5.ebuild b/dev-python/iniparse/iniparse-0.5.ebuild
deleted file mode 100644
index cf1b466997d7..000000000000
--- a/dev-python/iniparse/iniparse-0.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Better INI parser for Python"
-HOMEPAGE="https://pypi.org/project/iniparse/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
-BDEPEND=${RDEPEND}
-
-python_test() {
-	"${EPYTHON}" runtests.py || die
-}
diff --git a/dev-python/intelhex/Manifest b/dev-python/intelhex/Manifest
index 51bf15ad1328..9d5c8965a04c 100644
--- a/dev-python/intelhex/Manifest
+++ b/dev-python/intelhex/Manifest
@@ -1,4 +1,3 @@
 DIST intelhex-2.3.0.tar.gz 44513 BLAKE2B 935fb6d5c27231c4b09f7fbe624df07adfdb9eecdd99b17cbbb4994dc74e0c7a141546a663229b0598ddd3884b8d17dd7244f770319a594387de074e7591aea8 SHA512 41b50feb7505474d74a2b6293d755d118b6dfd23a5c9b995791e7dcb7a97fc6f39d8f804b72f6372ba8e136684f9c979c7ce9ef2ff9796b6202eefc9d18f4424
 EBUILD intelhex-2.3.0-r1.ebuild 508 BLAKE2B 505fbd518b8ef29d374b8227871a883f4e24e33eede06c56672e9a4273ea40a33ecd390b4216d98b752ddb30d40a250f42c292df73d544a7cdd3ff13437b0fa9 SHA512 f9524669dc23cc423d772644ecd9c059366e25ee28f30c565df501a37a26953fd136861f6a51cff3a3052bc60254938742b4dbf539d495328385202819d2c66b
-EBUILD intelhex-2.3.0.ebuild 467 BLAKE2B 6420a92abdfea42ef33d3dd516b6fe054a62e2e08567f1828b02694f52e597133d231def4ecdc83c8139df77f1752ae4b077050e80ec8db44a3c38a020018b6d SHA512 369ec24eab6c2eda1e8f91aeace1975af027031ae065d2501219a9fb4f2d3b664bb4cb619a17728c46d602c1eadc4d8e014ab37f4017b51089cf570a8de8b699
 MISC metadata.xml 368 BLAKE2B bfcc62fc30d07cfbf68c85cfe04d5a463f2495d692d903a09bfc7e64a2133de5fc9dac5a0acf6b8e361f94280b3640205121fc037b74dd9a2af515176ec17770 SHA512 064025d5665bf23868bd3d76a1acf4d93fa55063f89c96631642433922820db01ef8174dd05272ab17acab081eee54d6af411885089dd6b43546d4372dd8c61d
diff --git a/dev-python/intelhex/intelhex-2.3.0.ebuild b/dev-python/intelhex/intelhex-2.3.0.ebuild
deleted file mode 100644
index 172f601d36f2..000000000000
--- a/dev-python/intelhex/intelhex-2.3.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=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for Intel HEX files manipulations"
-HOMEPAGE="https://pypi.org/project/IntelHex/ https://github.com/python-intelhex/intelhex"
-SRC_URI="mirror://pypi/I/IntelHex/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~riscv ~x86"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index af62f21793a8..1594475871a5 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,6 +1,4 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
-DIST ipython-8.3.0.tar.gz 5314400 BLAKE2B 8f06dcaf32cea70ba9f19fb218d4ea6ca3e42651da065521133b1c7163f80324244f59b3c4d85039f1aa5ed363acad0dae11615ae4927d6c9a24197cc9640349 SHA512 95a3d50a5cffe9d4ed3f072c7fa8920c96beccdb15a7437836daa5f38f1ba228b4ebc4c3313d4c5016b77ed7d6f3787af727487ea379c9dc3b3de90eafa4d1c3
 DIST ipython-8.4.0.tar.gz 5314601 BLAKE2B 4a5804ad115b45568ddbc0b8fcd181ae0088690ae2d7dda8580588d1e1caa087582a279449142e0144568815270b3a9476893525c0e90320f9ec580a06126d1d SHA512 975915ee64ce6f3fc9bcda383c784759dd8b19151428b10ef92020097718c6e2a9804a00fe02bd541b845eca146c63a672f25ad4f00ec5302b3c61ae0c6935ce
-EBUILD ipython-8.3.0-r1.ebuild 4686 BLAKE2B 84112b5bba8125ff42312c46fa63f479970ea910623e96deb9c14cc946c2329ee69127e462f6dc8e99fbcc472ae44c50f5ef30a70e291fead15506a25ba695b7 SHA512 644837453f1d96c2d6dcac69d1908ff20cc10b7a6d960467b51f8bb571f0fb9c621a9766466e42ea471f8d368e122c1398aaccbb13563fdcd1e20f3a152b5dc0
 EBUILD ipython-8.4.0.ebuild 5022 BLAKE2B 7fde2660f84fe642531c604f0825d6432e3905cf08325743c220224445aed5db900f052f5bb3e18d53e66c2efe2c669065caa116fc20433c68a1b7e16d6c222b SHA512 02591875dc098943885a53452c3c1669ab9e273d6d229975120ebcbc83a80641df70ace2bd165e8a44950ebafffa0ff9dec33d84083c779ec1f1aa95afb3758a
 MISC metadata.xml 2883 BLAKE2B f61d1c66cdc9a956f3fdc9fcbc93fbc2051e9d0872beb9229e87a8fdabbce656efee9702e66bf30bec68009702f42e4036202e02208a428a8ed87b448f625536 SHA512 617f19e859544079d2680e9796e3ff0b7af41577776847d4c4dccfffc460dfc887631169289e5271120f375bea7c7836395abb9bf8a7628b3b55a7c1beefda9b
diff --git a/dev-python/ipython/ipython-8.3.0-r1.ebuild b/dev-python/ipython/ipython-8.3.0-r1.ebuild
deleted file mode 100644
index 7d34496fedfa..000000000000
--- a/dev-python/ipython/ipython-8.3.0-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/stack_data[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-RDEPEND+="
-	nbconvert? (
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-python_prepare_all() {
-	# Remove out of date insource files
-	#rm IPython/extensions/cythonmagic.py || die
-	#rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	# Rename the test directory to reduce sys.path pollution
-	# https://github.com/ipython/ipython/issues/12892
-	mv IPython/extensions/{,ipython_}tests || die
-
-	# remove pyproject.toml that specifies incorrect backend; since
-	# the package actually requires the legacy backend, force it implicitly
-	rm pyproject.toml || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
-	local EPYTEST_DESELECT=(
-		# Internet
-		IPython/core/display.py::IPython.core.display.Image.__init__
-		# TODO: looks to be a regression due to a newer dep
-		IPython/core/tests/test_oinspect.py::test_class_signature
-		IPython/core/tests/test_oinspect.py::test_render_signature_long
-	)
-	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
-		# TODO
-		IPython/core/tests/test_completer.py::TestCompleter::test_all_completions_dups
-		IPython/core/tests/test_completer.py::TestCompleter::test_deduplicate_completions
-	)
-	epytest || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "code formatting" dev-python/black
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/js2py/Manifest b/dev-python/js2py/Manifest
index 4eb43acb3833..fa2b90ee338a 100644
--- a/dev-python/js2py/Manifest
+++ b/dev-python/js2py/Manifest
@@ -1,5 +1,3 @@
-DIST Js2Py-0.71.tar.gz 1969618 BLAKE2B 293a830f4188e66927b23900e8c376bf1a4bfdfa8726e33aa5aa75dcdf735cde89ce463741c142fc7e487ae89c7c11421e459d2fdd09ba88edfe953e4e087e42 SHA512 75bae61619d4766117f3c163d36427f3019825ecb08b745aee7c3b6f2d33a4ea8507ca180b63c0a8e575a5f9491eb64d6963acbb912edc7b934a676b38814597
 DIST Js2Py-0.71_p20210918.tar.gz 1970784 BLAKE2B 4ea446b306e858c2acb192a699b4c098cca1a334fd97246d3149186795a013fa1ff9cf45ecc5cd9bed241b13b3eb003ebf272f5af4ed24a608564fd4709e4ff1 SHA512 810363e4b0716e324e6deb5f373968c9c57e7ecf120710c064601ad46ca2f24bc8da52f779f861296dd506de06d664be86b3c0d72bcb811892fe4e6c22ad7a6d
-EBUILD js2py-0.71.ebuild 1157 BLAKE2B 516469da33f8585b37dc0103bbdd0e106d97f04a0e3eb23ce1aebf7ff84886143eedd9877075880e62e9b6939246d47722d8e7c6d15f41800760182b671f98a8 SHA512 b298e699f7117c93e73fac3154eafa35794511f720ed125ba31f051e8908ccd8f404952ee3018973af30031fcc735b7091aae693add03da91a34e3a84b41d376
 EBUILD js2py-0.71_p20210918.ebuild 1127 BLAKE2B 46f6387148d8a1c6c0e3678e021dd32ab1c018fe33be1966feb1a0f592ab950fc8e662f06e7bac3af3ca76e5f71203c51ccd23df29143bcd92e317d3b56e901f SHA512 48eacd37e89f85f90b041a8960549bd3d93888bd70301f559fdb840bfb94bd1ee2f5a83d2202cf54fa4f7205828f962579714397a7eac92f22643a7c5ff9caf9
 MISC metadata.xml 385 BLAKE2B 145afe58273b407d1ba1f3859de0d79a3bdd4307575d043a8b574a8bac26c2d577efec841c6c3a9424ca7970dac33517df48c0f287c18bf4e1cc5faa5125ba6e SHA512 7e48c836578bcbb4abf0d99f0f2b870ab15158f05d5c402e2d84c9f9de7d2c994127eba26897e406b6c7d77c962867d39a37bf7ce78ca09d39b78d64f9d8d68d
diff --git a/dev-python/js2py/js2py-0.71.ebuild b/dev-python/js2py/js2py-0.71.ebuild
deleted file mode 100644
index 0dd24131e258..000000000000
--- a/dev-python/js2py/js2py-0.71.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_COMMIT="5f665f60083a9796ec33861240ce31d6d2b844b6"
-
-MY_PN="Js2Py"
-MY_P="${MY_PN}-${PV}"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="JavaScript to Python Translator & JavaScript interpreter in Python"
-HOMEPAGE="
-	http://piter.io/projects/js2py/
-	https://github.com/PiotrDabkowski/Js2Py/
-	https://pypi.org/project/Js2Py/
-"
-SRC_URI="https://github.com/PiotrDabkowski/${MY_PN}/archive/${MY_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
-
-RDEPEND="
-	>=dev-python/pyjsparser-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/tzlocal-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${MY_COMMIT}"
-
-python_test() {
-	pushd ./tests >/dev/null || die
-
-	# Tests require "node_failed.txt" file where the logs are kept
-	if [[ -f ./node_failed.txt ]]; then
-		rm ./node_failed.txt || die
-	fi
-
-	touch ./node_failed.txt || die
-	"${EPYTHON}" ./run.py || die "tests failed with ${EPYTHON}"
-
-	popd >/dev/null || die
-}
diff --git a/dev-python/jsonext/Manifest b/dev-python/jsonext/Manifest
index 15ddf4b71275..c680d9bd477a 100644
--- a/dev-python/jsonext/Manifest
+++ b/dev-python/jsonext/Manifest
@@ -1,4 +1,3 @@
 DIST jsonext-0.4.2.tar.gz 9574 BLAKE2B cba417bc116e572f383a6d396d33fab0f6b63534ae89c402b6cfc0297a0c2fce336bf63464252fe9c87a9617f7f00ed82fe9de9d4e95356b60ae555963d4951b SHA512 2b47b48b529ad8f3b9662ce19f6ea9250648e17cb94e4a59a52ab6a9aabf64abb74f3c76a1edf274fe1e52863352456c0f95c5cd7406c44ca917b6addd09a2a7
 EBUILD jsonext-0.4.2-r1.ebuild 649 BLAKE2B a645725b22992ca55b8e9b12f9e9a20beb9db543e0e6243109103781c15ceaab94a474cdb47ea78acef76d47cb5cdd612415a601af681aef54f84ce053e65433 SHA512 27a7dfa52c70bd9a3cc66c9f1ac33a81731b9f07e29931f00a7eebb593416aea70fbb47c191c75a852afa57c8c7a5618e312de0d2944d4dc818dc75caab59992
-EBUILD jsonext-0.4.2.ebuild 492 BLAKE2B af183454a8fefe2a3541c55f6531ce8bcaf58d075e8b2bc44f34d9b312b6b784575396b567bdb6445c3754596a910c5c111595e6b0c2c6c960e20f4f52bb28d7 SHA512 3a0355778768f8fd7fa9c45a6c6d45d5959f7c7d0233b57c2901a6222c805babe7c10ce9737e0fdb03fc3006a29453f8a6a2a2938ad9747e68d02ea140fa7249
 MISC metadata.xml 479 BLAKE2B 27ae299c717103796af60e26db6c5ca2ae874f4bcbd4a0c69998f1788b7566ca4fda77ab1135a04a1fb49ac7069b817e41a8f87851fd03618ec00311a5866752 SHA512 a05a510cfb4092995a4768830fd35b6de9a40bffcb8a8e5d39e3a1291f33fd067274005049a2e001a952cf7f59d4ba2612174ac35b2ef19fd75686eeb9608341
diff --git a/dev-python/jsonext/jsonext-0.4.2.ebuild b/dev-python/jsonext/jsonext-0.4.2.ebuild
deleted file mode 100644
index 67edd99ea58f..000000000000
--- a/dev-python/jsonext/jsonext-0.4.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Well-structured helpers for serializing commonly encountered structures to JSON"
-HOMEPAGE="https://github.com/mbr/jsonext"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	dev-python/arrow[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/jupyter_server_mathjax/Manifest b/dev-python/jupyter_server_mathjax/Manifest
index 884b0b53abe8..40fb40581a93 100644
--- a/dev-python/jupyter_server_mathjax/Manifest
+++ b/dev-python/jupyter_server_mathjax/Manifest
@@ -1,3 +1,5 @@
 DIST jupyter_server_mathjax-0.2.5.tar.gz 2634856 BLAKE2B 4fe518d3979271bc5ff64da040704862def25ec3fd184babe3f49a6bb1531db9b56c27d9edf0b5356b446e79fffe43cb32f1652f5276cd5fe4aabafd01dbbf5c SHA512 bc1f20bb0595d3e8a4483a6d0580ecaba1b1b296e63de86724b56782e42ec7ef80a5737fe16f610f38bbd0c4dd7573d498cd86d3bf97814d11d0ce6f77cfa317
+DIST jupyter_server_mathjax-0.2.6.tar.gz 2648665 BLAKE2B 079108842d1c62b58c12e5466736508a4002fcc977acdbb1ea0c35205f685f53b985038af7df1d58ab188eadf6be85c59cc3eed4012a92d4353d5b77424935ea SHA512 a87a73471c470a60fae67d3a2dc7e163c39fc2ce62b357fd6eaa030ffcf63b44106ef35377795e58c5f89a847648c7fedfcace68ad9aef8efa45e71a2fd1a79c
 EBUILD jupyter_server_mathjax-0.2.5.ebuild 909 BLAKE2B 8d248b2a1a8f2c40b5c54153cf0049fe5ad4d24d0526e37992447562562fbd6ddfd21c410bc1300c32d00d92e0aa54956c33b0e435c099fce9add00e5dafbc02 SHA512 ba28b3920d1be20179e2d70e6ef479fbc471467942c4aa2f58049f91fc091fb021a4faff22556183deea51b75530f9150fe147b2b718ef8c1fd66d17f9a4717d
+EBUILD jupyter_server_mathjax-0.2.6.ebuild 1026 BLAKE2B 5f261af8fbdfbc77b43c3dfc37d8f7ed57cd3ebf73484bc3231dc9b10101a4a6e664ed96328c707120463d3005f95c22eb12da4cda34ed4bbc8dc5f1c2422299 SHA512 804e085cf668af5220ebbbe7dc5c7c947916cc1307454a004b0096e29b5d6b857fd0e866e3bc63660688782849c47e4c3d4238ae530da6c865e549486eecb0e1
 MISC metadata.xml 453 BLAKE2B 7a4ebaf263ff85d75f9ceac762692040bac146e147e7d01f5464132f3c518f2141c884cc0c447388e863651929727fe1524971925bcee7fad92aa5d33febf90e SHA512 399c94bc19b4144701f44638ea0fde80c366750131c8952a9c8c5f8554275e8ff0be72c3ad08335facb3719c0f8b9c9027ab2f60b3897e5e9791eb3ab95daa17
diff --git a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
new file mode 100644
index 000000000000..3cf0df257510
--- /dev/null
+++ b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="MathJax resources as a Jupyter Server Extension"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter-server/jupyter_server_mathjax/
+	https://pypi.org/project/jupyter-server-mathjax/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/jupyter_server-1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/jupyter_packaging[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Don't try (and fail) to fetch things from the internet with npm
+	# https://bugs.gentoo.org/820317
+	sed -i -e '/cmdclass=cmdclass/d' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
diff --git a/dev-python/mistune/Manifest b/dev-python/mistune/Manifest
index 0c80a90031e5..65fab9b35dc0 100644
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@@ -1,5 +1,7 @@
 DIST mistune-2.0.2.tar.gz 75778 BLAKE2B 6ed690a70c54a0a06f154d42151d7d857f0e70cfe32529d7176726bd1e2f7a4fb9bf66be476af139c338c9f8b0d0de6541727e18718f6537d3a07771f34441f8 SHA512 8250243bf6cd2496ca1309e1fb062507f37c197817a4c5ec1a8e3c5865b6cc58866b88158b3a2e2967ad53b1f1a668a2e4282c30179ce126242c528000215992
 DIST mistune-2.0.3.tar.gz 75763 BLAKE2B f9508f6a3b955d716947ee8d3876b63a81113a4886dfc3212bdfff00db4c84527b334037eefae4592660ae802e14cab21727c1a50dfbf0ae5223a409688301db SHA512 b6eb9585616af3e1a10d48e469d893d3965048d47a772fd6dcfad4aa026feea8ffe8048c8e93b2d430c07b4bc15e8e8afe43f3a12cbeb8d70872af8b83dc9358
+DIST mistune-2.0.4.tar.gz 75977 BLAKE2B f5c29a211695897240664ff9ce7891ce81fec11f6a2e3865cf07e796ddf8e5664a4055f887318e53b315ac3bbdc90a3d0976ed1fe5b74b2f7812dffa29a57bda SHA512 4d000c5791c29069b5f252f2aa5d361eb9cdf717d33f8d66dee8b4aa3bfe1242a572af63ca3dfd57324fac457fb9b5a9dff18e7da15f9036becd14cb27882dba
 EBUILD mistune-2.0.2-r1.ebuild 589 BLAKE2B 8292ebc85d55dd390885c8cf972435a5c0f7533a8f0ac1d866e1b45f57f38135df7b484a1aeeb220fff77090212f68dda3c29be767bc1fba8d41553f8c112f0e SHA512 369a8525bbd5851d6bc6ddccdccefde590e83153711cc15253e2589c622fdddb6f3dd8e24b8e406f2baaf0785cda237e07c715d69245fc92c5c4bfdffebdea69
 EBUILD mistune-2.0.3.ebuild 597 BLAKE2B ec9c0ce6de4522bc278245b804f6f9932cab6a009dcc05b7f86bd589aa2b9ed9aa0f6328e0adf22f0b815f114f426b0eff6fc690666ff0167fd8b1f0c09354f0 SHA512 062e3ae5450e1bb2ec10724a324929f23d7c79b891de7bc3f99959898ce6c5ea3da607d0e232b75067240908abd153c8c2a19e4b91c9e57f033c123d47ac0ee5
+EBUILD mistune-2.0.4.ebuild 597 BLAKE2B ec9c0ce6de4522bc278245b804f6f9932cab6a009dcc05b7f86bd589aa2b9ed9aa0f6328e0adf22f0b815f114f426b0eff6fc690666ff0167fd8b1f0c09354f0 SHA512 062e3ae5450e1bb2ec10724a324929f23d7c79b891de7bc3f99959898ce6c5ea3da607d0e232b75067240908abd153c8c2a19e4b91c9e57f033c123d47ac0ee5
 MISC metadata.xml 403 BLAKE2B ed684a2a6de8b40c202467abc3277bfd280cff4441bd265b2ceb36105a4d3315a5147db7ec555a01c7cdd5c2ed26521254c75586cd44edbeaf0c59766800fc71 SHA512 a14b77e8fca2f7c7c51803f15a53ab82198d5a0682f7ebc53d5565e5b50d22c2ae196607da6fc67ef2c07c11a5469d394b1753546c270735dfa56a99bffc0f28
diff --git a/dev-python/mistune/mistune-2.0.4.ebuild b/dev-python/mistune/mistune-2.0.4.ebuild
new file mode 100644
index 000000000000..718413dc53f7
--- /dev/null
+++ b/dev-python/mistune/mistune-2.0.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="The fastest markdown parser in pure Python"
+HOMEPAGE="
+	https://github.com/lepture/mistune/
+	https://pypi.org/project/mistune/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+distutils_enable_tests pytest
diff --git a/dev-python/owslib/Manifest b/dev-python/owslib/Manifest
index 0499b5119e4f..70ca3d0667f0 100644
--- a/dev-python/owslib/Manifest
+++ b/dev-python/owslib/Manifest
@@ -1,5 +1,3 @@
-DIST owslib-0.25.0.tar.gz 936550 BLAKE2B 9cb34a6c7c93dc89a466c13351d457c9372d405055fa3f6cec9c05c231e76762168c6813085523037b3a6439100500c46c1044569bd2bb598c3e2e63757d8b86 SHA512 058108cf77197ce24793608869d56bf0467230f5f231ac9ba48445f2e02d07ea1e26be03ad6967504a1e625008ae2768ed2a663f3b7a49dcea410ee4a8b40cec
 DIST owslib-0.26.0.gh.tar.gz 948463 BLAKE2B 2cbdad2d8e9bc4b8a7e2db58dc75a7c053bde0b2cc772a01f230db044909615b96e62b08bb93233df153686a180a5e93af1bda6ea79b8565efacccfa18fcf4da SHA512 27362c47eae87dc6318d505dd1b0987de36d140d2d0fd5d7a5195470de39d73807fbcafa142366f6981cc36453c262a41133c6c68baf45a97d0fdaae5a0ebf4b
-EBUILD owslib-0.25.0.ebuild 1008 BLAKE2B b37bc0a351127e7dbf203fb0c3c92f17e0acd7ef591fa70922e0ea1e249a5c2d1ff2d1b7359aec0e63a25a72ccdfdee7bdc62694ea084b772c2f29a96fd1ebff SHA512 288045a3f8840f587c06290839eb70d37b4716946ed55cc669759b3ce3f062c561a2a7fc8a7f3df61aea892acbdfbb293f5af9e1e1bc6325e0c54392aa753c58
 EBUILD owslib-0.26.0.ebuild 1016 BLAKE2B b759495e41072f32b2e5dff2a986b39584b64cb11e0e2aaf28742d309fed54a7e46eed85cfa19ae06c6def31b76c1752bc24a82ee1720d3b29b02370cc6a1fc9 SHA512 df6fca3250c1bcba908ee57cc4885b8cfb56f531d9da02100d956aca73bad39138c37e71e629d0832b4d34382ccf351c270c044857e7c62190a25b1ad6f29a0e
 MISC metadata.xml 520 BLAKE2B 01705147ed084a8215d15016b6cc94b2fcdc926eff2755cf2d4c768197d0c39a30a8b0602d93bac7ec221e32c30b9280b37d5736f2f46342ad36e23c1b4a7c1c SHA512 c146cb483caacbde7966a95b899372261493543826cb20d638cd91e7cae245d60f1504bc53f485e35ca5d6c3f83780fc1da211c0838c604dafde27284dd8e40b
diff --git a/dev-python/owslib/owslib-0.25.0.ebuild b/dev-python/owslib/owslib-0.25.0.ebuild
deleted file mode 100644
index 320c8dcf9250..000000000000
--- a/dev-python/owslib/owslib-0.25.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=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Library for client programming with Open Geospatial Consortium web service"
-HOMEPAGE="https://geopython.github.io/OWSLib/"
-SRC_URI="https://github.com/geopython/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/OWSLib-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-RESTRICT="test"
-PROPERTIES="test_network"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pyproj[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="test? ( dev-python/pillow[${PYTHON_USEDEP}] )"
-
-EPYTEST_DESELECT=(
-	tests/test_ogcapi_features_pygeoapi.py::test_ogcapi_features_pygeoapi
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/addopts/d' -i tox.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 7cb7907a83a3..c450a24b66a1 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,7 +1,5 @@
-DIST python-phonenumbers-8.12.49.gh.tar.gz 4904202 BLAKE2B 20974162d5a8668c1d15021de71795983c4eda1f3afc931822b3593c80249481bcb4ea9f8b80066a71f7f2821284534991d3307eddea0e8f0270e75eced0573e SHA512 0504a84b3a6047c7ca4bc1667a0418d60c7f43052911751572820e7f4e40b430b8847e4c8f6e4d88dd7a2684b5ad8de2dfda8891d81fd8e1af1c595be152f9fc
 DIST python-phonenumbers-8.12.50.gh.tar.gz 4904755 BLAKE2B 60353aa081e4d4d0909302a97a45a89c1f94aac323a6a68fd93cd67146090189d0901b947c40e80e54e1718ce4a45c4a83d2799701ff1323666e82570174d358 SHA512 7a4406626d04a85e010036ceca20430a2562939ad8e7e2651afd65f0d5eb26feb1fbbe0c11f081ab58a9ab8bd81da2ccc153ad22f12eb8135b4f604077b5b29d
 DIST python-phonenumbers-8.12.51.gh.tar.gz 4903034 BLAKE2B 6d97e25c3601f817ad51eb8dac550fec4a13799dd9321235c9105386ca2a1ab3a7fa6403f31643197a5a2f162be50edf6b3705c8947098f2d9ff744f6af1dab6 SHA512 80f5ad4356e31bc505c929a8bb9b577ed1571b9173e7f8faebe972f62c16f5a5d764eab5e3bd8aa939faae2c4ebbe2b0fa11a5f2e6fe334be98148a68881c912
-EBUILD phonenumbers-8.12.49.ebuild 801 BLAKE2B 6a2726b7845d46717aacb23295f6248b11475b197ff1a37c0de0d2a4e409cac62e941f005057f715fced24909943303ee1f0e975e40484368d82a81578c26b14 SHA512 8b5f322852d39eeec3bf3f023765fda596f6459eba5fa70f9f7074bf5e45428a5f292b394bfcc7786cb25049e198c410d794aade497539b6f0e8964a9f72bbc4
 EBUILD phonenumbers-8.12.50.ebuild 801 BLAKE2B 6a2726b7845d46717aacb23295f6248b11475b197ff1a37c0de0d2a4e409cac62e941f005057f715fced24909943303ee1f0e975e40484368d82a81578c26b14 SHA512 8b5f322852d39eeec3bf3f023765fda596f6459eba5fa70f9f7074bf5e45428a5f292b394bfcc7786cb25049e198c410d794aade497539b6f0e8964a9f72bbc4
 EBUILD phonenumbers-8.12.51.ebuild 810 BLAKE2B 3b18782b7466900c6dcf66ada03d333fefd3df0a6a02bc1417de82a4e692e0baf316db5d1b4bf070d4a73b7f8b5133018c22587f5549fbe8863b8e3ec6859441 SHA512 9f1fc8118ab9fc7284723238e398f9152d6e491bfe0be97fa5b181f1bb30a0d96900c1e1674b6ca325daefb8813bc25dfae44f1ab172361e367725c5a040ba4e
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.49.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.49.ebuild
deleted file mode 100644
index 8e4b363b03b6..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.49.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="
-	https://github.com/daviddrysdale/python-phonenumbers/
-	https://pypi.org/project/phonenumbers/
-"
-SRC_URI="
-	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ../README.md )
-
-python_test() {
-	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 024b60e47c13..df6e40f75fdd 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,6 +1,4 @@
 AUX 7.44-fix-tests.patch 1679 BLAKE2B ca0126a6dc12203ba8409c70ffa5142288bc94fd07ccc4404ee6f19a8515a46cc4e257dd26a12266aa3263e359e9167daa3ef36bde9867d2a4346ce38fcaac1b SHA512 743fbc3335daccb4e1d21b4c0e659d87582120b21d1cacecf0725fed9fe1eb6251761fdb50814c04e79ac3b13408335b34072e94bc704d3c333b96eaa9d52f76
-DIST pycurl-7.44.1.tar.gz 227562 BLAKE2B 7dcbde563140f28382768b89b95422f873d5396a1f050dfcd3686d87b0ca2c3f3871281ed87b1dfbe7e4268728c2ec3ba7a76e7d7ef57754af5c185bf2a6fbe8 SHA512 e251db332791de07364695b5fd59b3a290486eabbde8be9914b5edeefa8702b4dd9ab678739ad765f76ededeb7192444fefe2a076d3977f454259dfd06731059
 DIST pycurl-7.45.1.tar.gz 233879 BLAKE2B 8a6fe72f00cfd172b4f5e257f4526c4115047aa911d7fb3802d3bf105ac70dc866b27fa4878aae9f92229a5dd5108a2b5e1c9acfe93e1a94dac60d9405c5d5e6 SHA512 05639d484aac6d6688677589e391975158c5ef778456a47df575ad13fb8bd0db67ff8f5a39bdd99d82a67926aca421c01e687eec9d4fd87f32822b492b429635
-EBUILD pycurl-7.44.1-r1.ebuild 2598 BLAKE2B 633630a72681052118b90decdec88c4dc89d3f732099a51aef2fafae6f2559841e263c9b284e746cc067b55e847e56c1973949f1b07d9b83689d627b673a6f89 SHA512 8a24ade216d126828771c3134365624eb593514041df26feb157c3fdc66fca1af47a8f149614fab3fcbb9233e531d003bbeb0f9b1b5ab1e5f082ae757579271b
-EBUILD pycurl-7.45.1.ebuild 2569 BLAKE2B 5fdc980db7fe3344b919df629ced19adda0ad55ccb35a53ed914a76efdd0524030efef6be6fa6423a5b7835b48c9c867244b4e34636c710e202de65de6b8643c SHA512 e023afc42cf5e2859baa9693a587b1c1ae76628d7358d56ab0dc80bc643caaf9c701cdf5d79f37032ee2271b8b5c9a631e1da11648e5940aadcea54008c45d22
+EBUILD pycurl-7.45.1.ebuild 2568 BLAKE2B e3f212c0ba6ee1caf06cfe7e5df2df7cf1a91b377979b252afc6d9b3cb6ac4910f1e40894d19cf127a335533c7924d34984ae49a31ac50ffe1f804e8d9861b04 SHA512 e3b561f3b481dad6aa8e3f7fbf200f2f4b3e4c756fe2cb50ed61a4a9117020fefe723184ebb08458242b591792549f393bbf3ae8a7180c86bdf3662cb7fbab06
 MISC metadata.xml 1100 BLAKE2B dfc7fe054c7cc34c61bf58fef0378df304a539c28cbc0dff4ffff65ccc8892c38aaf1e275885fc54d2854d9acc6b382947038041f815b5941859be7cfe75523f SHA512 f1de0dccd625ae0b02ff9a55cbc1bbf7944faa24dba28ffd711c728001f180afa598a255132aea860ad616637325cdc653577af531b1a954a3994e8902c774aa
diff --git a/dev-python/pycurl/pycurl-7.44.1-r1.ebuild b/dev-python/pycurl/pycurl-7.44.1-r1.ebuild
deleted file mode 100644
index 972d883b082a..000000000000
--- a/dev-python/pycurl/pycurl-7.44.1-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="python binding for curl/libcurl"
-HOMEPAGE="
-	http://pycurl.io/
-	https://github.com/pycurl/pycurl/
-	https://pypi.org/project/pycurl/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test"
-RESTRICT="!test? ( test )"
-
-# Depend on a curl with curl_ssl_* USE flags.
-# libcurl must not be using an ssl backend we do not support.
-# If the libcurl ssl backend changes pycurl should be recompiled.
-# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
-# does not need to initialize gcrypt threading and we do not need to
-# explicitly link to libgcrypt.
-DEPEND="
-	>=net-misc/curl-7.25.0-r1:=[ssl=]
-	ssl? (
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
-		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
-		curl_ssl_openssl? ( dev-libs/openssl:= )
-	)
-"
-
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	test? (
-		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/7.44-fix-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# docs installed into the wrong directory
-	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
-	# TODO
-	sed -e 's:test_socks5_gssapi_nec_setopt:_&:' \
-		-i tests/option_constants_test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# Override faulty detection in setup.py, bug 510974.
-	export PYCURL_SSL_LIBRARY=${CURL_SSL}
-}
-
-src_test() {
-	emake -C tests/fake-curl/libcurl CC="$(tc-getCC)"
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local EPYTEST_DESELECT=(
-		# refcounting tests are unreliable
-		tests/memory_mgmt_test.py::MemoryMgmtTest::test_readdata_refcounting
-		tests/memory_mgmt_test.py::MemoryMgmtTest::test_writedata_refcounting
-		tests/memory_mgmt_test.py::MemoryMgmtTest::test_writeheader_refcounting
-	)
-
-	epytest -p flaky tests
-}
-
-python_install_all() {
-	local HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycurl/pycurl-7.45.1.ebuild b/dev-python/pycurl/pycurl-7.45.1.ebuild
index 1324929a4530..33b0bfa5747a 100644
--- a/dev-python/pycurl/pycurl-7.45.1.ebuild
+++ b/dev-python/pycurl/pycurl-7.45.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl"
 
 # Depend on a curl with curl_ssl_* USE flags.
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index ab46c31506e7..672baf2edb20 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,7 +1,9 @@
 DIST pyfakefs-4.5.6.tar.gz 206310 BLAKE2B c37cb4709a285bfba411cd76da4f158cfe682d210411290ed3e06456ceb5b6de99ecc320da748c8d9b0e230b6384290638d3fd22f0e1388c1965b2b2806d2d30 SHA512 c7a31cc94eaa2b1830d4da355bf4d3de5cbdc8851561ec82fd2de9fe845457f13bcc25aa58a50afb862f396cb0e83c8bf71bb8be51cc3b628ff01b25db62eca6
 DIST pyfakefs-4.6.0.gh.tar.gz 208832 BLAKE2B 60a8c3223fc92e366beb8907ea0c8f242b91ddd422ab0b551d04d7c24ed3d4202b7c42b8971eef0f15fa27b7ed0821637e9341b3feeaf02232948a50898213d6 SHA512 9f507c7b0e28591886cb91c36dad22d6c55d123a447070c2fdc6573d2db1e2bb79cd5c203a9fce762882de680feacaf7e3b57f9bebf6922c643bf61fe44878f2
 DIST pyfakefs-4.6.1.gh.tar.gz 209134 BLAKE2B 81dc53dad9e815eaf3024f157aab36afcfd6547485b92b47e5acf2b03f49eb6ffe0d07da1c4d16b82585870535ba9d44580f190c28856dba6906d07996aba2f7 SHA512 ef2defe59e84e6e85408e7369efc86c1d6f3981456a2628552b63b8fca959ff8536b41fb006bd8b291bef9fb3dba17126c4e211a21f0d11cc29da8f7d5addce2
+DIST pyfakefs-4.6.2.gh.tar.gz 209535 BLAKE2B ffc14a6fbe55958c05cb9d2343d5375f1b72fb3264de2ccd72ee225a8569bb2de1a79cab597eb17f6b5ffeefa1ed224d0997ebd9b416ed357eff75cab24652bd SHA512 60a1c7f2ce969df91e0cabba85aaeb941ae38346c5f83f3fb39c112d49e51f53a837710b16d46096bbf7182b076f13b0aafbe4e7e34fdcfb2c49720958e35cef
 EBUILD pyfakefs-4.5.6.ebuild 1553 BLAKE2B 115f6b5b6ec93d47e45fb46c2a6acfdbddd535e1f2bf5edc5a470dea6814d50076fb9df51c7edd8b996d3c0a07c2e08fc2f69076826419fb9b20cf1d263652ad SHA512 4d540e284764f87545e4b284dcfb666943d173f3ca00228f2dcdab0ab6b046eab29926216e87668e5a0193f6ae4bfa2d6b3c2c00c19f84ef1c13de59445ee3fd
 EBUILD pyfakefs-4.6.0.ebuild 1478 BLAKE2B 22a3f52c585cdd23edd0ce8e6ba22b807436f9f243fe0b048386f9d2d769e1aeb66855b5961dad4869838b8dadbb31d194d5c1ca68d272e84c2b8b1d07aa1525 SHA512 789acb3e32a066104ed9d419d507de224e586d1daff0f1f6c9a47b741c589edf04b36ba17c041ec656f0aa4590e1ac34d5b50bb053ec5b5130447b828ff106c6
 EBUILD pyfakefs-4.6.1.ebuild 739 BLAKE2B 106b475508e75d0cc59630362ac5b424330ff9bbab6521b9b1fd4e47a8a6a828a03a1d65c26d625c9d0e73fa1d00ca94a05f8707fd33439f8235cdded55051c9 SHA512 f64f1538e124fbd96d49c8323dda92f6b21f4f69d67f974f8b6c42a32a89ac567ebf749dda480ef6a35eac8ee950c657a10c74aaca80881d40573612b86eb569
+EBUILD pyfakefs-4.6.2.ebuild 739 BLAKE2B 106b475508e75d0cc59630362ac5b424330ff9bbab6521b9b1fd4e47a8a6a828a03a1d65c26d625c9d0e73fa1d00ca94a05f8707fd33439f8235cdded55051c9 SHA512 f64f1538e124fbd96d49c8323dda92f6b21f4f69d67f974f8b6c42a32a89ac567ebf749dda480ef6a35eac8ee950c657a10c74aaca80881d40573612b86eb569
 MISC metadata.xml 395 BLAKE2B 8db2ffc4bcdcf27ed640f08d3f79b1dac72f3609d2113c5e2590c9b127ba0e20bf27f040976a34fd8a08166c455140cbc586da72d22ca67c329717bf5d54798d SHA512 86850a2bdfbc39096105db00d9b249224ab57c1fac71738f0a5df2b83bec7773f4150f7480b18fb066122fe0ed46fbc923a72e837db429b5b322e658bb340010
diff --git a/dev-python/pyfakefs/pyfakefs-4.6.2.ebuild b/dev-python/pyfakefs/pyfakefs-4.6.2.ebuild
new file mode 100644
index 000000000000..54098f2af2c1
--- /dev/null
+++ b/dev-python/pyfakefs/pyfakefs-4.6.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A fake file system that mocks the Python file system modules"
+HOMEPAGE="
+	https://github.com/jmcgeheeiv/pyfakefs/
+	https://pypi.org/project/pyfakefs/
+"
+SRC_URI="
+	https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pyfakefs.pytest_plugin
+}
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index 78db9a1fa9ae..cf143faa66ae 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1,6 +1,3 @@
-AUX scikit-build-0.12.0-tests-no-coverage.patch 270 BLAKE2B d7cba4096ffb66c98837da997024ee87bb3fd878a6492fbd63088aab294048e700652a82cd3e27bb8e55ea5fdeeda4240971a32b6c7644f2c51ab7c42da1abea SHA512 f52a6096a4840baa743b90296b98f55963c13990ce795cb0ff9ad11256196d9d5164d3118bb48e8e10779e55f2341309de71a3ee47cbde326280de0064f1b21a
-DIST scikit-build-0.14.1.tar.gz 266776 BLAKE2B cb674412ef000fa961b85b32bf7759430cc5ff1b175e29017219ae3b941bfefee5760742cf17549fe7868fa0fc80f72e027aa683cd07bec53c1578e27b1ea0a7 SHA512 c9c3caaab969e83739cb3be718fc7190ef25372fbbf689ea84f9b9725bfc8329640c26038d875ecf3ccdbab0637ef77d6a30c05dcdaaecf441f631c8601d3b63
 DIST scikit-build-0.15.0.tar.gz 268691 BLAKE2B f4cb51ee2367bd4ba6f6c1cada15e1e6be731998a914b28edcf703c5a92c409b78b17dddf04a29b24d40f249ffa06eb9d05d36dc30c0e62ee001519c3ca03f58 SHA512 4d9b1d06d48708ff4f2f5fa8c8f264c7ca85946d5842a1254930d9449d6b6386c17392473c3c85147f6573f7256c94c927962cb56fa23a90a5b442de8de8d727
-EBUILD scikit-build-0.14.1.ebuild 1970 BLAKE2B 750f8acada7df5e61e813d39555fd50594dddaa8fa537ed79508f7f15ae72a2fd4f4f7256f8418ea91a6b6387d9f9f6f5de6e627c30b8c930ff2a00f9d98e11a SHA512 61b7b7e34e41a0ac06ee998afdf64833eadfcbe6a93d2dde6bb7eefb58584957314730cd701834c78e5ba30ba1a6d227edcc9ba3043b1f312933dcaff72a8cfc
 EBUILD scikit-build-0.15.0.ebuild 2063 BLAKE2B 25ef4b651a08a739158ee51d7d8d5b3e3b19577e6c4e16247c16dfda2da4e951763c413835f7b10eb6cc5f864374bb2ebd9aeb062ce002b52c0992e53f3bd1b5 SHA512 4dd56b2946b1a5063f18a2b80d2a81331edfce743e2dd6a88909046751ca9001782b84c21278828a47d7ae06db1617e79e6d6e0ba745ee262cbde87fb97bd0cb
 MISC metadata.xml 408 BLAKE2B 4cdf98a2ac7e4bd6e1276e0ceadb3ac7849a81c5a9931b1ea5b3087cd7ced5072c390f1b77791732a3470f2cfba6a0537732f3632a156887d7c4046235062d3a SHA512 deb17b2d33bab0a1f713edd2e10b643b8801b3c04b142dd37530d5335bfde5be6e8ffb99177170a8c24380c2958164bec95db50538993fdb681aa1d0408ebf3e
diff --git a/dev-python/scikit-build/files/scikit-build-0.12.0-tests-no-coverage.patch b/dev-python/scikit-build/files/scikit-build-0.12.0-tests-no-coverage.patch
deleted file mode 100644
index 993258961f35..000000000000
--- a/dev-python/scikit-build/files/scikit-build-0.12.0-tests-no-coverage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -10,7 +10,7 @@
- 
- [tool:pytest]
- testpaths = tests
--addopts = -v --cov --cov-report xml -ra --strict-markers --showlocals --color=yes
-+addopts = -v -ra --strict-markers --showlocals --color=yes
- markers = 
- 	fortran: fortran testing
- 
diff --git a/dev-python/scikit-build/scikit-build-0.14.1.ebuild b/dev-python/scikit-build/scikit-build-0.14.1.ebuild
deleted file mode 100644
index 51a4443468d2..000000000000
--- a/dev-python/scikit-build/scikit-build-0.14.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
-HOMEPAGE="
-	https://github.com/scikit-build/scikit-build/
-	https://pypi.org/project/scikit-build/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/path-py[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinx-issues
-distutils_enable_tests pytest
-
-src_prepare() {
-	# not packaged
-	sed -i -e '/cmakedomain/d' docs/conf.py || die
-	# no pytest-cov
-	sed -i -e '/addopts =/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local deselect=(
-		# sandbox violations
-		tests/test_hello_cpp.py::test_hello_develop
-		tests/test_issue274_support_default_package_dir.py
-		tests/test_issue274_support_one_package_without_package_dir.py
-		tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
-		tests/test_pep518.py
-		# This fails because of additional item setup.py in sources
-		tests/test_include_exclude_data.py::test_hello_sdist
-		tests/test_include_exclude_data.py::test_hello_sdist_with_base
-		tests/test_issue401_sdist_with_symlinks.py::test_sdist_with_symlinks
-		tests/test_manifest_in.py::test_manifest_in_sdist
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index b1a25bf38fce..3642fbb8c9cf 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,16 +1,7 @@
 AUX setuptools-62.4.0-py-compile.patch 3704 BLAKE2B 9a5e70d2556b059be0ef060abd1db71298cd0e9aa1e2795d92cea5cdbaf0c82f4433e1a0c3095f4bc41bc72a457b63142253fe46c712afa1d7855a5d43607bca SHA512 48d7c065e2d8c29ce6e498effe6d79f9caa0f37d7cf6cadd0ed02c48d196a4d8a10a73cfa26744d6f74b48c63cd28a4074b161a6aae18c6169f6d8fffb044b1e
-DIST python-gentoo-patches-3.10.4.tar.xz 8592 BLAKE2B 67fba3e1fedb17430e5cd93da995b4acaf714db512031b5a2f775a25f793f007941561663cfa413d645ccddc2e22d65d250a40fa166cafda8805488d877ff57d SHA512 3ed2b8ff8f1eb8febe7dcd4b5d13d6d54468be1d525f8f1118977d3bbc78f690a597b09383939d023b03380a306e4bff1693382e29ff562312d803305b1709b2
-DIST setuptools-62.3.3.tar.gz 2586270 BLAKE2B 764f90a5b2585f05b6ae0ad23568a08069bb4ca776c969635dfaceb6b3f64dc6d56291c3e9f0a4540f0416eab9122f5d7d6ad193a5f604949b5827f3cfc2d1a9 SHA512 a7ca81b3f7adedb15a4ff3607654d1a4615de1b30a22aa5cbe4b0a8077db8bdd9348167cbb6deb97e1076d320c2a2a4b0d30acda389905d6503786902eeb66af
-DIST setuptools-62.3.4.tar.gz 2590435 BLAKE2B 089bb185b65107d54b3a17b423caa28b0505566f8e19efaf34ac347e074492278699295b5e8856756312182a78d524ae5098e86783c5c6e089bdbe2de1d1f60d SHA512 edd9595971ee3cca2d1280e695401d8e4aa38796af89f24132d81b897004147ff4f4fc8daebf6fef0606512cc71e09487a2cb416deeecd851a82abed30f57887
-DIST setuptools-62.4.0.tar.gz 2592908 BLAKE2B 5221c32545d451fe9e80f6c78296044fc805e995578f32d2a8809483c00ea84f918a3bb5e1d1a6d184533282d96a68fab8b4d303d839255a640952d1c575f53a SHA512 552bb6c93793a438d8d319b1ef51932e7e15fab965b9fc81a4f15015e02f3e7318b9df9890c3fb59fac1ec443c17cd5cbd17b7227a6a82deb355230673ae9ec5
-DIST setuptools-62.5.0.tar.gz 2596847 BLAKE2B 62bfd0271404dd77fbc1085ce8f6b8977d1f2fd3b1ccf5fc260df8875a2cfab9570db466c29646e7123404d9308765ef6cc6b4524b8c8dd3df9912c11b989e31 SHA512 32a9511ed9b2973cd81641458f8e9172b97d95a7dc10535a670ee1fe2ea3cba27ac9f93909c1d508c83293e6a20ab816bb899aaccf449823b5d67ac98bdf2718
 DIST setuptools-62.6.0.tar.gz 2599326 BLAKE2B 7f4200f9d9e94fca17fad2c37dab6c2175f5562703d2913ac11cf34020e65dd6aa7d024536e5294de5fb5e9523419526f0b56282da62ba0ca40e7e164c97260e SHA512 d67c438d507fc7959162b5e8c2a15e9c36d37e5cd7052e16eeb58d8a9bcf19b725a0e7b840e101500799d725bbc4c1872d0f79eead66a538e891cc7cfbe3d979
 DIST setuptools-63.1.0.tar.gz 2599380 BLAKE2B 532f484ea0e40a820ac266e878e6210c953a37f32f6ec51032c2570395c71fe7d59b30f8787a1127c7c2ebfcd76985bd3f6f57b558f01a34eced8797cc6d1aa6 SHA512 367b52dfbd5d1a6980d061a47c1948ee8efd9632f694c21e8d518639b8097fbda8f1735641c25d7528bc11beeffc42d6bcba9e0d9b755d5b6fbb74d26bf7cc5c
 DIST setuptools-63.2.0.tar.gz 2605892 BLAKE2B c9475a64fbe22be348277d25582a0c1789544822a891ebfb8e8e79b122631d31bf3535aac1b408a254c1f29ea9ca20bd9b270e4d78ddc539aea4e3c59a6e7f7b SHA512 e55c19bb95415a5f831fd23dfc32cb79fdad71867bc225f2a76caecb3c188fa6a5dac8d13e131a97d1833672a245b28a53a11ceafd67ac19cacd4a247ba7d291
-EBUILD setuptools-62.3.3.ebuild 4803 BLAKE2B 1b1c45e86f35f7993451244ceb1d89406867cb270100b56d5b61035d760c9a5ddd32126b8b32586b9cbcd7368bfacf770980a029cf9b516de05c6154c0f0d990 SHA512 b8e9c91c91418ac017f9c032c360bd430b9d43e23a50c7c317579b211c9d2f6ea805af3d3384a4a72766913d2e4ce3fd87d775291b9a91b195526060646147b2
-EBUILD setuptools-62.3.4.ebuild 4811 BLAKE2B 690ec6aab3b8fb8b1ece7e0c55a8e7eb92e6ab17270c260aef1c62abd63984bb1231678114a26fcee71c892153a91ed2b1ecf7364e1f0b7d4c550b81deab7c89 SHA512 6e9f1f18746abb4d6c1204eb9e104827d1e49964e296739527a1c64d9009c07f9bb93f9220917dcbb053f8dc74e3974a9fd77917eb3dd98eb887ec103813a379
-EBUILD setuptools-62.4.0.ebuild 4563 BLAKE2B ba1208f6c321c2905b96ecfd7cdc068ef87b5ac43db018c0790149aab910d902c39c35a65459c365a6a04fad7066a000adf0f450d01310b088f05ed2e721a27b SHA512 348b957cbf4f2b97372a2ec74d59b8e0e78bdd605b2c3275aa563f1e6e232b779f2ee569594b6a97776fadfcd251cd1b797ac10db03cc513bba0f2574ad61179
-EBUILD setuptools-62.5.0.ebuild 4085 BLAKE2B 3e4892512482fc1bc3adcb90bfc4f1a44b698957d6486f078fb6629ee73d7603eeddd768b072bde066a968a7c48900518d87336318c21b809e5c408623f8013c SHA512 49275430700aa47bb6df62e10d0252190437334078a6728c2cd24e9f8157e00e7266ce4f887aa98789819fa19b5aea1f8997f74686800a98be074c87f711063c
 EBUILD setuptools-62.6.0.ebuild 4077 BLAKE2B df8d3d5974d76cf4ee9089f73dacf365659432ee527e27b394d53311f3cf7ee69b3e612b5f1e8d634d0c30a8875c14924438a48b3466afdfdccb506ffbe5328a SHA512 d2173d8c251e7f2f4dec2e52887674d5ca31a3ba209b7455e9e9871befb96814852da137b5acb9a86364b0d8c1c0b394a306d8c4995aaa517a9eb950553b33bc
 EBUILD setuptools-63.1.0.ebuild 4085 BLAKE2B 3e4892512482fc1bc3adcb90bfc4f1a44b698957d6486f078fb6629ee73d7603eeddd768b072bde066a968a7c48900518d87336318c21b809e5c408623f8013c SHA512 49275430700aa47bb6df62e10d0252190437334078a6728c2cd24e9f8157e00e7266ce4f887aa98789819fa19b5aea1f8997f74686800a98be074c87f711063c
 EBUILD setuptools-63.2.0.ebuild 4085 BLAKE2B 3e4892512482fc1bc3adcb90bfc4f1a44b698957d6486f078fb6629ee73d7603eeddd768b072bde066a968a7c48900518d87336318c21b809e5c408623f8013c SHA512 49275430700aa47bb6df62e10d0252190437334078a6728c2cd24e9f8157e00e7266ce4f887aa98789819fa19b5aea1f8997f74686800a98be074c87f711063c
diff --git a/dev-python/setuptools/setuptools-62.3.3.ebuild b/dev-python/setuptools/setuptools-62.3.3.ebuild
deleted file mode 100644
index 1546c3f5f21b..000000000000
--- a/dev-python/setuptools/setuptools-62.3.3.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2022 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
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{8..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-CPY_PATCHSET="python-gentoo-patches-3.10.4"
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/python/${CPY_PATCHSET}.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-
-	# apply distutils patches to the bundled distutils
-	pushd setuptools/_distutils >/dev/null || die
-	# TODO: distutils C++ patch?
-	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
-	popd >/dev/null || die
-
-	distutils-r1_src_prepare
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# unhappy with pytest-xdist?
-		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		setuptools/tests/test_test.py::test_tests_are_run_once
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-62.3.4.ebuild b/dev-python/setuptools/setuptools-62.3.4.ebuild
deleted file mode 100644
index 66341af9f120..000000000000
--- a/dev-python/setuptools/setuptools-62.3.4.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2022 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
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{8..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-CPY_PATCHSET="python-gentoo-patches-3.10.4"
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/python/${CPY_PATCHSET}.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-
-	# apply distutils patches to the bundled distutils
-	pushd setuptools/_distutils >/dev/null || die
-	# TODO: distutils C++ patch?
-	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
-	popd >/dev/null || die
-
-	distutils-r1_src_prepare
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# unhappy with pytest-xdist?
-		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		setuptools/tests/test_test.py::test_tests_are_run_once
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-62.4.0.ebuild b/dev-python/setuptools/setuptools-62.4.0.ebuild
deleted file mode 100644
index ac38773bebad..000000000000
--- a/dev-python/setuptools/setuptools-62.4.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2022 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
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{8..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
-	)
-
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-
-	distutils-r1_src_prepare
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# unhappy with pytest-xdist?
-		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		setuptools/tests/test_test.py::test_tests_are_run_once
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-62.5.0.ebuild b/dev-python/setuptools/setuptools-62.5.0.ebuild
deleted file mode 100644
index 4133756fb9e7..000000000000
--- a/dev-python/setuptools/setuptools-62.5.0.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2022 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
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{8..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
-	)
-
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-
-	distutils-r1_src_prepare
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-	)
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 0c6e7008beea..8850c8b31286 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -2,14 +2,7 @@ AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3b
 AUX sip-6.5.0-pep517-args.patch 7397 BLAKE2B f29af4b2378c569b21e09b1659e1ebd4bcd2d0308cdfe82042c8830336090d55b0ac48c03b27c98a8488c183f4670f0333ef7b552e66f51432ea1db63025c851 SHA512 3aa8063c53f012bbc1d59d6c43c7053817ade8abb42918e32787faaa85d2bd909ed3760ac9d07d88e62780b35921e06711cd39fffbd2ac7671ac49c69d60ed3c
 AUX sip-6.6.1-python311-invalid-regex.patch 675 BLAKE2B 6f948473730ba93546948b6a597efd5df29df9f4aa18bb41b1eddb76a7a118328be6437185e63a3c5aa7a1c2c3be3eda6af716374929aae8039a07c2b63c75aa SHA512 2040bb54e700dbe8072f9a028b237f30e3256f566d1c7854c1efcef83bcad916b780b7a37a4e90682e293f064b29320fd7eb5deedbdff051be7bbbb75e638a00
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
-DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911 SHA512 0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803
-DIST sip-6.4.0.tar.gz 1201890 BLAKE2B be5ccdfa7853eb2baa3b7c4e7f64a315e39ef899631e93569d75ed27bbf9752c97cca1bfd6c813efb0046d1d82fc8c5625a04f08c330a4e2c102461f3a42beee SHA512 eec1bdbe4ef3d8ba5152a2dcd888efc23498bcbee01c95b7eb72074c2a133d8e8599cc4bb6d6b2fec99f093a73705e0fea1c148c2e49058c0fd6f2ba97f40884
-DIST sip-6.5.0.tar.gz 1202004 BLAKE2B a67ba784c0851a528fded689cc2a84fa18ba906d23adb71fceab14e652c02b079ce7d3b40a3594251852d20875ac53571e851630e441b8846c302772933b1829 SHA512 3baa20403b668e5f02b2506a693522ce421080e073ac39f62a23823b3e023b0b88fc60ab79e2301ecc39304f6df3d8647adc56429641e91c217fecea9bfacb91
 DIST sip-6.6.1.tar.gz 1134991 BLAKE2B dec51bce80566ffad25dd67686a746134e032f3cf1696fbf256d000d266f9e3921dcafaead40bcf3dc67d42aa89c5982d090abde7d8b3c3f8ec6ddd4470b9a43 SHA512 49d03730819210f4239946da0ddd0694583dc13458997edc11895ef399d8017f38e3354a87bae495492c3cf3334b810c2d924ec0f5bbb129e88cc15eac720c01
 EBUILD sip-4.19.25-r1.ebuild 2275 BLAKE2B 89ea240194120bff7b9b3d9b2026f2343fde3bbd8063bb2070ca12c624db79e4d2582a9024cc011705a8f3dd78468ba3849dfd9f806706a20cd1d3c3c0f21b79 SHA512 9cfcd1c771a10205695e66316168e3b29cf4b2fe48212b6918152b988571ce944ee86c6b55f3d9531e7a624a1c7554beff403d76addc6645e4f92e73fb904439
-EBUILD sip-5.5.0-r2.ebuild 873 BLAKE2B 6056c5ce42dfc77adfef3e38413eb91d150edfd33704dbd0434d4bebb6481b34376768e6b106c26e606094983a548155d5d62315f9cd9483ac49f6ba506a1eac SHA512 b7e8751fd35c0447502819f21600ce4fd7a62adb24c28510368fff1c5d1e21b1d6993aafe2c4b9bc863e44b4999b7ce42ccd67f06203a3aeb25d8e508ac80f39
-EBUILD sip-6.4.0.ebuild 906 BLAKE2B 983e093fda49cbb8ef2d9b99fbe27caa76c19348fef6b1133240c771dc69ac971a7d7e62a313ff6959bf226d09e0670a49616736c2a5791459d5733e851c9413 SHA512 b46a02396fe76b9ef983ca0f41e9c60ba7ce575a9bf58cdae25f425c7d4780e9f6eb0f58aa82f814820f5eb53404ec92e78da58b8ba1cbf948fd9df8f8705fa6
-EBUILD sip-6.5.0-r1.ebuild 951 BLAKE2B fc58209330df4aa21762f5b687b687c87e6cab5102585745e75d28b285abe2c15bdfd8832d3b2432bf0160be4f30fcfaff955ed72603535f6f643b3532752b64 SHA512 eeb40447bb7f40ccb119d24b786f7ac2b6ae45c174b7e2aabab96c494c8c11298e6d77593f9808dd8707e3628253ba5207941b3a44e7e9a7137e89eef11c267a
-EBUILD sip-6.5.0.ebuild 906 BLAKE2B 983e093fda49cbb8ef2d9b99fbe27caa76c19348fef6b1133240c771dc69ac971a7d7e62a313ff6959bf226d09e0670a49616736c2a5791459d5733e851c9413 SHA512 b46a02396fe76b9ef983ca0f41e9c60ba7ce575a9bf58cdae25f425c7d4780e9f6eb0f58aa82f814820f5eb53404ec92e78da58b8ba1cbf948fd9df8f8705fa6
 EBUILD sip-6.6.1.ebuild 1082 BLAKE2B 8f06f88625a1118f8ea004d1c07ccc2297b090c9adcd16506dc54572f9ba9d39d34f427880754b76a07c7bbd0d8a36b28806159329e31faaf3ec361506abd783 SHA512 4e4e6e5480243ffa5c75efe45896d143614a41f251012f399d894249fae70a92df6e23276bfe7bcec4d0535898b72d7b10db44c2f76d90f955dd591e8852269b
 MISC metadata.xml 639 BLAKE2B deb4a3e534eaa966db932dc17bf7df6a04ed41ce707dc7f1befb272c362be06f222f976c4b0d526a6190d4954f1fa0e2c94ccc2e6cfceff6e8db5959e653fed1 SHA512 8c8e45d32587e346d4df067950aacbc767618418d42f4a5bf48a62706c9612007915ec643dc9fe7b7d083696b26795abb76d9cc475481c26782874f5116863a1
diff --git a/dev-python/sip/sip-5.5.0-r2.ebuild b/dev-python/sip/sip-5.5.0-r2.ebuild
deleted file mode 100644
index ba80afbbe6ac..000000000000
--- a/dev-python/sip/sip-5.5.0-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings generator for C/C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/sip/"
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	!<dev-python/sip-4.19.25-r1[${PYTHON_USEDEP}]
-	!=dev-python/sip-5.5.0-r0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx doc --no-autodoc
diff --git a/dev-python/sip/sip-6.4.0.ebuild b/dev-python/sip/sip-6.4.0.ebuild
deleted file mode 100644
index f917fbbbb011..000000000000
--- a/dev-python/sip/sip-6.4.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=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Python bindings generator for C/C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/sip/"
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	!<dev-python/sip-4.19.25-r1[${PYTHON_USEDEP}]
-	!=dev-python/sip-5.5.0-r0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx doc --no-autodoc
diff --git a/dev-python/sip/sip-6.5.0-r1.ebuild b/dev-python/sip/sip-6.5.0-r1.ebuild
deleted file mode 100644
index b88e7aac4122..000000000000
--- a/dev-python/sip/sip-6.5.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 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="Python bindings generator for C/C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/sip/"
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-SLOT="5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	!<dev-python/sip-4.19.25-r1[${PYTHON_USEDEP}]
-	!=dev-python/sip-5.5.0-r0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx doc --no-autodoc
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pep517-args.patch
-)
diff --git a/dev-python/sip/sip-6.5.0.ebuild b/dev-python/sip/sip-6.5.0.ebuild
deleted file mode 100644
index f917fbbbb011..000000000000
--- a/dev-python/sip/sip-6.5.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=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Python bindings generator for C/C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/sip/"
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	!<dev-python/sip-4.19.25-r1[${PYTHON_USEDEP}]
-	!=dev-python/sip-5.5.0-r0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx doc --no-autodoc
diff --git a/dev-python/tblib/Manifest b/dev-python/tblib/Manifest
index 7a3f92bd0e6f..60f87e966045 100644
--- a/dev-python/tblib/Manifest
+++ b/dev-python/tblib/Manifest
@@ -1,4 +1,3 @@
 DIST tblib-1.7.0.tar.gz 33074 BLAKE2B e05b94b9a36efde4d3fe76e9b72502674554e84e49916ea585de4f6cf9e898d1544535b1a8935fe15ffc100fcbf2b5d4f9edfdcf0ce5c86d479f2f412d3ea83f SHA512 10dcff18a1da386d9dd6bae35608f4a2d3bc8f87c15fcf49d886f98d95a6defd348ef0dc5637e03f4c553a933a0ecb4c215cf15b1e78fca58fea10052f9fb4e9
 EBUILD tblib-1.7.0-r1.ebuild 716 BLAKE2B 3e675662237220af4dfb0d153fa636bb1607e9e7be12f425185ebce68b9a7696bf4c4f18517dcee6c335d2dbfff39e6deaffeafd7086688b9c2bacaa918ada33 SHA512 a2523328d3ff6ca1fc0517cd4b4d0cdc382688cb7c981435dc9ee61eb5f45b5e1944aa5ba002ad60612ac9962a44ff91a50884497e72af671ade48eee150e88c
-EBUILD tblib-1.7.0.ebuild 567 BLAKE2B c68612a4dbed8a4e643ec6de7a15a601958115b509ab655f1c807bd37ba5957714b7699d113d9a37efcb7c50523a05384593e5669205a4764ae12b3068b25b29 SHA512 10437a883c71293eca6dbbc347b4ebf2db0b1fe32c99f4c2b585d70d93e0865db7d232c1eb78b25cac281afe8f1a06e115443222a756bff5e4509548b6ca759b
 MISC metadata.xml 406 BLAKE2B 196dcfaca9d242ddf68db2f831720a877f9aa1ec0f1d8aefb4d20f03a8399370ac62e5c009b1538c7f20512bc17ca23c5286544081a8f15512a95e1b4c754e9e SHA512 0e82fd782c7532e0f1877aea67c3171847469f7c0669664b8d9b1a22bdeca9daf6f6159f202041d3f1d83c3bd9871ee084564df0e7b64c8c2230d8b5aba2a91f
diff --git a/dev-python/tblib/tblib-1.7.0.ebuild b/dev-python/tblib/tblib-1.7.0.ebuild
deleted file mode 100644
index 498016505478..000000000000
--- a/dev-python/tblib/tblib-1.7.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Traceback fiddling library for Python"
-HOMEPAGE="https://github.com/ionelmc/python-tblib"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/twisted[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 178f1b599f60..34cc9186fd86 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,8 +1,5 @@
-AUX translate-toolkit-3.3.0-no-install-docs.patch 652 BLAKE2B 202cfd408059115cfdb5933320b5a560eeee37e2c045cedcdd80cf808ab1e1a5569a964e9eab8114a2ab27e2c470285b254406c754b5289f7cff2f22afcebb6c SHA512 d98e2d7519ca630d41407d01f20543a84c3f408628832d4e79a5a52437d204f872aaef8eca80687565e6981dddb59480a313217eddf8a4084d8b6d71c3d2c0da
-DIST translate-3.6.2.gh.tar.gz 1152569 BLAKE2B 44c9a5878a177b53d34e48d8b642f293ed475c90de8a530f53462384420b8afaaf107cb62c0cdd45e6d0633f53cd8eedb73dd0dcd81d6f876dc5389ba4230c94 SHA512 fb1fc2f6abb766814269d7051f571cbfb25ecd6b7267e2080e5ab0bb41338ace430a8bb01084abe176e2fd0a934cdf6492bf79f5e27c1f8ce99b021175efcec9
 DIST translate-3.7.0.gh.tar.gz 1152162 BLAKE2B 75d3b0a7f2a840766f983d6e1484aab16de2aa2bab74d0753910be9ad0d1c76ebfa553188318920a7d5a6f1ce6b72e755147eb45c501cdeb79246472c0329449 SHA512 18159f85d94768c32fe5a44f3d3e586038b281a0f3e386621bd57a5be64a9ae21a4272c05de8a2ea2a2467c98935205a8ef49a714dc9aabf9ed21de4f533fb93
 DIST translate-3.7.1.gh.tar.gz 1152674 BLAKE2B c4a7d8cb1eec656a261a1af145a1171e9d686348294a0849f29ae23dcd867d831c6f95f0927101325f62ef9b21e0891a7a574f08111bbc3e9c0ce2b996faa70c SHA512 5ed9d156f071f4ce567a0ff3f0ef5c0b42b312edaae82e96eee040ae9547f0cb3334f2973d8050b9181b752f7e81021cc183613bb5c6309aeb110bcacab212fb
-EBUILD translate-toolkit-3.6.2.ebuild 2558 BLAKE2B 05380bb89b9fa0965dc5e07b531322b67964fba289bb3f259b99289dac530d88dddce1fb73edcc42c5a3c02356b40e972fde3870999114931a229745eaf7c6ec SHA512 68d840c4a2364bf3252e589cc93f912a39cb6509648e93045cbb08f43d088d8b10c04d597cbd708e58d0bc19ca44001b84020128f510b088c16fbe2b53207816
 EBUILD translate-toolkit-3.7.0.ebuild 2418 BLAKE2B 156d03ffb8e361ee3a3808080deeabc17bafc37992d043cc5ed79d70dff97348beb24dc6b7bbefadd212e48e262ece204603a116a306e53e27c5b6f3b720c353 SHA512 0b15869bb2752e241d92f38dc05708440e118c26b956e9ecf5996be6db90f9d78c40abafd00485dd5b387fa1d143f9e728ee5e9ee5b4d7683a91eb398977b5df
 EBUILD translate-toolkit-3.7.1.ebuild 2421 BLAKE2B b5c818ed8fdef983bf87d3103c58e4bb6bbb12a555213d40c40feef74402588db68fdf14caa958aea3f0a8d64ba39af06c46239afd61652c17f409f74a2a2fe2 SHA512 ab76f4b06f9b1e73b2cd83e85e5d82b50b5427327b999735abcd8537d15a2ddf30a43b626d345731e5fb038334acbf69c84c60f3991c2674a91ec23250cd8350
 MISC metadata.xml 756 BLAKE2B 06f64f258d362954f99f7e9eee241eb3dddc6b00b9069df2ad977d28b5cf06f9c8ee2246ee5958600b5ac86297968d7aaced6b6420dca4ed507c441c58c61ca9 SHA512 80374c40513ca450f97e3930929c1450e7438ea15830e60937952a6fccfd999675f2ca2056c5aa4e287ba256c6ec08a09d8f7adb8b2c5af8ca0cd595f34acd85
diff --git a/dev-python/translate-toolkit/files/translate-toolkit-3.3.0-no-install-docs.patch b/dev-python/translate-toolkit/files/translate-toolkit-3.3.0-no-install-docs.patch
deleted file mode 100644
index 9d812c4f98f7..000000000000
--- a/dev-python/translate-toolkit/files/translate-toolkit-3.3.0-no-install-docs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6271bfede35f22e8099261863d990eba3d26f989 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 4 Jan 2021 10:33:29 +0100
-Subject: [PATCH] Do not install docs tree into site-packages
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 5fc3abf..80ce25d 100755
---- a/setup.py
-+++ b/setup.py
-@@ -513,7 +513,7 @@ def getdatafiles():
-         )
- 
-     docfiles = []
--    for subdir in ["docs", "share"]:
-+    for subdir in ["share"]:
-         docwalk = os.walk(subdir)
-         for docs in docwalk:
-             files = listfiles(docs[0])
--- 
-2.30.0
-
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.6.2.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.6.2.ebuild
deleted file mode 100644
index 51e65be5f670..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.6.2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 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
-
-MY_P=translate-${PV}
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="
-	https://github.com/translate/translate/
-	https://pypi.org/project/translate-toolkit/
-"
-SRC_URI="
-	https://github.com/translate/translate/archive/${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"
-
-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/pyparsing-3[${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/watchdog/Manifest b/dev-python/watchdog/Manifest
index aa40df565d65..0ed1c929dbb9 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,5 +1,3 @@
-DIST watchdog-2.1.8.gh.tar.gz 101828 BLAKE2B ca14534af888154652951abb7e5f7f1bae1f2e072f113a034638f6384fc9b9044ab99191c6dc0ce38d7ded3dc6629a7aba1e1765f85ec5410706bd669411b929 SHA512 3182cb28701403e799c3850e5cd44acf6dc1aa7e98b1c4bb22b21de98fa4372c74a041e2f3be8d10ae77fe00018e460b98ce2fa5b0779edb84d15f952c407030
 DIST watchdog-2.1.9.gh.tar.gz 102882 BLAKE2B 601c94541846e0d63a39367040ac9b6a24c2920c70638ee3887a51838dd75bf8dfef8afae34c9566047c27502026d944f01c6f6249090f4a233a4892fc1e7c59 SHA512 1005c48b08968db7705acbb8a94a0852c72d8bcf45ac935e7e0b49daa6e422adb081cf431485618b37bcc1b2d3429369af1672b826bf9c1ebfa7aff91a88175a
-EBUILD watchdog-2.1.8.ebuild 1094 BLAKE2B 9c692090a747bc669bd3296c608c01fa50d889216e4ed152c31b2c0e6c38c572d1ab1bb17fb2aa0b2ab2e0d80b338d63f6389bcbc34e4fcb4551f7f7b9ce5da4 SHA512 c67611b8b375860fd2057748a016611e1e2f1c917ea8ac5bbff6ae46335f8b945150b297e26bdfb2026fdf31465b7b6f34280c3dfe2898952884e14e332f5d6e
-EBUILD watchdog-2.1.9.ebuild 1095 BLAKE2B e7372aaf10fe1062b63cf2fb134fd4d152d8e2381b7ef1e3fba3fa31747f3491e91c6338afd8e4f8a58c9c28b7021c64626f4a9f5511b75f089d33a5e95342be SHA512 7aa14cfeded865175d242a1102106c3e3e33b933f117343517aaf168494af7ccc6a276530f7cf87866c27a0fa4240b2bf121eb1f270f075cb1934b527eac6437
+EBUILD watchdog-2.1.9.ebuild 1094 BLAKE2B 9c692090a747bc669bd3296c608c01fa50d889216e4ed152c31b2c0e6c38c572d1ab1bb17fb2aa0b2ab2e0d80b338d63f6389bcbc34e4fcb4551f7f7b9ce5da4 SHA512 c67611b8b375860fd2057748a016611e1e2f1c917ea8ac5bbff6ae46335f8b945150b297e26bdfb2026fdf31465b7b6f34280c3dfe2898952884e14e332f5d6e
 MISC metadata.xml 463 BLAKE2B d4f4a77cbba45384d34ac533c223e6640f75460ebfa46ae029a57297ab1a8711f8c10bcd0c11926651bd61d5a2ae98e316ebe40c6011de06f8ee46ad5fcab5b2 SHA512 5eaf8c60e47afa3933115e23cec07340d8cb708c9c9568cf943030db2ed7e05771f51369d6d7d8e21ab598dc872af275784939a243a37abb1e3661b41f479721
diff --git a/dev-python/watchdog/watchdog-2.1.8.ebuild b/dev-python/watchdog/watchdog-2.1.8.ebuild
deleted file mode 100644
index 858b84c59fb2..000000000000
--- a/dev-python/watchdog/watchdog-2.1.8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="
-	https://github.com/gorakhargosh/watchdog/
-	https://pypi.org/project/watchdog/
-"
-SRC_URI="
-	https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' setup.cfg || die
-	default
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires root powers via sudo (yes, seriously)
-		tests/test_inotify_buffer.py::test_unmount_watched_directory_filesystem
-	)
-
-	epytest -p no:django
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-2.1.9.ebuild b/dev-python/watchdog/watchdog-2.1.9.ebuild
index 49e3e567aea5..858b84c59fb2 100644
--- a/dev-python/watchdog/watchdog-2.1.9.ebuild
+++ b/dev-python/watchdog/watchdog-2.1.9.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 2187a50eb35a..7e25fe6ac8e4 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/coercible/Manifest b/dev-ruby/coercible/Manifest
index 20b8b4e3741c..f5ba215e03f4 100644
--- a/dev-ruby/coercible/Manifest
+++ b/dev-ruby/coercible/Manifest
@@ -1,5 +1,3 @@
-DIST coercible-1.0.0.gem 24064 BLAKE2B 5f9708211600621869e78742dc5421672f27162c1e09e703bb2954d67b2ad281ddf59f9ecb28722f4423cbd0c7fc8bc14bda0f1f064135cbefc24ddb94ab1648 SHA512 5de43166625cca102cd048ae5cd4113ef834b273fb798490a99eeaab423174f1fa40410546de4e0224234efb996a4aa1f2c37b093298f50356f925b8a6163767
 DIST coercible-1.0.1.tar.gz 18949 BLAKE2B 92c4b2a38ac662d270aacd2d46216c188fef12b99f0a54c2642d96f72e5d45fac895c8e0c1d4300784e754f384eb86a9731c32a9780af9877668251fa39eca57 SHA512 27c563a70a028af0fdcf72200b47e29b4eb312539d16634b9533140903504a42284ff31fe73286b0944129b6481614184c2966f47b82d08ac419bdadb862f5ea
-EBUILD coercible-1.0.0-r1.ebuild 535 BLAKE2B 6d84b652bd23a948383c00fabe54cf1363205ffd9ce8c75c7967348c50291a1e538d35648aa6882c01726221b1d3a58323dcfcdfdc184221c8dd7f933102c28e SHA512 7e2bac3b3f17cb04adbad7947f3c2148abbc299c70df4f3039550aa0b2cc8aefde58a6cf68609a6dbffa799104eddc7d02da96e45cac8a2b570f6dd41b574092
 EBUILD coercible-1.0.1.ebuild 897 BLAKE2B 165ef3b8d8dfd047bb32a943076f7e42d9d609eaa7865d2544acbf5a4109eeb9d046f9de1a217ae50b75eace602e1211bb3bb0ae2e9f5aeebad4c339a4ef444f SHA512 cceb5fe1115c37a8c8cc3404a0b829007694a046bbb62925c6cf605b991da3324da82e0b727941afa9b5b40ca52ede43bf9c37f1fab42efe02c40809e918854b
 MISC metadata.xml 396 BLAKE2B dcae50d0bdfe178d58f3e034a26b9a5abb2409e7a18e77f2c3681d782a3af3c69cbaaff3927f5070cb99743708cd72091ae837e69cb44227ab66f1c12e569d0a SHA512 8119fce8ead8a0f5b178729338e66507fc0275f7b74073be24a8ad2700e600db091922e4e68cd9dfd069bf2cd5834c6de3fe8944750bb261ab70829c9e37670a
diff --git a/dev-ruby/coercible/coercible-1.0.0-r1.ebuild b/dev-ruby/coercible/coercible-1.0.0-r1.ebuild
deleted file mode 100644
index 8549f75505ec..000000000000
--- a/dev-ruby/coercible/coercible-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md Changelog.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Powerful, flexible and configurable coercion library"
-HOMEPAGE="https://github.com/solnic/coercible https://rubygems.org/gems/coercible"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/descendants_tracker-0.0.1
-	<dev-ruby/descendants_tracker-0.1"
diff --git a/dev-ruby/loquacious/Manifest b/dev-ruby/loquacious/Manifest
index 160c49835da0..4a14d6158fcb 100644
--- a/dev-ruby/loquacious/Manifest
+++ b/dev-ruby/loquacious/Manifest
@@ -1,3 +1,4 @@
 DIST loquacious-1.9.1.gem 22528 BLAKE2B 5ab28283e40f63a1bacdf6e7ca0c3c9e64527c21bbc7992720b7e2581c156fd449e18e56e10d6cdbe6c4238e129a0b99f5bf1b0487afbd3fc988ba6e9835d37b SHA512 49d176d0229e80a5af69a7cdd24fb2947332faeb70846f28c21249e5297d81246f55eb7f033cc444999267ae727b26f7540f1ec4a542a65af11c3d3ddf7bb129
 EBUILD loquacious-1.9.1-r3.ebuild 531 BLAKE2B 29fd2a28d437033e3d813f4923964d74be25e86361b44776c103189bdf9231530e9dde66e286d0450a631b42a6f37e052d3f9ad3ddbe0fe79b7b2c0c1e317fe3 SHA512 67bdf578219575e2284cc0f09339ffec99d32fdd912015a7e567bbfd0db1ecd38e23c9cb39b7fba354b07184110863345cc41bdd6972ac09b48b9f158c5969bf
+EBUILD loquacious-1.9.1-r4.ebuild 643 BLAKE2B 4ec1fd0f5ed3ef33819d7d59de79fe11c58d153b2725548978245376cce2923ac2c3ab80b6ab9a81c394db57b7ce594f23c3c9c2fa04f27b101a37ae94991bb1 SHA512 6dc2fb01c733788b8ae1f19d5b29f31a624cf4b836a9cd09646e05bbc3ac2d1d54007b1e5e259fc046ee8087fbaa5db0fe88499d056553a844e00fe878a0da64
 MISC metadata.xml 341 BLAKE2B e4656a93389a261e5e2bc5e99dd077b78800ca1e04810c35bd76e8df2820f930d6a9cff3c07facb491524b5ce3414f2357ae8b6ca2ee67da2c916b9c61947981 SHA512 6cfe2f25ee6c608264fbfcbfad5ca5c69aabe81a39577190c88302186197457d18467c6d4d4e7530f098ce9bd958aec78812c9fab06c9289008c560faabc968f
diff --git a/dev-ruby/loquacious/loquacious-1.9.1-r4.ebuild b/dev-ruby/loquacious/loquacious-1.9.1-r4.ebuild
new file mode 100644
index 000000000000..63f45cc4568d
--- /dev/null
+++ b/dev-ruby/loquacious/loquacious-1.9.1-r4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Descriptive configuration files for Ruby written in Ruby"
+HOMEPAGE="https://github.com/TwP/loquacious"
+
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+all_ruby_prepare() {
+	sed -i -e 's/be_true/be true/' -e 's/be_false/be false/' spec/*_spec.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/mash/Manifest b/dev-ruby/mash/Manifest
index 74e8dbc1393e..dea25b965184 100644
--- a/dev-ruby/mash/Manifest
+++ b/dev-ruby/mash/Manifest
@@ -1,3 +1,3 @@
 DIST mash-0.1.1.gem 8704 BLAKE2B 071559e64bc6b4be639f854405bed695a9e8136e9e20d2793a47336f4fc68acdf587051f920c3429b882c2941b9d0396adaf12352b4306d64af5cdefec3aae83 SHA512 5d3a0997b9a98e3228f6e838e449597f88c53f3f310b1c19b40dd1d5439887afc8e47710f0062b6bf0ab776aa6a9563b21b2fb402667701b215edd9d2ccb7e8e
-EBUILD mash-0.1.1-r3.ebuild 450 BLAKE2B 382b906ecd2a8983ff008650696c821d853151cb45e3bbd33fd97333589982295da494c25a0ac3fd56590804692ebdb1118611952a21b4bbb3df5b1f2fd2d6cc SHA512 59d033d3b9aedefb67198986d7e1508abea027ffcdfa1f0a4ecd66d91f5f4317b7ebaf912965df63b9ff6301ebe6f3023cac1979f29c4588a225ec1c8ffa8294
+EBUILD mash-0.1.1-r3.ebuild 572 BLAKE2B b648bac86e67e6a3f68e93feae880a956b6af33e9c6a44864c9b7a6ce261f4b1bbb086824110ee27dac679218aeb1b315f6404322e434506108a689af210fb3f SHA512 c11b80c36e3433ff2b46d1180e81b28086291386cbfff0eca086caa0a45bd8f5bcbf5adde5fa871018efd6fa7bebe189b77d1bb921a1c3d91ee7a2584775b481
 MISC metadata.xml 339 BLAKE2B da547365ceac6c54015f5937754ac9471f12f93db24f5b194cfaaced699945d5806716fb3cfe983313353cbf1c9a310ce8cbb08296e2e187c0e1f08585ddeae7 SHA512 b335e66ac92048d7fa9fa3e2e4bce4657855bd6409e081fabde744be58dacd79a677c0d66edf39a03ab66743e0880f93c4a9ad2aa121936645824d7bdcc6377c
diff --git a/dev-ruby/mash/mash-0.1.1-r3.ebuild b/dev-ruby/mash/mash-0.1.1-r3.ebuild
index 0f82122dc1c7..ff5e1df922ee 100644
--- a/dev-ruby/mash/mash-0.1.1-r3.ebuild
+++ b/dev-ruby/mash/mash-0.1.1-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
@@ -18,3 +18,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's/be_true/be true/' -e 's/be_false/be false/' spec/mash_spec.rb || die
+}
diff --git a/dev-ruby/org-ruby/Manifest b/dev-ruby/org-ruby/Manifest
index ddc97a464f93..a6b4e1638d76 100644
--- a/dev-ruby/org-ruby/Manifest
+++ b/dev-ruby/org-ruby/Manifest
@@ -1,3 +1,3 @@
 DIST org-ruby-0.9.12.tar.gz 143472 BLAKE2B c90e0f664f64be0449e63d717441f3c8aac9957c3b892392c8425847ea42dd23e3b7a598f57969432601ba9c6208633c7aa6e101a4684db2f68c07511bcb0458 SHA512 040c7bc9d9727fcec9bbd7ed4994ca489121c103d58242f98d340b4149f94cb97fc0bbc670bbd5dfba5a11de53930b579a33b6b1ffa343c7f2602674ec65aa07
-EBUILD org-ruby-0.9.12-r1.ebuild 861 BLAKE2B 78138e39a522f1f70cf9b80843254dc23ad4bb134b49f16f1e740ad97431abefe748543f9fdd7806c60b1270bfe8f110f17f941580ee159ef83caf56ff3970e0 SHA512 53a36886d03779a980d219263f72f930b7dbf5730ac558be8e71635742a94b53812f709a3e11737ed590fb0d3d7deef3428ad2f79bdc2fb25cf22e20e2424079
+EBUILD org-ruby-0.9.12-r1.ebuild 771 BLAKE2B db4f16dd41cf13d615ea55019f0738b5492c226cf5bb8f348f5dd542e41ada4b2f34d9efadc480e9155c6f4710d416680ddecb785f7ad1d0661505e842072961 SHA512 fc9a2e8f460a965ba44ebdc8af3c07e7606cf64684dc72668ad3b3ddc4de38e2c950a985a6ed86aec57a704ed90df00c55250548cda1171bb256c61338174340
 MISC metadata.xml 343 BLAKE2B 309e38a975f6297a3f1517b42d737cae8aa2265a5a31488fa7afbf973a4d18146a8c2f91e7b194e104c2f7ebd3f0c9c568093ba2a07348632359f68c302c1eee SHA512 b0a102d51989b9b86ef016de6885744e35c915d08c56c93ab07ff6058667818282a00a9d75b8e08a81aa95c02ee36cb4f88f31ead14c861cc2cb48a1b389b45a
diff --git a/dev-ruby/org-ruby/org-ruby-0.9.12-r1.ebuild b/dev-ruby/org-ruby/org-ruby-0.9.12-r1.ebuild
index d8552473aab2..324309d810d9 100644
--- a/dev-ruby/org-ruby/org-ruby-0.9.12-r1.ebuild
+++ b/dev-ruby/org-ruby/org-ruby-0.9.12-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="README.org History.org"
 RUBY_FAKEGEM_GEMSPEC="org-ruby.gemspec"
@@ -26,6 +26,5 @@ ruby_add_rdepend ">=dev-ruby/rubypants-0.2:0"
 ruby_add_bdepend "test? ( dev-ruby/tilt )"
 
 all_ruby_prepare() {
-	#Fix tests until rspec:3 is available in the tree
-	sed -i -e "s/truthy/true/" -e "s/falsy/false/" spec/headline_spec.rb spec/parser_spec.rb spec/line_spec.rb || die
+	sed -i -e '1irequire "pathname"' spec/spec_helper.rb || die
 }
diff --git a/dev-ruby/rr/Manifest b/dev-ruby/rr/Manifest
index a3089a4e79c1..189a4127b70f 100644
--- a/dev-ruby/rr/Manifest
+++ b/dev-ruby/rr/Manifest
@@ -1,5 +1,7 @@
 DIST rr-1.2.1.tar.gz 137497 BLAKE2B 3db6751d15e54da6ee6777fb7d383c1bfea2e68482dda03ceda9a70f66382cf9aa7c39f27fca9f0ce92b19858b5324bdbb5811809b3ae146e213bb03ddca0772 SHA512 df2d05ff732908da55878cb89cb7d1c4442a18c19f71940244f5bd7dc55632467a1824f55d7fade4b5122486a61277090d7ad05df9f99098030c21aa45b36dd2
 DIST rr-3.0.9.tar.gz 140053 BLAKE2B 598a8981d9d5cc84a4a93e401a39596be3d0b81c28677ccc69dc9bffda618cc68b1fa3f723d725812305de8d58f73540fb1b12a388f2cf452f8e9ccd6649de1b SHA512 df285aa1c9c226765f33338ad267abfded568bfc2b76d7d966e20b68d849f071c2a3e3a6a666c70584993d26956a7ae0ccca8be68a66a862826c9203b0e04ee9
+DIST rr-3.1.0.tar.gz 140388 BLAKE2B 0994ae589d1d9ebe6b4a334c1e93f959b63280beff8f2a6b1696722ac908ac5a21954e65d20216c239587abdbff3a1b3110f6f1eb3f17bd5e0f169a4892e750c SHA512 d05d8421d5cd6e9225cbf5ca183c54cc510a3212f0629f7cee60887b18c874618cb67836503aed7665cef8443cc579306b84e030ae1ec0834f56298f5044a2fa
 EBUILD rr-1.2.1.ebuild 1094 BLAKE2B 49caf7ccb853a9545414c8bd7dc82a7fa0ac3124b5f3e9029cc8b7428df9a53b278495fb0ea2458df358853881ed010ad0826e1c76230c46891aa93057670241 SHA512 26d86571134dfe9e89746f3f65907d6ffff218d6790e6aa1205c705765098ec6b8f22e8b6d6b1196ade5d955b30a715be901bf5abae5bba451db99ebfc986358
 EBUILD rr-3.0.9.ebuild 831 BLAKE2B 46a385944fc0b6eb823af0bff87178720179524d5da32ab54737bd3260bceba5c353427a0cc6d58d97da3aee34a3b7fcf73dbbe89721bb6e7e8f57ddbcd368bf SHA512 714497892c6003564ec36f9591a351a36fe76d7a02b12cccfb3f350c9d8495da0f1b2879f8cd8361e0e2719068bff90a11424250adb41c57f6b1f3b0d3b76789
+EBUILD rr-3.1.0.ebuild 831 BLAKE2B 46a385944fc0b6eb823af0bff87178720179524d5da32ab54737bd3260bceba5c353427a0cc6d58d97da3aee34a3b7fcf73dbbe89721bb6e7e8f57ddbcd368bf SHA512 714497892c6003564ec36f9591a351a36fe76d7a02b12cccfb3f350c9d8495da0f1b2879f8cd8361e0e2719068bff90a11424250adb41c57f6b1f3b0d3b76789
 MISC metadata.xml 332 BLAKE2B bd48ab9bc20270067f37efd109aca31b1ab136d04f3ee8d3f63ba1f88e85736991d2c584a4143a0d6d0ea1ca198b5b2d040556d48f5884f90f8fe0821a82cbbe SHA512 381259b905f2509b530d2474a09accc4c52e4e45adf96f23115756b2be71a1c9c2e36d4eb239dc4c333d5e1d6e7adaff575f4c1fba96a00d6242867235552177
diff --git a/dev-ruby/rr/rr-3.1.0.ebuild b/dev-ruby/rr/rr-3.1.0.ebuild
new file mode 100644
index 000000000000..3c2796a72e4e
--- /dev/null
+++ b/dev-ruby/rr/rr-3.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC=rr.gemspec
+
+inherit ruby-fakegem
+
+DESCRIPTION="A double framework featuring a selection of double techniques and a terse syntax"
+HOMEPAGE="https://rr.github.io/rr"
+SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? (
+		dev-ruby/minitest
+		dev-ruby/diff-lcs
+		dev-ruby/test-unit-rr )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+}
diff --git a/dev-ruby/seed-fu/Manifest b/dev-ruby/seed-fu/Manifest
index ba5c9bbd567f..19606755319e 100644
--- a/dev-ruby/seed-fu/Manifest
+++ b/dev-ruby/seed-fu/Manifest
@@ -1,3 +1,4 @@
 DIST seed-fu-2.3.9.tar.gz 13392 BLAKE2B 7468c54013f6a51bcebf4b6ad1f2401d53ddd2a5f61eddc71d0edc088ea1296acf8012ae885036d5f11c5e9336e7dbf67f2508b3d89830647b36d6f7992d574d SHA512 bf5b7a472a5af6bd40f06f60c404c8893641b222d80469765a434a126e182ae6e7fd5281a0ba9d5d61bd89aa515ee0a3f244238108cd41fb15ced501c917b216
+EBUILD seed-fu-2.3.9-r1.ebuild 940 BLAKE2B ee1ff94b4bae0f7791d4c2ba572266dce56692a898da30412e2d37364d5390bce19028a9b0be52a33e6197ac3a7e87570b98f9908881a190d005902e289667a2 SHA512 a92e66e625288001e66ce34486414a966ef39b9e853c61ece009dd462cc5448c1c4a0275235fbe4699e160b2631c2bceff45f67be33327366c0e67ab0043333f
 EBUILD seed-fu-2.3.9.ebuild 907 BLAKE2B 8f1ab70d0213ecb007415cab63fb4db57d59a3563aff01049ce1a098f1143a896208edc574d1d8642d94829a0cd7be42edd31b51566dd2063198c0621f37955c SHA512 6b85f3fb4d461c0acda70337b3b031230885b28c6b30c315563425c2fa9ab647bbcbd606f0a1e0be07b7ba624747045883507c875aa0e07b95524341e2d50376
 MISC metadata.xml 342 BLAKE2B 812a0870e13c96a3b3a5a817b0ad5582ca928acc6431d13b236f3f6db7aba91d06ef62cdccc9196ee5303de11bf80493c7ee8937b126e80322005c135474b317 SHA512 d1e4188cb0b2bad55f333324878827bc46f79eb96e1a4c6bfc3264f86d43f9ea0ac4a3271760a5fa7c8facde4251da6bd3bcabea0136d6043d48f2aa25f1a7b1
diff --git a/dev-ruby/seed-fu/seed-fu-2.3.9-r1.ebuild b/dev-ruby/seed-fu/seed-fu-2.3.9-r1.ebuild
new file mode 100644
index 000000000000..b12e4c868d1b
--- /dev/null
+++ b/dev-ruby/seed-fu/seed-fu-2.3.9-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_GEMSPEC="seed-fu.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Advanced seed data handling for Rails"
+HOMEPAGE="https://github.com/mbleigh/seed-fu"
+SRC_URI="https://github.com/mbleigh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/activerecord-3.1:*
+	>=dev-ruby/activesupport-3.1:*"
+ruby_add_bdepend "test? ( dev-ruby/sqlite3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' spec/spec_helper.rb || die "sed failed"
+
+	# Avoid failing test that appears not be innocent
+	sed -i -e '/raise an ActiveRecord::RecordNotSaved/,/end/ s:^:#:' spec/seeder_spec.rb || die
+}
diff --git a/dev-ruby/tidy-ext/Manifest b/dev-ruby/tidy-ext/Manifest
index 05f1a1bc2af4..07db945b520d 100644
--- a/dev-ruby/tidy-ext/Manifest
+++ b/dev-ruby/tidy-ext/Manifest
@@ -1,4 +1,4 @@
 AUX 11CVE-2015-5522.patch 1397 BLAKE2B 4e14c9f6c4d18e930b9d9324ed69717980a491e2ee217b96085d570541d5622a8120a5f47d53310cdf36b8907b610f527e1acf53918289eaf8b50b121c0ee823 SHA512 d0ff033d757ab6b1b4d4d77d4429f8e39ef7e818f35a9d6edeaf7e031c6e45d9df33d318d724a66fbc0a7cecd3303c4fe5260e5b3dcda5983e732b33aa675bd8
 DIST tidy-ext-0.1.14.gem 260608 BLAKE2B 5401ec2019f25307f4083f3a1717cd2b0419e0025875b0ad461c72e50445f9b1ffc488a723db04432d262cf2dd94fd267f5261b33eb53d829f4a03d5cd29ab30 SHA512 8a8eada3cb5e815338de49332a24c85b9b2cabba0e10f2d72fe85bd4faf76924e52d82066e7b73e62bc459631aaa9d1c42a6941988ae2a71ca0ddd4f3302ad86
-EBUILD tidy-ext-0.1.14-r4.ebuild 709 BLAKE2B bf6a5fd735fcc8435b40d1c26a549a6b9713df45c6f461eed5b33a195cacde75981d71f3e5ff0d0088ad92bee5bcc8a472cc662df05673e312aa37f24ac4eb23 SHA512 3e791edcf31f5d8d73855c541a9a38fc98d3264410d34d20ff842cb4bc0810ac650ef7b447bd978f586a4aa54417241ee6d4a88d2b8eb623cfd7789adb959b92
+EBUILD tidy-ext-0.1.14-r4.ebuild 816 BLAKE2B 6f70effef01801ddb40261dc7f4fc4c118b68440a368d54db1436b4c2b5b483c6428598f911a7bcab55a1762b13a394fe059af1395b2650d2c5007e18dbc5ee2 SHA512 feb8cb5cb4fced695e1f78f6a43051e4cac2df42006230b3b12c292144bf9a7147059ca29f63066139759561328a18f003be7209231dc23d5ab78ea015f4177c
 MISC metadata.xml 337 BLAKE2B a79aebb128de2c425a6a6aca3c7f5e0aa7cff2be5716ef7c53d90e8f2c0375d0a20b06b1cac6dd24dd4515149da8ca9c14b9bb0eb17a7d17c053a2ece3fb0329 SHA512 9c2e4983ae509f6b2dea3c201b320bf9d4e8ff250d6b4cc3039ae6b3b6afa7a744f92fc31c293c68b65372147d05ef070776481cb581d66272de7111e9c391f9
diff --git a/dev-ruby/tidy-ext/tidy-ext-0.1.14-r4.ebuild b/dev-ruby/tidy-ext/tidy-ext-0.1.14-r4.ebuild
index aa4500bb1c4b..1027b579d387 100644
--- a/dev-ruby/tidy-ext/tidy-ext-0.1.14-r4.ebuild
+++ b/dev-ruby/tidy-ext/tidy-ext-0.1.14-r4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 RUBY_FAKEGEM_EXTENSIONS=(ext/tidy/extconf.rb)
 
@@ -28,4 +28,7 @@ all_ruby_prepare() {
 
 	# Avoid spec that needs network connectivity.
 	rm spec/tidy/remote_uri_spec.rb || die
+
+	# rspec 3 compatibility
+	sed -i -e 's/be_true/be_truthy/' spec/tidy/compat_spec.rb || die
 }
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 1bffbd14657f..632e6cf2d1a0 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bsdiff/Manifest b/dev-util/bsdiff/Manifest
index bb2938cf7d29..a8af2ff14c3e 100644
--- a/dev-util/bsdiff/Manifest
+++ b/dev-util/bsdiff/Manifest
@@ -1,4 +1,4 @@
 AUX bsdiff-4.3-CVE-2014-9862.patch 304 BLAKE2B bf972f29b3ff36dad2fd656ddb9047ec0ef2b20d4d84f2e983d67478f471d1dcc82e6f577525549b7655c0f3608500dab172a39bced5cd4173fd83e05034bc22 SHA512 940c2cafc14e85a2cdd7f95d17de68f3a9d3e80828fcc302936e16a32733aa4a60d3ddb8fc9760e2fbd1fa626398669ef991688b26c23e8ff5c7e8d2612672ef
 DIST bsdiff-4.3.tar.gz 5740 BLAKE2B 869b957fac9de5977216b82ae46f5a291af4f64e8f4199b129b5e9963385e8f23d8593c307ddf953001fc54446ba66a0c57f9f9a841854afc3d32aee26fffc4e SHA512 bde46b393b74bcc9f05532ea4d45b12c104c4f182fdd49d4176aad5f02a2b357f435819f13a5a7ddefe27df0ca82980f06fad764094014a6d068622263e319c3
-EBUILD bsdiff-4.3-r4.ebuild 877 BLAKE2B 9cc6a0989c62b4bcc6f8d1205b6f1fb0b7367c0143db53aa03f1dc575ae980966f3f9eea2444776306b62869770e0c928601359457ab32ace494a505abea94f4 SHA512 aec5380d82349b42ac618ee5f80382e1f2cf3f8983813b27cd78085f8fc6106da99042158084d6cba4f3898f800fcd9d236bc2ae7caa5b1501da24128971d0d5
+EBUILD bsdiff-4.3-r4.ebuild 795 BLAKE2B 8ce2ac49f770a0fa44398794b587ba267e5875d9117a28ff81bfc45dacae90f118b40b86c2617885cad308da746d96db3621903c3d5dff7f6933eef87d461294 SHA512 ec71689006c2cc5fb7ca52c35791dd0ab10ed23f0dae3a82f9ff4fbae557d69d694c4bda3c7e969f9f12a68de2db558dd2d41c790c9de51a8ac54e46aa2ff909
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-util/bsdiff/bsdiff-4.3-r4.ebuild b/dev-util/bsdiff/bsdiff-4.3-r4.ebuild
index 08e45256bd2b..6083dac804a6 100644
--- a/dev-util/bsdiff/bsdiff-4.3-r4.ebuild
+++ b/dev-util/bsdiff/bsdiff-4.3-r4.ebuild
@@ -1,32 +1,30 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit edo flag-o-matic toolchain-funcs
 
 DESCRIPTION="bsdiff: Binary Differencer using a suffix alg"
 HOMEPAGE="https://www.daemonology.net/bsdiff/"
 SRC_URI="https://www.daemonology.net/bsdiff/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="BSD-2"
+SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="app-arch/bzip2"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-CVE-2014-9862.patch"
 )
 
 src_compile() {
-	doecho() {
-		echo "$@"
-		"$@"
-	}
 	append-lfs-flags
-	doecho $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o bsdiff bsdiff.c -lbz2 || die "failed compiling bsdiff"
-	doecho $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o bspatch bspatch.c -lbz2 || die "failed compiling bspatch"
+
+	edo $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o bsdiff bsdiff.c -lbz2
+	edo $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o bspatch bspatch.c -lbz2
 }
 
 src_install() {
diff --git a/dev-util/rt-tests/Manifest b/dev-util/rt-tests/Manifest
index 303578bdeb02..034c035762cc 100644
--- a/dev-util/rt-tests/Manifest
+++ b/dev-util/rt-tests/Manifest
@@ -1,4 +1,4 @@
-AUX rt-tests-2.3-musl.patch 9602 BLAKE2B 04b537cba7f1de60fa64683b313381304c5ca5b69c451097cf08c84c7dd18321e5b5bfa13a76ae5515bf194c808c017d92232a857725a197049a40b4e9ef7799 SHA512 9367dd015e9a6ee3ba054d89d28d4130fce94b26074434f781553bf5769069e12283d585a10e4777a6eeec39b829a4edcb7d9da7dede00c280eb643c7b3fec31
-DIST rt-tests-2.3.tar.xz 115000 BLAKE2B d5f6a31a31340873348b5ffa6c706deb080e9686944a759fa4e4d53f2041d3f27aa1e9512d7413438bce7c61e05e2495c96eeef0b976ee09377f89d847225aef SHA512 3bf6fe95c5ac9911fb51fba1d4a8e6ad3b96a6cdce464372917673862801353cbbb377c76d3a19325f0b5402f65daf5c605e496d7460949615069366a00a978a
-EBUILD rt-tests-2.3.ebuild 921 BLAKE2B 0dc4ba32df8d2b74077ba45e240a612eae58edf55d79b4ef17a2cd29c2c15a189c47cff27327d486da2250b71d1de00a4285b62d360c9d010138eb2ed7f931fe SHA512 bf4e3e11a31fdf28612b99d68b4fcf30dd77146fa7e2375c9ed780706a293fb28c9908b511bfb79213db336365224dbb2154f0802a92d603ac9463bf78a229af
+AUX rt-tests-2.4-musl.patch 9390 BLAKE2B 08844f79e506620bb38467be940757c34c4a125697eac329053e60d5f44b550bb6fbf849d58bda68cbec85e285a17365de0e5a88bd73f78473d386df5a62d47d SHA512 c286901c4ecd847882ecf53ef2a3ea60099b38c9dfb5baebc55f64d4025c24334cf169a23003503deb5b859c49f280c3ccbd24e5fddcb857608ad6cf451cdeee
+DIST rt-tests-2.4.tar.xz 104172 BLAKE2B bd7ac3ff64171b122341eec81ac61dcda429d33d6a69362d498d5db667b8cb77502d745bc2f7ce03cc1e958d02889a902f65544c7fef994fb4d7e72230c73e10 SHA512 308207ad620ee458e4ac000a9437266a84f4807d9cecd8030d5ae12a210c2a01f80a331bb60faeb41244d7ab80b3cadf8164711547a02f5afa353d1a3644d794
+EBUILD rt-tests-2.4.ebuild 915 BLAKE2B d09ad7ce907e3794aa0d304c8c99a6e97d81c024d920cd856d1fadde5ca006e77647d10d41357a8dfacaebee1bd7e11b7cfb21908efffb6a0aade343de53b7bd SHA512 e56bd29d25d4bf7f976541267091e0c337cb268029bd5b93c645c13e7b2c18cba6cb3578ee714bbe49ae281bc51156b127ad80e2c66a34ad9f948aa705c5fb4e
 MISC metadata.xml 749 BLAKE2B b0072755603e59495f6a9cb82885dd8c882e394c90be750293026948b3f66010c6cd0ab77af16d41a552a1117dbb92886f3afa44b9c9b0b9a6bc7793ab6e7700 SHA512 edcbee69b86ff91ea64a1e60bf7a4329805eaf48337370dba6c3f737c2e459e3c7fa6b6365261a0cb8f5604f5b22d1a7b08f0b8cbba0f0fb44e9623865eff522
diff --git a/dev-util/rt-tests/files/rt-tests-2.3-musl.patch b/dev-util/rt-tests/files/rt-tests-2.4-musl.patch
index 6732521a07a6..886359894cdf 100644
--- a/dev-util/rt-tests/files/rt-tests-2.3-musl.patch
+++ b/dev-util/rt-tests/files/rt-tests-2.4-musl.patch
@@ -20,13 +20,12 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  src/hackbench/hackbench.c             |    4 +
  src/include/musl.h                    |   28 +++++++++++++
  src/lib/rt-utils.c                    |    1 
- src/pi_tests/classic_pi.c             |    2 
  src/pi_tests/tst-mutexpi10.c          |    2 
  src/pmqtest/pmqtest.c                 |    1 
  src/ptsematest/ptsematest.c           |    1 
  src/rt-migrate-test/rt-migrate-test.c |    1 
  src/sched_deadline/cyclicdeadline.c   |    1 
- 12 files changed, 50 insertions(+), 67 deletions(-)
+ 11 files changed, 48 insertions(+), 67 deletions(-)
  create mode 100644 src/include/musl.h
 
 --- a/Makefile
@@ -77,7 +76,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  #include "rt_numa.h"
  
  #include "rt-utils.h"
-@@ -504,12 +505,8 @@ static void *timerthread(void *param)
+@@ -546,12 +547,8 @@ static void *timerthread(void *param)
  {
  	struct thread_param *par = param;
  	struct sched_param schedp;
@@ -90,7 +89,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  	struct thread_stat *stat = par->stats;
  	int stopped = 0;
  	cpu_set_t mask;
-@@ -538,14 +535,6 @@ static void *timerthread(void *param)
+@@ -580,14 +577,6 @@ static void *timerthread(void *param)
  	sigaddset(&sigset, par->signal);
  	sigprocmask(SIG_BLOCK, &sigset, NULL);
  
@@ -105,7 +104,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  	memset(&schedp, 0, sizeof(schedp));
  	schedp.sched_priority = par->prio;
  	if (setscheduler(0, par->policy, &schedp))
-@@ -599,20 +588,6 @@ static void *timerthread(void *param)
+@@ -641,20 +630,6 @@ static void *timerthread(void *param)
  		stop = now;
  		stop.tv_sec += duration;
  	}
@@ -126,7 +125,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  
  	stat->threadstarted++;
  
-@@ -620,16 +595,10 @@ static void *timerthread(void *param)
+@@ -662,16 +637,10 @@ static void *timerthread(void *param)
  
  		uint64_t diff;
  		unsigned long diff_smi = 0;
@@ -144,7 +143,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  		case MODE_CLOCK_NANOSLEEP:
  			if (par->timermode == TIMER_ABSTIME) {
  				ret = clock_nanosleep(par->clock, TIMER_ABSTIME,
-@@ -750,11 +719,6 @@ static void *timerthread(void *param)
+@@ -792,11 +761,6 @@ static void *timerthread(void *param)
  
  		next.tv_sec += interval.tv_sec;
  		next.tv_nsec += interval.tv_nsec;
@@ -156,7 +155,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  		tsnorm(&next);
  
  		while (tsgreater(&now, &next)) {
-@@ -779,17 +743,6 @@ out:
+@@ -821,17 +785,6 @@ out:
  		pthread_mutex_unlock(&refresh_on_max_lock);
  	}
  
@@ -174,7 +173,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  	/* close msr file */
  	if (smi)
  		close(par->msr_fd);
-@@ -1183,7 +1136,8 @@ static void process_options(int argc, ch
+@@ -1227,7 +1180,8 @@ static void process_options(int argc, ch
  		case OPT_VERBOSE: verbose = 1; break;
  		case 'x':
  		case OPT_POSIX_TIMERS:
@@ -184,7 +183,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  		case '?':
  		case OPT_HELP:
  			display_help(0); break;
-@@ -1216,13 +1170,6 @@ static void process_options(int argc, ch
+@@ -1260,13 +1214,6 @@ static void process_options(int argc, ch
  		}
  	}
  
@@ -198,7 +197,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  	/* if smp wasn't requested, test for numa automatically */
  	if (!smp) {
  		numa = numa_initialize();
-@@ -1952,7 +1899,6 @@ int main(int argc, char **argv)
+@@ -1993,7 +1940,6 @@ int main(int argc, char **argv)
  
  	}
  
@@ -206,7 +205,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  	mode = use_nanosleep + use_system;
  
  	sigemptyset(&sigset);
-@@ -2002,16 +1948,18 @@ int main(int argc, char **argv)
+@@ -2043,16 +1989,18 @@ int main(int argc, char **argv)
  			void *stack;
  			void *currstk;
  			size_t stksize;
@@ -230,15 +229,16 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  			/*  allocate memory for a stack on appropriate node */
 --- a/src/hackbench/hackbench.c
 +++ b/src/hackbench/hackbench.c
-@@ -24,13 +24,15 @@
+@@ -25,7 +25,7 @@
  #include <sys/socket.h>
  #include <sys/wait.h>
  #include <sys/time.h>
 -#include <sys/poll.h>
 +#include <poll.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
  #include <limits.h>
- #include <getopt.h>
- #include <signal.h>
+@@ -34,6 +34,8 @@
  #include <setjmp.h>
  #include <sched.h>
  
@@ -288,17 +288,6 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  #include "rt-utils.h"
  #include "rt-sched.h"
  #include "rt-error.h"
---- a/src/pi_tests/classic_pi.c
-+++ b/src/pi_tests/classic_pi.c
-@@ -34,6 +34,8 @@
- #include <signal.h>
- #include <getopt.h>
- 
-+#include "musl.h"
-+
- /* test timeout */
- #define TIMEOUT 2
- 
 --- a/src/pi_tests/tst-mutexpi10.c
 +++ b/src/pi_tests/tst-mutexpi10.c
 @@ -35,6 +35,8 @@
diff --git a/dev-util/rt-tests/rt-tests-2.3.ebuild b/dev-util/rt-tests/rt-tests-2.4.ebuild
index 247753110450..43403751c848 100644
--- a/dev-util/rt-tests/rt-tests-2.3.ebuild
+++ b/dev-util/rt-tests/rt-tests-2.4.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit python-single-r1 toolchain-funcs
 
 DESCRIPTION="A collection of latency testing tools for the linux(-rt) kernel"
-HOMEPAGE="https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/about/"
+HOMEPAGE="https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/"
 SRC_URI="
 	https://kernel.org/pub/linux/utils/rt-tests/${P}.tar.xz
 	https://kernel.org/pub/linux/utils/rt-tests/older/${P}.tar.xz"
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index b2b7a217ed03..3b3397a96ec3 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index 7c1d1b87de73..486d0bae81aa 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,5 +1,6 @@
+AUX libkgapi-22.04.2-gnu_source.patch 663 BLAKE2B 47373a868abb98aa1e3dd2a3040b67d07ff265131c627f96fb875ff642790f5d5144e08d7ce82508f091b57e2739df28b03dd050cf94fd4c13f40c75c6481b7c SHA512 9fcaafbbd28c08a1de2cf456644f77f6c7fff979758dd08ab5399e08003fbab62ae82f5633f9062bfb97df06d389024680ce11f7f96f513bd493277187d7b8dc
 DIST libkgapi-21.12.3.tar.xz 244976 BLAKE2B e358b22d93ba11cc732eaae1a762857590d1022fdda2d9a9d675d3a2c602bdd83aeaf8c99e2e712d9730d0a9a286229b19f8f348aff3697f174ff12953a30d05 SHA512 af7c39cf90a6d7c8a523451ab754559a6260f8ffd817d70188a64aa4ae2ddeb5a7e12303c61788304653a1866375638c03bc4ec20184b3f1f0d43a299a0631eb
 DIST libkgapi-22.04.3.tar.xz 245496 BLAKE2B 37ad9eef882c0e56e5298c34fb97cf3dbd4f85582ecf89b98b886757868820afd083f1596b6a737954956002ec1126166b028f0688e2baf544971a2d45b6560a SHA512 575a5aab6693510df7ea8949846e4de7d1d9e94264ee2075e66a5f0207a3078fcd9c8d1fa398f223476114487ac54fb88dab8d09e2166218831f55ee0326f38a
 EBUILD libkgapi-21.12.3.ebuild 1126 BLAKE2B c35ae8d8475a9908c34cb26de1ff53f7dd6bc14183a6344328add7e04ad8ef983e36875384037118bac9ac946e4751435854ac3bf5ca90a69c956a25fb0912ce SHA512 45498f43548583c30ca87699801c02976c6981379de1d8236e92d7eda7be4349202424b90574ac1033d6e6cd5fe13571d5b81de1900cf04c9cb57b2925a53170
-EBUILD libkgapi-22.04.3.ebuild 1134 BLAKE2B c581cff1b7821f7d92a3ce53a533b009ecd0d10600fb17e0a510bac6ccb01093864c2c4ad67424c3b163bf0da6d02ad8232a980de8f8ae25e3a48fbe1d4e408b SHA512 7688ee0de54c49df0ee9f3d303b5e9ad7e9f30e74d13a7196fbf78ec3f27f2161d1355117356ac7103ef17d5f4cd027958c59d1e9ea1fd01d58cd57445786c7d
+EBUILD libkgapi-22.04.3.ebuild 1192 BLAKE2B 8bec3edeaaf3577319820b9f067fa781f58ee2cbc4340625dbbd14d480eb24faa230490bdc3feeacec8016a0935fdaa9bfe324d3c94d2eedd4c2f01edbd3de6d SHA512 e36d8a456d043b52fe6f957b2963862d86e5af304db63358544bb427d6014355e7b31f0be9d6fad25337c8050b6d3b4716b68cccf3d59a21bf0d008ae0097d43
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libkgapi/files/libkgapi-22.04.2-gnu_source.patch b/kde-apps/libkgapi/files/libkgapi-22.04.2-gnu_source.patch
new file mode 100644
index 000000000000..88e3e2a3ed34
--- /dev/null
+++ b/kde-apps/libkgapi/files/libkgapi-22.04.2-gnu_source.patch
@@ -0,0 +1,23 @@
+https://invent.kde.org/pim/libkgapi/-/merge_requests/29
+https://invent.kde.org/pim/libkgapi/-/merge_requests/29/diffs?commit_id=1e6a54a9f2d818aa4046e5291702e236a53ba987
+
+---
+ src/saslplugin/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/saslplugin/CMakeLists.txt b/src/saslplugin/CMakeLists.txt
+index 61edd04..e8823fb 100644
+--- a/src/saslplugin/CMakeLists.txt
++++ b/src/saslplugin/CMakeLists.txt
+@@ -2,7 +2,7 @@ include(CheckIncludeFile)
+ include(CheckStructHasMember)
+ 
+ if (NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+-   add_definitions(-D_POSIX_SOURCE)
++	add_definitions(-D_GNU_SOURCE)
+ endif()
+ 
+ if (WIN32)
+-- 
+2.35.1
+
diff --git a/kde-apps/libkgapi/libkgapi-22.04.3.ebuild b/kde-apps/libkgapi/libkgapi-22.04.3.ebuild
index 6b4d892a0c6a..2e26e8525db4 100644
--- a/kde-apps/libkgapi/libkgapi-22.04.3.ebuild
+++ b/kde-apps/libkgapi/libkgapi-22.04.3.ebuild
@@ -32,6 +32,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-22.04.2-gnu_source.patch )
+
 src_test() {
 	local myctestargs=(
 		# Both fail for multiple distros, see bug #832709 for more discussion
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index a06509c53288..e07da8c7c1ba 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/gozer/Manifest b/media-gfx/gozer/Manifest
index 1e3825667f61..5027cd4b8b44 100644
--- a/media-gfx/gozer/Manifest
+++ b/media-gfx/gozer/Manifest
@@ -1,4 +1,4 @@
 AUX gozer-0.7-fix-build-system.patch 1600 BLAKE2B 2d1bb419c587c4c24bad15f8b0ec99f6052e6ff924db9e3ff4a26a7e04f2b2ecdbbe2bb0a022b24fc4c4150499ad562289e9311b711de71cf1dea280a2299276 SHA512 a17ffc77e3899dba47227343d7f3b656d3223085b8419460b73031c50e46d9ab5d7668154ea10cd733b3f3c2693649c355bf43306ef205213a42d2b990cc4648
 DIST gozer-0.7.tar.gz 103545 BLAKE2B 5eb3e2da348204f6fac9c00b681df56d4d419df671d9967c0b05b78838fd9b2ec4e76a7f2df07396e6aee1313117f72126aab57732d4b9713c54581bfbe3bf3d SHA512 ae39b74272f87d5e9bf71c9df7e6e9ac37a44a54dafba45aa5e8037657ba128e4e6c77a5624921fbca5c57791a0047f491013582cd9e5a6a5c8932a23233a29c
-EBUILD gozer-0.7-r3.ebuild 602 BLAKE2B 9aee70b89e2c5aa1f5557ee4932948812543ff3da79891fa680d9fd087055d1c55aca35bb974b3e554c150fd2ee018a67971feea64c9fb947ab5e75764dd4f96 SHA512 48f681c15824aa2d0ff9d64ea5d1ebd6207c587e73b18f62d161d5c604520351cbbfa8298c9ae0ba3790e1a259d9069119717682fa4b7a5cf7dd41a85c010216
+EBUILD gozer-0.7-r4.ebuild 595 BLAKE2B 52bae4b7b488ff49275b93f3768a1a4edfa287f8ab4a21e72326817f1c957f5e67337cfbc78fd8f7d50bed781b9461e53f426ad4181b0fc619fbb07afaf8c187 SHA512 34901faddb783ebd7e414c7f56f604c9796111c1899f017fdcbf737ae58453828d2d3fd21cf2608c3c40d442654fb070e7838e939dd85a435166a509d44a9fe1
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/media-gfx/gozer/gozer-0.7-r3.ebuild b/media-gfx/gozer/gozer-0.7-r4.ebuild
index eb15f0c92d2d..f14a25fce9c2 100644
--- a/media-gfx/gozer/gozer-0.7-r3.ebuild
+++ b/media-gfx/gozer/gozer-0.7-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
@@ -12,19 +12,23 @@ SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 LICENSE="feh LGPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 RDEPEND="
 	media-libs/giblib
-	media-libs/imlib2"
+	media-libs/imlib2
+"
 DEPEND="
 	${RDEPEND}
-	x11-libs/libXext"
+	x11-libs/libXext
+"
 
-PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-build-system.patch
+)
 
 src_prepare() {
 	default
+
 	mv configure.{in,ac} || die
 	eautoreconf
 }
diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest
index 95225686d214..0c30589b661e 100644
--- a/media-gfx/img2pdf/Manifest
+++ b/media-gfx/img2pdf/Manifest
@@ -1,4 +1,6 @@
 AUX img2pdf-0.4.3-test-gif-animation.patch 576 BLAKE2B 27b0357c0d1e307e54377fc3dd79c9ad1ae7864166ceab2efc518d9fa656e0685798a10da1dd488f1284a295fce2e0045f92e61e897431187f7083a4c95a9378 SHA512 edb0e95b8b126ddd8784ddb306b29173a2f22299016874e33eae0441837ca5a0f8608ed1a57f93b8a91a5f1723598e0a4f3fe94ab6eeff9ae372bdcd525a1c23
 DIST img2pdf-0.4.3.tar.gz 98656 BLAKE2B ec7be83fa7fc38f94c7770a2566a49a39e5fd0abb715de74fc3f65d59087cecdd009f4284e647facaf6ae019a118b4bedf7ce8d4a09b8479a299c8404a8940d5 SHA512 00755788c7380e44733c5a309428894b6689e93d4d7cca8f84681d12977848971a6b1a7c92c7203258a529894e7a0debb5beaeb6b375de769a0d600ea8d65423
+DIST img2pdf-0.4.4.tar.gz 97796 BLAKE2B d04eae8c02490e4e73339dade92b2521ad410ed741ccc2987961543790589b14a5c8939cb9bbadcc795f5edcbb59a1a43bd522c75948f42dde1acffafb6266e0 SHA512 56943cd965b3e6b0680b7696ca4b5a2ba779474f945dd0d2648fb6f18ab18aab6d74640f9bd8e9c8683e3e641b0657cb84c691054910d84f0c9e8ad733f179e9
 EBUILD img2pdf-0.4.3.ebuild 1456 BLAKE2B cdd2d23b78173ebafa8f2ad48a4bb430ac62ba153ca365fdce31a61b17e6b19017d22e8c45bfa1a5552d295c50bdc4aeaadd02bb05528b989c3180aeb0dffb65 SHA512 c5b2f2b6c797df6b2bd731df120811dedb19af9ae81a027afc54322daec5eca43fe8bf4b60bcc4272710f7d2b90b716564a2d0337d69e0d78d62647627c5eb27
-MISC metadata.xml 923 BLAKE2B fe0074db9549519b522f9d749388c5626b702dadba5a722444f652b203a60aea8e8ea5739c3c634076b42dddf24d17b4f449220de617224e59e5491893339901 SHA512 98fc799711e027afa40d2b9bf4558c38873d385920713f58d62782a986e72d1c9b04eb5591d4ec384bbf32376e2b03bf822bf5573015d003ff53ae0d4c7e6421
+EBUILD img2pdf-0.4.4.ebuild 1465 BLAKE2B 80ea7c728c3b37184b7733b5d2c55a71121de19af866c020cf224c469b38332f219ae5a2ac873a4d8d4e962ad27ce3175632c23281347b72a3557f72f1309235 SHA512 ef7b2753854ab8663da0fc01c5bcddc60b5e97e8946a148292d207ead94f039edf0b6e4fa881fae2cf1234d940d586808b9df988bdd677649b2eb8c92fa6a79c
+MISC metadata.xml 1154 BLAKE2B 2f41633fe9a437b16ab2aaaa134c90c1389ab6ce2c77c113087006e568c9caadc2df550371dd38de98e4fca145ae0185230b66cf3ac1a923a702307a6419836a SHA512 c1566346e1b88668a73ba5d78669a3ba002bf9a44612f0f20dbeadf18ada772f06e2090981043a8d9230ede3cac918dea35b4d28c815a367450a746e0ca563bc
diff --git a/media-gfx/img2pdf/img2pdf-0.4.4.ebuild b/media-gfx/img2pdf/img2pdf-0.4.4.ebuild
new file mode 100644
index 000000000000..8787b8ffc761
--- /dev/null
+++ b/media-gfx/img2pdf/img2pdf-0.4.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Losslessly convert raster images to PDF"
+HOMEPAGE="https://gitlab.mister-muffin.de/josch/img2pdf"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui"
+
+# pytest-xdist isn't really required but it helps speed up tests
+BDEPEND="
+	test? (
+		app-text/ghostscript-gpl
+		app-text/mupdf
+		app-text/poppler[cairo,png,tiff]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pdfrw[${PYTHON_USEDEP}]
+		dev-python/pillow[tiff,${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		media-gfx/imagemagick[jpeg,jpeg2k,lcms,png,-q8,-q32,tiff]
+		media-libs/exiftool
+		media-libs/netpbm[jpeg]
+	)
+"
+RDEPEND="
+	dev-python/pikepdf[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	gui? ( $(python_gen_impl_dep tk) )
+"
+
+# gif animation test fails
+PATCHES=( "${FILESDIR}"/img2pdf-0.4.3-test-gif-animation.patch )
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_python_prepare_all
+
+	# Remove gui executable if there's no demand/support for it.
+	if ! use gui; then
+		sed -i '/gui_scripts/d' setup.py || die
+	fi
+
+	# gif animation test fails
+	rm src/tests/input/animation.gif src/tests/output/animation.gif.pdf || die "rm animation gif failes"
+}
+
+python_test() {
+	epytest -n auto
+}
diff --git a/media-gfx/img2pdf/metadata.xml b/media-gfx/img2pdf/metadata.xml
index ab909682d5c4..f6852412a419 100644
--- a/media-gfx/img2pdf/metadata.xml
+++ b/media-gfx/img2pdf/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" proxied="yes">
+		<name>Thamognya Kodi</name>
+		<email>contact@thamognya.com</email>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<longdescription lang="en">
 	Losslessly convert raster images to PDF. The file size will not
diff --git a/media-gfx/propaganda/Manifest b/media-gfx/propaganda/Manifest
index ddfad8f5b2a7..8c9f275a4dca 100644
--- a/media-gfx/propaganda/Manifest
+++ b/media-gfx/propaganda/Manifest
@@ -14,4 +14,5 @@ DIST Propaganda-Vol-10.tar.gz 6376914 BLAKE2B 365e96616d8f82321fd0a0460e6b14e5db
 DIST Propaganda-Vol-11.tar.gz 3030910 BLAKE2B b5637635165557c079d7801b91a6b1d7372a7ac1ef1ba414d0cf172d652de779fb05f106f0ef7cabebac79bbc8a1b21cabde0f34a14735eca17ccb193ade0882 SHA512 752a3e27bfbde1f694be3f57e4c7bf638159f8e7b06c00c703a82ff2795625298feca20f91beecc651da66ac7b6dc5e7fcfc0b5d7b465118e94f8769488be1c7
 DIST Propaganda-Vol-12.tar.gz 3140955 BLAKE2B ce23e5e781bd1d1cba757bcee71df199627e18bb72eddd0a6dc5759f1d80fcefbb4daa6048450aa51f9b4830ece14461ef63a299e0c13d43a1670bc8b1a4b0fc SHA512 1cef61c88a4cbe4c757c05c1ecf2d72ab67ad13e0268497971f9a11047351d0a0e8770a69bd6754672b6a8c99e69a2e61693fb593bcfb4db7003cd9eddd31f80
 EBUILD propaganda-1.0-r1.ebuild 1200 BLAKE2B d0f29c2ef8d257b0d0bfe8d09926456a548d85cbadc8224ac90805e8788f4f75aa69af9991d603d40d4450ac7118c874f04f5cb7e80d04700e9fe0027ce1472d SHA512 b30d65a468330bcdadf91863bb41e6e36dba1957b2ecfc7a3199ad1921f1d0f2ce65114d01ebac86749f1c6c1e9ee3844af9c6822f4e5fb3cbb2cb0a929d934f
+EBUILD propaganda-1.0-r2.ebuild 1197 BLAKE2B 82dbe094df632449c92c1e5eb68168d112d6365c487a511fb906c4fd9c64197a53b5744f0cb65a174c3a9171ab29125fedbdf20c72e7a966a1ddd30eed2337dd SHA512 e0f434d11e6cb8a9ed8f2b29813f6ba4e2f8d546e6dc59258ec58efbff3100bef181eecc6191cc188bccb421e6e42dc11f3f1ac388e69be1d85b6989f0f55827
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/media-gfx/propaganda/propaganda-1.0-r2.ebuild b/media-gfx/propaganda/propaganda-1.0-r2.ebuild
new file mode 100644
index 000000000000..86662e6c0a08
--- /dev/null
+++ b/media-gfx/propaganda/propaganda-1.0-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+SITE="https://dev.gentoo.org/~andrey_utkin/distfiles/"
+DESCRIPTION="Propaganda Volume 1-14 + E. Tiling images for your desktop"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="${SITE}Propaganda-Vol-01.tar.gz
+	${SITE}Propaganda-Vol-02.tar.gz
+	${SITE}Propaganda-Vol-03.tar.gz
+	${SITE}Propaganda-Vol-04.tar.gz
+	${SITE}Propaganda-Vol-05.tar.gz
+	${SITE}Propaganda-Vol-06.tar.gz
+	${SITE}Propaganda-Vol-07.tar.gz
+	${SITE}Propaganda-Vol-08.tar.gz
+	${SITE}Propaganda-Vol-09.tar.gz
+	${SITE}Propaganda-Vol-10.tar.gz
+	${SITE}Propaganda-Vol-11.tar.gz
+	${SITE}Propaganda-Vol-12.tar.gz
+	${SITE}Propaganda-13.tar.gz
+	${SITE}Propaganda-14.tar.gz
+	${SITE}Propaganda-For-E.tar.gz"
+S="${WORKDIR}/Propaganda"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+src_prepare() {
+	default
+
+	mv ../Propaganda-Vol-11 Vol11 || die
+	mv ../Propaganda-Vol-12 Vol12 || die
+
+	rename JPG jpg */*.JPG || die
+}
+
+src_install() {
+	dodoc README-PROPAGANDA
+
+	local VOLUME
+	for VOLUME in Vol* Propaganda-For-E; do
+		insinto "/usr/share/pixmaps/Propaganda/${VOLUME}"
+		doins "${VOLUME}"/*.jpg
+	done
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 9dcde87271c5..2f66995350f8 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/fidlib/Manifest b/media-libs/fidlib/Manifest
index c35c01846d2a..4110998e99fd 100644
--- a/media-libs/fidlib/Manifest
+++ b/media-libs/fidlib/Manifest
@@ -1,4 +1,4 @@
 AUX fidlib-0.9.10-extern.patch 501 BLAKE2B 883d3914412ba50429a5fd0e607effbfa477e4e806d7f820ed1afdc4e11d18315602dc70271888a15072f2b21ff21dbc00cb5c24240a9bc9f56d1084ba4dafb1 SHA512 b49c6fd88d59b82fdcf96692e4ce1abfccf7209c9ce0757e8111e7a5c66b4d56558999dde2b3e1e017c87bd662e22edd9bb3aed827f12f94429eba4fd37c7c96
 DIST fidlib-0.9.10.tgz 87082 BLAKE2B 1a8c2c9abaf1d8d0855466af2c3243a4253f505b488822852d49c702f0904beb599bfa7a023d4be925d1d245b8357ebef05dd6c4051bdc9c9c3eeae96bbf0b46 SHA512 77600acd665407b4d786b406a4f20b2f6c30c74775f5777d5054420b80c74e5bfa316bf7bd90df1669c09cef0ff9b552a0338cd138bf7d9bcf1df7cbff9fea4b
-EBUILD fidlib-0.9.10-r1.ebuild 1106 BLAKE2B 847539de1169e67cbecaa8aa2be90b039701e31d149502e28d416a5fcf7f223a9d10aa6c6eac9ecb20851e61c55f4ab19fef1303063f1c5d6378253c232e277f SHA512 4b101015a6434781c2c7ad11354d60fc3b2484e2d879f845b0637bb5efbbd132f2e3d6891f389be7742206fe327fa097f330b7f3107874d6c880d05dcd2f31cc
+EBUILD fidlib-0.9.10-r1.ebuild 1066 BLAKE2B abe01c69c666ee37484f5264b576c579a85faf3e183d13ba2caa3609a15e917a0dab150362ebf5041a936fedb0bf34e0d4d1e5305356ff09098d5f10c058d2f1 SHA512 01a7cd143899a543ef244b39d992807fc5d4d9b8214b10c5420e48d82916a80694de9a988ba99ebb9e4a98100efda205671f10e24408c1c2985cf0725e931e8d
 MISC metadata.xml 266 BLAKE2B ca23b48703283ee907c17267dae8c0f40748e75a7ab7217981a5a81a39c28797966c43265fb0b9dce0b0acf6c79dde5826cf30eb3ca1ec808e96e790d4c554d3 SHA512 d91b69020930a0f557b96c72c89a0881c573da762dbb53dd6fb96e77bba0adbec787b75286ee3e5a62a34e3fa6913c742fa22f99c17d4a3e466e8be05009a6c3
diff --git a/media-libs/fidlib/fidlib-0.9.10-r1.ebuild b/media-libs/fidlib/fidlib-0.9.10-r1.ebuild
index 43f1384db120..f1ded950cbab 100644
--- a/media-libs/fidlib/fidlib-0.9.10-r1.ebuild
+++ b/media-libs/fidlib/fidlib-0.9.10-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit edo flag-o-matic toolchain-funcs
 
 DESCRIPTION="Run-time filter design and execution library"
 HOMEPAGE="http://uazu.net/fidlib/"
@@ -17,11 +17,6 @@ PATCHES=(
 	"${FILESDIR}"/${P}-extern.patch
 )
 
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
 src_prepare() {
 	default
 
@@ -33,11 +28,11 @@ src_prepare() {
 
 src_compile() {
 	# build library
-	doecho $(tc-getCC) ${CFLAGS} -DT_LINUX ${LDFLAGS} -Wl,-soname,libfidlib.so.${PV:0:1} \
+	edo $(tc-getCC) ${CFLAGS} -DT_LINUX ${LDFLAGS} -Wl,-soname,libfidlib.so.${PV:0:1} \
 		-fPIC -shared fidlib.c -lm -o libfidlib.so.${PV:0:1}
 
 	# build command-line tool
-	doecho $(tc-getCC) ${CFLAGS} ${LDFLAGS} firun.c -lm ./libfidlib.so.${PV:0:1} -o firun
+	edo $(tc-getCC) ${CFLAGS} ${LDFLAGS} firun.c -lm ./libfidlib.so.${PV:0:1} -o firun
 }
 
 src_install() {
diff --git a/media-libs/giblib/Manifest b/media-libs/giblib/Manifest
index ab4b3558d514..905ae7f1c3ba 100644
--- a/media-libs/giblib/Manifest
+++ b/media-libs/giblib/Manifest
@@ -1,4 +1,6 @@
 AUX giblib-1.2.4-fix-build-system.patch 792 BLAKE2B 4e59d03acceb1ff6ea013660e2c6ce1435c47bfcd040800de7deda37346ec7b5687d4b7809222b2331c6b9f52e54c53524d30ca03fe4096b0134fcd5e1a11a7d SHA512 8dc2de904f9c0082b5be16d21d366e84f6912cf891e80b8c32681e4f589c911775fb5227f0ef3d4790920512b279b02b451f3afcbbada329d004c2eac494fe8f
+AUX giblib-1.2.4-use-pkg-config-imlib2.patch 656 BLAKE2B 01bfa778adc8f2a80c750ccc82455ac1548c123789855ad1f1b1b62e0d91f03330fc6228078300566b411f3b3e814a462241c6deab627ed25475dc2352ec216a SHA512 bdf26ce8aec00b5d84b4903602d1be6322f86c9658b02756ea623c24d824d41e7843f4bf618496eed5a04d816f2dd27545ae54dabdbde5f7f3fb2a4ed7272bbd
 DIST giblib-1.2.4.tar.gz 287653 BLAKE2B 0b936fe3b56b933a5038751428ec56a872911d3c4ae972e9670cb1ce2496de6a8e21cb4718e7bab4eb1d547eb67ca71b25d77405ff04ebcb1ca0dc03fafea7ef SHA512 4866df223e6d219a5c9a327874bcd67260c83fba8f99862222df41ef86fb31efa0172a777bf46c853ca380dc2a64bbd41bf4fd658fcb84a924cab4e0f525dcfd
 EBUILD giblib-1.2.4-r1.ebuild 821 BLAKE2B b3ddd1f969e3725f62abb1e115787a28a9d3f21fc659c76045dfbbeb029dd76703b2692ba64d56d57dd7068479ca9fe945b7f4dfcf82fcb2b0678ef931fd637d SHA512 8d997f409cb9952d19c4825a265e2ee9ab4ed1e8131318ea049f578646c04168b181a6bede4bb99d996dbd9a26a421180991fb329646b3c8af22247868f58ce4
+EBUILD giblib-1.2.4-r2.ebuild 864 BLAKE2B 38c267f504b605ce0dfa5b5c93c37fe9f6c1b920bdee4e7c19a8de85e6bdbf4f2bdd6a62f0f9aab538d81551fd3b8d2b567fecd2c86521389264fbdb33f2776e SHA512 36a86b2551549faa99538f68abea0420d7cf0283844cef65ad7cd93bffb84c8950e958e5d52fa529350b96e2e1cd8becaf1c4f31a6560f1a42dc2f88a0543504
 MISC metadata.xml 586 BLAKE2B 3574a174fb7d107863fab7ec9fed0568f2bf0a6e5304a284c5a45f6b49cf632004b3547369693fbde44032ce2ec7e0c9ae5f054637fe35bfb640866b6bca0da9 SHA512 7cc17400b2ab02f3660683c7d4c6d3d3e948bc67579e2618186b0e19284fa6b282e6b25c891a3b45d484cddfaf3cba688c294a69278e8789b8e95d5f19c76df9
diff --git a/media-libs/giblib/files/giblib-1.2.4-use-pkg-config-imlib2.patch b/media-libs/giblib/files/giblib-1.2.4-use-pkg-config-imlib2.patch
new file mode 100644
index 000000000000..9b0cc163a593
--- /dev/null
+++ b/media-libs/giblib/files/giblib-1.2.4-use-pkg-config-imlib2.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/828879
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,20 +16,12 @@ AM_SANITY_CHECK
+ AM_MAINTAINER_MODE
+ AM_WITH_DMALLOC
+ 
+-AC_PATH_GENERIC(imlib2, 1.0.0, [
+-  AC_SUBST(IMLIB_LIBS)
+-  AC_SUBST(IMLIB_CFLAGS) ],
+-  AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) )
+-
+-dnl the above doesn't work for some reason :/
+-IMLIB_LIBS=`imlib2-config --libs`
+-IMLIB_CFLAGS=`imlib2-config --cflags`
+-AC_SUBST(IMLIB_LIBS)
+-AC_SUBST(IMLIB_CFLAGS)
+-
+-LIBS="$LIBS -lm"
+-CFLAGS="$CFLAGS -Wall"
++PKG_PROG_PKG_CONFIG
++PKG_CHECK_MODULES([IMLIB], [imlib2 > 1.0])
++
++AC_CHECK_LIB([m],[cos])
+ 
++CFLAGS="$CFLAGS -Wall"
+ 
+ AC_OUTPUT([
+ Makefile
diff --git a/media-libs/giblib/giblib-1.2.4-r2.ebuild b/media-libs/giblib/giblib-1.2.4-r2.ebuild
new file mode 100644
index 000000000000..c19ab3fa4421
--- /dev/null
+++ b/media-libs/giblib/giblib-1.2.4-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A graphics library built on top of imlib2"
+HOMEPAGE="http://freshmeat.sourceforge.net/projects/giblib http://www.linuxbrit.co.uk/giblib/"
+SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	media-libs/freetype
+	media-libs/imlib2:=[X]
+	x11-libs/libX11
+	x11-libs/libXext
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.4-fix-build-system.patch
+	"${FILESDIR}"/${PN}-1.2.4-use-pkg-config-imlib2.patch
+)
+
+src_prepare() {
+	default
+
+	rm configure.in || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index a8e42b429541..07e72f558844 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -1,3 +1,3 @@
 DIST libmikmod-3.3.11.1.tar.gz 1240373 BLAKE2B 9de58eea739f8f7a5c4ff482093974f67a623fd0acd3b65752b0832b1376fb05ca00e7fbd09c242a25fb76d90d662afc3886808fbe6cabb15332f263adba37ad SHA512 f2439e2b691613847cd0787dd4e050116683ce7b05c215b8afecde5c6add819ea6c18e678e258c0a80786bef463f406072de15127f64368f694287a5e8e1a9de
-EBUILD libmikmod-3.3.11.1.ebuild 2118 BLAKE2B 9a8eb819b8519eccd9781c1a3f21dfaade1c0f2341d13c370d78fe870029c6f42a4553bc97a720cafdd02919c2dbe347536b967678a0562b2316ae315be6b82c SHA512 7c49e676b89c05704265109d72d183a28710cde49e7ae321e529a4d1ba742d3e132a076c3a18b951f80fd01f852727795d1a4696886ad61d2401358cf1b6281f
+EBUILD libmikmod-3.3.11.1.ebuild 2146 BLAKE2B 5878ab493eeba16da587677cf27da12806f5ba1ca4f1d1beb4a0449401270d5b524a99a488650ab1405967bbcf5be9a21d417df8e819c450f2c658b3dff6dd97 SHA512 91e568298df78291ce5a23f95a183270bffd9b30b75b8453dd30bd2b808daed49c0d28b7239b25d71242de417eb648589857ec201024f02dbfa43151a1024b30
 MISC metadata.xml 330 BLAKE2B f865c47d2fe40d5bb20da22fc2b3a93568b7b3756a424367a2be855b49ea8287af72f5973ccfc8c4c4c7f501c9b9d468539e8d929699acada27e0fee40206bba SHA512 9ef7a547be98060ffb33c04cc09bc2fad66a26b9a71c5602a3627a69c9e9e280573e61239318b689bdfeaa157215672e03ee8838893ea1923b618421c2888111
diff --git a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
index 6210ef76f370..bb462fd8cdd0 100644
--- a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
 LICENSE="LGPL-2+ LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
+IUSE="+alsa coreaudio cpu_flags_ppc_altivec debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
 
 REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
 
@@ -37,7 +37,7 @@ src_prepare() {
 multilib_src_configure() {
 	local mysimd="--disable-simd"
 	if use ppc || use ppc64 || use ppc-macos; then
-		mysimd="$(use_enable altivec simd)"
+		mysimd="$(use_enable cpu_flags_ppc_altivec simd)"
 	fi
 	if use amd64 || use x86 || use amd64-linux || use x86-linux || use x64-macos; then
 		mysimd="$(use_enable cpu_flags_x86_sse2 simd)"
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 768ae8d0993b..17dea0effad9 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -2,7 +2,7 @@ AUX xine-lib-1.2.12-dav1d-1.0.0.patch 805 BLAKE2B 83b97835c46ff547636c9a39836ee4
 AUX xine-lib-1.2.12-fix-mmap-crash.patch 535 BLAKE2B 6b6782a7923754c29daf8263bc267f57124de6b80705214537c9d788bafb3f80bcec35915ca50fb50935ffcbc612187dc1f0e0d71e80279d4d9e3fcbe54a4ebd SHA512 f642612419abd03b765f8dbf787aa675a1e5a031878db9b51c7f2a829caa19c153f9cabe733dbd21cbbbe55ce1ce5d5793b75e9b32c229e3fb57b548d39a6aa5
 DIST xine-lib-1.2.11.tar.xz 5282204 BLAKE2B c61bec690f662e01372b1c068b0681ac4435925ca90a767c590d5d3b968163280c11210dc9e3aeb4cc6bb6b3520349ba22e18b17f34bd9139af02280d3a37ee3 SHA512 8208e4699819465ec9e820530f27b6129ee954ea17ab474eb9eda12137af1417ed5260830c1006ce32266a3913d22ba9957689bb5552464908038a1b8a8efbcf
 DIST xine-lib-1.2.12.tar.xz 5341212 BLAKE2B e975be2e7cf013e218001631c6b27a0d5e291605cb236c075e4b7463b30d23f3ee14aa7e18473d52efaf124f6ab0346b93591b613c6d9339f8f28e6a719b1ef8 SHA512 cdc913d0c78a3a34bd6e4060040fd844f22dbc673330e30769c83e9682a46f3369af8f59bd0c759ddc601de979b13d53e7ed10c54f3b78bdc63afceb484826be
-EBUILD xine-lib-1.2.11-r1.ebuild 5243 BLAKE2B 087b3da9e057005fc7491836360a1138da855307fa6bebeb8bf9ec5758d185765497cb0a43f59055ba8079e6c1a3f77b27cd4bd7e1859d0d2bac3b6512e7e6b3 SHA512 9e851905fe186736f48690183b1c94319d48deff5980a996bca90d123652a3b1830f7a670681ed531c3db52a33b28916acf57f885a23220089e472eb301aa195
-EBUILD xine-lib-1.2.12-r2.ebuild 5454 BLAKE2B c5f54e059986ac814ab073081218514fcce20837ac6b44691f3f68cd3d56de0b7eff4da6c324070515c625960bb5764c4406580787ebad5d71573a72ab356f0a SHA512 f0bdd97575c737b419f1fdf3d73ac42eadb2f17bd3517741b9f525c31b47503676f30dc5709d54bf27daed848a8ed43a20ba4b908d0b11ce824b10b837f72a50
-EBUILD xine-lib-1.2.9999.ebuild 5346 BLAKE2B 3d3b7903e15afae9fd8e3254e161d63888f9e4980c54860c0ecfe226fcbbb766beb5beee9e4e49e803def4997ab0dc131f6a310ccff6c49613d4102e022a5278 SHA512 62284092acf1b12cc05d8cc1ded7c946d2cd78bed0325d60d7a9e757c90bea198d97f9a19aa3b74420c9ae642fb5646dec5089a0a86b7a5d7ba18726357bc4a0
+EBUILD xine-lib-1.2.11-r1.ebuild 5279 BLAKE2B e633122ea0b8054e6bf31243c3aa21d62fe237b2d3215b81869a79688cf7d59aa9718ded6fdb45af4dc9b10b7a3cc6ac58af82f980beb81c9cbf258a756c68ed SHA512 bb7ac4c59028a55ce70650ea6d346a56e5df4b785be9a7b20f1e2f413fb6a88df928d4aa3124ab3a6776be166f75a97cb45e1235be0be6a42d442a93ecf83620
+EBUILD xine-lib-1.2.12-r2.ebuild 5490 BLAKE2B 0d9079bc4c4382ab3a3b077575521292a2ecd27d7e106d6f593bf0b904a9cb41c1749386b0f8d144ee49265d983ac61f038cf5b322e375ebd665ca4208075ee1 SHA512 8326e47ae4f4fa1f4892ce43f7f5c6ebcb70c4438ba6baa293c495c8e9fdbe4893d7e12619dc47f6dde4fa8b433ec90934d52e5723c8d5442329f02f7e7a17b5
+EBUILD xine-lib-1.2.9999.ebuild 5382 BLAKE2B ed262358be6fdf8eba9f224dcc4e42bbaa0d17303656378bd2a2577ef79304e19acdb8f5ee0875962534a4cadc18944b080354adf03d084b71d6427453ca0e95 SHA512 7847d957f3b35f507bba194397cffa798425367d8f6597c61c3669e846968ac3849277ccdfc403706a091c39f8cddcffe0cee4b42fba1d2b343a41b4890160ec
 MISC metadata.xml 2773 BLAKE2B 5f143a245bde88888f0b8e73601f62cfa7e8c23b9ed9c44b6baa13d8f78e8a05aba513996c323ecdcea83c91c938e86ef454571065eb110b11e9ea6285d89231 SHA512 9ed8a950a2c87b1c63ccab900a5cd80b37a0330bd5c859100559c7e8ec68581f7fda45ad6dc01dca98665798265dd0611e2cde4f9e7d2b9bff84249dfe2fd0c2
diff --git a/media-libs/xine-lib/xine-lib-1.2.11-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.11-r1.ebuild
index de062653a998..d6b4b9882a0a 100644
--- a/media-libs/xine-lib/xine-lib-1.2.11-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.11-r1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://xine.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
 
 BDEPEND="
 	app-arch/xz-utils
@@ -162,7 +162,7 @@ src_configure() {
 		$(use_enable a52 a52dec)
 		$(use_enable aac faad)
 		$(use_enable aalib)
-		$(use_enable altivec)
+		$(use_enable cpu_flags_ppc_altivec altivec)
 		$(use_enable bluray)
 		$(use_enable dts)
 		$(use_enable dvb)
diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r2.ebuild b/media-libs/xine-lib/xine-lib-1.2.12-r2.ebuild
index bd9029dfd27e..ea732911944b 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r2.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://xine.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
 
 BDEPEND="
 	app-arch/xz-utils
@@ -168,7 +168,7 @@ src_configure() {
 		$(use_enable a52 a52dec)
 		$(use_enable aac faad)
 		$(use_enable aalib)
-		$(use_enable altivec)
+		$(use_enable cpu_flags_ppc_altivec altivec)
 		$(use_enable bluray)
 		$(use_enable dts)
 		$(use_enable dvb)
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index e9acbf2c1072..b276937acc11 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://xine.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
 
 BDEPEND="
 	app-arch/xz-utils
@@ -163,7 +163,7 @@ src_configure() {
 		$(use_enable a52 a52dec)
 		$(use_enable aac faad)
 		$(use_enable aalib)
-		$(use_enable altivec)
+		$(use_enable cpu_flags_ppc_altivec altivec)
 		$(use_enable bluray)
 		$(use_enable dts)
 		$(use_enable dvb)
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 4a57ef3938e4..0a6e69eeb8ea 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index f3f3f2ad9d8f..85b279d73867 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,5 +1,5 @@
 AUX ardour-6.8-metadata.patch 653 BLAKE2B 3929d825fd8de5205d0f5aa8d0172e6374ca9ffd195789386b756ae540e1842a9902592b8b6d74019c52f134e8cb9886085e23277ef022883c4425dc580c5bc9 SHA512 963f3cfcd00a3fb15cb9875f7fc31a8294058898b6fab94feb32f786369643139b1e8787ecc47a4ea6a33dabe6bd90f564b6009e0d6e482d8e5129534c789972
 DIST Ardour-6.9.0.tar.bz2 12297369 BLAKE2B 62037130b9f2d15a7f527b549c552a281105298dc85e3019d0f7ac09cb791f2b5460c4a7bd2f2098ccade6b87c70a16e6414691d90ec4baafeb6065f26d10a66 SHA512 ace45f5bfe6d0c9e4bb1712ae53ebaee2f15f883045650cae3ddcae251d4fd2f645ba745effb739b47c73a0568ae9e8ae443b711dd610584e04575fd9046b234
-EBUILD ardour-6.9-r1.ebuild 4806 BLAKE2B fd8f17a0c98f99f5e09436e432ba0161e53bd1cf72f684e43d02bc7207b08d71b372c476e501e35c7ea6eef4f236f3b4366cf4e274c32119e3b8320ec627524f SHA512 69626174efa7c1712c9e04bfaf3455ec173891ada40ad6af40ecbed4e7b67261b6c42357e96008e561ff2e9bfc80139b87935627577bdd91426ea0ed88dc39bd
-EBUILD ardour-9999.ebuild 4971 BLAKE2B 47971c41635208d1bc7d9e7675fc0ad97521aed9c3d8ff8b6039fbb49ed6a65aa06b6a00a7a01843f299871d5f21062b16f27c8d3fbaef1aaa57d2c29c48c3f4 SHA512 798d1ee8bfc0515491434d7e68e89552547d1156e7589e1356a4194e7d5df8c7d7ab400029a5841c7438993fb823f7374bb2739b6e6b05feb1ea21c17b2f96e8
+EBUILD ardour-6.9-r1.ebuild 4834 BLAKE2B cabeaa9566c59ea18b5703d03a35abd75b4b4587211100728cf97fd7a9efb8b288e5e5bc6886b5a56cfa27ac13517ff7823640bb79d21dec100c11566911d1c7 SHA512 1b7214218f1300039110c08bea127ceaf733c50023eaa66390c4cb44b00b1307d90dd54ef944ced7fe44f1e23accd63dfbbab9ec9514bace9f2cb2dd8d1350b6
+EBUILD ardour-9999.ebuild 4999 BLAKE2B d88879da572a587222c54e9581cea1acbd0b5e0f7fdaa8af2231ba3af69a14dd9aaa77605fe988464a24e2f90bff9c4c9e92fbc149217a56b2f25d4161f050f3 SHA512 579f48b04011367326a15a53caf5b528b6dc969287b484108f97a80e9bcb2022295cddb55bc35cf84696a6e65b88d7cde4cf3b234f0d29045b5725950c13a75c
 MISC metadata.xml 451 BLAKE2B 0ed571ca79f0d4b92239239982f04abf725365df169290e4a02f6d8f580cf801f70d8bc93414b4549c8172ff43864d5c49fa987caeec58e1b2331ffe01a69ae6 SHA512 504bd817356c7ee57c64193584b3fc5b3bc70f5224d5a531ac5ecf8fb974728639e75b77bb9e7c5ad77cf6099123361b9ec6211b855edb4761acd95b8cb7abcb
diff --git a/media-sound/ardour/ardour-6.9-r1.ebuild b/media-sound/ardour/ardour-6.9-r1.ebuild
index 95a824b4d2d7..e258a1144663 100644
--- a/media-sound/ardour/ardour-6.9-r1.ebuild
+++ b/media-sound/ardour/ardour-6.9-r1.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="6"
-IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+IUSE="doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
 	dev-cpp/glibmm:2
@@ -136,7 +136,7 @@ src_configure() {
 		--noconfirm
 		--optimize
 		--with-backends=${backends}
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+		$({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
 		$(usex doc "--docs" '')
 		$(usex nls "--nls" "--no-nls")
 		$(usex phonehome "--phone-home" "--no-phone-home")
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 4b3a74958f62..9309627c651a 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="7"
-IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+IUSE="doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
 	dev-cpp/glibmm:2
@@ -136,7 +136,7 @@ src_configure() {
 		--noconfirm
 		--optimize
 		--with-backends=${backends}
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+		$({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
 		$(usex doc "--docs" '')
 		$(usex nls "--nls" "--no-nls")
 		$(usex phonehome "--phone-home" "--no-phone-home")
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index 0fd61bd3bf07..5b9c8e4d3280 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -1,4 +1,4 @@
 AUX jack-audio-connection-kit-0.125.0-freebsd.patch 533 BLAKE2B 1e99c1a0f722a2aa94ea5862026b3493a89beb7cb76b444f269c56c47f98d297f15842cf468e81a28014664eb09007e4adb93a4636e955cd690ccc8ac28b140c SHA512 23ff3f34b7891d0725b32faf515a138fd1220199bba6aceebc232a9647be99658f922c6d4a42f1c3b6f98bb9619cf470e2ec213fe906a9189b43163d21f47316
 DIST jack-audio-connection-kit-0.125.0.tar.gz 1217977 BLAKE2B 4037b76a5a6814f30adb4145282e2295bd7b2502934ec7b3cc41ed9bc1a1319855a60d739d72641c0e18a3ee1d8bcb829a637fabf7df7a4525271bff8933f09c SHA512 acdac0588c8a6b79763177677885b6e7bfa8ee3cd9556b33bfe09512bc1191414bb4f97eed62c3c71567b13b4eb69d95ec6b438e5a9d2e22a956c073d500c46f
-EBUILD jack-audio-connection-kit-0.125.0-r1.ebuild 2151 BLAKE2B e1b8b8d6010f4f054faee6ad5ed4b64591a95b18729c6f7cbbf2c1fc62919683bcf9a0589ed7ea9f83cbd5eca7b41f6e2b518d794046f084bb3e0194cfb82d7a SHA512 3fa8131bb43697ebf3c01f85f63b9ed1b4be6e832b5928c3683a26da100ad78f73a8aef5098f24426483003000842fe7ecf3abfcafcba322e6649f8c2afb5a2f
+EBUILD jack-audio-connection-kit-0.125.0-r1.ebuild 2187 BLAKE2B b52f3cb0504bf86f1c65178ed4a63d6b629cd1262303c235b6837562c42148254225591e9ac1cacc1b02f834533e851a316357d8abc1b4f8572c961d22557347 SHA512 5bf3c7139da37aa55a9dd2219998b2105d1677235cf8bb6b3a5cb5d4abf8c1718718b87f9458ecfb87f745a698426b33023e79bfde368df35f460e8beed16266
 MISC metadata.xml 372 BLAKE2B 66c633666e2c8a5b8d8ef71fba7385592793402402a1ae68e056942bb8f42a83db9d040f37bd3bf4ed5b49fa98c5a4cb827e634a0f9eff31f50b9db18e814baa SHA512 b9816869688b653d145e3eb2aee1dcc911ebd292b81855a079104fa0a93306b61cd4658323a1985c8a2c735f6f44b62e8d4a54b1761725d8c66db2bf2ac48025
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
index a01b6111e1c1..af01c2ca271f 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jackaudio/jack1/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse pam"
+IUSE="cpu_flags_ppc_altivec cpu_flags_x86_3dnow alsa coreaudio doc debug examples oss cpu_flags_x86_sse pam"
 
 # readline: only used for jack_transport -> useless for non native ABIs
 # libsndfile: ditto for jackrec
@@ -64,7 +64,7 @@ multilib_src_configure() {
 	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
 
 	econf \
-		$(use_enable altivec) \
+		$(use_enable cpu_flags_ppc_altivec altivec) \
 		$(use_enable alsa) \
 		$(use_enable coreaudio) \
 		$(use_enable debug) \
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index ed6dfbe78e60..cc0d80fff8ee 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 70b24eb29fcc..4810ed566796 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -12,7 +12,7 @@ AUX xinitrc-r1 234 BLAKE2B 0227ea065f1c43e1b2f1583bcbc798db76e9a08d345bbd8ed8837
 DIST mythtv-31.0.tar.gz 102552136 BLAKE2B b09b41230eb2cae19d770c3cc59151863e0a56e95a86627473d52613e62f0acf3bd0c4bb37afb340ab874c222899f9d3c219ded470785d27960db9b39d784ceb SHA512 d53817231409934ef37d12739c38cf6936f04f816b0ba1c9738ce99b5b4ff387c70b683ccd84f649ff2f74992b2158829f5f1d1ffe06c8768da1922b90439f6e
 DIST mythtv-31.0_p20210731.tar.gz 102637029 BLAKE2B 0ca6124d20d428c8b9999813c819c01a97c4806fbd2f70f5b50d698c5f9c3cafd3141ee1379b2b63510705e2083109d91362c3fcc6277f58d461f2138d1604fd SHA512 e262ce91fd8a523daa772d13675ff6639f95202f66be67b2a405e9ea9204d6663128621c5142752f2a889e25cbc8be6d92b3759508767e94207326343a91f092
 DIST mythtv-32.0.tar.gz 115960698 BLAKE2B 3be4106fa2c4fcb95fd5414b347fd6256658566bbb9775ed32cb9686e4a61ecf89e7c684db8d3408292c3737ae6090771862aa65ac0d5d467e90c3a110484898 SHA512 6a1472c954b929319a570d76769ababad43d086d53b6679c9d6da91446677f04b71918b326bb4ff0fc16fbaf7d9a447a86f623a6f1399f9ed29ca86a9782396c
-EBUILD mythtv-31.0-r7.ebuild 12374 BLAKE2B 6c600b224133332d4de4fd514c24fdeac16a3d1da45fd4d9c85a7ce513df68d82454ab1f1cf2fcf472ca73360edbc9bb55bd01522e30b3630c2154b885502fdd SHA512 a6f0dc3c43434779caba73cdd4febd1d579d533607cb9b7088a3c75f6090bb9d2bdf8b6a28552b63055c42cd1f47a255b6ced79da59e4ad7b980a6f2c8a93e4a
-EBUILD mythtv-31.0_p20210731-r2.ebuild 12483 BLAKE2B 447bd3ffe16676ccd8da114e94436f359cc522a6a25334a5548e263e6fe949f6b09e5ef1ba2c95b5b42e81279a18a024c906eb5dbdb3e4ae5f6c95b93e5aa7b4 SHA512 cc3bc0bbae0dc41b56b000cd35a601ba2a3e449c7c2a546af89e004cbb6e88dcfbf165cacc2fcbc4d871dad0bbf6cd44d04bf23a90a0435aa6d15c138a298b6e
-EBUILD mythtv-32.0-r2.ebuild 12192 BLAKE2B e2be66287c7385db08c81cd108c4270d1c2bbb100ccd9f5cd7a421247d989a8f6c994968246639a4eab07dd6f023870c99b31c95c0fceeac5dd7a8921b812351 SHA512 6516854cf09f9784b5b751d95923d5d7b3cdb505fdf9e98cdfd6d0e83cf70014fcfef6e116cdf5560659449090fa10cf0c3805a04d168376addc6f0ac2d9f213
+EBUILD mythtv-31.0-r7.ebuild 12410 BLAKE2B 2faf2bc2a3b59162e82296b6b1b82f5e8b2d87d42ffa0fbade1139028a34781789c116c954f1ca3be803eb02aba47159bab010c4e84fb0b3147802f0f3da47f2 SHA512 4318589286811df97ad1b089b4dd8b1f41d5cfe3fc6c9cc828facf7baa691e2d9e92cc3a618a805e2b449ec3c0117792ddb8ba10499ca03ffa9a5b9c4ea3d5e7
+EBUILD mythtv-31.0_p20210731-r2.ebuild 12519 BLAKE2B 073d3d88acf2ffac14b7d37e44f764b6bc62333ae3efc117df98edaae8c99c43915a9d2b87c68eff3792abe7256f05c0c724cc3e9df13ce6f2ef005e1780bd87 SHA512 bd6b6d23ffcb67ad1501744297929cd107ce217e4b01af3976f88ee37e0d62eff23b317830ae571d574dddfc55b0cf5e2f4b90b921c62ada56d5fa2f41ba5dff
+EBUILD mythtv-32.0-r2.ebuild 12228 BLAKE2B 9457712f14b5dffd9a45ed0f5770a5e5b92724909c4f3078252f42779994b3608d6d8b3d3764110c22778e78682fa45ea75d020d9cebb692900f6a08db45fb65 SHA512 d52ffa9dccd2e2f9909aac885de58bc0fcbdfe1890824902c9b548ed28bf79800f8f1cd4f9b3960085b097f25e4056fbe65d8cb33e74c146ec4604f304852ccd
 MISC metadata.xml 2239 BLAKE2B b8b2c890bec1edfdc46ed53ddfc694af63ed762996759b7dd0a03c0d743874256deb0cae4cad36f9ce28388f349a023528536f828e86e51b93ffdc50597d55d6 SHA512 1b6abf1bafa4a34cc91209b23d8b8957852f7efda3013f2868086faf3d14f28b8c9e84edc1a07f09e952723dc406c5ea8be809935f45750be7155970d165c421
diff --git a/media-tv/mythtv/mythtv-31.0-r7.ebuild b/media-tv/mythtv/mythtv-31.0-r7.ebuild
index ff8b1ff4dbd2..71aff81fa6f6 100644
--- a/media-tv/mythtv/mythtv-31.0-r7.ebuild
+++ b/media-tv/mythtv/mythtv-31.0-r7.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 
 IUSE_INPUT_DEVICES="input_devices_joystick"
 IUSE_VIDEO_CAPTURE_DEVICES="v4l ivtv ieee1394 hdpvr hdhomerun vbox ceton"
-IUSE="alsa altivec asi autostart bluray cdda cdr cec debug dvd dvb egl exif fftw jack java
+IUSE="alsa asi autostart bluray cdda cdr cec cpu_flags_ppc_altivec debug dvd dvb egl exif fftw jack java
 	+lame lcd libass lirc nvdec +opengl oss perl pulseaudio python raw systemd vaapi vdpau vpx
 	+wrapper x264 x265 +xml xmltv +xvid +X zeroconf
 	${IUSE_INPUT_DEVICES} ${IUSE_VIDEO_CAPTURE_DEVICES}"
@@ -256,7 +256,7 @@ src_configure() {
 		myconf+=(--cpu="${i}")
 		break
 	done
-	myconf+=($(use_enable altivec))
+	myconf+=($(use_enable cpu_flags_ppc_altivec altivec))
 
 	# Sound Output Support
 	myconf+=(
diff --git a/media-tv/mythtv/mythtv-31.0_p20210731-r2.ebuild b/media-tv/mythtv/mythtv-31.0_p20210731-r2.ebuild
index 3cc8bb70c1bf..bb31ae3c7fbf 100644
--- a/media-tv/mythtv/mythtv-31.0_p20210731-r2.ebuild
+++ b/media-tv/mythtv/mythtv-31.0_p20210731-r2.ebuild
@@ -26,7 +26,7 @@ SLOT="0"
 
 IUSE_INPUT_DEVICES="input_devices_joystick"
 IUSE_VIDEO_CAPTURE_DEVICES="v4l ivtv ieee1394 hdpvr hdhomerun vbox ceton"
-IUSE="alsa altivec asi autostart bluray cdda cdr cec debug dvd dvb egl exif fftw jack java
+IUSE="alsa asi autostart bluray cdda cdr cec cpu_flags_ppc_altivec debug dvd dvb egl exif fftw jack java
 	+lame lcd libass lirc nvdec +opengl oss perl pulseaudio python raw systemd vaapi vdpau vpx
 	+wrapper x264 x265 +xml xmltv +xvid +X zeroconf
 	${IUSE_INPUT_DEVICES} ${IUSE_VIDEO_CAPTURE_DEVICES}"
@@ -255,7 +255,7 @@ src_configure() {
 		myconf+=(--cpu="${i}")
 		break
 	done
-	myconf+=($(use_enable altivec))
+	myconf+=($(use_enable cpu_flags_ppc_altivec altivec))
 
 	# Sound Output Support
 	myconf+=(
diff --git a/media-tv/mythtv/mythtv-32.0-r2.ebuild b/media-tv/mythtv/mythtv-32.0-r2.ebuild
index fdb61c967c44..a6724f68db8b 100644
--- a/media-tv/mythtv/mythtv-32.0-r2.ebuild
+++ b/media-tv/mythtv/mythtv-32.0-r2.ebuild
@@ -25,7 +25,7 @@ SLOT="0"
 
 IUSE_INPUT_DEVICES="input_devices_joystick"
 IUSE_VIDEO_CAPTURE_DEVICES="v4l ieee1394 hdhomerun vbox ceton"
-IUSE="alsa altivec asi autostart cdda cdr cec debug dvd dvb exif fftw jack java
+IUSE="alsa asi autostart cdda cdr cec cpu_flags_ppc_altivec debug dvd dvb exif fftw jack java
 	+lame lcd libass lirc nvdec +opengl oss perl pulseaudio python raw systemd vaapi vdpau vpx
 	+wrapper x264 x265 +xml xmltv +xvid +X zeroconf
 	${IUSE_INPUT_DEVICES} ${IUSE_VIDEO_CAPTURE_DEVICES}"
@@ -248,7 +248,7 @@ src_configure() {
 		myconf+=(--cpu="${i}")
 		break
 	done
-	myconf+=($(use_enable altivec))
+	myconf+=($(use_enable cpu_flags_ppc_altivec altivec))
 
 	# Sound Output Support
 	myconf+=(
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 3a267a4b2fd1..bc98ce81d8bb 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/matroxset/Manifest b/media-video/matroxset/Manifest
index 926453be7e2f..8ddc67d9ca13 100644
--- a/media-video/matroxset/Manifest
+++ b/media-video/matroxset/Manifest
@@ -1,3 +1,3 @@
 DIST matroxset-0.4.tar.gz 24996 BLAKE2B 849c07f5edfbdd22abf5e11a8acecad1efc505dbb5abf9a735ca92ecb08194e575099ce314c9dfec7c19483c9d6a703a77db97a918ec3dc710e65cba2469d420 SHA512 e313c266331e247fdb790f1fefe58ceeabea5c4dc665f70a53f9318eecda590161b85e1d8804b1d2e14c761afbf58efb719164741cb4a6298de953a62c56da74
-EBUILD matroxset-0.4-r1.ebuild 967 BLAKE2B a6453aa33aefb391206d6641eb8659288d11b74e1799c91c5935e51df96c835f4de4558e3ed965aebb7371f4a46eb782cb20c0ddd4bb7a87e0af3ba1a2e280b1 SHA512 f7706f23de15cb6effbba608eeca9b3bf06c53b2a2e6d71771b28d4f84e4d86450bf85becd591f4841a5b8e216ec79f0649f7cab35208cf1636165843a1da300
+EBUILD matroxset-0.4-r2.ebuild 916 BLAKE2B d9d3108f2c571e289f44c4778525b52426755bf6225abb9d2cf0913e339e0af71aa1d6f0de44cebb9401929b9bd86219532328cde7cdb1bc2f99d9258edb5338 SHA512 297ce4ddc433b468d775e4898784dcc53e09ad3e387a4b799c8e2a3b5e3125902d4cc81d0fc58d0f60c51dc83f2166a9745eaaa2a0b48c595a5c0120085eddae
 MISC metadata.xml 266 BLAKE2B 36614651a4d037c813bf931c79a881ff0f13c4f9ba55f26e1ca09eb7b78840cd8aa087bfbb165e2a4c4188fbc1f96328895272d03c0cb7c955162e39a96e58c6 SHA512 f1e7e0fa3347969a4bf314dc3fe128778b6fbdaa18f24948c56e0564280335b6e5e4683cc5318fd0c60fa76733790a204b491ad0cd9c0b84588ecd6db803c0c6
diff --git a/media-video/matroxset/matroxset-0.4-r1.ebuild b/media-video/matroxset/matroxset-0.4-r2.ebuild
index cb498e31f168..315ff4f04551 100644
--- a/media-video/matroxset/matroxset-0.4-r1.ebuild
+++ b/media-video/matroxset/matroxset-0.4-r2.ebuild
@@ -1,38 +1,29 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit toolchain-funcs
+EAPI=8
+
+inherit edo toolchain-funcs
 
 DESCRIPTION="Matrox utility to switch output modes (activate tvout)"
 HOMEPAGE="ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/"
 SRC_URI="ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-RDEPEND="
-	sys-libs/ncurses:=
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-doecho() {
-	echo "$@"
-	"$@"
-}
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_compile() {
-	doecho $(tc-getCC) -o ${PN} \
+	edo $(tc-getCC) -o ${PN} \
 		${CFLAGS} ${LDFLAGS} \
 		${PN}.c \
-		$($(tc-getPKG_CONFIG) --libs ncurses) \
-		|| die "build failed"
+		$($(tc-getPKG_CONFIG) --libs ncurses)
 
-	#prepare small README
+	# Prepare small README
 	cat >> "${S}"/README << _EOF_
 This utility has been created by Petr Vandrovec
 
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 922764f8a1b0..47a9c0322b23 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -8,6 +8,6 @@ DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e
 DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
 DIST mplayer-1.4-ffmpeg5.patch.bz2 11428 BLAKE2B 2cc9839333161fd00db87b7dd103e10414c910eb5b21b39454daed36440d54f5947216b80ac91947932c760c21c275328b3a642d0a2c8cd6963fe4b7671c9f90 SHA512 61038ad8ef8a55a99dd7e7a20ff38805c86f6a6ecb876261d0e3f4db7f30f36a9dfedbd6c895fd8168fef8833b856b3d3501a89fd041365ba07c81c3ebd36a69
-EBUILD mplayer-1.4-r1.ebuild 16815 BLAKE2B 8a615d5e25d15e114400fc5655c1011dbae4b53136cbec7b195f81d07a13f3705ac2ef859bbcc09719f8ccd16f9a1fa20c56dc1dd51c6cdf53dc0476f879f605 SHA512 b5e770b6b6de4eca6d236fbe4aa531e95cfd77c65f0e3adb9b184a3a1d90bc131a3396b47105062ea4274504969cf33a7c2491eb6df43a94d13fe27b8c7b030f
-EBUILD mplayer-9999.ebuild 16565 BLAKE2B 2d6e90e19c2311a42ba341a72fd9c77f3a6a2d1ed732988e0a473a3e012ebab877bb4eeb36529c025b3351bdde409ff61ff4efe738f413f65838fc67b311af51 SHA512 d28abeb0df72c04f859af33416659f9aaadeb960dc2aa245bd83e4bc08b6bb447806d1f4ff7c3a210b8568e2fad8d2d9f9c567d3c2be2acbe3094d97decac4c0
+EBUILD mplayer-1.4-r1.ebuild 16839 BLAKE2B 271608f9c1dbcdfe78ac9e02c2d054dc7a1f8be1fc8f259b7b70473e995d103cabb771ff7ff26d6c040199e30c5154e6c0b8492c63a7c50d0450a43d043e6175 SHA512 84eaef167fdfca3c1b4e8155375b0ff90016335c2e64c618e9bfb666525b5b5ad178826df8d9ddea871ef6851be04460b8371f2c15e7a112c4801ee5abeb2bab
+EBUILD mplayer-9999.ebuild 16589 BLAKE2B ce429cad3845735ce89a73606aac2ffe7086abff57c2f7916e9cbfee8d757f7a1b2639435fbec08b35b04f3d0e7995a663ecad8183c008724e1acdbae7f3edca SHA512 23a0cf76e0600783c713d7cfdb85ebe9a07c8b920ec749007c7dde710bc4a2d50c91d561c0fb1353b949d19c974cc6ac12b1014547edbb0d1326fa737d243ca5
 MISC metadata.xml 2464 BLAKE2B 417f17be4528c579dc736323ba1f6cb62dd9f9ac27b67286321ec1f2a29b5102e8a8df368c5f3850a885b00472921df2b3e1ec7be40b10d880a1fb03b4b37ba2 SHA512 038c0ef2141c0c822658733499c1779efee751558bd0420314f67e04fd8ed97e4ec3bcb5b12680b9dc72023346b06f8a0b195dd254328caa3b76b2b0daf1adcc
diff --git a/media-video/mplayer/mplayer-1.4-r1.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild
index a6f47c026ec8..732273bcd899 100644
--- a/media-video/mplayer/mplayer-1.4-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.4-r1.ebuild
@@ -9,7 +9,7 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 
 inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
 
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
+IUSE="cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa aqua bidi bl bluray
 bs2b cddb +cdio cdparanoia cpudetection debug dga
 doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
 ftp ggi gsm +iconv ipv6 jack joystick jpeg ladspa
@@ -90,7 +90,7 @@ RDEPEND+="
 	gsm? ( media-sound/gsm )
 	iconv? ( virtual/libiconv )
 	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	ladspa? ( media-libs/ladspa-sdk )
 	libass? ( >=media-libs/libass-0.9.10:= )
 	libcaca? ( media-libs/libcaca )
@@ -454,10 +454,9 @@ src_configure() {
 		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
 	done
 
-	uses="altivec shm"
-	for i in ${uses}; do
-		myconf+=" $(use_enable ${i})"
-	done
+	myconf+="
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable shm)"
 
 	use debug && myconf+=" --enable-debug=3"
 
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 247a9c42852a..e07e9e46bd59 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -9,7 +9,7 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 
 inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
 
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
+IUSE="cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa aqua bidi bl bluray
 bs2b cddb +cdio cdparanoia cpudetection debug dga
 doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
 ftp ggi gsm +iconv ipv6 jack joystick jpeg ladspa
@@ -89,7 +89,7 @@ RDEPEND+="
 	gsm? ( media-sound/gsm )
 	iconv? ( virtual/libiconv )
 	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	ladspa? ( media-libs/ladspa-sdk )
 	libass? ( >=media-libs/libass-0.9.10:= )
 	libcaca? ( media-libs/libcaca )
@@ -448,10 +448,9 @@ src_configure() {
 		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
 	done
 
-	uses="altivec shm"
-	for i in ${uses}; do
-		myconf+=" $(use_enable ${i})"
-	done
+	myconf+="
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable shm)"
 
 	use debug && myconf+=" --enable-debug=3"
 
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index e62fdb973ede..82e2dd477725 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -4,5 +4,5 @@ AUX transcode-1.1.7-swresample.patch 674 BLAKE2B 733a3490d2a25b20555cce3624f8e17
 DIST transcode-1.1.7-ffmpeg4.patch.xz 4880 BLAKE2B 92bf63ba3f9cb69aff3cdc0f7250da0452f8bc0977010d024bbd8bbf9f66b86fb31e819ec3d1069e9176fdb58cba6ec510b866ddc44a65fd252f175cc567807a SHA512 8c44fd1b78dbbafbbef090d6115bbe086605f1d5b5286eba83d9c7c0d5457af286cb5d61ab6d260380694b6b3636f751709476915dcab5cc3109dc868785f424
 DIST transcode-1.1.7-patchset.tar.bz2 16379 BLAKE2B fbdc188bffeb8751814abfa7e119a1053e482f194bc1b87a721c48e2b66e107df146d38b3ea11a88d066c49d8862489b88b74f61fa36ce3f8a1a782da3762615 SHA512 bedc82aa4fbc17774e34d8fc24799d70b8460c6c1dd728549bcaa5c387492f56e520674fdf8bb976c0b5fcc9ccefb765f2ee26816e0d2b96a83402a21cee3f6d
 DIST transcode-1.1.7.tar.bz2 2183627 BLAKE2B 25001d4cae83d86e5295917bcd9e2e77dd61637e238394a2d603398baf810201dc61d8b0de5b54a7b8848ac3bcef5fb211e8f2b43ed7da4e56e335b8d4d2fbe1 SHA512 d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f
-EBUILD transcode-1.1.7-r6.ebuild 4313 BLAKE2B 1822ddd4c060f88ea9bd9f29079fd2330dd7cb14c628bdc1fac85f8fdf3af3e0998808470f89c100836c2950cf3410f3d6c1596ac9d0353f5d30a67b496fc2f6 SHA512 e6f1f80923caff6c4ec37a2cc78d33395503b027a2e622d1d15f0716dde061def22cc6fe574060bad97334714a51b4e5a23463703fa09c237e19d69690a90c9d
+EBUILD transcode-1.1.7-r6.ebuild 4360 BLAKE2B 207a7382b55d568e04d2e56498fcb28be1b0de21c6b7d55c0adec6dff1cac71ba886f62302e19b504752896428ea5e833c87d3aa8e5b1e6f4ea7575690deaa68 SHA512 9f13454e20de67b81abf34bda1fc9a32d2edf909684892abedfa3e32a69ad7c394accc5a3bdb9b196806286f887bbd954ad163ba726f740d82952ac8280bf63d
 MISC metadata.xml 620 BLAKE2B 7d36a7aa64fe84070dadb59d69180050132d21c3fae55c15f050e559c7d030a64235c8cbdb0cc5d4a0c6a68a51d98c39e3f4c4ee28ca70baee233e1a9922e219 SHA512 b4660c17ea9cdc71082dc5e05872148ba5e25d2382fc89172996bba4b2b5ee283152d376b9d64a77d84639945806e28f261345a96b1e651e3d1dc01e7ca68f51
diff --git a/media-video/transcode/transcode-1.1.7-r6.ebuild b/media-video/transcode/transcode-1.1.7-r6.ebuild
index 2c446a83b2d3..ba7343990bf2 100644
--- a/media-video/transcode/transcode-1.1.7-r6.ebuild
+++ b/media-video/transcode/transcode-1.1.7-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.bitbucket.org/france/${PN}-tcforge/downloads/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm64 ppc ppc64 ~riscv sparc x86"
-IUSE="cpu_flags_x86_3dnow a52 aac alsa altivec dv dvd +iconv imagemagick jpeg lzo mjpeg cpu_flags_x86_mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl cpu_flags_x86_sse cpu_flags_x86_sse2 theora truetype v4l vorbis X x264 xml xvid"
+IUSE="cpu_flags_ppc_altivec cpu_flags_x86_3dnow a52 aac alsa dv dvd +iconv imagemagick jpeg lzo mjpeg cpu_flags_x86_mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl cpu_flags_x86_sse cpu_flags_x86_sse2 theora truetype v4l vorbis X x264 xml xvid"
 
 REQUIRED_USE="
 	cpu_flags_x86_sse? ( cpu_flags_x86_mmx )
@@ -32,7 +32,7 @@ RDEPEND="
 	dvd? ( media-libs/libdvdread:0= )
 	iconv? ( virtual/libiconv )
 	imagemagick? ( media-gfx/imagemagick:= )
-	jpeg? ( virtual/jpeg:0= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	lzo? ( >=dev-libs/lzo-2 )
 	mjpeg? ( media-video/mjpegtools:= )
 	mp3? ( media-sound/lame )
@@ -99,11 +99,11 @@ src_configure() {
 	use x86 && myconf="$(use_enable !pic x86-textrels)" # bug 271476
 
 	local myeconfargs=(
+		$(use_enable cpu_flags_ppc_altivec altivec)
 		$(use_enable cpu_flags_x86_mmx mmx)
 		$(use_enable cpu_flags_x86_3dnow 3dnow)
 		$(use_enable cpu_flags_x86_sse sse)
 		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable altivec)
 		$(use_enable v4l libv4l2)
 		$(use_enable v4l libv4lconvert)
 		$(use_enable mpeg libmpeg2)
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 3e9ec3608c86..1d72ea0df915 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 4191176da359..be3716e8bb52 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 15 Jul 2022 05:39:50 +0000
+Fri, 15 Jul 2022 11:39:54 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index f4d4d64e5994..cef47d0b177c 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 518604 BLAKE2B 771190ff87bcfe6702a19150591bf573a429c51546ab7bd3ae25f101a4ec657d93d6fb83f7cb3aa4055e581eab5fde9d88a73a604dc34f426cb30ebb4385af9b SHA512 0b5d0f14e5d6ec3ff896d9d472edea00620a08f552ffc5516b0264e609527cf65471ee37a5002559add52d5c1898b2b60d48c9e97e6d2451bd84bf24fd112ab4
-TIMESTAMP 2022-07-15T05:39:54Z
+TIMESTAMP 2022-07-15T11:39:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLQ/apfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLRUg9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBvqhAArw3zI9AlWU8XS18/z+VvhG7EENULmSDrKRGTG45X7FFaxoDrh4SPsKVa
-9KG19mkhmjWGkr0cA7MBE4lRa3IlW1bWAV6QRQYNRnn+3eNKD2cEvk696dfqGCP4
-B36sTqkmiR6E6oGvQggWUfH8uKN26Af6NLJ/sOvv7AcqE6ENz0kCet/Zyvf1K95/
-TohlT+5VvUy6xvBQRBz1H5b6Ubj0R3pgrlDXQmErSzwUhwMkcWyZkcXWRuHje9Gh
-b2UQQ9c89LT0g36B4IUUbn41VoHljowQ0tVKy2w9Yd/OB01i1lSDu9q1wPaxIOoj
-nevMDBaEOTjdDSszFABRAdqE/3mESzHYUA0UTs0+CWNRINhTYD4NuOKGPTAgqZ8/
-lWzSz5vcWndq7WJF+lfUsGHnu7BiEq1MUgkCr5lJuq/+4KHNye90k6dFop8QYq4l
-/gfw+SxDm3Tgs2ifA1Qa9OFUdMGrpEIERJtM6svD2UgQe0QGAVx91msdHPphSx0y
-wvq7QL8DDAGX/DrGov4Jq8GUSBDYzD6fwBKtpxXy9HLGozKQy7oDyc8srvV1yr5f
-8y7wrvFgpRiELDrGHP4fxt5g0Lp8nwpESXc2OFcYwridXAvIx0lkq59NEM8kWU/h
-cjuIeX9jRvDqYFRdOWNM215mE7lYzn8P5I2gX6nffcWb4PHwR7M=
-=1rVU
+klBEJQ//f39+x7hu3OcbQAlzc52I63gfAbv2/ek03dtxkGKKM4c8JIGObN4NB4z2
+CxJCnRvQAVakAy3r/zEpjgCnWNS9QO1unJyr3IA6kNyK/9vUV7HYaqDSqWQ4js04
+GlS+OKhvqUF6lmbktUu4o90zkQ9fi2guBq9bO4ul+fBb5KkV4LZBDLUhLxZ6kipG
+3iRSJT0FjtA0n6VF5HmG/OIB9EMXLYtoZFHwCEi9hR/Te5J2Za9lrxsKky6qlgkY
+ZLb/ejAvddir0LGE2DZebS2peef/nuhCbD55A+GiIP8j+KEmJZxKiYNwS6OYDQhK
+3adWvw1ktlN+eOYEuTIKfqVQVWrbnvDSlG/dfdq4J1F7x8fIXUqpJFohqV9UB3XP
+Sv2eEmBcr4AnweLzrp4Y0OxIMiNsHMbzB0dzKm7gDhju7R5otFOh8UUSY8IRs1Cw
+yBR09nGNDTXRTTh3EFBb0wuhDr3SnLdiFQ4pycZkVB/llQYeKERM/9yKXZ0mx/U7
+mz1CEWHaAJ9Ji312D0kkAu88WUn0d6FPYz1UtqP2lZQ0idZKYl7PEYRnMEf+lRRd
+aoTydFtUpJmKUjPIN2nv/DOrXnMlDBhC/jgo+sqC9kI7vfDOZcHvfuS5MlqYw4lK
+2+NcCl0CvmDZWa1XQAP48QFGr7A7SGava76Ti07/fDb5L1O9LZA=
+=ydh/
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 4fb94070b8f3..94746d66dea9 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 15 Jul 2022 05:39:51 +0000
+Fri, 15 Jul 2022 11:39:55 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index b1b208bf3fc3..7eb2e5b73dbc 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 cfa26d226f20..82fb6ab752d4 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.30 b/metadata/md5-cache/app-admin/awscli-1.25.30
new file mode 100644
index 000000000000..12faa5d21c63
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.25.30
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.30[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.6.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(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[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(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+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.27.30[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.6.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(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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.25.30.tar.gz -> aws-cli-1.25.30.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=0fd6a2cdd4f5b854d8449e5fd0580e2b
diff --git a/metadata/md5-cache/app-admin/logrotate-3.20.1-r1 b/metadata/md5-cache/app-admin/logrotate-3.20.1-r1
index 546f0f3cff37..f5e931aaeb47 100644
--- a/metadata/md5-cache/app-admin/logrotate-3.20.1-r1
+++ b/metadata/md5-cache/app-admin/logrotate-3.20.1-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/logrotate/logrotate
 INHERIT=systemd tmpfiles verify-sig
 IUSE=acl +cron selinux verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/logrotate/logrotate/releases/download/3.20.1/logrotate-3.20.1.tar.xz verify-sig? ( https://github.com/logrotate/logrotate/releases/download/3.20.1/logrotate-3.20.1.tar.xz.asc )
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=5f2946025e131eb4aa24308170110e03
+_md5_=cac4ae8bca16606c61c380fced25020f
diff --git a/metadata/md5-cache/app-admin/logstash-bin-6.8.23 b/metadata/md5-cache/app-admin/logstash-bin-6.8.23
deleted file mode 100644
index 6bbb0ccb015c..000000000000
--- a/metadata/md5-cache/app-admin/logstash-bin-6.8.23
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Tool for managing events and logs
-EAPI=7
-HOMEPAGE=https://www.elastic.co/products/logstash
-INHERIT=java-pkg-2
-IUSE=x-pack
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 MIT x-pack? ( Elastic )
-RDEPEND=acct-group/logstash acct-user/logstash virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
-RESTRICT=strip
-SLOT=0
-SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-6.8.23.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-6.8.23.tar.gz )
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=91ab3a09e4966e2a55f022623969c834
diff --git a/metadata/md5-cache/app-admin/logstash-bin-7.17.3 b/metadata/md5-cache/app-admin/logstash-bin-7.17.5
index be14a8fe2140..1b197f7d57b4 100644
--- a/metadata/md5-cache/app-admin/logstash-bin-7.17.3
+++ b/metadata/md5-cache/app-admin/logstash-bin-7.17.5
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install postinst preinst prepare setup
 DEPEND=>=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Tool for managing events and logs
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.elastic.co/products/logstash
 INHERIT=java-pkg-2
 IUSE=x-pack
@@ -10,6 +10,6 @@ LICENSE=Apache-2.0 MIT x-pack? ( Elastic )
 RDEPEND=acct-group/logstash acct-user/logstash virtual/jre >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip
 SLOT=0
-SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-7.17.3-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-7.17.3-linux-x86_64.tar.gz )
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-7.17.5-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-7.17.5-linux-x86_64.tar.gz )
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=d318db48307d56b673819e276a1a9f41
+_md5_=ae97e098897e2d4a03e368c3952b4dda
diff --git a/metadata/md5-cache/app-admin/needrestart-3.6 b/metadata/md5-cache/app-admin/needrestart-3.6
index 0a6130fdb168..c62f229ad1cc 100644
--- a/metadata/md5-cache/app-admin/needrestart-3.6
+++ b/metadata/md5-cache/app-admin/needrestart-3.6
@@ -3,9 +3,9 @@ DEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Modul
 DESCRIPTION=Restart daemons after library updates
 EAPI=8
 HOMEPAGE=https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers amd64? ( sys-apps/iucode_tool ) x86? ( sys-apps/iucode_tool )
 SLOT=0
 SRC_URI=https://github.com/liske/needrestart/archive/v3.6.tar.gz -> needrestart-3.6.tar.gz
-_md5_=5e5aa6ec2fc4a3b37a8e519d97b42063
+_md5_=dfa7e450eb3f42f02acab4accf648821
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 547b2bf02470..3c7d48092b47 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/gpgme-1.16.0 b/metadata/md5-cache/app-crypt/gpgme-1.16.0
deleted file mode 100644
index f44b6c12a3ae..000000000000
--- a/metadata/md5-cache/app-crypt/gpgme-1.16.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python? ( dev-lang/swig ) verify-sig? ( sec-keys/openpgp-keys-gnupg ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error-1.36:= python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) qt5? ( dev-qt/qtcore:5 ) qt5? ( dev-qt/qttest:5 )
-DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
-EAPI=7
-HOMEPAGE=http://www.gnupg.org/related_software/gpgme
-INHERIT=distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs verify-sig
-IUSE=common-lisp static-libs +cxx python qt5 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error-1.36:= python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) qt5? ( dev-qt/qtcore:5 )
-REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
-SLOT=1/11
-SRC_URI=mirror://gnupg/gpgme/gpgme-1.16.0.tar.bz2 verify-sig? ( mirror://gnupg/gpgme/gpgme-1.16.0.tar.bz2.sig )
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	qmake-utils	59420c906278d16deaaa629f9d115707	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=38f067491c0de38d1ae449a9fb34051b
diff --git a/metadata/md5-cache/app-crypt/tpm2-tools-5.2-r1 b/metadata/md5-cache/app-crypt/tpm2-tools-5.2-r1
index 8b8c80ee682b..6b9a1a921ff6 100644
--- a/metadata/md5-cache/app-crypt/tpm2-tools-5.2-r1
+++ b/metadata/md5-cache/app-crypt/tpm2-tools-5.2-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/tpm2-software/tpm2-tools
 INHERIT=autotools bash-completion-r1 python-any-r1
 IUSE=+fapi test
-KEYWORDS=~amd64 arm arm64 ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=BSD
 RDEPEND=>=app-crypt/tpm2-tss-3.0.1:=[fapi?] dev-libs/openssl:= net-misc/curl sys-libs/efivar:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tpm2-software/tpm2-tools/releases/download/5.2/tpm2-tools-5.2.tar.gz
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=a355df7300ed19a6781ac929c9ce9db7
+_md5_=c823c8e3dfc4a7898ee5042896979b48
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 86de3873260d..7b11fa1aa146 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/neovim-0.7.2 b/metadata/md5-cache/app-editors/neovim-0.7.2
index 8a80a08993c8..df3e4b61181b 100644
--- a/metadata/md5-cache/app-editors/neovim-0.7.2
+++ b/metadata/md5-cache/app-editors/neovim-0.7.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://neovim.io
 INHERIT=cmake lua-single optfeature xdg
 IUSE=+lto +nvimpager test +tui lua_single_target_luajit lua_single_target_lua5-1
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
+KEYWORDS=~amd64 ~arm arm64 ~riscv ~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-1.43.0[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-1.44.1:= >=dev-libs/libvterm-0.1.4 >=dev-libs/msgpack-3.0.0:= >=dev-libs/tree-sitter-0.20.6:= tui? ( >=dev-libs/libtermkey-0.22 >=dev-libs/unibilium-2.0.0:0= ) app-eselect/eselect-vi
 REQUIRED_USE=test? ( lua_single_target_luajit )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/neovim/neovim/archive/v0.7.2.tar.gz -> neovim-0.7.2.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e9c040fcfb8c55cb149661394e0a1817
+_md5_=5b454fc9e49f707a41c984e7d02560db
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index f82c10f0fec1..8543434a84ad 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 ee0bde80c9f2..64ade25d53cf 100644
--- a/metadata/md5-cache/app-misc/abduco-0.6
+++ b/metadata/md5-cache/app-misc/abduco-0.6
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst prepare test
 DESCRIPTION=lightweight session manager with {de,at}tach support
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.brain-dump.org/projects/abduco/
 INHERIT=savedconfig toolchain-funcs
 IUSE=savedconfig
@@ -9,4 +9,4 @@ LICENSE=ISC
 SLOT=0
 SRC_URI=https://www.brain-dump.org/projects/abduco/abduco-0.6.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	portability	d33a77692bb47e8227f27e17fb9c3c05	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=4a1fb3798996b45f55cb8dbb1865698c
+_md5_=d82d8df6fba5f628f144a1cfca5f328a
diff --git a/metadata/md5-cache/app-misc/astrolog-7.40 b/metadata/md5-cache/app-misc/astrolog-7.40
index 213954d6479c..cce37c0f0dd7 100644
--- a/metadata/md5-cache/app-misc/astrolog-7.40
+++ b/metadata/md5-cache/app-misc/astrolog-7.40
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.astrolog.org/astrolog.htm
 INHERIT=toolchain-funcs
 IUSE=X
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ppc64 x86
 LICENSE=astrolog
 RDEPEND=X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=https://www.astrolog.org/ftp/ast74src.zip
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=78fcb8071746e5e92c11c0764e4ba6aa
+_md5_=56a582fbbe72c5d4ea42a92f12574281
diff --git a/metadata/md5-cache/app-misc/astrolog-ephemeris-7.40 b/metadata/md5-cache/app-misc/astrolog-ephemeris-7.40
index 4e7bf71cbe7b..7bb792ec8727 100644
--- a/metadata/md5-cache/app-misc/astrolog-ephemeris-7.40
+++ b/metadata/md5-cache/app-misc/astrolog-ephemeris-7.40
@@ -3,9 +3,9 @@ DEFINED_PHASES=install
 DESCRIPTION=ephemeris files for optional extended accuracy of astrolog's calculations
 EAPI=8
 HOMEPAGE=https://www.astrolog.org/astrolog.htm
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ppc64 x86
 LICENSE=astrolog
 RDEPEND=app-misc/astrolog
 SLOT=0
 SRC_URI=https://www.astrolog.org/ftp/ephem/ephemall.zip
-_md5_=38cf0c0db33aef5b5af7cd1302c2d082
+_md5_=b6ea5d0877ef87a8b3014b79f853a27d
diff --git a/metadata/md5-cache/app-misc/elasticsearch-7.17.5 b/metadata/md5-cache/app-misc/elasticsearch-7.17.5
new file mode 100644
index 000000000000..418b110b4a0c
--- /dev/null
+++ b/metadata/md5-cache/app-misc/elasticsearch-7.17.5
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=Free and Open, Distributed, RESTful Search Engine
+EAPI=8
+HOMEPAGE=https://www.elastic.co/elasticsearch/
+INHERIT=systemd tmpfiles
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 Elastic-2.0 LGPL-3 MIT public-domain
+RDEPEND=acct-group/elasticsearch acct-user/elasticsearch sys-libs/zlib virtual/jre virtual/tmpfiles
+SLOT=0
+SRC_URI=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.17.5-no-jdk-linux-x86_64.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=94bc7db8aa23b93119ee8a1ba5ab638e
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 6d6f64256fd6..23f28cee3c64 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/unoconv-0.9.0 b/metadata/md5-cache/app-office/unoconv-0.9.0
deleted file mode 100644
index e20e00b0e3b6..000000000000
--- a/metadata/md5-cache/app-office/unoconv-0.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DESCRIPTION=Convert between document formats supported by LibreOffice
-EAPI=7
-HOMEPAGE=http://dag.wiee.rs/home-made/unoconv/
-INHERIT=python-single-r1
-IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) !app-text/odt2txt virtual/ooo
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/dagwieers/unoconv/archive/0.9.0.tar.gz -> unoconv-0.9.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=b4e0bc5221d056878416cf3824faf9d4
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index a2de48ecc74e..44a6a101c6bf 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/mysql-connector-c-8.0.27-r1 b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.27-r1
new file mode 100644
index 000000000000..cacf8c149e6f
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.27-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-arch/lz4-0_p131:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( dev-libs/cyrus-sasl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=C client library for MariaDB/MySQL
+EAPI=7
+HOMEPAGE=https://dev.mysql.com/downloads/
+INHERIT=cmake-multilib flag-o-matic
+IUSE=ldap static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-arch/lz4-0_p131:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( dev-libs/cyrus-sasl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<dev-db/mysql-5.6.45-r1 !=dev-db/mysql-5.7.23* !=dev-db/mysql-5.7.24* !=dev-db/mysql-5.7.25* !=dev-db/mysql-5.7.26-r0 !=dev-db/mysql-5.7.27-r0 !<dev-db/percona-server-5.7.26.29-r1
+SLOT=0/21
+SRC_URI=https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-8.0.27.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a257af84439a424da322fa3ccaddb1a3
diff --git a/metadata/md5-cache/dev-db/sqldeveloper-21.4.3.063.0100 b/metadata/md5-cache/dev-db/sqldeveloper-22.2.0.173.2018
index 1bdc2b96b544..5eb9fa278304 100644
--- a/metadata/md5-cache/dev-db/sqldeveloper-21.4.3.063.0100
+++ b/metadata/md5-cache/dev-db/sqldeveloper-22.2.0.173.2018
@@ -8,9 +8,9 @@ INHERIT=desktop java-pkg-2
 IUSE=mssql mysql postgres sybase
 KEYWORDS=-* ~amd64
 LICENSE=OTN
-RDEPEND=<dev-java/openjdk-17:*[javafx] >=virtual/jre-1.8:* mssql? ( dev-java/jtds:1.3 ) mysql? ( dev-java/jdbc-mysql:0 ) postgres? ( dev-java/jdbc-postgresql:0 ) sybase? ( dev-java/jtds:1.3 ) >=dev-java/java-config-2.2.0-r3
+RDEPEND=dev-java/openjdk:11[javafx] virtual/jre:11 mssql? ( dev-java/jtds:1.3 ) mysql? ( dev-java/jdbc-mysql:0 ) postgres? ( dev-java/jdbc-postgresql:0 ) sybase? ( dev-java/jtds:1.3 ) >=dev-java/java-config-2.2.0-r3
 RESTRICT=bindist fetch
 SLOT=0
-SRC_URI=sqldeveloper-21.4.3.063.0100-no-jre.zip
+SRC_URI=sqldeveloper-22.2.0.173.2018-no-jre.zip
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=73c15614648a6ca6b387de4742d83a5f
+_md5_=13a320b78401cb5abd90aa1f95eb61b0
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 02a035e20429..5bbfc4cf0596 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/python-3.11.0_beta4-r1 b/metadata/md5-cache/dev-lang/python-3.11.0_beta4-r2
index 8bb1c22c3f11..a62d989c7087 100644
--- a/metadata/md5-cache/dev-lang/python-3.11.0_beta4-r1
+++ b/metadata/md5-cache/dev-lang/python-3.11.0_beta4-r2
@@ -1,5 +1,5 @@
 BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.11
 SRC_URI=https://www.python.org/ftp/python/3.11.0/Python-3.11.0b4.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.11.0b4.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.11.0/Python-3.11.0b4.tar.xz.asc )
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9e33e79c53511d8c351e8b8212e9ff8b
+_md5_=f307f2bd5dd3412b65112c15eb402498
diff --git a/metadata/md5-cache/dev-lang/zig-9999 b/metadata/md5-cache/dev-lang/zig-9999
index ff8b8cfa4a50..86ad6454d4b4 100644
--- a/metadata/md5-cache/dev-lang/zig-9999
+++ b/metadata/md5-cache/dev-lang/zig-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=sys-devel/clang:13 >=sys-devel/lld-13 <sys-devel/lld-14 sys-devel/llvm:13[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] !!sys-devel/llvm:0
+DEPEND=sys-devel/clang:14 >=sys-devel/lld-14 <sys-devel/lld-15 sys-devel/llvm:14 >=sys-libs/zlib-1.2.12 !!sys-devel/llvm:0
 DESCRIPTION=A robust, optimal, and maintainable programming language
 EAPI=8
 HOMEPAGE=https://ziglang.org/
@@ -8,8 +8,8 @@ INHERIT=cmake llvm check-reqs git-r3
 IUSE=test +stage2 +threads
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=sys-devel/clang:13 >=sys-devel/lld-13 <sys-devel/lld-14 sys-devel/llvm:13[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]
+RDEPEND=sys-devel/clang:14 >=sys-devel/lld-14 <sys-devel/lld-15 sys-devel/llvm:14 >=sys-libs/zlib-1.2.12
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=17d2455db04c98c52a867207add71917
+_md5_=b8434520ec10ec0acb606eb736b838b3
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 46f0f9f52aca..3c0f7867570f 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/OpenNI2-2.2_beta2-r1 b/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2-r1
index 65f7472c4e79..18dec9fb175b 100644
--- a/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2-r1
+++ b/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 opengl? ( media-libs/freeglut ) java? ( virtual/jre:1.8 ) doc? ( app-doc/doxygen ) java? ( virtual/jdk:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=media-libs/libjpeg-turbo:= virtual/libusb:1 virtual/libudev opengl? ( media-libs/freeglut ) java? ( virtual/jre:1.8 ) doc? ( app-doc/doxygen ) java? ( virtual/jdk:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=OpenNI2 SDK
 EAPI=7
 HOMEPAGE=https://structure.io/openni
-INHERIT=toolchain-funcs multilib java-pkg-opt-2 flag-o-matic
-IUSE=doc java neon opengl static-libs java
+INHERIT=toolchain-funcs java-pkg-opt-2
+IUSE=cpu_flags_arm_neon doc java opengl static-libs java
 KEYWORDS=amd64 ~arm
 LICENSE=Apache-2.0
-RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 opengl? ( media-libs/freeglut ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=media-libs/libjpeg-turbo:= virtual/libusb:1 virtual/libudev opengl? ( media-libs/freeglut ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/occipital/OpenNI2/archive/2.2-beta2.tar.gz -> OpenNI2-2.2_beta2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1ecb64d91da654c0d919ed18ffccecf2
+_eclasses_=java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=9ffbeab1281d714e904c928157eda3d7
diff --git a/metadata/md5-cache/dev-libs/OpenNI2-9999 b/metadata/md5-cache/dev-libs/OpenNI2-9999
index b8351e672236..e91de02cce40 100644
--- a/metadata/md5-cache/dev-libs/OpenNI2-9999
+++ b/metadata/md5-cache/dev-libs/OpenNI2-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 opengl? ( media-libs/freeglut ) java? ( virtual/jre:1.8 ) doc? ( app-doc/doxygen ) java? ( virtual/jdk:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=media-libs/libjpeg-turbo:= virtual/libusb:1 virtual/libudev opengl? ( media-libs/freeglut ) java? ( virtual/jre:1.8 ) doc? ( app-doc/doxygen ) java? ( virtual/jdk:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=OpenNI2 SDK
 EAPI=7
 HOMEPAGE=https://structure.io/openni
-INHERIT=git-r3 toolchain-funcs multilib java-pkg-opt-2 flag-o-matic
-IUSE=doc java neon opengl static-libs java
+INHERIT=git-r3 toolchain-funcs java-pkg-opt-2
+IUSE=cpu_flags_arm_neon doc java opengl static-libs java
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 opengl? ( media-libs/freeglut ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=media-libs/libjpeg-turbo:= virtual/libusb:1 virtual/libudev opengl? ( media-libs/freeglut ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=21a62bd7506e946145177b606b781960
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=44604fc0e0803cfca4c8d48e7ac10456
diff --git a/metadata/md5-cache/dev-libs/botan-2.19.2 b/metadata/md5-cache/dev-libs/botan-2.19.2
index 6b66a619470f..ff3e58663604 100644
--- a/metadata/md5-cache/dev-libs/botan-2.19.2
+++ b/metadata/md5-cache/dev-libs/botan-2.19.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://botan.randombit.net/
 INHERIT=edo python-r1 toolchain-funcs verify-sig
 IUSE=doc boost bzip2 lzma python static-libs sqlite test tools zlib cpu_flags_arm_aes cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_aes cpu_flags_x86_avx2 cpu_flags_x86_popcnt cpu_flags_x86_rdrand cpu_flags_x86_sha cpu_flags_x86_sse2 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~ppc-macos
 LICENSE=BSD-2
 RDEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2/2.19
 SRC_URI=https://botan.randombit.net/releases/Botan-2.19.2.tar.xz verify-sig? ( https://botan.randombit.net/releases/Botan-2.19.2.tar.xz.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=3544f6ab6b4ec3dbbc085ac41341dc63
+_md5_=3f93af111bbd5ae8f6239c2b11c6a1e4
diff --git a/metadata/md5-cache/dev-libs/libmpack-1.0.5-r2 b/metadata/md5-cache/dev-libs/libmpack-1.0.5-r2
index 4438cc6f6708..d7cc9fdd8217 100644
--- a/metadata/md5-cache/dev-libs/libmpack-1.0.5-r2
+++ b/metadata/md5-cache/dev-libs/libmpack-1.0.5-r2
@@ -3,9 +3,9 @@ DESCRIPTION=Simple implementation of msgpack in C
 EAPI=8
 HOMEPAGE=https://github.com/libmpack/libmpack
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/libmpack/libmpack/archive/1.0.5.tar.gz -> libmpack-1.0.5.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=c65266876b94ed6026ca935c561866ee
+_md5_=3db2ebdda16bff81a69f6bbe7bd0e4bf
diff --git a/metadata/md5-cache/dev-libs/libtermkey-0.22 b/metadata/md5-cache/dev-libs/libtermkey-0.22
index 46e1a1bc3557..0c84da1e5ac3 100644
--- a/metadata/md5-cache/dev-libs/libtermkey-0.22
+++ b/metadata/md5-cache/dev-libs/libtermkey-0.22
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=http://www.leonerd.org.uk/code/libtermkey/
 INHERIT=flag-o-matic
 IUSE=demos static-libs
-KEYWORDS=amd64 arm ~arm64 ~riscv x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~riscv x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-libs/unibilium:=
 SLOT=0
 SRC_URI=http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=54171f714b6dcb95abc962ef93fc2129
+_md5_=8527f763abb851d66254df95c64e6b0b
diff --git a/metadata/md5-cache/dev-libs/libvterm-0.1.4 b/metadata/md5-cache/dev-libs/libvterm-0.1.4
index c94960c71435..1ac4d5177306 100644
--- a/metadata/md5-cache/dev-libs/libvterm-0.1.4
+++ b/metadata/md5-cache/dev-libs/libvterm-0.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=An abstract library implementation of a VT220/xterm/ECMA-48 terminal
 EAPI=8
 HOMEPAGE=https://www.leonerd.org.uk/code/libvterm/
 INHERIT=flag-o-matic toolchain-funcs
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~riscv x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=!dev-libs/libvterm-neovim
 SLOT=0
 SRC_URI=https://www.leonerd.org.uk/code/libvterm/libvterm-0.1.4.tar.gz
 _eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=858f920693f50175861b4a55da4e7c57
+_md5_=7f6a6e0c9ea9bf7cc0aeb1093920b88e
diff --git a/metadata/md5-cache/dev-libs/msgpack-3.3.0 b/metadata/md5-cache/dev-libs/msgpack-3.3.0
index 8f61692ff1e2..903e76d1a544 100644
--- a/metadata/md5-cache/dev-libs/msgpack-3.3.0
+++ b/metadata/md5-cache/dev-libs/msgpack-3.3.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://msgpack.org/ https://github.com/msgpack/msgpack-c/
 INHERIT=cmake-multilib
 IUSE=boost +cxx doc examples static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Boost-1.0
 RDEPEND=boost? ( dev-libs/boost[context,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-3.3.0/msgpack-3.3.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=73a5c33436f466b2a971391fc922a3cf
+_md5_=9ab49270a9de0882906f1d99fa3ddbab
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1q b/metadata/md5-cache/dev-libs/openssl-1.1.1q
index c630e24b4712..9c61f75d984b 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1q
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1q
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.openssl.org/
 INHERIT=edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
 IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~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 ~loong ~m68k ~mips 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=openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<net-misc/openssh-8.0_p1-r3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.1
 SRC_URI=mirror://openssl/source/openssl-1.1.1q.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1q.tar.gz.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=71afdb4bc0ff5969f2d3e76ac3fdbf4e
+_md5_=65a5f0fcffd27ae210f1b9c718572059
diff --git a/metadata/md5-cache/dev-libs/unibilium-2.1.1 b/metadata/md5-cache/dev-libs/unibilium-2.1.1
index 731bcc146b8c..6141d8b64259 100644
--- a/metadata/md5-cache/dev-libs/unibilium-2.1.1
+++ b/metadata/md5-cache/dev-libs/unibilium-2.1.1
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://github.com/neovim/unibilium/
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=static-libs
-KEYWORDS=amd64 arm ~arm64 ~riscv x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~riscv x86 ~x64-macos
 LICENSE=LGPL-3+ MIT
 SLOT=0/4
 SRC_URI=https://github.com/neovim/unibilium/archive/v2.1.1.tar.gz -> unibilium-2.1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=61ff893d92e21f25c7322605c7dcb307
+_md5_=ea4f415e8240db832d6e488fafff0b3d
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 98b9324b85a2..477e72883554 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/luv-1.43.0.0 b/metadata/md5-cache/dev-lua/luv-1.43.0.0
index 19392b28bfb5..d0eee744a486 100644
--- a/metadata/md5-cache/dev-lua/luv-1.43.0.0
+++ b/metadata/md5-cache/dev-lua/luv-1.43.0.0
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/luvit/luv
 INHERIT=cmake flag-o-matic lua-single unpacker
 IUSE=test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~riscv x86 ~x64-macos
 LICENSE=Apache-2.0 MIT
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/libuv-1.32.0:=
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luvit/luv/archive/1.43.0-0.tar.gz -> luv-1.43.0.0.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v0.10.tar.gz -> luv-lua-compat-0.10.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9a70c724e2814b362ac24aae9ce3cd27
+_md5_=b91502017cb1fee543eee68c6802b0fe
diff --git a/metadata/md5-cache/dev-lua/mpack-1.0.9-r1 b/metadata/md5-cache/dev-lua/mpack-1.0.9-r1
index d9a72b9a4978..2987c1cdd62c 100644
--- a/metadata/md5-cache/dev-lua/mpack-1.0.9-r1
+++ b/metadata/md5-cache/dev-lua/mpack-1.0.9-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/libmpack/libmpack-lua/
 INHERIT=lua toolchain-funcs
 IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-libs/libmpack 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libmpack/libmpack-lua/archive/1.0.9.tar.gz -> mpack-1.0.9.tar.gz
 _eclasses_=lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=09c5b15aea7654d15ac38f9a2dfac0e3
+_md5_=88cb506a527ba8e8152f19bef002898d
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index f33a91d517e5..da709c223a59 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/PyQt5-sip-12.9.0 b/metadata/md5-cache/dev-python/PyQt5-sip-12.9.0
deleted file mode 100644
index 07b263a1b51c..000000000000
--- a/metadata/md5-cache/dev-python/PyQt5-sip-12.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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=sip extension module for PyQt5
-EAPI=7
-HOMEPAGE=https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/PyQt5-sip/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 SIP )
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0/12
-SRC_URI=mirror://pypi/P/PyQt5-sip/PyQt5_sip-12.9.0.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=00ea1196147e265c2b6ce7a427e0551f
diff --git a/metadata/md5-cache/dev-python/QtPy-2.1.0 b/metadata/md5-cache/dev-python/QtPy-2.1.0
deleted file mode 100644
index 0125d1051c45..000000000000
--- a/metadata/md5-cache/dev-python/QtPy-2.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] pyqt5? ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location] dev-python/PyQt5[multimedia,network,opengl,positioning,printsupport] dev-python/PyQt5[sensors,serialport,speech(-),sql,svg,testlib,webchannel] dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns] dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) pyside2? ( dev-python/pyside2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help] dev-python/pyside2[location,multimedia,network,opengl(+),positioning] dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml] dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib] dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras] dev-python/pyside2[xml,xmlpatterns] ) ) test? ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] pyqt5? ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt5[declarative?,designer?,gui?,help?,location?] dev-python/PyQt5[multimedia?,network?,opengl?,positioning?] dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?] dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?] dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?] webengine? ( dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) pyside2? ( dev-python/pyside2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyside2[designer?,gui?,help?,location?,multimedia?] dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?] dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?] dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?] dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?] declarative? ( dev-python/pyside2[qml,quick] ) ) >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets
-EAPI=8
-HOMEPAGE=https://github.com/spyder-ide/qtpy/ https://pypi.org/project/QtPy/
-INHERIT=distutils-r1 virtualx
-IUSE=+pyqt5 pyside2 declarative designer gui help location multimedia network opengl positioning printsupport sensors serialport speech sql svg testlib webchannel webengine websockets widgets x11extras xml xmlpatterns test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=amd64 ~arm arm64 x86
-LICENSE=MIT
-RDEPEND=dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] pyqt5? ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt5[declarative?,designer?,gui?,help?,location?] dev-python/PyQt5[multimedia?,network?,opengl?,positioning?] dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?] dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?] dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?] webengine? ( dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) pyside2? ( dev-python/pyside2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyside2[designer?,gui?,help?,location?,multimedia?] dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?] dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?] dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?] dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?] declarative? ( dev-python/pyside2[qml,quick] ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( pyqt5 pyside2 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/Q/QtPy/QtPy-2.1.0.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=5cc5c34c94f661dba61e3d187c661c4d
diff --git a/metadata/md5-cache/dev-python/QtPy-2.1.0-r1 b/metadata/md5-cache/dev-python/QtPy-2.1.0-r1
deleted file mode 100644
index 909dae5a0501..000000000000
--- a/metadata/md5-cache/dev-python/QtPy-2.1.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] pyqt5? ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location] dev-python/PyQt5[multimedia,network,opengl,positioning,printsupport] dev-python/PyQt5[sensors,serialport,speech(-),sql,svg,testlib,webchannel] dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns] dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) pyside2? ( python_targets_python3_8? ( dev-python/pyside2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help] dev-python/pyside2[location,multimedia,network,opengl(+),positioning] dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml] dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib] dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras] dev-python/pyside2[xml,xmlpatterns] ) python_targets_python3_9? ( dev-python/pyside2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help] dev-python/pyside2[location,multimedia,network,opengl(+),positioning] dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml] dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib] dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras] dev-python/pyside2[xml,xmlpatterns] ) python_targets_python3_10? ( dev-python/pyside2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help] dev-python/pyside2[location,multimedia,network,opengl(+),positioning] dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml] dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib] dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras] dev-python/pyside2[xml,xmlpatterns] ) ) ) test? ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] pyqt5? ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt5[declarative?,designer?,gui?,help?,location?] dev-python/PyQt5[multimedia?,network?,opengl?,positioning?] dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?] dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?] dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?] webengine? ( dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) pyside2? ( python_targets_python3_8? ( dev-python/pyside2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyside2[designer?,gui?,help?,location?,multimedia?] dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?] dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?] dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?] dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?] declarative? ( dev-python/pyside2[qml,quick] ) ) python_targets_python3_9? ( dev-python/pyside2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyside2[designer?,gui?,help?,location?,multimedia?] dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?] dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?] dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?] dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?] declarative? ( dev-python/pyside2[qml,quick] ) ) python_targets_python3_10? ( dev-python/pyside2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyside2[designer?,gui?,help?,location?,multimedia?] dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?] dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?] dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?] dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?] declarative? ( dev-python/pyside2[qml,quick] ) ) ) >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets
-EAPI=8
-HOMEPAGE=https://github.com/spyder-ide/qtpy/ https://pypi.org/project/QtPy/
-INHERIT=distutils-r1 virtualx
-IUSE=+pyqt5 pyside2 declarative designer gui help location multimedia network opengl positioning printsupport sensors serialport speech sql svg testlib webchannel webengine websockets widgets x11extras xml xmlpatterns test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] pyqt5? ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt5[declarative?,designer?,gui?,help?,location?] dev-python/PyQt5[multimedia?,network?,opengl?,positioning?] dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?] dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?] dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?] webengine? ( dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) pyside2? ( python_targets_python3_8? ( dev-python/pyside2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyside2[designer?,gui?,help?,location?,multimedia?] dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?] dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?] dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?] dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?] declarative? ( dev-python/pyside2[qml,quick] ) ) python_targets_python3_9? ( dev-python/pyside2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyside2[designer?,gui?,help?,location?,multimedia?] dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?] dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?] dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?] dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?] declarative? ( dev-python/pyside2[qml,quick] ) ) python_targets_python3_10? ( dev-python/pyside2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyside2[designer?,gui?,help?,location?,multimedia?] dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?] dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?] dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?] dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?] declarative? ( dev-python/pyside2[qml,quick] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( pyqt5 pyside2 ) python_targets_python3_11? ( pyqt5 !pyside2 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/Q/QtPy/QtPy-2.1.0.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=6a143c5e587c5de69db0e364faf18af0
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.8.1-r1 b/metadata/md5-cache/dev-python/aiohttp-3.8.1-r1
index 37b40005f6df..710d08ceb2fa 100644
--- a/metadata/md5-cache/dev-python/aiohttp-3.8.1-r1
+++ b/metadata/md5-cache/dev-python/aiohttp-3.8.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/aio-libs/aiohttp/ https://pypi.org/project/aiohttp/
 INHERIT=distutils-r1 multiprocessing
 IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/aiosignal-1.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/async-timeout-4.0.0_alpha3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-17.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/charset_normalizer-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/frozenlist-1.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/multidict-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/yarl-1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.8.1.tar.gz
 _eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=32468c5bb1393c15c25084866f24ebac
+_md5_=f977e54f56a070480b4e82dc9110de4f
diff --git a/metadata/md5-cache/dev-python/apipkg-2.1.1 b/metadata/md5-cache/dev-python/apipkg-2.1.1
deleted file mode 100644
index c22c4ceb8875..000000000000
--- a/metadata/md5-cache/dev-python/apipkg-2.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Namespace control and lazy-import mechanism
-EAPI=8
-HOMEPAGE=https://github.com/pytest-dev/apipkg/ https://pypi.org/project/apipkg/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-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.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pytest-dev/apipkg/archive/v2.1.1.tar.gz -> apipkg-2.1.1.gh.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=aa9556e57a496dd115a2cbc79bc971b6
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.30 b/metadata/md5-cache/dev-python/boto3-1.24.30
new file mode 100644
index 000000000000..70a05693fe67
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.24.30
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.30[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.30[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.24.30.tar.gz -> boto3-1.24.30.gh.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.30 b/metadata/md5-cache/dev-python/botocore-1.27.30
new file mode 100644
index 000000000000..1bf888675947
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.27.30
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[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(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~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(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.27.30.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=251ab9b79e6c92dfb42db053bb2839a4
diff --git a/metadata/md5-cache/dev-python/dask-2022.6.1 b/metadata/md5-cache/dev-python/dask-2022.6.1
index c514f21fa10c..bc83da62d9f6 100644
--- a/metadata/md5-cache/dev-python/dask-2022.6.1
+++ b/metadata/md5-cache/dev-python/dask-2022.6.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.dask.org/ https://github.com/dask/dask/ https://pypi.org/project/dask/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dask/dask/archive/2022.6.1.tar.gz -> dask-2022.6.1.gh.tar.gz
 _eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=620b26c1a2bb7ed02f529dda0bdaeb09
+_md5_=c750f824a630037819b3b15774ba3186
diff --git a/metadata/md5-cache/dev-python/debugpy-1.6.0 b/metadata/md5-cache/dev-python/debugpy-1.6.0
index 8ad625c012dc..9462cf320257 100644
--- a/metadata/md5-cache/dev-python/debugpy-1.6.0
+++ b/metadata/md5-cache/dev-python/debugpy-1.6.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/pydevd[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/microsoft/debugpy/archive/v1.6.0.tar.gz -> debugpy-1.6.0.gh.tar.gz
 _eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=138cd6d98a25b8ff04e8fc9f7484b9d0
+_md5_=79b101d535b70eab7ab807d2ef6794c7
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
deleted file mode 100644
index 8b5bde9cee13..000000000000
--- a/metadata/md5-cache/dev-python/dj-database-url-0.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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=Use Database URLs in your Django Application
-EAPI=7
-HOMEPAGE=https://pypi.org/project/dj-database-url/ https://github.com/jacobian/dj-database-url
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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/jacobian/dj-database-url/archive/v0.5.0.tar.gz -> dj-database-url-0.5.0.gh.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=e6a15902665fb3c6fc7057c428a0ca24
diff --git a/metadata/md5-cache/dev-python/dj-search-url-0.1 b/metadata/md5-cache/dev-python/dj-search-url-0.1
deleted file mode 100644
index e557e6e4bb1b..000000000000
--- a/metadata/md5-cache/dev-python/dj-search-url-0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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=Use Search URLs in your Django Haystack Application
-EAPI=7
-HOMEPAGE=https://pypi.org/project/dj-search-url/ https://github.com/dstufft/dj-search-url/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=BSD-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/d/dj-search-url/dj-search-url-0.1.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=4f4305fb1ab445a58f06a129a67d1644
diff --git a/metadata/md5-cache/dev-python/dj-search-url-0.1-r1 b/metadata/md5-cache/dev-python/dj-search-url-0.1-r1
index 366a3d40c99f..b7f43a0ebf18 100644
--- a/metadata/md5-cache/dev-python/dj-search-url-0.1-r1
+++ b/metadata/md5-cache/dev-python/dj-search-url-0.1-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/dstufft/dj-search-url/ https://pypi.org/project/dj-search-url/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD-2
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dj-search-url/dj-search-url-0.1.tar.gz
 _eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=9494ef8c35c77d67069735c84c6849b1
+_md5_=0f03f7de16682882aea29e79bb5eac91
diff --git a/metadata/md5-cache/dev-python/django-cache-url-3.4.0 b/metadata/md5-cache/dev-python/django-cache-url-3.4.0
deleted file mode 100644
index 3dc3d9655258..000000000000
--- a/metadata/md5-cache/dev-python/django-cache-url-3.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[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(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Use Cache URLs in your Django application
-EAPI=8
-HOMEPAGE=https://github.com/epicserve/django-cache-url
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=MIT
-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.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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/epicserve/django-cache-url/archive/v3.4.0.tar.gz -> django-cache-url-3.4.0.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=64736c3c5246ac78ef568b3cd6437d38
diff --git a/metadata/md5-cache/dev-python/dogpile-cache-1.1.5 b/metadata/md5-cache/dev-python/dogpile-cache-1.1.5
deleted file mode 100644
index 00cb871531ca..000000000000
--- a/metadata/md5-cache/dev-python/dogpile-cache-1.1.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/decorator-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A locking API for expiring values while a single thread generates a new value
-EAPI=8
-HOMEPAGE=https://github.com/sqlalchemy/dogpile.cache
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/decorator-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/dogpile.cache/dogpile.cache-1.1.5.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=79120ebd7bfc8b55dfc1d936ff546f6f
diff --git a/metadata/md5-cache/dev-python/dogpile-cache-1.1.7 b/metadata/md5-cache/dev-python/dogpile-cache-1.1.7
deleted file mode 100644
index e194df2285d0..000000000000
--- a/metadata/md5-cache/dev-python/dogpile-cache-1.1.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/decorator-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A locking API for expiring values while a single thread generates a new value
-EAPI=8
-HOMEPAGE=https://github.com/sqlalchemy/dogpile.cache
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/decorator-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/dogpile.cache/dogpile.cache-1.1.7.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=8035d4d0d984bd0ee5fc1b0f5f912bea
diff --git a/metadata/md5-cache/dev-python/html2text-2020.1.16-r2 b/metadata/md5-cache/dev-python/html2text-2020.1.16-r2
new file mode 100644
index 000000000000..579ff338116c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/html2text-2020.1.16-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Turn HTML into equivalent Markdown-structured text
+EAPI=8
+HOMEPAGE=https://github.com/Alir3z4/html2text https://pypi.org/project/html2text/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/h/html2text/html2text-2020.1.16.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=cf90f85343968513f31f7a198677640c
diff --git a/metadata/md5-cache/dev-python/http-parser-0.9.0 b/metadata/md5-cache/dev-python/http-parser-0.9.0
deleted file mode 100644
index 1bf43243d717..000000000000
--- a/metadata/md5-cache/dev-python/http-parser-0.9.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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=HTTP request/response parser for python in C
-EAPI=7
-HOMEPAGE=https://github.com/benoitc/http-parser
-INHERIT=distutils-r1
-IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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/benoitc/http-parser/archive/0.9.0.tar.gz -> http-parser-0.9.0.gh.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=8be7d75a1fd42f82e43871412c6dee6f
diff --git a/metadata/md5-cache/dev-python/iniparse-0.5 b/metadata/md5-cache/dev-python/iniparse-0.5
deleted file mode 100644
index b5730b60e77a..000000000000
--- a/metadata/md5-cache/dev-python/iniparse-0.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Better INI parser for Python
-EAPI=7
-HOMEPAGE=https://pypi.org/project/iniparse/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm64 ~riscv x86
-LICENSE=MIT PSF-2
-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.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-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	a012c7f8c0a9dddadb3a4f56364c8f62	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=3def2bbc91e9984d9309e805965a1fe8
diff --git a/metadata/md5-cache/dev-python/intelhex-2.3.0 b/metadata/md5-cache/dev-python/intelhex-2.3.0
deleted file mode 100644
index 3bb14c039f66..000000000000
--- a/metadata/md5-cache/dev-python/intelhex-2.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library for Intel HEX files manipulations
-EAPI=8
-HOMEPAGE=https://pypi.org/project/IntelHex/ https://github.com/python-intelhex/intelhex
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~mips ~riscv ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/I/IntelHex/intelhex-2.3.0.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=a43cbf0ebc7d270729c9121440b5a7d4
diff --git a/metadata/md5-cache/dev-python/ipython-8.3.0-r1 b/metadata/md5-cache/dev-python/ipython-8.3.0-r1
deleted file mode 100644
index f9426890465a..000000000000
--- a/metadata/md5-cache/dev-python/ipython-8.3.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( app-text/dvipng[truetype] >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/backcall[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jedi-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/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-2.4.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/stack_data[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[readline,sqlite,threads(+)] ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Advanced interactive shell for Python
-EAPI=8
-HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/
-INHERIT=distutils-r1 optfeature virtualx
-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 hppa ~ia64 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/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/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-2.4.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/stack_data[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.0[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.13:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[readline,sqlite,threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipython/ipython-8.3.0.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=ddd0469745f1ec2c41b5279218f685ec
diff --git a/metadata/md5-cache/dev-python/js2py-0.71 b/metadata/md5-cache/dev-python/js2py-0.71
deleted file mode 100644
index dae793fc683f..000000000000
--- a/metadata/md5-cache/dev-python/js2py-0.71
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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=JavaScript to Python Translator & JavaScript interpreter in Python
-EAPI=7
-HOMEPAGE=http://piter.io/projects/js2py/ https://github.com/PiotrDabkowski/Js2Py/ https://pypi.org/project/Js2Py/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pyjsparser-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tzlocal-1.2.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(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-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	a012c7f8c0a9dddadb3a4f56364c8f62	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=adfc8fe55854f974a7c401a5e38dd8e7
diff --git a/metadata/md5-cache/dev-python/jsonext-0.4.2 b/metadata/md5-cache/dev-python/jsonext-0.4.2
deleted file mode 100644
index ad7f0456f90c..000000000000
--- a/metadata/md5-cache/dev-python/jsonext-0.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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=Well-structured helpers for serializing commonly encountered structures to JSON
-EAPI=7
-HOMEPAGE=https://github.com/mbr/jsonext
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=MIT
-RDEPEND=dev-python/arrow[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.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-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	a012c7f8c0a9dddadb3a4f56364c8f62	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=515243943474539c925d9fb558a9e06c
diff --git a/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6 b/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6
new file mode 100644
index 000000000000..3f4c971da911
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/jupyter_packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-tornasync[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/jupyter_server-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[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(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=MathJax resources as a Jupyter Server Extension
+EAPI=8
+HOMEPAGE=https://jupyter.org/ https://github.com/jupyter-server/jupyter_server_mathjax/ https://pypi.org/project/jupyter-server-mathjax/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-python/jupyter_server-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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_server_mathjax/jupyter_server_mathjax-0.2.6.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=eac1cc0bcba948cd5e631ccc00e5144a
diff --git a/metadata/md5-cache/dev-python/mistune-2.0.4 b/metadata/md5-cache/dev-python/mistune-2.0.4
new file mode 100644
index 000000000000..7c3180dd576d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mistune-2.0.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The fastest markdown parser in pure Python
+EAPI=8
+HOMEPAGE=https://github.com/lepture/mistune/ https://pypi.org/project/mistune/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/mistune/mistune-2.0.4.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=1f10a9d4b685d7b05416d1a59c3b0863
diff --git a/metadata/md5-cache/dev-python/owslib-0.25.0 b/metadata/md5-cache/dev-python/owslib-0.25.0
deleted file mode 100644
index c33d3077d4f7..000000000000
--- a/metadata/md5-cache/dev-python/owslib-0.25.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyproj[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/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library for client programming with Open Geospatial Consortium web service
-EAPI=8
-HOMEPAGE=https://geopython.github.io/OWSLib/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~x86
-LICENSE=BSD
-PROPERTIES=test_network
-RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyproj[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/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/geopython/owslib/archive/0.25.0.tar.gz -> owslib-0.25.0.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=d80ec218e991b0c3200113f263fb05ac
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.49 b/metadata/md5-cache/dev-python/phonenumbers-8.12.49
deleted file mode 100644
index 696a3e556a81..000000000000
--- a/metadata/md5-cache/dev-python/phonenumbers-8.12.49
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[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(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python port of Google's libphonenumber
-EAPI=8
-HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers/ https://pypi.org/project/phonenumbers/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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/daviddrysdale/python-phonenumbers/archive/v8.12.49.tar.gz -> python-phonenumbers-8.12.49.gh.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=2042896d25e099277f282ec993e1b165
diff --git a/metadata/md5-cache/dev-python/pycurl-7.44.1-r1 b/metadata/md5-cache/dev-python/pycurl-7.44.1-r1
deleted file mode 100644
index ba1a845d8d9d..000000000000
--- a/metadata/md5-cache/dev-python/pycurl-7.44.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-python/bottle-0.12.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2] ) test? ( >=net-misc/curl-7.25.0-r1:=[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= ) curl_ssl_openssl? ( dev-libs/openssl:= ) ) >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-misc/curl-7.25.0-r1:=[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= ) curl_ssl_openssl? ( dev-libs/openssl:= ) )
-DESCRIPTION=python binding for curl/libcurl
-EAPI=8
-HOMEPAGE=http://pycurl.io/ https://github.com/pycurl/pycurl/ https://pypi.org/project/pycurl/
-INHERIT=distutils-r1 toolchain-funcs
-IUSE=curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=LGPL-2.1
-RDEPEND=>=net-misc/curl-7.25.0-r1:=[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= ) curl_ssl_openssl? ( dev-libs/openssl:= ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pycurl/pycurl-7.44.1.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=16d8635d4be1dd91a7739fff362de10e
diff --git a/metadata/md5-cache/dev-python/pycurl-7.45.1 b/metadata/md5-cache/dev-python/pycurl-7.45.1
index 51ffdf766803..15cb7323eb1f 100644
--- a/metadata/md5-cache/dev-python/pycurl-7.45.1
+++ b/metadata/md5-cache/dev-python/pycurl-7.45.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://pycurl.io/ https://github.com/pycurl/pycurl/ https://pypi.org/project/pycurl/
 INHERIT=distutils-r1 toolchain-funcs
 IUSE=curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=net-misc/curl-7.25.0-r1:=[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= ) curl_ssl_openssl? ( dev-libs/openssl:= ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycurl/pycurl-7.45.1.tar.gz
 _eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=3ac40469765ab54838a5fa900352298e
+_md5_=b655a4c14d1a12a501db59d6d38b1db2
diff --git a/metadata/md5-cache/dev-python/pyfakefs-4.6.2 b/metadata/md5-cache/dev-python/pyfakefs-4.6.2
new file mode 100644
index 000000000000..e23e16aca4aa
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyfakefs-4.6.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A fake file system that mocks the Python file system modules
+EAPI=8
+HOMEPAGE=https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v4.6.2.tar.gz -> pyfakefs-4.6.2.gh.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=12c1671b0714b7764dc85be9dc9f8b8d
diff --git a/metadata/md5-cache/dev-python/scikit-build-0.14.1 b/metadata/md5-cache/dev-python/scikit-build-0.14.1
deleted file mode 100644
index 8dfdb42ced53..000000000000
--- a/metadata/md5-cache/dev-python/scikit-build-0.14.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] dev-python/sphinx-issues[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] dev-python/sphinx-issues[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] dev-python/sphinx-issues[python_targets_python3_8(-)] ) ) ) test? ( dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/path-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
-DESCRIPTION=Improved build system generator for Python C/C++/Fortran/Cython extensions
-EAPI=8
-HOMEPAGE=https://github.com/scikit-build/scikit-build/ https://pypi.org/project/scikit-build/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/scikit-build/scikit-build-0.14.1.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=e3855b3554cd89bee8de398dd83a5703
diff --git a/metadata/md5-cache/dev-python/setuptools-62.3.3 b/metadata/md5-cache/dev-python/setuptools-62.3.3
deleted file mode 100644
index f205938d1090..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-62.3.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) >=dev-python/wheel-0.37.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=7
-HOMEPAGE=https://github.com/pypa/setuptools/ https://pypi.org/project/setuptools/
-INHERIT=distutils-r1 multiprocessing
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-RDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools/setuptools-62.3.3.tar.gz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.4.tar.xz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=74f491abc805ac45858c2b4ef7ff0755
diff --git a/metadata/md5-cache/dev-python/setuptools-62.3.4 b/metadata/md5-cache/dev-python/setuptools-62.3.4
deleted file mode 100644
index ecd3c08a58df..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-62.3.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) >=dev-python/wheel-0.37.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=7
-HOMEPAGE=https://github.com/pypa/setuptools/ https://pypi.org/project/setuptools/
-INHERIT=distutils-r1 multiprocessing
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-RDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools/setuptools-62.3.4.tar.gz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.4.tar.xz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=170f619cac3622af4e3ff25574926aa2
diff --git a/metadata/md5-cache/dev-python/setuptools-62.4.0 b/metadata/md5-cache/dev-python/setuptools-62.4.0
deleted file mode 100644
index 9db32dbb550b..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-62.4.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) >=dev-python/wheel-0.37.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=7
-HOMEPAGE=https://github.com/pypa/setuptools/ https://pypi.org/project/setuptools/
-INHERIT=distutils-r1 multiprocessing
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-RDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools/setuptools-62.4.0.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=063d1e63df84531a0aaca53d28f071a7
diff --git a/metadata/md5-cache/dev-python/setuptools-62.5.0 b/metadata/md5-cache/dev-python/setuptools-62.5.0
deleted file mode 100644
index 7c3d81f0931a..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-62.5.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) >=dev-python/wheel-0.37.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=7
-HOMEPAGE=https://github.com/pypa/setuptools/ https://pypi.org/project/setuptools/
-INHERIT=distutils-r1 multiprocessing
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-RDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools/setuptools-62.5.0.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=d7df155dd4095ff15c6271b211da2bff
diff --git a/metadata/md5-cache/dev-python/sip-5.5.0-r2 b/metadata/md5-cache/dev-python/sip-5.5.0-r2
deleted file mode 100644
index b9316b342281..000000000000
--- a/metadata/md5-cache/dev-python/sip-5.5.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( >=dev-python/sphinx-4.5.0-r1 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python bindings generator for C/C++ libraries
-EAPI=7
-HOMEPAGE=https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/sip/
-INHERIT=distutils-r1
-IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=|| ( GPL-2 GPL-3 SIP )
-RDEPEND=!<dev-python/sip-4.19.25-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !=dev-python/sip-5.5.0-r0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-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	a012c7f8c0a9dddadb3a4f56364c8f62	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=3f170ebd209d9b39eefe342f459ccf8f
diff --git a/metadata/md5-cache/dev-python/sip-6.4.0 b/metadata/md5-cache/dev-python/sip-6.4.0
deleted file mode 100644
index 3aeaf7a7398b..000000000000
--- a/metadata/md5-cache/dev-python/sip-6.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( >=dev-python/sphinx-4.5.0-r1 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python bindings generator for C/C++ libraries
-EAPI=8
-HOMEPAGE=https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/sip/
-INHERIT=distutils-r1
-IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=|| ( GPL-2 GPL-3 SIP )
-RDEPEND=!<dev-python/sip-4.19.25-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !=dev-python/sip-5.5.0-r0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=5
-SRC_URI=mirror://pypi/s/sip/sip-6.4.0.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=c01034644ec6868229a291ea42b845f5
diff --git a/metadata/md5-cache/dev-python/sip-6.5.0 b/metadata/md5-cache/dev-python/sip-6.5.0
deleted file mode 100644
index e75923a1cd99..000000000000
--- a/metadata/md5-cache/dev-python/sip-6.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( >=dev-python/sphinx-4.5.0-r1 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python bindings generator for C/C++ libraries
-EAPI=8
-HOMEPAGE=https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/sip/
-INHERIT=distutils-r1
-IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=|| ( GPL-2 GPL-3 SIP )
-RDEPEND=!<dev-python/sip-4.19.25-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !=dev-python/sip-5.5.0-r0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=5
-SRC_URI=mirror://pypi/s/sip/sip-6.5.0.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=c01034644ec6868229a291ea42b845f5
diff --git a/metadata/md5-cache/dev-python/sip-6.5.0-r1 b/metadata/md5-cache/dev-python/sip-6.5.0-r1
deleted file mode 100644
index 25beeb0a3fc3..000000000000
--- a/metadata/md5-cache/dev-python/sip-6.5.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( >=dev-python/sphinx-4.5.0-r1 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python bindings generator for C/C++ libraries
-EAPI=8
-HOMEPAGE=https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/sip/
-INHERIT=distutils-r1
-IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 SIP )
-RDEPEND=!<dev-python/sip-4.19.25-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !=dev-python/sip-5.5.0-r0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=5
-SRC_URI=mirror://pypi/s/sip/sip-6.5.0.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=6380654eb6044a9926c532ef15febab1
diff --git a/metadata/md5-cache/dev-python/tblib-1.7.0 b/metadata/md5-cache/dev-python/tblib-1.7.0
deleted file mode 100644
index d761aaae79a5..000000000000
--- a/metadata/md5-cache/dev-python/tblib-1.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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=Traceback fiddling library for Python
-EAPI=7
-HOMEPAGE=https://github.com/ionelmc/python-tblib
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc 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.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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/tblib/tblib-1.7.0.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=1a6d6383509a1e2942414d311238a20c
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.6.2 b/metadata/md5-cache/dev-python/translate-toolkit-3.6.2
deleted file mode 100644
index d37d49df4ddb..000000000000
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.6.2
+++ /dev/null
@@ -1,16 +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.4:3.10[sqlite] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[sqlite] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[sqlite] >=dev-python/sphinx-4.5.0-r1[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/pyparsing-3[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-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=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=8
-HOMEPAGE=https://github.com/translate/translate/ https://pypi.org/project/translate-toolkit/
-INHERIT=distutils-r1
-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/pyparsing-3[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.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
-REQUIRED_USE=|| ( 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/3.6.2.tar.gz -> translate-3.6.2.gh.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=934954b66c9ab4bbecb55040389a7378
diff --git a/metadata/md5-cache/dev-python/watchdog-2.1.8 b/metadata/md5-cache/dev-python/watchdog-2.1.8
deleted file mode 100644
index 149e48c4b5a0..000000000000
--- a/metadata/md5-cache/dev-python/watchdog-2.1.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-timeout-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python API and shell utilities to monitor file system events
-EAPI=8
-HOMEPAGE=https://github.com/gorakhargosh/watchdog/ https://pypi.org/project/watchdog/
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v2.1.8.tar.gz -> watchdog-2.1.8.gh.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=85c04a6df73f297e12504b948a647083
diff --git a/metadata/md5-cache/dev-python/watchdog-2.1.9 b/metadata/md5-cache/dev-python/watchdog-2.1.9
index 84eeda996768..d8b1aafcf94a 100644
--- a/metadata/md5-cache/dev-python/watchdog-2.1.9
+++ b/metadata/md5-cache/dev-python/watchdog-2.1.9
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/gorakhargosh/watchdog/ https://pypi.org/project/watchdog/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v2.1.9.tar.gz -> watchdog-2.1.9.gh.tar.gz
 _eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=73e1bf101b6cc0b874f9b2c60f5d5926
+_md5_=85c04a6df73f297e12504b948a647083
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index ba7642a20e4e..af24455de29f 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/coercible-1.0.0-r1 b/metadata/md5-cache/dev-ruby/coercible-1.0.0-r1
deleted file mode 100644
index 115b5debeda3..000000000000
--- a/metadata/md5-cache/dev-ruby/coercible-1.0.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby26(-)] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby27(-)] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby27(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[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=Powerful, flexible and configurable coercion library
-EAPI=8
-HOMEPAGE=https://github.com/solnic/coercible https://rubygems.org/gems/coercible
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby26(-)] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby27(-)] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/coercible-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=a2035b78fafe7e0d816164f4fba1c23e
diff --git a/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r4 b/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r4
new file mode 100644
index 000000000000..cc4b2facf6db
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r4
@@ -0,0 +1,17 @@
+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_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) 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_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+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_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Descriptive configuration files for Ruby written in Ruby
+EAPI=8
+HOMEPAGE=https://github.com/TwP/loquacious
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/loquacious-1.9.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=3a5d036f456275f742be1c92113c0d1e
diff --git a/metadata/md5-cache/dev-ruby/mash-0.1.1-r3 b/metadata/md5-cache/dev-ruby/mash-0.1.1-r3
index 126329788a13..433c9babae3c 100644
--- a/metadata/md5-cache/dev-ruby/mash-0.1.1-r3
+++ b/metadata/md5-cache/dev-ruby/mash-0.1.1-r3
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby27(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+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_ruby31? ( dev-lang/ruby:3.1 ) 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_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 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(-)] )
+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_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=Mash is an extended Hash that gives simple pseudo-object functionality
 EAPI=8
 HOMEPAGE=https://github.com/mbleigh/mash
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 test test
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+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_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mash-0.1.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=825878f2995579ab2de1382ce0a41c05
+_md5_=dc1495d42035d29b050e6b1910e1c570
diff --git a/metadata/md5-cache/dev-ruby/org-ruby-0.9.12-r1 b/metadata/md5-cache/dev-ruby/org-ruby-0.9.12-r1
index d368ed16bccf..d4744a0305b6 100644
--- a/metadata/md5-cache/dev-ruby/org-ruby-0.9.12-r1
+++ b/metadata/md5-cache/dev-ruby/org-ruby-0.9.12-r1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/tilt[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/tilt[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby27(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/tilt[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/tilt[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/tilt[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/tilt[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) 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_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 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(-)] )
+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_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=Ruby routines for parsing org-mode files
 EAPI=8
 HOMEPAGE=https://github.com/wallyqs/org-ruby
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rubypants-0.2: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 )
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wallyqs/org-ruby/archive/version-0.9.12.tar.gz -> org-ruby-0.9.12.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=41669c1c5a392aa25762cc8c07d3b771
+_md5_=7b0007a128d2fa69d4498acf093bce3a
diff --git a/metadata/md5-cache/dev-ruby/rr-3.1.0 b/metadata/md5-cache/dev-ruby/rr-3.1.0
new file mode 100644
index 000000000000..3beef64fa985
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rr-3.1.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] dev-ruby/diff-lcs[ruby_targets_ruby26(-)] dev-ruby/test-unit-rr[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/diff-lcs[ruby_targets_ruby27(-)] dev-ruby/test-unit-rr[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] dev-ruby/diff-lcs[ruby_targets_ruby30(-)] dev-ruby/test-unit-rr[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest[ruby_targets_ruby31(-)] dev-ruby/diff-lcs[ruby_targets_ruby31(-)] dev-ruby/test-unit-rr[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+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_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=A double framework featuring a selection of double techniques and a terse syntax
+EAPI=8
+HOMEPAGE=https://rr.github.io/rr
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/rr/rr/archive/v3.1.0.tar.gz -> rr-3.1.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=6fd1d4f5c46c25171a14bb8a8c9e7744
diff --git a/metadata/md5-cache/dev-ruby/seed-fu-2.3.9-r1 b/metadata/md5-cache/dev-ruby/seed-fu-2.3.9-r1
new file mode 100644
index 000000000000..d39f223bcbb5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/seed-fu-2.3.9-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/activerecord-3.1:*[ruby_targets_ruby26(-)] >=dev-ruby/activesupport-3.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/activerecord-3.1:*[ruby_targets_ruby27(-)] >=dev-ruby/activesupport-3.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/activerecord-3.1:*[ruby_targets_ruby30(-)] >=dev-ruby/activesupport-3.1:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/sqlite3[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(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[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=Advanced seed data handling for Rails
+EAPI=8
+HOMEPAGE=https://github.com/mbleigh/seed-fu
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/activerecord-3.1:*[ruby_targets_ruby26(-)] >=dev-ruby/activesupport-3.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/activerecord-3.1:*[ruby_targets_ruby27(-)] >=dev-ruby/activesupport-3.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/activerecord-3.1:*[ruby_targets_ruby30(-)] >=dev-ruby/activesupport-3.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mbleigh/seed-fu/archive/v2.3.9.tar.gz -> seed-fu-2.3.9.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=7b4b0a2bb05b0d2af9d1a5c7a6ced2e0
diff --git a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r4 b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r4
index 88e00fc7ac09..0b1d8046e357 100644
--- a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r4
+++ b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r4
@@ -1,17 +1,17 @@
-BDEPEND=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:2[ruby_targets_ruby26(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby27(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ) virtual/pkgconfig
+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_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) 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_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
 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(-)] )
+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_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=W3C HTML Tidy library implemented as a Ruby extension
 EAPI=8
 HOMEPAGE=https://github.com/carld/tidy
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86
 LICENSE=HTML-Tidy
-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 )
+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_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tidy-ext-0.1.14.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=9e2b45e2bc1eee631a09fed91e39e831
+_md5_=e1c2a84a9c8aa5243a35f6ad0319d34e
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 09a49c393935..5fcd6a02cd3c 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/bsdiff-4.3-r4 b/metadata/md5-cache/dev-util/bsdiff-4.3-r4
index cd370d454afd..51112c827986 100644
--- a/metadata/md5-cache/dev-util/bsdiff-4.3-r4
+++ b/metadata/md5-cache/dev-util/bsdiff-4.3-r4
@@ -1,12 +1,13 @@
 DEFINED_PHASES=compile install
+DEPEND=app-arch/bzip2
 DESCRIPTION=bsdiff: Binary Differencer using a suffix alg
 EAPI=7
 HOMEPAGE=https://www.daemonology.net/bsdiff/
-INHERIT=flag-o-matic toolchain-funcs
+INHERIT=edo flag-o-matic toolchain-funcs
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD-2
 RDEPEND=app-arch/bzip2
 SLOT=0
 SRC_URI=https://www.daemonology.net/bsdiff/bsdiff-4.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0410c8eb7aad1288b29a46b465dbfdcc
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=d00ce207024d2e0c1479fb47cae96f86
diff --git a/metadata/md5-cache/dev-util/rt-tests-2.3 b/metadata/md5-cache/dev-util/rt-tests-2.4
index f3b6fda6b4a9..823d7d005fc9 100644
--- a/metadata/md5-cache/dev-util/rt-tests-2.3
+++ b/metadata/md5-cache/dev-util/rt-tests-2.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile install prepare setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) sys-process/numactl
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) sys-process/numactl
 DESCRIPTION=A collection of latency testing tools for the linux(-rt) kernel
 EAPI=8
-HOMEPAGE=https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/about/
+HOMEPAGE=https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/
 INHERIT=python-single-r1 toolchain-funcs
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2 GPL-2+ LGPL-2.1+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) sys-process/numactl
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) sys-process/numactl
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
-SRC_URI=https://kernel.org/pub/linux/utils/rt-tests/rt-tests-2.3.tar.xz https://kernel.org/pub/linux/utils/rt-tests/older/rt-tests-2.3.tar.xz
+SRC_URI=https://kernel.org/pub/linux/utils/rt-tests/rt-tests-2.4.tar.xz https://kernel.org/pub/linux/utils/rt-tests/older/rt-tests-2.4.tar.xz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=867f4ffdf8d504940574830d54c479c8
+_md5_=00be06484892507f52822db902a3e015
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 0399013853e9..5cc84a81eb50 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/libkgapi-22.04.3 b/metadata/md5-cache/kde-apps/libkgapi-22.04.3
index f9e90c1832ec..5f9e90eaa430 100644
--- a/metadata/md5-cache/kde-apps/libkgapi-22.04.3
+++ b/metadata/md5-cache/kde-apps/libkgapi-22.04.3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/22.04.3/src/libkgapi-22.04.3.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gear.kde.org	aebcdbce229877667716707f608f9cc3	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b0722d0588017dad40e851cdee5ba855
+_md5_=7ff9fc9d2e065f2b6de677bb944e2846
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 4ca055a383a5..18c1326b4db2 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/gozer-0.7-r3 b/metadata/md5-cache/media-gfx/gozer-0.7-r3
deleted file mode 100644
index 405e59956340..000000000000
--- a/metadata/md5-cache/media-gfx/gozer-0.7-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=media-libs/giblib media-libs/imlib2 x11-libs/libXext sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=tool for rendering arbitrary text as graphics, using ttfs and styles
-EAPI=6
-HOMEPAGE=http://www.linuxbrit.co.uk/gozer/
-INHERIT=autotools
-KEYWORDS=amd64 ppc x86
-LICENSE=feh LGPL-2+
-RDEPEND=media-libs/giblib media-libs/imlib2
-SLOT=0
-SRC_URI=http://www.linuxbrit.co.uk/downloads/gozer-0.7.tar.gz
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=22ed134c486a63cb78df68a8eab4c085
diff --git a/metadata/md5-cache/media-gfx/gozer-0.7-r4 b/metadata/md5-cache/media-gfx/gozer-0.7-r4
new file mode 100644
index 000000000000..a669459698ef
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gozer-0.7-r4
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
+DEPEND=media-libs/giblib media-libs/imlib2 x11-libs/libXext
+DESCRIPTION=tool for rendering arbitrary text as graphics, using ttfs and styles
+EAPI=8
+HOMEPAGE=http://www.linuxbrit.co.uk/gozer/
+INHERIT=autotools
+KEYWORDS=amd64 ppc x86
+LICENSE=feh LGPL-2+
+RDEPEND=media-libs/giblib media-libs/imlib2
+SLOT=0
+SRC_URI=http://www.linuxbrit.co.uk/downloads/gozer-0.7.tar.gz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=01c96301581f6593b59d9e27052bc4cb
diff --git a/metadata/md5-cache/media-gfx/img2pdf-0.4.4 b/metadata/md5-cache/media-gfx/img2pdf-0.4.4
new file mode 100644
index 000000000000..0a721e1739c9
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/img2pdf-0.4.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-text/ghostscript-gpl app-text/mupdf app-text/poppler[cairo,png,tiff] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pdfrw[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[tiff,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/imagemagick[jpeg,jpeg2k,lcms,png,-q8,-q32,tiff] media-libs/exiftool media-libs/netpbm[jpeg] ) test? ( dev-python/pikepdf[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(-)?] gui? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[tk] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[tk] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[tk] ) ) >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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=Losslessly convert raster images to PDF
+EAPI=8
+HOMEPAGE=https://gitlab.mister-muffin.de/josch/img2pdf
+INHERIT=distutils-r1
+IUSE=gui test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=dev-python/pikepdf[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(-)?] gui? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[tk] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[tk] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[tk] ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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/img2pdf/img2pdf-0.4.4.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=6310558356c76ee971b11453d3599708
diff --git a/metadata/md5-cache/media-gfx/propaganda-1.0-r2 b/metadata/md5-cache/media-gfx/propaganda-1.0-r2
new file mode 100644
index 000000000000..dfd761f9d4ec
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/propaganda-1.0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Propaganda Volume 1-14 + E. Tiling images for your desktop
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-01.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-02.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-03.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-04.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-05.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-06.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-07.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-08.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-09.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-10.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-11.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-12.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-13.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-14.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-For-E.tar.gz
+_md5_=61dd2ec18a792ae4fb2c6c589672eb1c
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 1111a746120f..e8e0dc5bdf3c 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/fidlib-0.9.10-r1 b/metadata/md5-cache/media-libs/fidlib-0.9.10-r1
index b6b4b119a451..1ae31e49c88e 100644
--- a/metadata/md5-cache/media-libs/fidlib-0.9.10-r1
+++ b/metadata/md5-cache/media-libs/fidlib-0.9.10-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Run-time filter design and execution library
 EAPI=7
 HOMEPAGE=http://uazu.net/fidlib/
-INHERIT=flag-o-matic toolchain-funcs
+INHERIT=edo flag-o-matic toolchain-funcs
 KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=http://uazu.net/fidlib/fidlib-0.9.10.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9c468d4a918b9849da98281680cc9924
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=9339b293ab20a86bcf80bd528f5b3b4a
diff --git a/metadata/md5-cache/media-libs/giblib-1.2.4-r2 b/metadata/md5-cache/media-libs/giblib-1.2.4-r2
new file mode 100644
index 000000000000..4637018b72fb
--- /dev/null
+++ b/metadata/md5-cache/media-libs/giblib-1.2.4-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/freetype media-libs/imlib2:=[X] x11-libs/libX11 x11-libs/libXext
+DESCRIPTION=A graphics library built on top of imlib2
+EAPI=8
+HOMEPAGE=http://freshmeat.sourceforge.net/projects/giblib http://www.linuxbrit.co.uk/giblib/
+INHERIT=autotools
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=feh
+RDEPEND=media-libs/freetype media-libs/imlib2:=[X] x11-libs/libX11 x11-libs/libXext
+SLOT=0
+SRC_URI=http://www.linuxbrit.co.uk/downloads/giblib-1.2.4.tar.gz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=1a1df6707d006881dba4a00301513e93
diff --git a/metadata/md5-cache/media-libs/libmikmod-3.3.11.1 b/metadata/md5-cache/media-libs/libmikmod-3.3.11.1
index 6e9ee45b7595..9303bd1b986c 100644
--- a/metadata/md5-cache/media-libs/libmikmod-3.3.11.1
+++ b/metadata/md5-cache/media-libs/libmikmod-3.3.11.1
@@ -4,7 +4,7 @@ DESCRIPTION=A library to play a wide range of module formats
 EAPI=6
 HOMEPAGE=http://mikmod.sourceforge.net/
 INHERIT=multilib-minimal
-IUSE=+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=+alsa coreaudio cpu_flags_ppc_altivec debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2+ LGPL-2.1
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-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(-)?] ) !media-libs/libmikmod:2
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( alsa coreaudio nas openal oss pulseaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/mikmod/libmikmod-3.3.11.1.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=e1eb66af137e9c05060254001c04c117
+_md5_=c218314446e0949d3e96768fbbb699bc
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.11-r1 b/metadata/md5-cache/media-libs/xine-lib-1.2.11-r1
index 119408e41e0d..17419e70a5f6 100644
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.11-r1
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.11-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Core libraries for Xine movie player
 EAPI=7
 HOMEPAGE=http://xine.sourceforge.net/
 INHERIT=flag-o-matic libtool
-IUSE=a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc nls
+IUSE=a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc nls
 KEYWORDS=amd64 arm64 ~hppa ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl ) dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:0= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:0=[X,opengl] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:0=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
@@ -13,4 +13,4 @@ REQUIRED_USE=vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )
 SLOT=1
 SRC_URI=mirror://sourceforge/xine/xine-lib-1.2.11.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=24ee0bebab42197f21b0b9b2d9cbe2a9
+_md5_=6cd85ee289b44281eadcda88d3e6f749
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.12-r2 b/metadata/md5-cache/media-libs/xine-lib-1.2.12-r2
index 97d48d07cb92..dfbe9efa5a8c 100644
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.12-r2
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.12-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Core libraries for Xine movie player
 EAPI=8
 HOMEPAGE=http://xine.sourceforge.net/
 INHERIT=flag-o-matic libtool
-IUSE=a52 aac aalib +alsa altivec bluray +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc nls
+IUSE=a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc nls
 KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:0= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:0=[X,opengl] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:0=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
@@ -13,4 +13,4 @@ REQUIRED_USE=vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )
 SLOT=1
 SRC_URI=mirror://sourceforge/xine/xine-lib-1.2.12.tar.xz
 _eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=060726262355df2c95ab573d7f460188
+_md5_=13ec4c647fef1492b7dddb6b66e5234a
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.9999 b/metadata/md5-cache/media-libs/xine-lib-1.2.9999
index 1cac21d58eb1..be2ae3159921 100644
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.9999
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.9999
@@ -5,11 +5,11 @@ DESCRIPTION=Core libraries for Xine movie player
 EAPI=7
 HOMEPAGE=http://xine.sourceforge.net/
 INHERIT=flag-o-matic libtool autotools mercurial
-IUSE=a52 aac aalib +alsa altivec bluray +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc
+IUSE=a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:0= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:0=[X,opengl] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:0=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
 REQUIRED_USE=vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )
 SLOT=1
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mercurial	53b96197cb26db4afb5056f1bbfa4845	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4aecec61fba9c81d087ec1df20c7a361
+_md5_=65a808afc6481880e2944ea0cf399517
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 3abe8b8a2ee7..96b9cfc7ea42 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/ardour-6.9-r1 b/metadata/md5-cache/media-sound/ardour-6.9-r1
index 2258c8bd101a..dbd8d75e5eb1 100644
--- a/metadata/md5-cache/media-sound/ardour-6.9-r1
+++ b/metadata/md5-cache/media-sound/ardour-6.9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Digital Audio Workstation
 EAPI=7
 HOMEPAGE=https://ardour.org/
 INHERIT=eutils toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
-IUSE=altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow
+IUSE=doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/boost:= dev-libs/glib:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord media-libs/suil[gtk] media-libs/lv2
 SLOT=6
 SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/Ardour-6.9.0.tar.bz2
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	plocale	7ce00136a77130df46fbbd5966f98a61	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0716b17bdfb71161c2df5e19b4310469
+_md5_=6a74368c9b860fafbf6e0d62f5501d3c
diff --git a/metadata/md5-cache/media-sound/ardour-9999 b/metadata/md5-cache/media-sound/ardour-9999
index 0dadbccb2b38..b3ac15bb9b5b 100644
--- a/metadata/md5-cache/media-sound/ardour-9999
+++ b/metadata/md5-cache/media-sound/ardour-9999
@@ -5,10 +5,10 @@ DESCRIPTION=Digital Audio Workstation
 EAPI=7
 HOMEPAGE=https://ardour.org/
 INHERIT=eutils toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg git-r3
-IUSE=altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow
+IUSE=doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/boost:= dev-libs/glib:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord media-libs/suil[gtk] media-libs/lv2
 SLOT=7
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	plocale	7ce00136a77130df46fbbd5966f98a61	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=559eb36799fc5a7656be73c7114731d6
+_md5_=2ae647e265f1c844e81392a0b54ba953
diff --git a/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0-r1 b/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0-r1
index 5bd5d942b5e4..8bbe08cb7788 100644
--- a/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0-r1
+++ b/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=A low-latency audio server
 EAPI=7
 HOMEPAGE=http://www.jackaudio.org
 INHERIT=multilib-minimal
-IUSE=cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse 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
+IUSE=cpu_flags_ppc_altivec cpu_flags_x86_3dnow alsa coreaudio doc debug examples oss cpu_flags_x86_sse 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
 KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-libs/db:=[abi_x86_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= >=media-libs/libsndfile-1.0.0 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(-)?] media-libs/zita-resampler media-libs/zita-alsa-pcmi ) >=media-libs/libsamplerate-0.1.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( sys-process/lsof ) pam? ( sys-auth/realtime-base )
 SLOT=0
 SRC_URI=https://github.com/jackaudio/jack1/archive/0.125.0.tar.gz -> jack-audio-connection-kit-0.125.0.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=71df6ccea066440acc513fefb4d9d9e3
+_md5_=adc2d6bdfb194d098f9696e42f530dc0
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 4dd89c57cab1..f1fa17d11d47 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/mythtv-31.0-r7 b/metadata/md5-cache/media-tv/mythtv-31.0-r7
index a60f10389b87..bb2168aeb102 100644
--- a/metadata/md5-cache/media-tv/mythtv-31.0-r7
+++ b/metadata/md5-cache/media-tv/mythtv-31.0-r7
@@ -5,7 +5,7 @@ DESCRIPTION=Open Source DVR and media center hub
 EAPI=7
 HOMEPAGE=https://www.mythtv.org https://github.com/MythTV/mythtv
 INHERIT=eutils flag-o-matic python-any-r1 qmake-utils readme.gentoo-r1 systemd user-info
-IUSE=alsa altivec asi autostart bluray cdda cdr cec debug dvd dvb egl exif fftw jack java +lame lcd libass lirc nvdec +opengl oss perl pulseaudio python raw systemd vaapi vdpau vpx +wrapper x264 x265 +xml xmltv +xvid +X zeroconf input_devices_joystick v4l ivtv ieee1394 hdpvr hdhomerun vbox ceton
+IUSE=alsa asi autostart bluray cdda cdr cec cpu_flags_ppc_altivec debug dvd dvb egl exif fftw jack java +lame lcd libass lirc nvdec +opengl oss perl pulseaudio python raw systemd vaapi vdpau vpx +wrapper x264 x265 +xml xmltv +xvid +X zeroconf input_devices_joystick v4l ivtv ieee1394 hdpvr hdhomerun vbox ceton
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=acct-user/mythtv dev-libs/glib:2 dev-libs/lzo dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts media-fonts/tex-gyre media-gfx/exiv2:= <media-libs/dav1d-1.0.0:= media-libs/freetype:2 media-libs/libsamplerate media-libs/taglib sys-libs/zlib alsa? ( media-libs/alsa-lib ) autostart? ( net-dialup/mingetty x11-apps/xset x11-wm/evilwm ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:=[java?] sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvd? ( dev-libs/libcdio:= media-libs/libdvdcss sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl(+)] ) fftw? ( sci-libs/fftw:3.0=[threads] ) hdhomerun? ( media-libs/libhdhomerun ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) java? ( dev-java/ant-core ) lame? ( media-sound/lame ) lcd? ( app-misc/lcdproc ) libass? ( media-libs/libass:= ) lirc? ( app-misc/lirc ) nvdec? ( x11-drivers/nvidia-drivers ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:= ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau ) vpx? ( media-libs/libvpx:= ) x264? ( media-libs/x264:= ) X? ( x11-apps/xinit x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= x11-misc/wmctrl:= ) x265? ( media-libs/x265 ) xml? ( dev-libs/libxml2:2 ) xmltv? ( dev-perl/XML-LibXML media-tv/xmltv ) xvid? ( media-libs/xvid ) zeroconf? ( dev-libs/openssl:= net-dns/avahi[mdnsresponder-compat] )
@@ -13,4 +13,4 @@ REQUIRED_USE=bluray? ( xml ) cdr? ( cdda )
 SLOT=0
 SRC_URI=https://github.com/MythTV/mythtv/archive/v31.0.tar.gz -> mythtv-31.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	user-info	69a1ed744ec33cf2c910ff2bd6084d11	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=aa43be380c7b06bc58b3a2dd1dfc088d
+_md5_=2f52d082b311a9b2d3fb71878d584df7
diff --git a/metadata/md5-cache/media-tv/mythtv-31.0_p20210731-r2 b/metadata/md5-cache/media-tv/mythtv-31.0_p20210731-r2
index 17f86c5755bc..3aec35052363 100644
--- a/metadata/md5-cache/media-tv/mythtv-31.0_p20210731-r2
+++ b/metadata/md5-cache/media-tv/mythtv-31.0_p20210731-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Open Source DVR and media center hub
 EAPI=7
 HOMEPAGE=https://www.mythtv.org https://github.com/MythTV/mythtv
 INHERIT=eutils flag-o-matic python-any-r1 qmake-utils readme.gentoo-r1 systemd user-info
-IUSE=alsa altivec asi autostart bluray cdda cdr cec debug dvd dvb egl exif fftw jack java +lame lcd libass lirc nvdec +opengl oss perl pulseaudio python raw systemd vaapi vdpau vpx +wrapper x264 x265 +xml xmltv +xvid +X zeroconf input_devices_joystick v4l ivtv ieee1394 hdpvr hdhomerun vbox ceton
+IUSE=alsa asi autostart bluray cdda cdr cec cpu_flags_ppc_altivec debug dvd dvb egl exif fftw jack java +lame lcd libass lirc nvdec +opengl oss perl pulseaudio python raw systemd vaapi vdpau vpx +wrapper x264 x265 +xml xmltv +xvid +X zeroconf input_devices_joystick v4l ivtv ieee1394 hdpvr hdhomerun vbox ceton
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=acct-user/mythtv dev-libs/glib:2 dev-libs/lzo dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts media-fonts/tex-gyre media-gfx/exiv2:= <media-libs/dav1d-1.0.0:= media-libs/freetype:2 media-libs/libsamplerate media-libs/taglib sys-libs/zlib alsa? ( media-libs/alsa-lib ) autostart? ( net-dialup/mingetty x11-apps/xset x11-wm/evilwm ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:=[java?] sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvd? ( dev-libs/libcdio:= media-libs/libdvdcss sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl(+)] ) fftw? ( sci-libs/fftw:3.0=[threads] ) hdhomerun? ( media-libs/libhdhomerun ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) java? ( dev-java/ant-core ) lame? ( media-sound/lame ) lcd? ( app-misc/lcdproc ) libass? ( media-libs/libass:= ) lirc? ( app-misc/lirc ) nvdec? ( x11-drivers/nvidia-drivers ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:= ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau ) vpx? ( media-libs/libvpx:= ) x264? ( media-libs/x264:= ) X? ( x11-apps/xinit x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= x11-misc/wmctrl:= ) x265? ( media-libs/x265 ) xml? ( dev-libs/libxml2:2 ) xmltv? ( dev-perl/XML-LibXML media-tv/xmltv ) xvid? ( media-libs/xvid ) zeroconf? ( dev-libs/openssl:= net-dns/avahi[mdnsresponder-compat] )
@@ -13,4 +13,4 @@ REQUIRED_USE=bluray? ( xml ) cdr? ( cdda )
 SLOT=0
 SRC_URI=https://github.com/MythTV/mythtv/archive/5824c588db24b4e71a7d94e829e6419f71089297.tar.gz -> mythtv-31.0_p20210731.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	user-info	69a1ed744ec33cf2c910ff2bd6084d11	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=36782d8d543829a910cadf92f87e1c15
+_md5_=b1c767ec000b50bab7a9b6b3e1e8f6b5
diff --git a/metadata/md5-cache/media-tv/mythtv-32.0-r2 b/metadata/md5-cache/media-tv/mythtv-32.0-r2
index 042f3113c200..43205c892b63 100644
--- a/metadata/md5-cache/media-tv/mythtv-32.0-r2
+++ b/metadata/md5-cache/media-tv/mythtv-32.0-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Open Source DVR and media center hub
 EAPI=8
 HOMEPAGE=https://www.mythtv.org https://github.com/MythTV/mythtv
 INHERIT=flag-o-matic java-pkg-opt-2 java-ant-2 python-any-r1 qmake-utils readme.gentoo-r1 systemd user-info
-IUSE=alsa altivec asi autostart cdda cdr cec debug dvd dvb exif fftw jack java +lame lcd libass lirc nvdec +opengl oss perl pulseaudio python raw systemd vaapi vdpau vpx +wrapper x264 x265 +xml xmltv +xvid +X zeroconf input_devices_joystick v4l ieee1394 hdhomerun vbox ceton java
+IUSE=alsa asi autostart cdda cdr cec cpu_flags_ppc_altivec debug dvd dvb exif fftw jack java +lame lcd libass lirc nvdec +opengl oss perl pulseaudio python raw systemd vaapi vdpau vpx +wrapper x264 x265 +xml xmltv +xvid +X zeroconf input_devices_joystick v4l ieee1394 hdhomerun vbox ceton java
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=acct-user/mythtv dev-libs/glib:2 dev-libs/lzo dev-libs/libzip:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts media-fonts/tex-gyre media-gfx/exiv2:= media-libs/freetype:2 media-libs/libbluray:=[java?] media-libs/libsamplerate media-libs/libsoundtouch media-libs/taglib sys-libs/zlib alsa? ( media-libs/alsa-lib ) autostart? ( net-dialup/mingetty x11-apps/xset x11-wm/evilwm ) cec? ( dev-libs/libcec ) dvd? ( dev-libs/libcdio:= media-libs/libdvdcss sys-fs/udisks:2 ) fftw? ( sci-libs/fftw:3.0=[threads] ) hdhomerun? ( media-libs/libhdhomerun ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) lame? ( media-sound/lame ) lcd? ( app-misc/lcdproc ) libass? ( media-libs/libass:= ) lirc? ( app-misc/lirc ) nvdec? ( x11-drivers/nvidia-drivers ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:= ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau ) vpx? ( media-libs/libvpx:= ) x264? ( media-libs/x264:= ) X? ( x11-apps/xinit x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= x11-misc/wmctrl:= ) x265? ( media-libs/x265 ) xml? ( dev-libs/libxml2:2 ) xmltv? ( dev-perl/XML-LibXML media-tv/xmltv ) xvid? ( media-libs/xvid ) zeroconf? ( dev-libs/openssl:= net-dns/avahi[mdnsresponder-compat] ) java? ( >=dev-java/java-config-2.2.0-r3 )
@@ -13,4 +13,4 @@ REQUIRED_USE=cdr? ( cdda )
 SLOT=0
 SRC_URI=https://github.com/MythTV/mythtv/archive/v32.0.tar.gz -> mythtv-32.0.tar.gz
 _eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=00e5178ce237a2c63980608ea760b84d
+_md5_=1fee7b45712e323ae955e7aaae8d2d38
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index c885946c9c36..cd61d791c8aa 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/matroxset-0.4-r1 b/metadata/md5-cache/media-video/matroxset-0.4-r2
index 692d49a80540..50ae2c36ee6d 100644
--- a/metadata/md5-cache/media-video/matroxset-0.4-r1
+++ b/metadata/md5-cache/media-video/matroxset-0.4-r2
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install
-DEPEND=sys-libs/ncurses:= virtual/pkgconfig
+DEPEND=sys-libs/ncurses:=
 DESCRIPTION=Matrox utility to switch output modes (activate tvout)
-EAPI=6
+EAPI=8
 HOMEPAGE=ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/
-INHERIT=toolchain-funcs
+INHERIT=edo toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/matroxset-0.4.tar.gz
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=b61a5d77edadd29b207bc8964db3d562
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=59826879e5d411519b5e55bfdd58f168
diff --git a/metadata/md5-cache/media-video/mplayer-1.4-r1 b/metadata/md5-cache/media-video/mplayer-1.4-r1
index eb9b8fc83717..d595188d562a 100644
--- a/metadata/md5-cache/media-video/mplayer-1.4-r1
+++ b/metadata/md5-cache/media-video/mplayer-1.4-r1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install postrm preinst prepare setup unpack
-DEPEND=sys-libs/ncurses:0= app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-4.0:0=[vdpau?] a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvd? ( >=media-libs/libdvdread-4.1.3:0= ) dvdnav? ( >=media-libs/libdvdnav-4.1.3:0= ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) virtual/pkgconfig dga? ( x11-base/xorg-proto ) dvb? ( virtual/linuxtv-dvb-headers ) X? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto ) xscreensaver? ( x11-base/xorg-proto ) amd64? ( dev-lang/yasm ) doc? ( dev-libs/libxslt app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets ) x86? ( dev-lang/yasm )
+DEPEND=sys-libs/ncurses:0= app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-4.0:0=[vdpau?] a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvd? ( >=media-libs/libdvdread-4.1.3:0= ) dvdnav? ( >=media-libs/libdvdnav-4.1.3:0= ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) virtual/pkgconfig dga? ( x11-base/xorg-proto ) dvb? ( virtual/linuxtv-dvb-headers ) X? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto ) xscreensaver? ( x11-base/xorg-proto ) amd64? ( dev-lang/yasm ) doc? ( dev-libs/libxslt app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets ) x86? ( dev-lang/yasm )
 DESCRIPTION=Media Player for Linux
 EAPI=6
 HOMEPAGE=http://www.mplayerhq.hu/
 INHERIT=toolchain-funcs flag-o-matic
-IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp ggi gsm +iconv ipv6 jack joystick jpeg ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas +network openal opengl +osdmenu oss png pnm pulseaudio pvr radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3 tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran video_cards_mga
+IUSE=cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp ggi gsm +iconv ipv6 jack joystick jpeg ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas +network openal opengl +osdmenu oss png pnm pulseaudio pvr radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3 tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran video_cards_mga
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-4.0:0=[vdpau?] a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvd? ( >=media-libs/libdvdread-4.1.3:0= ) dvdnav? ( >=media-libs/libdvdnav-4.1.3:0= ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) selinux? ( sec-policy/selinux-mplayer )
+RDEPEND=sys-libs/ncurses:0= app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-4.0:0=[vdpau?] a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvd? ( >=media-libs/libdvdread-4.1.3:0= ) dvdnav? ( >=media-libs/libdvdnav-4.1.3:0= ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) selinux? ( sec-policy/selinux-mplayer )
 REQUIRED_USE=dga? ( X ) dvdnav? ( dvd ) enca? ( iconv ) ggi? ( X ) libass? ( truetype ) opengl? ( X ) osdmenu? ( X ) truetype? ( iconv ) vdpau? ( X ) vidix? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
 RESTRICT=faac? ( bindist )
 SLOT=0
 SRC_URI=mirror://mplayer/releases/MPlayer-1.4.tar.xz https://dev.gentoo.org/~aballier/distfiles/mplayer-1.4-ffmpeg5.patch.bz2 !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=75fb8e64eaf2017e47fbc45b0dd44af8
+_md5_=b092252a1d62ab8ee35abedf6aad0214
diff --git a/metadata/md5-cache/media-video/mplayer-9999 b/metadata/md5-cache/media-video/mplayer-9999
index 227ded42881c..03a7fd218832 100644
--- a/metadata/md5-cache/media-video/mplayer-9999
+++ b/metadata/md5-cache/media-video/mplayer-9999
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install postrm preinst prepare setup unpack
-DEPEND=sys-libs/ncurses:0= app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-4.0:0=[vdpau?] a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvd? ( >=media-libs/libdvdread-4.1.3:0= ) dvdnav? ( >=media-libs/libdvdnav-4.1.3:0= ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) virtual/pkgconfig dga? ( x11-base/xorg-proto ) dvb? ( virtual/linuxtv-dvb-headers ) X? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto ) xscreensaver? ( x11-base/xorg-proto ) amd64? ( dev-lang/yasm ) doc? ( dev-libs/libxslt app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets ) x86? ( dev-lang/yasm ) dev-vcs/subversion[http(+)] net-misc/rsync >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=sys-libs/ncurses:0= app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-4.0:0=[vdpau?] a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvd? ( >=media-libs/libdvdread-4.1.3:0= ) dvdnav? ( >=media-libs/libdvdnav-4.1.3:0= ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) virtual/pkgconfig dga? ( x11-base/xorg-proto ) dvb? ( virtual/linuxtv-dvb-headers ) X? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto ) xscreensaver? ( x11-base/xorg-proto ) amd64? ( dev-lang/yasm ) doc? ( dev-libs/libxslt app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets ) x86? ( dev-lang/yasm ) dev-vcs/subversion[http(+)] net-misc/rsync >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Media Player for Linux
 EAPI=6
 HOMEPAGE=http://www.mplayerhq.hu/
 INHERIT=toolchain-funcs flag-o-matic subversion git-r3
-IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp ggi gsm +iconv ipv6 jack joystick jpeg ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas +network openal opengl +osdmenu oss png pnm pulseaudio pvr radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3 tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran video_cards_mga
+IUSE=cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp ggi gsm +iconv ipv6 jack joystick jpeg ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas +network openal opengl +osdmenu oss png pnm pulseaudio pvr radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3 tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran video_cards_mga
 LICENSE=GPL-2
 PROPERTIES=live live
-RDEPEND=sys-libs/ncurses:0= app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-4.0:0=[vdpau?] a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvd? ( >=media-libs/libdvdread-4.1.3:0= ) dvdnav? ( >=media-libs/libdvdnav-4.1.3:0= ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) selinux? ( sec-policy/selinux-mplayer )
+RDEPEND=sys-libs/ncurses:0= app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-4.0:0=[vdpau?] a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvd? ( >=media-libs/libdvdread-4.1.3:0= ) dvdnav? ( >=media-libs/libdvdnav-4.1.3:0= ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) selinux? ( sec-policy/selinux-mplayer )
 REQUIRED_USE=dga? ( X ) dvdnav? ( dvd ) enca? ( iconv ) ggi? ( X ) libass? ( truetype ) opengl? ( X ) osdmenu? ( X ) truetype? ( iconv ) vdpau? ( X ) vidix? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
 RESTRICT=faac? ( bindist )
 SLOT=0
 SRC_URI=!truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	subversion	dee31e56422214d05644c2a3c900a148	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fc669fc3e01c83d138133d5fc06db5d2
+_md5_=c21ffa3cdb6f4d6ae36119113621f54c
diff --git a/metadata/md5-cache/media-video/transcode-1.1.7-r6 b/metadata/md5-cache/media-video/transcode-1.1.7-r6
index 0d719c44fd2d..c78ad325d2dd 100644
--- a/metadata/md5-cache/media-video/transcode-1.1.7-r6
+++ b/metadata/md5-cache/media-video/transcode-1.1.7-r6
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig v4l? ( >=sys-kernel/linux-headers-2.6.11 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=>=media-video/ffmpeg-0.10 a52? ( media-libs/a52dec ) aac? ( media-libs/faac ) alsa? ( media-libs/alsa-lib ) dv? ( media-libs/libdv ) dvd? ( media-libs/libdvdread:0= ) iconv? ( virtual/libiconv ) imagemagick? ( media-gfx/imagemagick:= ) jpeg? ( virtual/jpeg:0= ) lzo? ( >=dev-libs/lzo-2 ) mjpeg? ( media-video/mjpegtools:= ) mp3? ( media-sound/lame ) mpeg? ( media-libs/libmpeg2 ) ogg? ( media-libs/libogg ) postproc? ( >=media-video/ffmpeg-0.10 ) quicktime? ( >=media-libs/libquicktime-1 ) sdl? ( >=media-libs/libsdl-1.2.5[X?] ) theora? ( media-libs/libtheora ) truetype? ( >=media-libs/freetype-2 ) v4l? ( media-libs/libv4l ) vorbis? ( media-libs/libvorbis ) X? ( x11-libs/libXaw x11-libs/libXpm x11-libs/libXv ) x264? ( media-libs/x264:= ) xml? ( dev-libs/libxml2 ) xvid? ( media-libs/xvid )
+DEPEND=>=media-video/ffmpeg-0.10 a52? ( media-libs/a52dec ) aac? ( media-libs/faac ) alsa? ( media-libs/alsa-lib ) dv? ( media-libs/libdv ) dvd? ( media-libs/libdvdread:0= ) iconv? ( virtual/libiconv ) imagemagick? ( media-gfx/imagemagick:= ) jpeg? ( media-libs/libjpeg-turbo:= ) lzo? ( >=dev-libs/lzo-2 ) mjpeg? ( media-video/mjpegtools:= ) mp3? ( media-sound/lame ) mpeg? ( media-libs/libmpeg2 ) ogg? ( media-libs/libogg ) postproc? ( >=media-video/ffmpeg-0.10 ) quicktime? ( >=media-libs/libquicktime-1 ) sdl? ( >=media-libs/libsdl-1.2.5[X?] ) theora? ( media-libs/libtheora ) truetype? ( >=media-libs/freetype-2 ) v4l? ( media-libs/libv4l ) vorbis? ( media-libs/libvorbis ) X? ( x11-libs/libXaw x11-libs/libXpm x11-libs/libXv ) x264? ( media-libs/x264:= ) xml? ( dev-libs/libxml2 ) xvid? ( media-libs/xvid )
 DESCRIPTION=Utilities for transcoding video and audio codecs in different containers
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 INHERIT=autotools
-IUSE=cpu_flags_x86_3dnow a52 aac alsa altivec dv dvd +iconv imagemagick jpeg lzo mjpeg cpu_flags_x86_mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl cpu_flags_x86_sse cpu_flags_x86_sse2 theora truetype v4l vorbis X x264 xml xvid
+IUSE=cpu_flags_ppc_altivec cpu_flags_x86_3dnow a52 aac alsa dv dvd +iconv imagemagick jpeg lzo mjpeg cpu_flags_x86_mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl cpu_flags_x86_sse cpu_flags_x86_sse2 theora truetype v4l vorbis X x264 xml xvid
 KEYWORDS=~alpha amd64 ~arm64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/ffmpeg-0.10 a52? ( media-libs/a52dec ) aac? ( media-libs/faac ) alsa? ( media-libs/alsa-lib ) dv? ( media-libs/libdv ) dvd? ( media-libs/libdvdread:0= ) iconv? ( virtual/libiconv ) imagemagick? ( media-gfx/imagemagick:= ) jpeg? ( virtual/jpeg:0= ) lzo? ( >=dev-libs/lzo-2 ) mjpeg? ( media-video/mjpegtools:= ) mp3? ( media-sound/lame ) mpeg? ( media-libs/libmpeg2 ) ogg? ( media-libs/libogg ) postproc? ( >=media-video/ffmpeg-0.10 ) quicktime? ( >=media-libs/libquicktime-1 ) sdl? ( >=media-libs/libsdl-1.2.5[X?] ) theora? ( media-libs/libtheora ) truetype? ( >=media-libs/freetype-2 ) v4l? ( media-libs/libv4l ) vorbis? ( media-libs/libvorbis ) X? ( x11-libs/libXaw x11-libs/libXpm x11-libs/libXv ) x264? ( media-libs/x264:= ) xml? ( dev-libs/libxml2 ) xvid? ( media-libs/xvid )
+RDEPEND=>=media-video/ffmpeg-0.10 a52? ( media-libs/a52dec ) aac? ( media-libs/faac ) alsa? ( media-libs/alsa-lib ) dv? ( media-libs/libdv ) dvd? ( media-libs/libdvdread:0= ) iconv? ( virtual/libiconv ) imagemagick? ( media-gfx/imagemagick:= ) jpeg? ( media-libs/libjpeg-turbo:= ) lzo? ( >=dev-libs/lzo-2 ) mjpeg? ( media-video/mjpegtools:= ) mp3? ( media-sound/lame ) mpeg? ( media-libs/libmpeg2 ) ogg? ( media-libs/libogg ) postproc? ( >=media-video/ffmpeg-0.10 ) quicktime? ( >=media-libs/libquicktime-1 ) sdl? ( >=media-libs/libsdl-1.2.5[X?] ) theora? ( media-libs/libtheora ) truetype? ( >=media-libs/freetype-2 ) v4l? ( media-libs/libv4l ) vorbis? ( media-libs/libvorbis ) X? ( x11-libs/libXaw x11-libs/libXpm x11-libs/libXv ) x264? ( media-libs/x264:= ) xml? ( dev-libs/libxml2 ) xvid? ( media-libs/xvid )
 REQUIRED_USE=cpu_flags_x86_sse? ( cpu_flags_x86_mmx ) cpu_flags_x86_sse2? ( cpu_flags_x86_mmx cpu_flags_x86_sse ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) nuv? ( lzo )
 SLOT=0
 SRC_URI=https://www.bitbucket.org/france/transcode-tcforge/downloads/transcode-1.1.7.tar.bz2 https://dev.gentoo.org/~mgorny/dist/transcode-1.1.7-patchset.tar.bz2 https://dev.gentoo.org/~whissi/dist/transcode/transcode-1.1.7-ffmpeg4.patch.xz
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=052f09eaecfea37a0470b68b390fce79
+_md5_=3285509d9546cfdf518d947ec49d00c6
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 558ff1fe76de..a4e107a43b7f 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/cacti-1.2.21 b/metadata/md5-cache/net-analyzer/cacti-1.2.21
index f52a2c5938da..e6839dab6847 100644
--- a/metadata/md5-cache/net-analyzer/cacti-1.2.21
+++ b/metadata/md5-cache/net-analyzer/cacti-1.2.21
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.cacti.net/
 INHERIT=edos2unix webapp
 IUSE=snmp doc vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[cli,mysql,pdo,session,sockets,xml] dev-php/adodb net-analyzer/rrdtool[graph] virtual/cron snmp? ( >=net-analyzer/net-snmp-5.2.0 ) app-admin/webapp-config
 SLOT=1.2.21
 SRC_URI=https://www.cacti.net/downloads/cacti-1.2.21.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	webapp	d872f28d7595b70dd46545199ef35fb0
-_md5_=f7c2fe8085fd390f7cd0765661874f37
+_md5_=19c4526aeb4d9d29e38542ae138af37f
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-1.2.20 b/metadata/md5-cache/net-analyzer/cacti-spine-1.2.20
index 467d5a493d72..abe6847d3f0b 100644
--- a/metadata/md5-cache/net-analyzer/cacti-spine-1.2.20
+++ b/metadata/md5-cache/net-analyzer/cacti-spine-1.2.20
@@ -5,10 +5,10 @@ DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
 EAPI=8
 HOMEPAGE=https://cacti.net/spine_info.php
 INHERIT=autotools
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-db/mysql-connector-c:= dev-libs/openssl:= net-analyzer/net-snmp:= >net-analyzer/cacti-0.8.8
 SLOT=0
 SRC_URI=https://www.cacti.net/downloads/spine/cacti-spine-1.2.20.tar.gz
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=510634fe0b2a96a1861c1a7fe2f5e151
+_md5_=618bc3e49bf60e7000ac7d451f793cbd
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 9670fc18074a..62b3f488848d 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/nfacct-1.0.2-r1 b/metadata/md5-cache/net-firewall/nfacct-1.0.2-r1
deleted file mode 100644
index b184b69bfdb9..000000000000
--- a/metadata/md5-cache/net-firewall/nfacct-1.0.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=net-libs/libmnl >=net-libs/libnetfilter_acct-1.0.3 virtual/pkgconfig
-DESCRIPTION=Command line tool to create/retrieve/delete accounting objects in NetFilter
-EAPI=6
-HOMEPAGE=https://www.netfilter.org/projects/nfacct/
-INHERIT=linux-info
-KEYWORDS=amd64 ~arm ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libmnl >=net-libs/libnetfilter_acct-1.0.3
-SLOT=0
-SRC_URI=https://www.netfilter.org/projects/nfacct/files/nfacct-1.0.2.tar.bz2
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=92ea2d876213cff7c16e9a5125d9f1cf
diff --git a/metadata/md5-cache/net-firewall/nfacct-1.0.2-r2 b/metadata/md5-cache/net-firewall/nfacct-1.0.2-r2
new file mode 100644
index 000000000000..97ea745a2757
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/nfacct-1.0.2-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install setup
+DEPEND=net-libs/libmnl:= >=net-libs/libnetfilter_acct-1.0.3
+DESCRIPTION=Command line tool to create/retrieve/delete accounting objects in NetFilter
+EAPI=8
+HOMEPAGE=https://www.netfilter.org/projects/nfacct/
+INHERIT=linux-info
+KEYWORDS=amd64 ~arm ~ppc64 x86
+LICENSE=GPL-2
+RDEPEND=net-libs/libmnl:= >=net-libs/libnetfilter_acct-1.0.3
+SLOT=0
+SRC_URI=https://www.netfilter.org/projects/nfacct/files/nfacct-1.0.2.tar.bz2
+_eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=58666293e021d0393687512b2121d6a6
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 41efb6ff173c..707add354235 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/cifs-utils-6.15 b/metadata/md5-cache/net-fs/cifs-utils-6.15
index d1cce7ee3ec4..d2a80062031a 100644
--- a/metadata/md5-cache/net-fs/cifs-utils-6.15
+++ b/metadata/md5-cache/net-fs/cifs-utils-6.15
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.samba.org/index.php/LinuxCIFS_utils
 INHERIT=autotools bash-completion-r1 linux-info pam python-single-r1
 IUSE=+acl +ads +caps creds pam +python systemd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
 LICENSE=GPL-3
 PDEPEND=acl? ( >=net-fs/samba-4.0.0_alpha1 )
 RDEPEND=sys-apps/keyutils:= ads? ( sys-libs/talloc virtual/krb5 ) caps? ( sys-libs/libcap-ng ) pam? ( sys-libs/pam ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) )
@@ -14,4 +14,4 @@ REQUIRED_USE=acl? ( ads ) python? ( ^^ ( python_single_target_python3_8 python_s
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-6.15.tar.bz2
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=439456f8bd19080fd969b618a4406854
+_md5_=b33fd13f4873046a1fc9816d972450ff
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 32574e7bc8ff..735cc3331731 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-opus-13.0.1.3.0-r1 b/metadata/md5-cache/net-misc/asterisk-opus-13.0.1.3.0-r1
index fe536e9b42f9..011905c8678e 100644
--- a/metadata/md5-cache/net-misc/asterisk-opus-13.0.1.3.0-r1
+++ b/metadata/md5-cache/net-misc/asterisk-opus-13.0.1.3.0-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install setup
 DESCRIPTION=OPUS codec and supporting files for asterisk
 EAPI=7
 HOMEPAGE=https://wiki.asterisk.org/wiki/display/AST/Codec+Opus
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=Digium
 RDEPEND==net-misc/asterisk-13*
 RESTRICT=mirror strip
 SLOT=0/13.0
 SRC_URI=amd64? ( https://downloads.digium.com/pub/telephony/codec_opus/asterisk-13.0/x86-64/codec_opus-13.0_1.3.0-x86_64.tar.gz ) x86? ( https://downloads.digium.com/pub/telephony/codec_opus/asterisk-13.0/x86-32/codec_opus-13.0_1.3.0-x86_32.tar.gz )
-_md5_=47f935bd8676df23f69f9f4ac1019df3
+_md5_=8cb69e84cb7c11ce36e4de3682731960
diff --git a/metadata/md5-cache/net-misc/asterisk-opus-16.0.1.3.0-r1 b/metadata/md5-cache/net-misc/asterisk-opus-16.0.1.3.0-r1
index af4f4e81956f..9c32a0dfd99b 100644
--- a/metadata/md5-cache/net-misc/asterisk-opus-16.0.1.3.0-r1
+++ b/metadata/md5-cache/net-misc/asterisk-opus-16.0.1.3.0-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install setup
 DESCRIPTION=OPUS codec and supporting files for asterisk
 EAPI=7
 HOMEPAGE=https://wiki.asterisk.org/wiki/display/AST/Codec+Opus
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=Digium
 RDEPEND==net-misc/asterisk-16*
 RESTRICT=mirror strip
 SLOT=0/16.0
 SRC_URI=amd64? ( https://downloads.digium.com/pub/telephony/codec_opus/asterisk-16.0/x86-64/codec_opus-16.0_1.3.0-x86_64.tar.gz ) x86? ( https://downloads.digium.com/pub/telephony/codec_opus/asterisk-16.0/x86-32/codec_opus-16.0_1.3.0-x86_32.tar.gz )
-_md5_=47f935bd8676df23f69f9f4ac1019df3
+_md5_=8cb69e84cb7c11ce36e4de3682731960
diff --git a/metadata/md5-cache/net-misc/asterisk-opus-18.0.1.3.0-r1 b/metadata/md5-cache/net-misc/asterisk-opus-18.0.1.3.0-r1
index 6a9597ba2dfe..f1e6fccbcbbe 100644
--- a/metadata/md5-cache/net-misc/asterisk-opus-18.0.1.3.0-r1
+++ b/metadata/md5-cache/net-misc/asterisk-opus-18.0.1.3.0-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install setup
 DESCRIPTION=OPUS codec and supporting files for asterisk
 EAPI=7
 HOMEPAGE=https://wiki.asterisk.org/wiki/display/AST/Codec+Opus
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=Digium
 RDEPEND==net-misc/asterisk-18*
 RESTRICT=mirror strip
 SLOT=0/18.0
 SRC_URI=amd64? ( https://downloads.digium.com/pub/telephony/codec_opus/asterisk-18.0/x86-64/codec_opus-18.0_1.3.0-x86_64.tar.gz ) x86? ( https://downloads.digium.com/pub/telephony/codec_opus/asterisk-18.0/x86-32/codec_opus-18.0_1.3.0-x86_32.tar.gz )
-_md5_=47f935bd8676df23f69f9f4ac1019df3
+_md5_=8cb69e84cb7c11ce36e4de3682731960
diff --git a/metadata/md5-cache/net-misc/teamviewer-15.31.5 b/metadata/md5-cache/net-misc/teamviewer-15.31.5
new file mode 100644
index 000000000000..5096d15bab85
--- /dev/null
+++ b/metadata/md5-cache/net-misc/teamviewer-15.31.5
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/xz-utils[extra-filters] virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm preinst prepare
+DESCRIPTION=All-In-One Solution for Remote Access and Support over the Internet
+EAPI=8
+HOMEPAGE=https://www.teamviewer.com
+INHERIT=desktop optfeature systemd xdg
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=TeamViewer MIT
+RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/fontconfig media-libs/freetype media-libs/libglvnd[X] sys-apps/dbus sys-apps/util-linux sys-libs/glibc sys-libs/zlib:0/1[minizip] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.31.5_amd64.tar.xz ) arm? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.31.5_armhf.tar.xz ) arm64? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.31.5_arm64.tar.xz ) x86? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.31.5_i386.tar.xz )
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=b7ff4802438d4b8025fc5f9648cbf037
diff --git a/metadata/md5-cache/net-misc/wget-1.21.3-r1 b/metadata/md5-cache/net-misc/wget-1.21.3-r1
index 07ae6e0b169c..960ce5923a45 100644
--- a/metadata/md5-cache/net-misc/wget-1.21.3-r1
+++ b/metadata/md5-cache/net-misc/wget-1.21.3-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/wget/
 INHERIT=flag-o-matic python-any-r1 toolchain-funcs verify-sig
 IUSE=cookie-check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( cookie-check? ( net-libs/libpsl ) idn? ( >=net-dns/libidn2-0.14:= ) metalink? ( app-crypt/gpgme media-libs/libmetalink ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
 REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.21.3.tar.gz verify-sig? ( mirror://gnu/wget/wget-1.21.3.tar.gz.sig )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=93f41fbe9e225a54b3d2742d66042802
+_md5_=8bd185b6c89a7278afd83bb6f6bf4a82
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index f2f62f49528e..6b2d2f1e9c43 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/ed2k_hash-0.4.0-r2 b/metadata/md5-cache/net-p2p/ed2k_hash-0.4.0-r3
index cdfa66235edd..487cc450c485 100644
--- a/metadata/md5-cache/net-p2p/ed2k_hash-0.4.0-r2
+++ b/metadata/md5-cache/net-p2p/ed2k_hash-0.4.0-r3
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure install
 DESCRIPTION=Tool for generating eDonkey2000 links
-EAPI=6
+EAPI=8
 HOMEPAGE=http://ed2k-tools.sourceforge.net/ed2k_hash.shtml
 KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/ed2k-tools/ed2k_hash-0.4.0.tar.gz
-_md5_=3fa3efccea2ed618ffcf0fc6b01fc25f
+_md5_=f64efeac262451e5483de9411aa87e48
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 09e1f801b06d..2b4ba824273e 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/cups-2.4.2-r1 b/metadata/md5-cache/net-print/cups-2.4.2-r1
index 198295548fe9..856ba6375e3c 100644
--- a/metadata/md5-cache/net-print/cups-2.4.2-r1
+++ b/metadata/md5-cache/net-print/cups-2.4.2-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.cups.org/ https://github.com/OpenPrinting/cups
 INHERIT=autotools linux-info xdg multilib-minimal optfeature pam toolchain-funcs
 IUSE=acl dbus debug kerberos openssl pam selinux +ssl static-libs systemd test usb X xinetd zeroconf abi_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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=Apache-2.0
 PDEPEND=>=net-print/cups-filters-1.0.43
 RDEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[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(-)?] ) acct-group/lp acct-group/lpadmin selinux? ( sec-policy/selinux-cups )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/OpenPrinting/cups/releases/download/v2.4.2/cups-2.4.2-source.tar.gz
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	optfeature	d524f291c80f9d21ad80fe978e3ca760	pam	e44a1dd98f13e1ad76de01e919bde1f1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5484409533b87a5d4b26758bda9e71fa
+_md5_=b35512d8e64dca79e14a1e708e320d1d
diff --git a/metadata/md5-cache/perl-core/Compress-Raw-Zlib-2.202.0 b/metadata/md5-cache/perl-core/Compress-Raw-Zlib-2.202.0
index 262c034574f4..2d7cb8667091 100644
--- a/metadata/md5-cache/perl-core/Compress-Raw-Zlib-2.202.0
+++ b/metadata/md5-cache/perl-core/Compress-Raw-Zlib-2.202.0
@@ -5,10 +5,10 @@ DESCRIPTION=Low-Level Interface to zlib compression library
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Compress-Raw-Zlib
 INHERIT=perl-module
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=sys-libs/zlib-1.2.12 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.202.tar.gz
 _eclasses_=alternatives	a0c93671b4b99c1326c746e95dc53396	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec
-_md5_=e5165867576442b4725f1a5ff03d2fa9
+_md5_=7c159416ef3a2206ed98cfa987e7b843
diff --git a/metadata/md5-cache/perl-core/Manifest.gz b/metadata/md5-cache/perl-core/Manifest.gz
index 789706993c6b..f8dc446608f0 100644
--- a/metadata/md5-cache/perl-core/Manifest.gz
+++ b/metadata/md5-cache/perl-core/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index 787f382a3eb7..c6b688917fd8 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/siril-1.0.3 b/metadata/md5-cache/sci-astronomy/siril-1.0.3
new file mode 100644
index 000000000000..17dd52569c65
--- /dev/null
+++ b/metadata/md5-cache/sci-astronomy/siril-1.0.3
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst pretend setup test
+DEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/json-glib-1.2.6 >=dev-libs/libconfig-1.4[cxx] >=media-gfx/exiv2-0.25 media-libs/librtprocess:= >=media-libs/opencv-4.4.0:= sci-libs/cfitsio sci-libs/fftw:3.0= sci-libs/gsl:= x11-libs/cairo >=x11-libs/gtk+-3.20.0:3 curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg:= ) heif? ( media-libs/libheif ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( >=media-libs/libpng-1.6.0 ) raw? ( media-libs/libraw ) tiff? ( media-libs/tiff ) wcs? ( >=sci-astronomy/wcslib-7.7 )
+DESCRIPTION=A free astronomical image processing software
+EAPI=8
+HOMEPAGE=https://www.siril.org/
+INHERIT=meson optfeature toolchain-funcs xdg
+IUSE=curl ffmpeg heif jpeg openmp png raw tiff wcs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ Boost-1.0
+RDEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/json-glib-1.2.6 >=dev-libs/libconfig-1.4[cxx] >=media-gfx/exiv2-0.25 media-libs/librtprocess:= >=media-libs/opencv-4.4.0:= sci-libs/cfitsio sci-libs/fftw:3.0= sci-libs/gsl:= x11-libs/cairo >=x11-libs/gtk+-3.20.0:3 curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg:= ) heif? ( media-libs/libheif ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( >=media-libs/libpng-1.6.0 ) raw? ( media-libs/libraw ) tiff? ( media-libs/tiff ) wcs? ( >=sci-astronomy/wcslib-7.7 )
+SLOT=0
+SRC_URI=https://gitlab.com/free-astro/siril/-/archive/1.0.3/siril-1.0.3.tar.bz2
+_eclasses_=meson	46c25780996ffc397131ecd35a2194a2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=dce97f8a3c855fcb0e2ea5884271733e
diff --git a/metadata/md5-cache/sci-astronomy/siril-9999 b/metadata/md5-cache/sci-astronomy/siril-9999
index 80cb1aa8f411..0c3cde778ef5 100644
--- a/metadata/md5-cache/sci-astronomy/siril-9999
+++ b/metadata/md5-cache/sci-astronomy/siril-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst pretend setup test unpack
-DEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/json-glib-1.2.6 >=dev-libs/libconfig-1.4[cxx] >=media-gfx/exiv2-0.25 media-libs/librtprocess:= >=media-libs/opencv-4.4.0:= sci-libs/cfitsio sci-libs/fftw:3.0= sci-libs/gsl:= x11-libs/cairo >=x11-libs/gtk+-3.20.0:3 curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg:= ) heif? ( media-libs/libheif ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( >=media-libs/libpng-1.6.0 ) raw? ( media-libs/libraw ) tiff? ( media-libs/tiff ) wcs? ( >=sci-astronomy/wcslib-7.7 )
+DEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/json-glib-1.2.6 >=media-gfx/exiv2-0.25 media-libs/librtprocess:= >=media-libs/opencv-4.4.0:= sci-libs/cfitsio sci-libs/fftw:3.0= sci-libs/gsl:= x11-libs/cairo >=x11-libs/gtk+-3.20.0:3 curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg:= ) heif? ( media-libs/libheif ) libconfig? ( >=dev-libs/libconfig-1.4[cxx] ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( >=media-libs/libpng-1.6.0 ) raw? ( media-libs/libraw ) tiff? ( media-libs/tiff ) wcs? ( >=sci-astronomy/wcslib-7.7 )
 DESCRIPTION=A free astronomical image processing software
 EAPI=8
 HOMEPAGE=https://www.siril.org/
-INHERIT=meson toolchain-funcs xdg git-r3
-IUSE=curl ffmpeg gnuplot heif jpeg openmp png raw tiff wcs
-LICENSE=GPL-3+
+INHERIT=meson optfeature toolchain-funcs xdg git-r3
+IUSE=curl ffmpeg heif jpeg libconfig openmp png raw tiff wcs
+LICENSE=GPL-3+ Boost-1.0
 PROPERTIES=live
-RDEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/json-glib-1.2.6 >=dev-libs/libconfig-1.4[cxx] >=media-gfx/exiv2-0.25 media-libs/librtprocess:= >=media-libs/opencv-4.4.0:= sci-libs/cfitsio sci-libs/fftw:3.0= sci-libs/gsl:= x11-libs/cairo >=x11-libs/gtk+-3.20.0:3 curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg:= ) heif? ( media-libs/libheif ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( >=media-libs/libpng-1.6.0 ) raw? ( media-libs/libraw ) tiff? ( media-libs/tiff ) wcs? ( >=sci-astronomy/wcslib-7.7 ) gnuplot? ( sci-visualization/gnuplot )
+RDEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/json-glib-1.2.6 >=media-gfx/exiv2-0.25 media-libs/librtprocess:= >=media-libs/opencv-4.4.0:= sci-libs/cfitsio sci-libs/fftw:3.0= sci-libs/gsl:= x11-libs/cairo >=x11-libs/gtk+-3.20.0:3 curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg:= ) heif? ( media-libs/libheif ) libconfig? ( >=dev-libs/libconfig-1.4[cxx] ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( >=media-libs/libpng-1.6.0 ) raw? ( media-libs/libraw ) tiff? ( media-libs/tiff ) wcs? ( >=sci-astronomy/wcslib-7.7 )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	46c25780996ffc397131ecd35a2194a2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=54a0b6dbaf8b1287769b7acde81c053f
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	46c25780996ffc397131ecd35a2194a2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=70879f17208b2e64f52018c75a7f275b
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index d5fb00ccafdf..ecf250f48776 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/uchime-4.2.40 b/metadata/md5-cache/sci-biology/uchime-4.2.40
deleted file mode 100644
index 6be69463de41..000000000000
--- a/metadata/md5-cache/sci-biology/uchime-4.2.40
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Fast, accurate chimera detection
-EAPI=7
-HOMEPAGE=https://www.drive5.com/usearch/manual/uchime_algo.html
-INHERIT=cmake flag-o-matic
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=public-domain
-SLOT=0
-SRC_URI=https://www.drive5.com/uchime/uchime4.2.40_src.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=421c75fd545cd9d38575321e00aeab36
diff --git a/metadata/md5-cache/sci-biology/uchime-4.2.40-r1 b/metadata/md5-cache/sci-biology/uchime-4.2.40-r1
new file mode 100644
index 000000000000..28983daec2b5
--- /dev/null
+++ b/metadata/md5-cache/sci-biology/uchime-4.2.40-r1
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Fast, accurate chimera detection
+EAPI=8
+HOMEPAGE=https://www.drive5.com/usearch/manual/uchime_algo.html
+INHERIT=cmake
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://www.drive5.com/uchime/uchime4.2.40_src.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=75e1e97ed1a0b22c90eebd09f4e46d59
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 8206fea63f85..4c1bf1668ce5 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/linux-gpib-modules-4.3.3-r1 b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.3-r1
deleted file mode 100644
index 9cc9e7510895..000000000000
--- a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst setup unpack
-DEPEND=virtual/pkgconfig kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Kernel modules for GPIB (IEEE 488.2) hardware
-EAPI=6
-HOMEPAGE=https://linux-gpib.sourceforge.io/
-INHERIT=linux-info linux-mod toolchain-funcs
-IUSE=debug dist-kernel
-KEYWORDS=amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/gpib !<sci-libs/linux-gpib-4.2.0_rc1 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.3.3.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6ff232574f0bcad33767903505553e8d	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c8498b92847c4cc16977e7532d55d320
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 769127326722..e13cab5411d0 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/singular-4.3.1_p1 b/metadata/md5-cache/sci-mathematics/singular-4.3.1_p1
new file mode 100644
index 000000000000..c62187f009d7
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/singular-4.3.1_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm test
+DEPEND=dev-lang/perl dev-libs/gmp:0 dev-libs/ntl:= sci-libs/cddlib sci-mathematics/flint emacs? ( >=app-editors/emacs-23.1:* ) polymake? ( sci-mathematics/polymake ) readline? ( sys-libs/readline )
+DESCRIPTION=Computer algebra system for polynomial computations
+EAPI=8
+HOMEPAGE=https://www.singular.uni-kl.de/ https://github.com/Singular/Singular
+INHERIT=elisp-common
+IUSE=emacs examples polymake +readline static-libs
+KEYWORDS=~amd64 ~ppc ~riscv ~x86 ~x86-linux
+LICENSE=BSD GPL-2 GPL-3
+RDEPEND=dev-lang/perl dev-libs/gmp:0 dev-libs/ntl:= sci-libs/cddlib sci-mathematics/flint emacs? ( >=app-editors/emacs-23.1:* ) polymake? ( sci-mathematics/polymake ) readline? ( sys-libs/readline )
+SLOT=0
+SRC_URI=ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/4-3-1/singular-4.3.1p1.tar.gz
+_eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=bee9fd5a9cef832bf0c9d7d32531e82f
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 860930022e4f..0041459e7eb9 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/xd3d-8.3.1-r1 b/metadata/md5-cache/sci-visualization/xd3d-8.3.1-r1
deleted file mode 100644
index 9d6176773626..000000000000
--- a/metadata/md5-cache/sci-visualization/xd3d-8.3.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=x11-libs/libXpm app-shells/tcsh virtual/fortran
-DESCRIPTION=Scientific visualization tool
-EAPI=6
-HOMEPAGE=http://www.cmap.polytechnique.fr/~jouve/xd3d/
-INHERIT=fortran-2 flag-o-matic toolchain-funcs
-IUSE=doc examples
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXpm virtual/fortran
-SLOT=0
-SRC_URI=mirror://gentoo/xd3d-8.3.1.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d9d3e4150e015a6fbec9c775318ac8aa
diff --git a/metadata/md5-cache/sci-visualization/xd3d-8.3.1-r2 b/metadata/md5-cache/sci-visualization/xd3d-8.3.1-r2
new file mode 100644
index 000000000000..c6a78b89e815
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/xd3d-8.3.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=app-shells/tcsh virtual/fortran
+DEFINED_PHASES=configure install prepare setup
+DEPEND=x11-libs/libXpm virtual/fortran
+DESCRIPTION=Scientific visualization tool
+EAPI=8
+HOMEPAGE=http://www.cmap.polytechnique.fr/~jouve/xd3d/
+INHERIT=edo fortran-2 flag-o-matic toolchain-funcs
+IUSE=doc examples
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=x11-libs/libXpm virtual/fortran
+SLOT=0
+SRC_URI=mirror://gentoo/xd3d-8.3.1.tar.gz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=07ab612820f0e727153d42c51e35e150
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 8d4ac237fac3..a7d919edc43a 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/firejail-0.9.70 b/metadata/md5-cache/sys-apps/firejail-0.9.70
index 64e73430b646..02a71f69ee7d 100644
--- a/metadata/md5-cache/sys-apps/firejail-0.9.70
+++ b/metadata/md5-cache/sys-apps/firejail-0.9.70
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://firejail.wordpress.com/
 INHERIT=toolchain-funcs python-single-r1 linux-info
 IUSE=apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home test +userns X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-apps/firejail-lts apparmor? ( sys-libs/libapparmor ) contrib? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) dbusproxy? ( sys-apps/xdg-dbus-proxy )
 REQUIRED_USE=contrib? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netblue30/firejail/releases/download/0.9.70/firejail-0.9.70.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=b3b672642338ac104ff5038962219972
+_md5_=57ba5f20baa360f777fb0c84893d31e7
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 5b9c5607fe5f..eb6b8dc33ff8 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/nbd-3.24 b/metadata/md5-cache/sys-block/nbd-3.24
index fe9290c1a800..e09b45648fd2 100644
--- a/metadata/md5-cache/sys-block/nbd-3.24
+++ b/metadata/md5-cache/sys-block/nbd-3.24
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://nbd.sourceforge.net/
 INHERIT=systemd
 IUSE=debug gnutls netlink zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26.0 gnutls? ( >=net-libs/gnutls-2.12.0 ) netlink? ( >=dev-libs/libnl-3.1 ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://github.com/NetworkBlockDevice/nbd/releases/download/nbd-3.24/nbd-3.24.tar.xz mirror://sourceforge/nbd/nbd-3.24.tar.xz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=3823ca8aec8ccdb62f41eb62dbf4051b
+_md5_=c8a918f62f77edcb006b4e2c1dbd72a6
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index fe65d0cfc462..098e8f789417 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/csync2-2.0-r2 b/metadata/md5-cache/sys-cluster/csync2-2.0-r2
deleted file mode 100644
index c9637940d4e5..000000000000
--- a/metadata/md5-cache/sys-cluster/csync2-2.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=config configure install postinst prepare
-DEPEND=>=net-libs/librsync-0.9.5 mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3.0 ) ssl? ( >=net-libs/gnutls-2.7.3 ) xinetd? ( sys-apps/xinetd ) virtual/pkgconfig
-DESCRIPTION=Cluster synchronization tool
-EAPI=7
-HOMEPAGE=https://github.com/LINBIT/csync2
-INHERIT=autotools
-IUSE=mysql postgres sqlite ssl xinetd
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/librsync-0.9.5 mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3.0 ) ssl? ( >=net-libs/gnutls-2.7.3 ) xinetd? ( sys-apps/xinetd )
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=0
-SRC_URI=https://github.com/LINBIT/csync2/archive/csync2-2.0.tar.gz -> csync2-2.0-github.tar.gz
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=24471175e2bb77371adb73d214134e78
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index eae5d4a54ea3..0d5538b0f3e1 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.10.1-r1 b/metadata/md5-cache/sys-fs/btrfs-progs-5.10.1-r1
index de3c983dcb47..dee87eea2de9 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.10.1-r1
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.10.1-r1
@@ -1,10 +1,10 @@
-BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto )
+BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postrm prepare setup
 DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ) zstd? ( app-arch/zstd:0= ) convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=7
 HOMEPAGE=https://btrfs.wiki.kernel.org
-INHERIT=bash-completion-r1 python-single-r1
+INHERIT=bash-completion-r1 python-single-r1 udev
 IUSE=+convert doc python reiserfs static static-libs +zstd python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.10.1.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=49d3742f7b186fdcfde99a118c5bfd85
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=b9dda8004d09b2c326fc230f404e253e
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.15.1 b/metadata/md5-cache/sys-fs/btrfs-progs-5.15.1
index 9c67a521bf64..b4038eb1235c 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.15.1
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.15.1
@@ -1,10 +1,10 @@
-BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto )
+BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postrm prepare setup
 DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) zstd? ( app-arch/zstd:0= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=7
 HOMEPAGE=https://btrfs.wiki.kernel.org
-INHERIT=bash-completion-r1 python-single-r1
+INHERIT=bash-completion-r1 python-single-r1 udev
 IUSE=+convert doc python reiserfs static static-libs +zstd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.15.1.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=144843286e388257946f3c9779cda690
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=cd2500b47c0446702568dc8f7da40028
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.16.2 b/metadata/md5-cache/sys-fs/btrfs-progs-5.16.2
index f19ad29f7899..ba2290294aa2 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.16.2
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.16.2
@@ -1,10 +1,10 @@
-BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto )
+BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postrm prepare setup
 DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) zstd? ( app-arch/zstd:0= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=7
 HOMEPAGE=https://btrfs.wiki.kernel.org
-INHERIT=bash-completion-r1 python-single-r1
+INHERIT=bash-completion-r1 python-single-r1 udev
 IUSE=+convert doc python reiserfs static static-libs +zstd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.16.2.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=0c4c98bc2d07ee7f4686b035c5e1c83d
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=24da22a44b0afc7345ad883326a8abc4
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 656ebcf2907a..e9b49fa396aa 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/gentoo-sources-5.10.131 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.131
new file mode 100644
index 000000000000..c12c47e6de9a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.131
@@ -0,0 +1,15 @@
+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
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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.131
+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-140.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-140.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-140.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-140.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-140.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-140.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-140.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-140.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-140.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=529484bbdf5bc12481434ba7b19af3f1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.55 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.55
new file mode 100644
index 000000000000..d04e4c70c0c2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.55
@@ -0,0 +1,15 @@
+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.15 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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.15.55
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-59.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-59.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-59.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-59.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-59.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-59.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-59.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-59.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-59.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=b058cff283373f50f71b64ca9d41bcd9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.12 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.12
new file mode 100644
index 000000000000..e2a34c5b3c40
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.12
@@ -0,0 +1,15 @@
+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.18 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+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.18.12
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-15.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-15.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-15.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-15.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-15.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-15.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-15.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-15.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-15.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=94902062852814d849d8db10ed1e7ccf
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.206 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.206
new file mode 100644
index 000000000000..5c98d4381982
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.206
@@ -0,0 +1,15 @@
+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
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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.206
+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-211.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-211.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-211.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-211.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-211.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-211.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-211.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-211.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-211.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=dc891ff185ed445ab6b728db8fd23cc8
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.130 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.131
index aa0e2ceee896..71924c8aa1ea 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.130
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.131
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 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.130
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.130.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+SLOT=5.10.131
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.131.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.54 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.55
index b438e451921b..9046861efe41 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.54
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.55
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 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.54
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.54.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
+SLOT=5.15.55
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.55.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.17.15 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.17.15
deleted file mode 100644
index 5dae819bfc41..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.17.15
+++ /dev/null
@@ -1,15 +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
-INHERIT=kernel-2
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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.17.15
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.17.15.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.17.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.11 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.12
index 382db35a2c02..885b0d077b32 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.11
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.12
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 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.18.11
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.18.11.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
+SLOT=5.18.12
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.18.12.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.205 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.206
index 838076fa7499..45fb5d9814d9 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.205
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.206
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 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.205
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.205.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+SLOT=5.4.206
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.206.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index b28aadff2e28..e18ef9f331f1 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.202.0 b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.202.0
index faf1829dc98a..4e272b57c8c7 100644
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.202.0
+++ b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.202.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Compress-Raw-Zlib
 EAPI=8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/Compress-Raw-Zlib-2.202.0 dev-lang/perl:= !<perl-core/Compress-Raw-Zlib-2.202.0 !>perl-core/Compress-Raw-Zlib-2.202.0-r999
 SLOT=0
-_md5_=e19c021ed1af770d834103fd77907eb5
+_md5_=f815fe4a16f94eb34c3af4ec5ea5bb66
diff --git a/metadata/md5-cache/virtual/podofo-build-0.9.6 b/metadata/md5-cache/virtual/podofo-build-0.9.6-r1
index 92ef1a3f20ff..6887e7190077 100644
--- a/metadata/md5-cache/virtual/podofo-build-0.9.6
+++ b/metadata/md5-cache/virtual/podofo-build-0.9.6-r1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual package for building against PoDoFo
-EAPI=6
+EAPI=8
 IUSE=+boost idn debug test +tools
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86
 RDEPEND=app-text/podofo:0/0.9.6[boost=,idn=,debug=,test=,tools=] boost? ( dev-libs/boost )
 RESTRICT=!test? ( test )
 SLOT=0/0.9.6
-_md5_=abe7c5326861bc3734dfa4b92adc08ff
+_md5_=cf8460dbf9a55119f3d3b787085a4110
diff --git a/metadata/md5-cache/virtual/podofo-build-0.9.7 b/metadata/md5-cache/virtual/podofo-build-0.9.7-r1
index 107bcf2de767..899a28528ea7 100644
--- a/metadata/md5-cache/virtual/podofo-build-0.9.7
+++ b/metadata/md5-cache/virtual/podofo-build-0.9.7-r1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual package for building against PoDoFo
-EAPI=6
+EAPI=8
 IUSE=+boost idn debug test +tools
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 RDEPEND=app-text/podofo:0/0.9.7[boost=,idn=,debug=,test=,tools=] boost? ( dev-libs/boost )
 RESTRICT=!test? ( test )
 SLOT=0/0.9.7
-_md5_=06dd68080fae85e29687188521104bd7
+_md5_=e118db892e8bdc011454c45e468872fe
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index b6455ba040a1..7046aa6f65d3 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/kibana-bin-7.17.3 b/metadata/md5-cache/www-apps/kibana-bin-7.17.5
index e61cbd3f599d..4c28a24b1ddb 100644
--- a/metadata/md5-cache/www-apps/kibana-bin-7.17.3
+++ b/metadata/md5-cache/www-apps/kibana-bin-7.17.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 Elastic-2.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB
 RDEPEND=acct-group/kibana acct-user/kibana dev-libs/expat dev-libs/nspr dev-libs/nss >=net-libs/nodejs-16.13.0
 SLOT=0
-SRC_URI=https://artifacts.elastic.co/downloads/kibana/kibana-7.17.3-linux-x86_64.tar.gz
+SRC_URI=https://artifacts.elastic.co/downloads/kibana/kibana-7.17.5-linux-x86_64.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1fa4ac7fa51c35a871e74b00f4eebfdd
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 2992312e3fad..c56140bfeeb7 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-104.0.5112.48 b/metadata/md5-cache/www-client/chromium-104.0.5112.48
new file mode 100644
index 000000000000..01dc6b657c4d
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-104.0.5112.48
@@ -0,0 +1,16 @@
+BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.10.4:3.10[xml] >=dev-lang/python-3.9.12:3.9[xml] >=dev-lang/python-3.8.13:3.8[xml] ) || ( ( >=dev-lang/python-3.10.4:3.10[xml] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml] dev-python/setuptools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[xml] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 libcxx? ( >=sys-devel/clang-12 ) lto? ( || ( ( sys-devel/clang:12 sys-devel/llvm:12 =sys-devel/lld-12* ) ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:12 sys-devel/llvm:12 =sys-devel/lld-12* ) ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre ) pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= 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:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= ) !headless? ( gtk4? ( gui-libs/gtk:4[X?,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) ) !!sys-devel/llvm:0
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=8
+HOMEPAGE=https://chromium.org/
+INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
+IUSE=+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_af +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_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW pgo
+KEYWORDS=~amd64 ~arm64
+LICENSE=BSD
+RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= 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:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) x11-misc/xdg-utils ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
+REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
+SLOT=0/beta
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-104.0.5112.48.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-104-patchset-2/chromium-104-patchset-2.tar.xz pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=87319965d565466745a5e340fea81388
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 4744db755a3f..647d908f072f 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/nginx-1.21.6-r3 b/metadata/md5-cache/www-servers/nginx-1.21.6-r3
index e5416a705672..478aa2969c5a 100644
--- a/metadata/md5-cache/www-servers/nginx-1.21.6-r3
+++ b/metadata/md5-cache/www-servers/nginx-1.21.6-r3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://nginx.org
 INHERIT=autotools lua-single ssl-cert toolchain-funcs perl-module systemd pax-utils
 IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic +pcre pcre-jit rtmp selinux ssl threads vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy +lua_single_target_luajit
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
 PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
 RDEPEND=acct-group/nginx acct-user/nginx virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=mainline
 SRC_URI=https://nginx.org/download/nginx-1.21.6.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.7.5.tar.gz -> njs-0.7.5.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.7.5.tar.gz -> njs-0.7.5.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=2fbe61f2ef8653d6b7ecc95b1c49d2a0
+_md5_=2391c4ec4f6de08ef3a2d625888971be
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index ca666ba78ef7..5f58ae294dd4 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/idesk-1-r1 b/metadata/md5-cache/x11-misc/idesk-1-r1
new file mode 100644
index 000000000000..027fa262453d
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/idesk-1-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/glib dev-libs/libxml2 media-libs/freetype media-libs/imlib2[X] media-libs/libart_lgpl x11-libs/libXft x11-libs/gtk+:3 x11-libs/pango x11-libs/startup-notification
+DESCRIPTION=Utility to place icons on the root window
+EAPI=8
+HOMEPAGE=https://github.com/antonialoytorrens/idesk/
+INHERIT=autotools
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/glib dev-libs/libxml2 media-libs/freetype media-libs/imlib2[X] media-libs/libart_lgpl x11-libs/libXft x11-libs/gtk+:3 x11-libs/pango x11-libs/startup-notification
+SLOT=0
+SRC_URI=https://github.com/antonialoytorrens/idesk/releases/download/v1/idesk-v1.tar.gz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=bccb3d6e0c014e06a5444947530199f7
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 7b8e5929ef2e..796b3121ae4a 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20220302 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20220606
index 9f677dcc9d68..17c536fc5a9a 100644
--- a/metadata/md5-cache/x11-themes/papirus-icon-theme-20220302
+++ b/metadata/md5-cache/x11-themes/papirus-icon-theme-20220606
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install postinst postrm preinst
 DESCRIPTION=Free and open source SVG icon theme
 EAPI=8
 HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
+INHERIT=xdg
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3
 SLOT=0
-SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20220302.tar.gz -> papirus-icon-theme-20220302.tar.gz
+SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20220606.tar.gz -> papirus-icon-theme-20220606.tar.gz
 _eclasses_=xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=90b02dd76a49c439576a4df402226a3d
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 4665c6c1b2aa..f316be233bd7 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/xfdashboard-0.9.91 b/metadata/md5-cache/xfce-extra/xfdashboard-0.9.91
new file mode 100644
index 000000000000..64fba41ec653
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfdashboard-0.9.91
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.2:3 >=media-libs/clutter-1.12:1.0=[gtk] >=x11-libs/libwnck-3:3= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXinerama:= >=xfce-base/garcon-0.2.0:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfconf-4.14:=
+DESCRIPTION=Maybe a GNOME shell like dashboard for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://goodies.xfce.org/projects/applications/xfdashboard/start
+INHERIT=xdg-utils
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.2:3 >=media-libs/clutter-1.12:1.0=[gtk] >=x11-libs/libwnck-3:3= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXinerama:= >=xfce-base/garcon-0.2.0:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfconf-4.14:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/xfdashboard/0.9/xfdashboard-0.9.91.tar.bz2
+_eclasses_=xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=23343154aa450ecc7e74ca17a8b14a5a
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index dd6152dde0fc..7ce49d81351c 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 17708 BLAKE2B 4ce2223644596204d9c2bb3f48afce531273d698d0831b6c63489b590dab9b0f76b97e01974eb386fd4ee731e91da53e23679e783c4d88a79a610f95158b28ce SHA512 a1f139db9aee3a21dedb41e88e0ac33c6c041d7b8c88c3e9baf0cdb441d1f610d920165d40c97cd51b23366513243ae6bbe2d000a224c900523cffd5ea695cf8
-TIMESTAMP 2022-07-15T05:39:54Z
+TIMESTAMP 2022-07-15T11:39:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLQ/apfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLRUg9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDk/Q/+M+8NvNNVkAEaWQx77n/107COiAk6Gu1xtwTG9noLM4I/fmA02em85NXw
-HBS4I2JSDKQebSNcdU7lXT9uScGyv0x02BVlMAekLdV3cB0Z2goeYXV7RFwyA38X
-PbjHCNPpNrSiPu0zg3j/E6GUe4ifWiw2PmWZPXKrVNM/wJlZNvKzq1Ht475nOpwL
-utC98fWjL6MOt8fuFw2dp17O+WzbURACEDDHaZYtlcJ8ZUMRwFIbV2PmK+JuRSug
-ZB+V2HRJ7yTqRc2vVHi+JyZ3mDpqNpPmWPN4UDw494VOxDMDOgSvT2R1DNxDl8fg
-m7RmLr1dU8g5zme7Z3YfEHKtvryfu+0tkES+FpTP823ogEqi3NyfbVQUd0mwjtAq
-dSIvSRKCkyHawcMlHtVF1MhH5Vb4DjjFVfdV2AfN+133m+wBsr1RHrNjRJ8iXWV9
-tkfVNFC8eUBxkuWZHGqmvIKp4gDfQ5W6rH2jhwPkaihTQpAKfAx4pgCnwFvI3yd1
-JbBjCrTtS2TvrLrJkCDY8tM/rLUmm36RRl3L/l2FOplZsyr1nUiH7oefLgsRfHhE
-RrQYO+t/7KBcgURwm7jAVJggV5PxRlOB8tHZvI5Lr+L+dcMtjrJUiTu4pHYo3ATq
-LZAdKnVG4UZAXmIyije0yPDe7Jb1Iw+n8aiksaWtlDz6XJsfkNQ=
-=8vLi
+klDJ8w//Tz/8FkIsvKf+pcB8c+vdlCizFMOfVtl5CH3bnoz/RPhuAY76arm+AygB
+FK8WIKQDYhrrYkTc4Afnv80EaoUS5UHlEx4DqeOd+mEionJkoG1AxfHtyXGwoEga
+UPu51heDz/acpRpAlEFWvLBKkCxHrASCZsqtzpHGccXuxaO3tewi4ijpwMOKY1Mr
+qsCYwp9f8LPiD7wXY2kriCOxkJJBT5ShV7GPThANvBsJe/NhPCUNyNjMsChOL8R4
+PhkFE2Q3GLUmwdCM3e9/nW5ret7t84Qys9AkSmx4s6W7VGYfoTUmgoKETcQc4OWh
+q9UAYjkmDitr58OaMqPAijjOjDo3sg8XTAFItzzqvBnLV1CJx/vBmmVpyjAJr5Qh
+PKpHBr6kHbEGY2YJoiCxyndAV4t05XvGajc9GU2vym9ubTefr3qToM5x9AywaKGt
+OGAdB0XC9y+tYMysyUTmylyXGOH5K2DfMD+ZSfkCR+/Q/SFhGdn6CrSBOQtDgLfq
+FIqiwRCPmkcHi26tVr5beDzAmHHJKdguEBOxuLVDuHM2ozO1lY1FvLaJ4cRIMMWQ
+c5sY0Ypae2TkSbn9+S3Ti6+HS0JBhpelebmWEUMNQ1ZrgaBId2YAQZU/rhvf2u5r
+47Uhad9pEyVyDmkm4OIf+gyaxSUGA/TczGQh37W+74qrId1bST4=
+=kEH8
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 4fb94070b8f3..94746d66dea9 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 15 Jul 2022 05:39:51 +0000
+Fri, 15 Jul 2022 11:39:55 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 4b3195e88f91..1613d2d4a51e 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Jul 15 05:39:50 AM UTC 2022
+Fri Jul 15 11:39:54 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e07fcb91063f..868723d9b0b2 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 15 Jul 2022 05:45:01 +0000
+Fri, 15 Jul 2022 11:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 009ed065a10e..d9564b737642 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-27448f87aaff6807762e0a1558b3d5b2146af24e 1657862628 2022-07-15T05:23:48+00:00
+1eae626c6bcabcdef25c2ebf79c6fe6cecf8a1ec 1657884812 2022-07-15T11:33:32+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 12198823f57a..35d4cee6a8d8 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1657863601 Fri 15 Jul 2022 05:40:01 AM UTC
+1657885201 Fri 15 Jul 2022 11:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 4191176da359..be3716e8bb52 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 15 Jul 2022 05:39:50 +0000
+Fri, 15 Jul 2022 11:39:54 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index f309ab195f3e..8a397ee20164 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index b4f6ad07d8eb..e0febbffd667 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -5,6 +5,6 @@ DIST cacti-spine-1.2.19.tar.gz 113974 BLAKE2B 6ec71e1480e9dfd2636c61bcea10c65810
 DIST cacti-spine-1.2.20.tar.gz 115258 BLAKE2B 78a9ed8a9e7e69e98bfa9971134dd6f34f540a93b0b1a2aababb66781f3c9787712d57d86b81d7f409487c4cc4447d4f84bd7292890b7eb70ec4137d97248793 SHA512 d7e129f7b42542d7ecc78d55cebc6d9ce481834342d3f3da1fce5538d8e42bc194a825795053d5e3a065b54574e2a3b9413725f1bc0562e55f1db213f9a94d0c
 EBUILD cacti-spine-1.2.17.ebuild 812 BLAKE2B 9d463bf6b62d3c1e0af474a29a13b64704b4216b282ea9b0c20136d42222d25d70dd35b193e6c29943f3037fdf22b9a64ca924de9f42854df58d73e171b8750f SHA512 1acbe3686e387bbeebadbc804fcbb75d1a9e05db5e51dfdcc46a46b30707e1adcf9eb0be67e169dc9666404abe38bf32d244b6be9135208f7947c1623454761b
 EBUILD cacti-spine-1.2.19.ebuild 869 BLAKE2B 9e4b4b35400f7cdb298e9788c9aaf1a8db283d5e312aeecd0a804b73cd80fc4b53eae0b822e4ed5f060f94b60c1f617af54c8f9e6dda2d57868ca2dfd7211e08 SHA512 a56cca2de931d2d536b16e105c042057b4793c2533c93b242b5818a9f49829d1be29803147d267a6afc766c15401cccf30babc988a6287407e565a0380f2166f
-EBUILD cacti-spine-1.2.20.ebuild 873 BLAKE2B ec84fa39636f944678e3f2b0a8253ee0d7d0a1a56475e18880bb40672bc05864fee722f9901cab589aa3b798a0c319b9f9b7692c59e6ea4784747fad6577ac88 SHA512 06313642f398bd3362d31508bbabc9cee6f05ccded6c3825f3f5d40f374396a6ce0173ab66afb500b3865e76acdbf55fa1d3625f26e909c387b76a9548d8e8f5
+EBUILD cacti-spine-1.2.20.ebuild 872 BLAKE2B 849d672e632f5155449ad0f6b9f42c53aa89fa32306ce62c5ed44150028375bd67e7d4d7c25a72932c080236a7df0632f85a21043d21603188f9dd4d4597969d SHA512 f303a8de78168d84440c3ca0a36142fa1c6393ee280150f69eec446081ae6d5f2c61a8fccc16b9a629007813dc47086144d9369d03649dc2dcd6e063a4e569c0
 EBUILD cacti-spine-9999.ebuild 745 BLAKE2B b125a5cf26b9b1d4aef143f8ed5a43caec47bd2ab81bd043c1ee297840020ee5016bdbad16a8e7c32615d0a82edfeccf441d89e727f6f6e2d86a8bf1c0036849 SHA512 af8e206e1d5cb0036c6b6d9d7e02b4003dd19c5a322e40e6728b43fd7a0ddd5e67202c9946abeadc06e0bf1174faf66795a9162b4412290dc7dae2ce7a6dcd46
 MISC metadata.xml 805 BLAKE2B b841b3ffc9585c51e7ebbcebc0847dbc0aa7f38e4005f34d7aab206501925c96e0d3797c678928503f69f30e82f6f3f9e5f7b100b206af9eb1d116da2133c97b SHA512 1d03529f32f001e726654c60c4199d33b01e943359e6bc9bbb71ff3429d620f5c07bb028816a103ca65575276293bbd56d2dd4c0867af702bf9d391a82ea3d0f
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.20.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.20.ebuild
index a8ac30938351..b15238c31742 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.20.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.20.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="dev-db/mysql-connector-c:=
 	dev-libs/openssl:=
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 49aa69ee0065..d01e17422569 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -6,5 +6,5 @@ DIST cacti-1.2.21.tar.gz 40798454 BLAKE2B 86eae6743c07e45b4b06202cca072a385f45d2
 EBUILD cacti-1.2.17.ebuild 1016 BLAKE2B 3fd84d213f5f184e06eb129880a19efa6442e1004534688a7f68a2a72387beded0b1a27e0c7763e7b7c849a50c61400f0a0a2cae4341780c9dd2b011b7481d34 SHA512 33d434610d58e3962fc3f61b17b47bbf9aab2f00176053d497a4572ee2029a493aec9f27639f134ccacdaf1ff4b28cea2ca29699e136a409b30a26a0b3786f53
 EBUILD cacti-1.2.19.ebuild 1016 BLAKE2B 2d209ac6b571e667cff77e7b54e66514f25eb58959a15ffb715e2ae7f9c07c728818e4a2bc8d82850adaf8633051394df9a3ecc196c162b693a143fbbbcb7bdc SHA512 28ce4760980317aea825c30b73fff2a129153702b2c7690412acdcbb7add3701fdfa8f2dad21311710751bf4f7d9fcccbc4d427dadf5de82b3932aba1ba41a6a
 EBUILD cacti-1.2.20.ebuild 1019 BLAKE2B f26eab536bd660ce7f6ac6f04282d7be5db132068d967f0f8559f46fefa72274558b5d9e767c228dfc24b5b0c9527f8a919956cd8fa02e3c0714ce4bb1df4e71 SHA512 17552b8f00fc04e1ac2bd0962e05f8fee33dfbc47bde4894f5daf43440ca34635f175b58d266d4935d395b268780bf8379a9ba89fe7111ed0ca48d6e2d7a31db
-EBUILD cacti-1.2.21.ebuild 1019 BLAKE2B f26eab536bd660ce7f6ac6f04282d7be5db132068d967f0f8559f46fefa72274558b5d9e767c228dfc24b5b0c9527f8a919956cd8fa02e3c0714ce4bb1df4e71 SHA512 17552b8f00fc04e1ac2bd0962e05f8fee33dfbc47bde4894f5daf43440ca34635f175b58d266d4935d395b268780bf8379a9ba89fe7111ed0ca48d6e2d7a31db
+EBUILD cacti-1.2.21.ebuild 1018 BLAKE2B d105cdece55852f861fafc0f9d043604a028deb48ecfa5ddb675caa43ef9772256228b10aaad650bed44304b64976ba572555e07ab97d569a568bd1f3b18fad5 SHA512 f541b3b861cbf41bd3ae126e0d60d4ef2b5f8a0a1316575bd67bc6f4a0b1025e9d8b4ab61a14872b11a7e37fe37cf2e152f85ba1acd8ecd08bdc31f10feefbc2
 MISC metadata.xml 935 BLAKE2B f600d10bd7dfd3bce36a092f31a12a750548866bac21b5b66ff4fc4a876c554ee26d5c4f467830bd3fdcdaf63b0c20c53bf5ca1fb98d6497f84a04b3d8474a81 SHA512 309b48d93e91560458b50ef3c96f1da32a7b7d2dbf38eb4bdaad7b6acb4301528fb9f50b2e79398c7c6026f19efb66d2c79a46afe8e38ecd01f0a4d2d9310ca0
diff --git a/net-analyzer/cacti/cacti-1.2.21.ebuild b/net-analyzer/cacti/cacti-1.2.21.ebuild
index 831a6dd6858f..f4abb2551423 100644
--- a/net-analyzer/cacti/cacti-1.2.21.ebuild
+++ b/net-analyzer/cacti/cacti-1.2.21.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.cacti.net/"
 SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="snmp doc"
 
 need_httpd
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 9601db627990..f8e2f94ce95e 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/nfacct/Manifest b/net-firewall/nfacct/Manifest
index c83f67ab638f..1f937ab88393 100644
--- a/net-firewall/nfacct/Manifest
+++ b/net-firewall/nfacct/Manifest
@@ -1,5 +1,5 @@
 AUX nfacct.confd 187 BLAKE2B a24307553ce81bba7885b4846ece38d0e2dad233271c3a38536e1f091a56c0fd9f8b60263f111c41b91f971ab26522aba85be62c4fff216b1c843abb1530d46a SHA512 01207f81a75365982ce9090cc605ee60799b0a46a3d649132733238a70b4380dceedaef39b1d52b99b661b1adeecd799f30c01f38ee5e923a9f94e9c3dadc34f
 AUX nfacct.initd 775 BLAKE2B dedd042368320a5c028fe733eeb6be104c12b0aa84c88a21a361cf71b4b188d1179066f979c9a3e5a916af9d63da0d4cf7f1548acdaac62305812c793a7f62fc SHA512 d87bc1f884698024677af8c11ad2c8c5459bd452d09139425bd751247e3024f9253893cd6d25fad6365349d9c4699c0e3904659b6eb7b7a34b0702e463319d0e
 DIST nfacct-1.0.2.tar.bz2 265449 BLAKE2B 08da45f90a2982746633001265c93ff6d055bc0ec9bcfb731b60e3666a2ee2520ed499ea57815e524b6c49369415aa4215d0c8e6ea02c1ce76dbc22de2fc79ea SHA512 2d7a76a51ffb10601e67ceda2ce055e63a8da802a682aab3c96cfa38e1d9d0d7ae7fa204d17d555303216e2ceeb0965d6b25387634725cf35e0a7109d84b47b3
-EBUILD nfacct-1.0.2-r1.ebuild 705 BLAKE2B 55b5a0b5aedefe31b3cf0e02522c3bee1b2a761ea30370320e0243822e9931037be6f95313d4dfbec841dc089d5569b91e8e75228f0ce3ba6e82698e83c3de5b SHA512 f3a11b28f7cf36b2f4900b26a247df207798c723dd024e8ff4ed7772e32ced35538c7f7efcd7fbebdd1ee8f1a9e5dda12a3204697ffd3c87ba905112521e9e8e
+EBUILD nfacct-1.0.2-r2.ebuild 702 BLAKE2B b4fccb126db2166a7a947150e1e35fcfff0d03d90d339d1844e91172bd80f04d49901f24d13fc2f4182940603992b9068c99f911a441ba2999177e819daaae59 SHA512 d2ed10fecdd9d14572a0dcdb4749576b5c32449a1274647462e34de95c3a5430b228d3aaff01da1bddfbfbdb7d4b05e82206a1e5cb872f0315d8af8c1dc12f9c
 MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/net-firewall/nfacct/nfacct-1.0.2-r1.ebuild b/net-firewall/nfacct/nfacct-1.0.2-r2.ebuild
index 1feb53596a4b..a6dc39569c14 100644
--- a/net-firewall/nfacct/nfacct-1.0.2-r1.ebuild
+++ b/net-firewall/nfacct/nfacct-1.0.2-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit linux-info
 
 DESCRIPTION="Command line tool to create/retrieve/delete accounting objects in NetFilter"
@@ -13,18 +14,16 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc64 x86"
 
 RDEPEND="
-	net-libs/libmnl
+	net-libs/libmnl:=
 	>=net-libs/libnetfilter_acct-1.0.3
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 CONFIG_CHECK="~NETFILTER_NETLINK_ACCT"
 
 src_install() {
-	default_src_install
+	default
 
 	keepdir /var/lib/nfacct
 	newinitd "${FILESDIR}"/${PN}.initd nfacct
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index e973e417115a..dffb3bc7b05d 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index aa09bf5fe11b..a01c5cacd067 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -5,5 +5,5 @@ DIST cifs-utils-6.13-kerberos_mount_regression_fix.patch.xz 4336 BLAKE2B de268f8
 DIST cifs-utils-6.13.tar.bz2 414584 BLAKE2B 5133ea39fc65acaf2a9791f8ac97dee681dd12f509e0abd095542ce663e7c62002b033dcf35f0a8eec214cb9940597fb568fd50d4cfe5271ca4e433afbe1a7bc SHA512 1337ac4b69f0c3e8d0241eb608207ba81dfa35f84c661649d25da78637882c4d73467b0f632be0bd120362e0b786e40eb340bffcf21c8a09629c441100fd10de
 DIST cifs-utils-6.15.tar.bz2 416592 BLAKE2B 8af926bf255c5b3a66bf52ccca99632aacb9ed1c83ad7db5543b32df2f3bcd4be9a9cd17b744ec115d1568d07084e2bd2d03849aa9ab97cff2862f39bcf137b8 SHA512 eedb8066563db584595a8ba7cb7a603e6b763ac2c1261430d605c327fcc5a831acd48b58ea55dd243af778dfdc827ab8c6daf4015764ff550dcffc2182773510
 EBUILD cifs-utils-6.13-r1.ebuild 3634 BLAKE2B 306cfc34bd2e8bab67f221bac8abcac52d5b57556f1e10ed3a9248ce83345d2269276e5727cc5f134af13431ff61b95ba9a3637dd4d91cb7ee2e51a8a0541223 SHA512 50d15605ff770799c16d8c0acc9b55199620f89ed1a62d7056e59da7359989174ccccca4fa18169219dd3dd72ecd1b429b733030245758232aec1c8b6e87655f
-EBUILD cifs-utils-6.15.ebuild 3490 BLAKE2B bef146e63f1f9514ed5e906df99c6d8b6c2a90595178b3efd9b681d684ffe39a9b577251835d2863e6e7ba9f14b29741cca26b77efe444622cddeb33417de7d9 SHA512 8714a396cc0471239d92e0dbb474a9f9f8426bdd83a6fe6cba3313c06ffc52307d6d0cb1305468c4c2354b6e9d39b14c85ea102eaf1aea7ba0a2090cd4c0967d
+EBUILD cifs-utils-6.15.ebuild 3488 BLAKE2B d65e5c25e8acbfc5190caa51b1bb2bd9cde29a67501f1cae1bb749b7797e8224237f21b437d88281c23ed412185451d5140aa8054ce1bcc2a6c3514bd720b587 SHA512 f3cd513b48d9b8cbdf44d7a7808ebb9dfa08aa636b011e741c4af37b25cc4cfa5a407af880ad4ab3b4972fe0bd3758c767bdc9708bcbd58937edf63f59709d5b
 MISC metadata.xml 967 BLAKE2B dc6654b412c77f2e95cad9cfa2d4e4465d3292b546d55ddc04ad1b3d5b8220bbe4ef0b0d1409fb2f5da99851d45567667935057f5d5c15dad4e2cf26e3ce0e00 SHA512 c6b0fbdd9d776695032cd4a3e109717dfa7cd07b1456da8264dc0688fcfa158d1f4a73758ee24ba318f14e7a321811bd24f688ca3c39156b304028566315b650
diff --git a/net-fs/cifs-utils/cifs-utils-6.15.ebuild b/net-fs/cifs-utils/cifs-utils-6.15.ebuild
index c29aa577860b..de5192dd712e 100644
--- a/net-fs/cifs-utils/cifs-utils-6.15.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 IUSE="+acl +ads +caps creds pam +python systemd"
 
 RDEPEND="
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 00f940416ceb..3ba69920de4d 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk-opus/Manifest b/net-misc/asterisk-opus/Manifest
index c9ea89814a7a..b22b8a095838 100644
--- a/net-misc/asterisk-opus/Manifest
+++ b/net-misc/asterisk-opus/Manifest
@@ -4,7 +4,7 @@ DIST codec_opus-16.0_1.3.0-x86_32.tar.gz 394187 BLAKE2B 0b187360ae65fe4cfd56f90c
 DIST codec_opus-16.0_1.3.0-x86_64.tar.gz 388551 BLAKE2B d36f4ce8e9414e0887232afe6fd15098e48eb5ccaf690f340d4a62eaac432342a61e43801260f0198bd68af58217ef2a9aacd6d46af99b192444fa59994ff590 SHA512 601d04de2bd4e67cd3d111c8a6c383ea3885180f8ab82c8943e0d09f8203cff3e6d45b6048843946d53b4002d01d31d92592107053e512b5347568050aba5ac7
 DIST codec_opus-18.0_1.3.0-x86_32.tar.gz 394411 BLAKE2B ecd374e7a6d0f8ee9dfffe7437276fabbcdbc334c0d3791874fcc22b41f150bb0ea2918920018bfb28b27538be9cb4fa4fe430d05e3c117041b33890e9d72ee5 SHA512 5d7b6651b8097a017ccbddd82811558d1b3e6f82871c4b761212f3695baa9207899fbce35cb9185a4543ad8fc8b11557c73bb21f3fc57e7d4b45f9e75a8189cf
 DIST codec_opus-18.0_1.3.0-x86_64.tar.gz 388492 BLAKE2B acf993c9d82921ec72307e1237ec0a88df2e10321423672e6d3d6377b61d44ed8bb7ec5e9109e3d5d17ba8dae54b03fb245ca59e90d896897536b1f629c213ab SHA512 5155703af8e9d1b68b3f0469d3e77f266d8b1d4bbb5bb5761e4f775d3ea117902d9a50ffc390db2d367c8a9dc5682f61c199e18450b6567c5518163e0e04605f
-EBUILD asterisk-opus-13.0.1.3.0-r1.ebuild 1176 BLAKE2B b0df7de74f692ae3386aae6013b053ac52f9063df56ee0f37af616b0873e7dd725094aa431a0f7b4e875765db5c2e49205c242c87328cbb1b5ac4e66110776e0 SHA512 e6333fd18bae0750d967edd483b9bfbf7d19ed4239285389386ef9d06a86eaee992c8cbdba8da5400f8d271599192518658615cc1a3bfb3178d98c11c6ea6963
-EBUILD asterisk-opus-16.0.1.3.0-r1.ebuild 1176 BLAKE2B b0df7de74f692ae3386aae6013b053ac52f9063df56ee0f37af616b0873e7dd725094aa431a0f7b4e875765db5c2e49205c242c87328cbb1b5ac4e66110776e0 SHA512 e6333fd18bae0750d967edd483b9bfbf7d19ed4239285389386ef9d06a86eaee992c8cbdba8da5400f8d271599192518658615cc1a3bfb3178d98c11c6ea6963
-EBUILD asterisk-opus-18.0.1.3.0-r1.ebuild 1176 BLAKE2B b0df7de74f692ae3386aae6013b053ac52f9063df56ee0f37af616b0873e7dd725094aa431a0f7b4e875765db5c2e49205c242c87328cbb1b5ac4e66110776e0 SHA512 e6333fd18bae0750d967edd483b9bfbf7d19ed4239285389386ef9d06a86eaee992c8cbdba8da5400f8d271599192518658615cc1a3bfb3178d98c11c6ea6963
+EBUILD asterisk-opus-13.0.1.3.0-r1.ebuild 1174 BLAKE2B d2ac45e03339460e9f0004d5e376b6bdf53e9f3e34a9ff7bf32cb272cd79e07e8afcc6f25c9e31ad4b146a866659e95554e85fc09470e8427f5fd9a7f831176e SHA512 489008b7ec01f9f38425961b78dc83e70ce817c3a8452e8c936051492f59a656056af867a5019ddc0788a9e6f4d375e7df7f405f239e6349cb449454ab672c2a
+EBUILD asterisk-opus-16.0.1.3.0-r1.ebuild 1174 BLAKE2B d2ac45e03339460e9f0004d5e376b6bdf53e9f3e34a9ff7bf32cb272cd79e07e8afcc6f25c9e31ad4b146a866659e95554e85fc09470e8427f5fd9a7f831176e SHA512 489008b7ec01f9f38425961b78dc83e70ce817c3a8452e8c936051492f59a656056af867a5019ddc0788a9e6f4d375e7df7f405f239e6349cb449454ab672c2a
+EBUILD asterisk-opus-18.0.1.3.0-r1.ebuild 1174 BLAKE2B d2ac45e03339460e9f0004d5e376b6bdf53e9f3e34a9ff7bf32cb272cd79e07e8afcc6f25c9e31ad4b146a866659e95554e85fc09470e8427f5fd9a7f831176e SHA512 489008b7ec01f9f38425961b78dc83e70ce817c3a8452e8c936051492f59a656056af867a5019ddc0788a9e6f4d375e7df7f405f239e6349cb449454ab672c2a
 MISC metadata.xml 587 BLAKE2B add5f4001d9991d6399559cf47d32037475edcd1ee90ecb7d3882fcac7bd3498ad716aba23a014232bd396cb932f61e009e18658d9fac05e672b40996f103b59 SHA512 a059cf516edc2325752a8e86c2376b0c4f4bb2575834a4ec6da7d421a5b0f85c9ca01ea1148521385959195a8fce1f47b829d55b6867ad04e27398a53bfa3266
diff --git a/net-misc/asterisk-opus/asterisk-opus-13.0.1.3.0-r1.ebuild b/net-misc/asterisk-opus/asterisk-opus-13.0.1.3.0-r1.ebuild
index e21609589199..9d7059690599 100644
--- a/net-misc/asterisk-opus/asterisk-opus-13.0.1.3.0-r1.ebuild
+++ b/net-misc/asterisk-opus/asterisk-opus-13.0.1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -18,7 +18,7 @@ x86? (
 
 LICENSE="Digium"
 SLOT="0/${AST_PV}"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="=net-misc/asterisk-${PV%%.*}*"
 
diff --git a/net-misc/asterisk-opus/asterisk-opus-16.0.1.3.0-r1.ebuild b/net-misc/asterisk-opus/asterisk-opus-16.0.1.3.0-r1.ebuild
index e21609589199..9d7059690599 100644
--- a/net-misc/asterisk-opus/asterisk-opus-16.0.1.3.0-r1.ebuild
+++ b/net-misc/asterisk-opus/asterisk-opus-16.0.1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -18,7 +18,7 @@ x86? (
 
 LICENSE="Digium"
 SLOT="0/${AST_PV}"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="=net-misc/asterisk-${PV%%.*}*"
 
diff --git a/net-misc/asterisk-opus/asterisk-opus-18.0.1.3.0-r1.ebuild b/net-misc/asterisk-opus/asterisk-opus-18.0.1.3.0-r1.ebuild
index e21609589199..9d7059690599 100644
--- a/net-misc/asterisk-opus/asterisk-opus-18.0.1.3.0-r1.ebuild
+++ b/net-misc/asterisk-opus/asterisk-opus-18.0.1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -18,7 +18,7 @@ x86? (
 
 LICENSE="Digium"
 SLOT="0/${AST_PV}"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="=net-misc/asterisk-${PV%%.*}*"
 
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index a7e4fcd7301d..b762656ee5b9 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -7,6 +7,11 @@ DIST teamviewer_15.30.3_amd64.tar.xz 64105604 BLAKE2B f109daa08dd56fbe5852a14482
 DIST teamviewer_15.30.3_arm64.tar.xz 66193152 BLAKE2B a62096f527ab7745a6a4c3d4bd31d9cc59f93388b5bd31321de2c9f807671a7761ca9296b18d287a959072a16e8a92b6477d70e6afad8d3a5e2fdcb93f03ca89 SHA512 18dcc473b6e7922ab271c4c3d1a7556a49ab92131ea21a476bb777329d0a138a64fedf6e232476b084cc207b3d1358c591af2d3236165dafca0d87347e7b7a08
 DIST teamviewer_15.30.3_armhf.tar.xz 58911308 BLAKE2B 5b9215240ae5957ea66faf766c59a1d8fd6026208a47a36be1a4f7bfe86073e0829114465715eb03c60ca08c13943e57e30374df738dfb6369d124ad66706c61 SHA512 eff506206f06bbe285af73031a475764ced5d7ca99587285e9ef5838243b54c2d14d99caed1282d4b3c21dd71a75b01a035c46d71af5d05951041e9fab1a7e73
 DIST teamviewer_15.30.3_i386.tar.xz 68610636 BLAKE2B cadbc2b768ea155a016ab08008c2a25496e7e894fe58b156883f8001f0c5fde6a2ac5b8ad827fe6e6b1522afce3f9617a9a575dbdbc4763eeb2e997f9ddb5d14 SHA512 03b71778045e039d8c1400bff5e32e02dbe10235c74b2e0f977a0cb263cbcdc41e8dae842884826a13855edd9a7791c02c6df7a7cc04678a810f75c01fc9f770
+DIST teamviewer_15.31.5_amd64.tar.xz 64084732 BLAKE2B 5335e6bb4879e7aac5712589ffdcb436f2d853ae9738bb1873a410683229e372f9cccc67e9f88df3a1a622ea8b8952872d13c2566f2c9a142c98abb7dc700bdd SHA512 09bd03540024a77a9efa132f6e48371b1e80a8967b02d82920caedd96a4cad8dfce81316b339e815d4351b0cc41478bbe48751f8ed7c1d406e2b7f1bd06fda6b
+DIST teamviewer_15.31.5_arm64.tar.xz 66197676 BLAKE2B 41fda9e7fddf97593f2a2da835bc3b5f786673431229a932cd97872c61a8b9a17857c5a5339ee1883473595c2620374d4c8ea38d0c819a271961a5ef87f7d9c5 SHA512 482b9ca8eb07e7ec6ccac56d36bd2dd0e875bb295c4b5625b2244c269f9ccf56c94c4510b4465d199ba3140905d335ce8da2b21c80b0077ecd2d8209840aadb5
+DIST teamviewer_15.31.5_armhf.tar.xz 58921732 BLAKE2B 90850d87e962ade70ea78f7ad4ad9cc5daa26abc1029eb012f33df05c4eaf574de06b96a40cba3b68663c4017491bc99368805ec3d31ca59a28418ad090997a8 SHA512 cc28e997e4e312d0e064e98d4752e290fcd8750e006be6d0babe887c17c481e1691886ed3973501010fc0ef26471594d0214d9441a3d50e888c982d826e9660b
+DIST teamviewer_15.31.5_i386.tar.xz 68616660 BLAKE2B f4594df8f33086ce114741f44afa34feb9927969f0f880feb298d2db3f60ed9332ff57e2cc508d31e7d572d442480287f4e2b7e3a852d7d3f41cbbab658d9d4c SHA512 fa244fa69e59f31603ec6d03a373c07be8ddfa0c927b633b234ce821960dad2807bf9596e69336fab011804edb888ddad4fef90137b4b2211b5108e8d0db1a65
 EBUILD teamviewer-15.28.6.ebuild 4522 BLAKE2B f79168e36b016dcefd00818caf91a16de93cce98cf67ae52a41ed02577bcd29d74f75a2b8c2c9f7fd1cc839e3c52f8c1c9360647feab4f99dd73f3cb01204651 SHA512 ce7120c5226ac257e7e9c2309abc4e3817a16222eb39ea0679c4643c734438ca6d931098d89a744df61f3403c01cf895cb06c2f5095c93966252fff9c1750418
 EBUILD teamviewer-15.30.3.ebuild 4522 BLAKE2B f79168e36b016dcefd00818caf91a16de93cce98cf67ae52a41ed02577bcd29d74f75a2b8c2c9f7fd1cc839e3c52f8c1c9360647feab4f99dd73f3cb01204651 SHA512 ce7120c5226ac257e7e9c2309abc4e3817a16222eb39ea0679c4643c734438ca6d931098d89a744df61f3403c01cf895cb06c2f5095c93966252fff9c1750418
+EBUILD teamviewer-15.31.5.ebuild 4522 BLAKE2B f79168e36b016dcefd00818caf91a16de93cce98cf67ae52a41ed02577bcd29d74f75a2b8c2c9f7fd1cc839e3c52f8c1c9360647feab4f99dd73f3cb01204651 SHA512 ce7120c5226ac257e7e9c2309abc4e3817a16222eb39ea0679c4643c734438ca6d931098d89a744df61f3403c01cf895cb06c2f5095c93966252fff9c1750418
 MISC metadata.xml 398 BLAKE2B 445ffd891e67241252fcac645e4506315a23501976a36522f4bc9065b712e5b519f78bc523707014ab71dfccc796248094cc51edc43a0ecf9a1a3957a31d07c1 SHA512 a6364c26016b8fdcb0388f839fd1c04c83c0f83eff1661df75173eb81b426b6df9e3bb7ed1f44cce89010e8a94fbf12323d39a6534c4ae5105d7aa0a4883b0e3
diff --git a/net-misc/teamviewer/teamviewer-15.31.5.ebuild b/net-misc/teamviewer/teamviewer-15.31.5.ebuild
new file mode 100644
index 000000000000..733ad3a3da07
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-15.31.5.ebuild
@@ -0,0 +1,156 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature systemd xdg
+
+MY_MAJOR="$(ver_cut 1)"
+MY_P="${PN}${MY_MAJOR}"
+DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
+HOMEPAGE="https://www.teamviewer.com"
+MY_URI="https://dl.tvcdn.de/download/linux/version_${MY_MAJOR}x/${PN}_${PV}"
+SRC_URI="amd64? ( ${MY_URI}_amd64.tar.xz )
+		arm? ( ${MY_URI}_armhf.tar.xz )
+		arm64? ( ${MY_URI}_arm64.tar.xz )
+		x86? ( ${MY_URI}_i386.tar.xz )"
+S="${WORKDIR}"/teamviewer
+
+LICENSE="TeamViewer MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist mirror"
+
+# Unpack will fail without app-arch/xz-utils[extra-filters], bug #798027
+BDEPEND="app-arch/xz-utils[extra-filters]"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libglvnd[X]
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/glibc
+	sys-libs/zlib:0/1[minizip]
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/libxkbcommon[X]
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-renderutil
+	x11-libs/xcb-util-wm
+"
+# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html#8332956
+
+QA_PREBUILT="opt/${MY_P}/*"
+
+src_prepare() {
+	default
+
+	# Switch operation mode from 'portable' to 'installed'
+	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
+
+	sed -i \
+		-e "/^ExecStart/s|${PN}|${MY_P}|" \
+		-e "/^PIDFile/s|/var/run/|/run/|" \
+		tv_bin/script/teamviewerd.service || die
+}
+
+src_install() {
+	local dst="/opt/${MY_P}" # install destination
+
+	insinto ${dst}
+	doins -r tv_bin
+
+	# Set permissions for executables and libraries
+	local exe
+	for exe in $(find tv_bin -type f -executable -or -name '*.so' || die); do
+		fperms +x ${dst}/${exe}
+	done
+
+	newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd
+	systemd_dounit tv_bin/script/teamviewerd.service
+
+	insinto /usr/share/dbus-1/services
+	doins tv_bin/script/com.teamviewer.TeamViewer.service
+	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
+
+	insinto /usr/share/polkit-1/actions
+	doins tv_bin/script/com.teamviewer.TeamViewer.policy
+
+	local size
+	for size in 16 24 32 48 256; do
+		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png teamviewer.png
+	done
+
+	dodoc -r doc
+
+	# Make docs available in expected location
+	dosym ../../usr/share/doc/${PF}/doc ${dst}/doc
+
+	# We need to keep docs uncompressed, bug #778617
+	docompress -x /usr/share/doc/${PF}/.
+
+	keepdir /etc/${MY_P}
+	dosym ../../etc/${MY_P} ${dst}/config
+
+	# Create directory and symlink for log files (NOTE: according to Team-
+	# Viewer devs, all paths are hard-coded in the binaries; therefore
+	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
+	# <major-version>')
+	keepdir /var/log/${MY_P}
+	dosym ../../var/log/${MY_P} ${dst}/logfiles
+
+	dodir /opt/bin
+	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
+	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
+
+	make_desktop_entry teamviewer "TeamViewer ${MY_MAJOR}"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	ewarn
+	ewarn "Please note that the teamviewer gui works only when started from"
+	ewarn "a session initiated by a display manager." #799137
+	optfeature_header "Install one of the following display managers:"
+	optfeature "an example display manager" x11-misc/cdm gnome-base/gdm gui-apps/gtkgreet x11-misc/lightdm lxde-base/lxdm sys-apps/qingy x11-misc/sddm x11-misc/slim x11-misc/wdm x11-apps/xdm
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "Please note that parallel installation of multiple versions of"
+		elog "TeamViewer is currently not supported at runtime. Bug #621818"
+		elog
+		elog "Before using TeamViewer, you need to start its daemon:"
+		elog "OpenRC:"
+		elog "# /etc/init.d/teamviewerd start"
+		elog "# rc-update add teamviewerd default"
+		elog
+		elog "Systemd:"
+		elog "# systemctl start teamviewerd.service"
+		elog "# systemctl enable teamviewerd.service"
+		elog
+		elog "To display additional command line options simply run:"
+		elog "$ teamviewer help"
+		elog
+		elog "Most likely TeamViewer will work normally only on systems with systemd"
+		elog "or elogind. See this thread for additional info:"
+		elog "https://forums.gentoo.org/viewtopic-p-8332956.html#8332956"
+	fi
+}
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 2fcde3ecf7e0..a748e7405a82 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -3,6 +3,6 @@ DIST wget-1.21.2.tar.gz 5004576 BLAKE2B e11c3a2b89ab26834dc4cbb445bcc6122d3a6b2a
 DIST wget-1.21.3.tar.gz 5079864 BLAKE2B 4ff40a30cb3be82ea492d0eae324a9d43de30a0169d3b219ce25f3d667915f90c7eb1559760d1605340f112e96e028613265e0be73aaba7935c69cc06a4ae4f6 SHA512 29889ecbf590dff0f39183d9e0621741d731a554d990e5c995a4644725dca62e8e19601d40db0ef7d62ebf54e5457c7409965e4832b6e60e4ccbc9c8caa30718
 DIST wget-1.21.3.tar.gz.sig 854 BLAKE2B 71f69492397ae9e36284be9acdd1c94da34a7397c14a6de1a867c0d1e807bf961f8a2e098ab5629425691ce595227fb08f046416245fda2a6025929079f2d7c2 SHA512 b9f41496e0083545bc703c97b0758500f337527647cdc422152d7855d05351e3a62685269238c78300eafdbfaed8afecaeb988901a3d8a6b002e9fb3d70efe4f
 EBUILD wget-1.21.2.ebuild 2873 BLAKE2B b0ca4fa3105c73c9623e788863cd6c46b6da3d4d2f7f158538a7b5468560648d89bfef1900818ddf64343cc8e5d3675b1324835c30964767b51fab2c94e44e90 SHA512 4c2c0e9751fd37ce85be5c9abfa028f0813d17b7d0c902792406e4a94c30590781d00d243e936fd4a107090921d5ec4023c358e712c84aed44bb99d6982936b9
-EBUILD wget-1.21.3-r1.ebuild 3260 BLAKE2B fc3207fe851535b13d306193500a9610461d6d655d14544fec8bc5bfa41689604b5656dbcb4ae2a0120a6c5fbd28ab34a5419fb08bc2a65c11b2c06174fdd555 SHA512 6aa9368503381bdb747844994706f010a772cca1c34126c4ca0bd25e22492afd1427d1036892f3eed870b9a7f7993ef2983317848c47be21a988b149ee88f69a
+EBUILD wget-1.21.3-r1.ebuild 3258 BLAKE2B 9c70cb26fd16754d182b93cb26e642e0933ef11350b595774a4fbe205e53348638b388b1d47806463aeabe81d8c8fd7928e1ff8bc48d44bdff798693cd8fbddc SHA512 409c54a51f43aa3fcfade2276cbd184de3a8ed14ba8dfb8d76bfc2670d316e3ad2ef6fec089aa420cc706b443a04263c73a5fabeb6851af31e722d09f79df78b
 EBUILD wget-1.21.3.ebuild 3203 BLAKE2B fb43f5fdfe06d756846ed4eb98869777643b7c0cfd373d1ebd6b81bf5067ea74bbb967aaf3549c3544bfd462db81fc20df837b0388624aeacce261a8522d44c7 SHA512 a1008cb3d17be6f4cbf0e6aae87b8891b5d555a6d6967e227383881664e828865f8c8c2e87f8df8308d6d7e500cd1660085dfb16ad241b436bff8f13830b9c73
 MISC metadata.xml 803 BLAKE2B 9bdb761fa36afd7a03f4631ed314230776de4af2c3e153a3631ee8f9e801233e44abe68ba5ec874bcfaef53d2cb1100a671768169d58d6e2c96387be5210abc9 SHA512 4ddbdc883a155f4eddeb5cd6e031b4824f1f50586ceaedd1b72a8d2ce9d3dffe440a0554e4a9a07f1295f79a5958bcb533ae324919c64daf77caff577318dfc1
diff --git a/net-misc/wget/wget-1.21.3-r1.ebuild b/net-misc/wget/wget-1.21.3-r1.ebuild
index 922b3579b4f0..ece75d0087d7 100644
--- a/net-misc/wget/wget-1.21.3-r1.ebuild
+++ b/net-misc/wget/wget-1.21.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/wget/${P}.tar.gz.sig )"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~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 ~loong ~m68k ~mips ~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="cookie-check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 RESTRICT="!test? ( test )"
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index f3679f740c3a..92ccf14cf0f3 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/ed2k_hash/Manifest b/net-p2p/ed2k_hash/Manifest
index 92643e0a99c7..9f39b77dfe08 100644
--- a/net-p2p/ed2k_hash/Manifest
+++ b/net-p2p/ed2k_hash/Manifest
@@ -1,4 +1,5 @@
-AUX ed2k_64bit.patch 462 BLAKE2B c1eb10361ed28157e86423ddf01ee8e742ac0fbe732885f58d4c1f61efd18285aba2767e4085d2667e06e23e80f664233bcc03421e94968c205c25cfdfbed9de SHA512 48143a761a271cd40641c06f7ea109f68111962ff14e22be85e842932726233994f84ea60f208d7f10f38de0c6709b80c4c30f3fc051e3170991919c90909ff1
+AUX ed2k_64bit.patch 390 BLAKE2B 4f217abb41e9c196380564216ddd72a98cbfd1bc167c00e719162087610920b55ca14abbffb310514cd0f56106f56818e9689eb5143a725996273314a1f3e8c1 SHA512 8d334360d62883617148585b831d5950460a1e3848af8879ac95fb988fca77fb4b8a6dbfcd19b7a1f010c606b49560653ac67aeede96723ffe5c389498b04f43
+AUX ed2k_hash-0.4.0-missing-includes.patch 392 BLAKE2B 5252553249bc64bce02a8ce5f9da56bec4084f735c461c66fa570dd63cce736ddf5c7054900b79fe461021b33bfbbfa11c673de4515f5c2cbbccfb80c289406d SHA512 607aeeb8820905f1b08a228491a1c5b9adabc004d3e158086815d6b14accc703c1b33df819d1903c23208f76fd865bee29987772f5c8a02a06d9cfe65f6aae99
 DIST ed2k_hash-0.4.0.tar.gz 113158 BLAKE2B f553ffde9fe2287247b063a4eb5d30cdd22484979063561652efb4b5a2574ac0a13ef039d2b1d3ab60ab0c37dae5620b5ded80566be959236a061f0170167477 SHA512 f924c6b39bf82fe0d4e68decb5ae9fb5ce2999e8b1d3083ba97c178f3f716634603982962947cecb2ef20de56672b10e833d104bae9627ae180ba629c9e1b4c6
-EBUILD ed2k_hash-0.4.0-r2.ebuild 812 BLAKE2B 05840782612710ab621a6961fa6c1ca883c1d58d040df3929ee0527199fb9587a755ae59eac7c510e4f3817e2df778559944cecb24a25161dd03e253f1e8fe4b SHA512 b683f15d7efb2d1279d47c9b962b5a40276da07da8e95ef9bddc0e07f005409a244d5f8372dfb246a3fbb8aafbde3c9ba4fc728f7f9fbf20426c1a2f91c019eb
+EBUILD ed2k_hash-0.4.0-r3.ebuild 843 BLAKE2B e554d25e145a912d188468272a3c93d6db36acd9f05ca1fd7b39c4f1a3b48cb4a7efa6e2cbbf2e5354c896cb0579ffafa8088866224a9860b87d407994d41420 SHA512 2ee334297c3d77e26fb06d1ec18a5edd7b042f570a35650915474d6da3754dd8cd67d5615d4129c057f82660aaefe71f6e63b8d998178c8b39d8176e17f87afb
 MISC metadata.xml 248 BLAKE2B fc53937c9b798afa35cfd05df23aadfb5d154a04b0f50c7f271925416edbb0cbc0d4d6f5aceb4e5325ac17bfd043ead1a033bd01191c7404b05b4e0ec83e75f1 SHA512 654b930e28cbeb8b5c46218a01fa89dde583f14ae72ae4db67e0dce325b659c23e768398c4d6ba3e5efb89eea83e1d8e4eca2f07a4f06f9e828e8f6a8025e74e
diff --git a/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild b/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r3.ebuild
index d415e2ec2ecd..2f50faf76f65 100644
--- a/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild
+++ b/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r3.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 #inherit flag-o-matic
 
 DESCRIPTION="Tool for generating eDonkey2000 links"
 HOMEPAGE="http://ed2k-tools.sourceforge.net/ed2k_hash.shtml"
-RESTRICT="mirror"
 SRC_URI="mirror://sourceforge/ed2k-tools/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -15,19 +14,22 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="" # fltk support is broken, bug #359643
 
-DEPEND=""
-RDEPEND=""
+RESTRICT="mirror"
+
 #DEPEND="fltk? ( x11-libs/fltk:1 )"
 
-PATCHES=( "${FILESDIR}/ed2k_64bit.patch" )
+PATCHES=(
+	"${FILESDIR}/ed2k_64bit.patch"
+	"${FILESDIR}/${PN}-0.4.0-missing-includes.patch"
+)
 
 src_configure() {
-#	if use fltk; then
-#		append-ldflags "$(fltk-config --ldflags)"
-#		export CPPFLAGS="$(fltk-config --cxxflags)"
-#	else
+	#if use fltk; then
+	#	append-ldflags "$(fltk-config --ldflags)"
+	#	export CPPFLAGS="$(fltk-config --cxxflags)"
+	#else
 		export ac_cv_lib_fltk_main='no'
-#	fi
+	#fi
 
 	econf
 }
diff --git a/net-p2p/ed2k_hash/files/ed2k_64bit.patch b/net-p2p/ed2k_hash/files/ed2k_64bit.patch
index 3523b1febecd..2f1520e137ec 100644
--- a/net-p2p/ed2k_hash/files/ed2k_64bit.patch
+++ b/net-p2p/ed2k_hash/files/ed2k_64bit.patch
@@ -1,5 +1,5 @@
---- a/ed2k_hash/md4.h	2002-09-04 18:24:37.000000000 +0100
-+++ b/ed2k_hash/md4.h	2004-09-02 21:13:49.900613616 +0100
+--- a/ed2k_hash/md4.h
++++ b/ed2k_hash/md4.h
 @@ -66,7 +66,8 @@
  typedef unsigned short int UINT2;
  
diff --git a/net-p2p/ed2k_hash/files/ed2k_hash-0.4.0-missing-includes.patch b/net-p2p/ed2k_hash/files/ed2k_hash-0.4.0-missing-includes.patch
new file mode 100644
index 000000000000..4b9fcc109a38
--- /dev/null
+++ b/net-p2p/ed2k_hash/files/ed2k_hash-0.4.0-missing-includes.patch
@@ -0,0 +1,20 @@
+--- a/ed2k_hash/cl_ui.c
++++ b/ed2k_hash/cl_ui.c
+@@ -18,6 +18,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <stdarg.h>
++#include <string.h>
+ 
+ #include "global.h"
+ 
+--- a/ed2k_hash/options.c
++++ b/ed2k_hash/options.c
+@@ -16,6 +16,7 @@
+  ***************************************************************************/
+ 
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include "global.h"
+ 
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 8b9529f9ddda..d6ef975e0e1a 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 5e225d2e1fe7..874405a17590 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -12,6 +12,6 @@ AUX cupsd.init.d-r4 577 BLAKE2B 48508b10a13ee73e905b3d061275f5cb12ebdc2175ce46af
 DIST cups-2.3.3op2-source.tar.gz 7993205 BLAKE2B 8c115b91ec185a4820578561aaf681238280b22b5c68b68c484ffbd0fa3c4ec1beb4d426e3f0e33192e32bce78aa8b7f50ed6799732a467fa9e75c34787057ee SHA512 db27dd6fb616bd7ad895b2bdf4ea7b010501358a50dc8f2e7e29558d1cfc088a572b1b35ac512654d3ed410c84df87dc34ca636533a4499117253915d4763117
 DIST cups-2.4.2-source.tar.gz 8128785 BLAKE2B 97053feb502d4fdc28810b806000b6c84a6795d5adcec0789e73e5477d5802d46a99381366d16219f627166df088f6decde5c144bd0c38b5745815dc1e426bc5 SHA512 07474643bffe11c79b3226b70d28f1bb803dc19daa10711938cea303feacdcce3945ba8ff0334d94fdd5922ea7d6bf37a28c1ea62cce8ce946c2f90a0faf002f
 EBUILD cups-2.3.3_p2-r3.ebuild 9571 BLAKE2B 5afeb6352867c9069d4446c83e854f790b1e13b6a88a73f1fb72b27e139f2694435ac2db5328d031d91408f31ccbde60e7b29287dc402437e29831199e8ea295 SHA512 0265ec3ab43990be1917cf6e021049cf5fcae7e17a2e968ada26eef5a1e0f5cd9a2e5221781c2800382b943c08376947337e43aca6e6052e62fce28c2d448e38
-EBUILD cups-2.4.2-r1.ebuild 9441 BLAKE2B 0c3e0d14e8315bc487196ff8ed7f3a8ee79db6ec9943772982af652e0f104b301c0546a69a4d820231df362a5c15d1d00247b2f1321010dd6695adec26c125fb SHA512 1f194f9dde815b4f721fa8ec2181fca69a07e0a6ae0298b16be40148575b2d911aed3ed6af188e66850ccf6097cf1b45ee868bbc0311a9582c410198115f5eff
+EBUILD cups-2.4.2-r1.ebuild 9437 BLAKE2B 09590f80f981e0826626b1e117ae08b341da10dc093a9789f9dc3a906aac2543c2757fe8c3c4c893f251d85fc48822a7da2615b706e5c940f7061c25a5bb2b76 SHA512 14a886be82663410bae1c9da4478b27f578ba19fcbb68119402bb2cbb16759340b5d72187078b30c12ffe1c79b5ad6b7f0a8ba2e432bcf6e2db39393d299abc7
 EBUILD cups-9999.ebuild 9441 BLAKE2B 0c3e0d14e8315bc487196ff8ed7f3a8ee79db6ec9943772982af652e0f104b301c0546a69a4d820231df362a5c15d1d00247b2f1321010dd6695adec26c125fb SHA512 1f194f9dde815b4f721fa8ec2181fca69a07e0a6ae0298b16be40148575b2d911aed3ed6af188e66850ccf6097cf1b45ee868bbc0311a9582c410198115f5eff
 MISC metadata.xml 527 BLAKE2B 04a32175e666165226eaa97785a6b9e4b779644e352c503a4653870631f28089dddbaaa3db3143f09a1d97c7f57952e4d760d64005eafacb379c23035fe9ad19 SHA512 136c81a99b501ffcedfd71f4425ba556292b79abc0ac819d336d2c845401775955b8cd72e6194f02f4c48d0cd26bc93ee7c94c7438228b49410daca80a159523
diff --git a/net-print/cups/cups-2.4.2-r1.ebuild b/net-print/cups/cups-2.4.2-r1.ebuild
index 8583dd21407e..9ad77e8d0627 100644
--- a/net-print/cups/cups-2.4.2-r1.ebuild
+++ b/net-print/cups/cups-2.4.2-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+		KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 	fi
 fi
 
diff --git a/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.202.0.ebuild b/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.202.0.ebuild
index c33577df730c..79fec4051ede 100644
--- a/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.202.0.ebuild
+++ b/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.202.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Low-Level Interface to zlib compression library"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # We use the bundled version of zlib as the minimum version for the system copy
 # Check on bumps! Look in https://github.com/pmqs/Compress-Raw-Zlib/commits/master/zlib-src.
diff --git a/perl-core/Compress-Raw-Zlib/Manifest b/perl-core/Compress-Raw-Zlib/Manifest
index b80455b686dc..4a71934db1d6 100644
--- a/perl-core/Compress-Raw-Zlib/Manifest
+++ b/perl-core/Compress-Raw-Zlib/Manifest
@@ -1,5 +1,5 @@
 DIST Compress-Raw-Zlib-2.201.tar.gz 480467 BLAKE2B e2c706447cdd82c712b0613da69903adb3e9f51dd3e791bea51c836a767ca1df03f18870d377fea20af5f5ffb074925b0a70c80ef507622264d21b657bda4ea2 SHA512 1262f5be347e1efe71f0308385a5b8b927854b1e061d69d9a38c74e6dfacf2ffbec0891bdeb76092de28a5049e1fd1eb3e784e0570b34612a8256d955d7f1ab7
 DIST Compress-Raw-Zlib-2.202.tar.gz 480563 BLAKE2B 8e9eef5fae7dcac500b08ee7315e6d05912fe954e18560f1ecc195800343102cd0f97690c46c5e06bc6c734877e48356cb93fa70d7070c954e62dc2a7bd2d6c5 SHA512 add25f83ecd83fe3beaad12a6f8b37ca046fdfccfa44c03f32b104a9ec6c132407dc606ba0e30fad67151f1b1d4f6886991b19948c12e2964df13a6daa703e72
 EBUILD Compress-Raw-Zlib-2.201.0.ebuild 1022 BLAKE2B a6118f7f2aed28c197caa2b02f9888407142d187dbbfa7c91b23b3ff5a07a8baebeb91f63a1ece9e5285d266628a49dcc829ef729e976b67c76db5bbc1782a52 SHA512 43f17e50386dfc5583464bc2852458f151ce0c94d65cf2bd8758f7328c08b820fae80412f5a4e217d4a99f9ec2ba638731a08fecd3ddd77110ab17f74522452c
-EBUILD Compress-Raw-Zlib-2.202.0.ebuild 1022 BLAKE2B 23e652d2f6e6018f354ea0bdf9b40c05b9d70db938ac04542fbdccf1eff7bb224856d239b35d2ac5c8c64ef329ccb3e1f7041c92f68857fbc22689a8358a46da SHA512 868ee3d10aaea6bf0ec3dbee12714e42d1d3a343e6e691240a4b68e7758f3205b1d56286280701dbc5524b1421fd16160248f5ae27b062290e1d9caaf69f8699
+EBUILD Compress-Raw-Zlib-2.202.0.ebuild 1016 BLAKE2B d98546d1c73daeefcb0b7a14022c2b705fd22ef82314dc2fff14d21e2001ecea5915bc5f9466669dae79e925d836fe73aac14bc3ce04c9031721e4845cc45b91 SHA512 44b8431ac546b266435f0abbeba32a5e990237867b85779c75ae23479366c4b4039d56b48a863f54c24ed583744590dd5ff2049ecc8a63aca5f55283b91d7c9f
 MISC metadata.xml 407 BLAKE2B 87f44de722fc21134d519d30d6ad719fd7cb8506ffc9bf9e0c97f7f33cd4f18aa6cf066ba51fbecb3c81d669d938520100cc0e50da715b909b03306ec393e434 SHA512 ae1b6145b0e19f878ba182325dffe1c9d5f5412dacb31d84b3426bc25090f596b3205ca9a967a7fb0828c546e3263dd05306154948f3bb4c5c685ff5dfc5ba9a
diff --git a/perl-core/Manifest.gz b/perl-core/Manifest.gz
index 0cfcad9a0710..597aea8b757d 100644
--- a/perl-core/Manifest.gz
+++ b/perl-core/Manifest.gz
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 37fe2b79970d..5e658fd52d5f 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/arm/armv7a/use.mask b/profiles/arch/arm/armv7a/use.mask
index f8d4ad73b7ed..fb779ca1d2e9 100644
--- a/profiles/arch/arm/armv7a/use.mask
+++ b/profiles/arch/arm/armv7a/use.mask
@@ -2,8 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask armv7 specific USE flags
--neon
-
 -cpu_flags_arm_v4
 -cpu_flags_arm_v5
 -cpu_flags_arm_v6
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 4556ba23f498..8c35c3fc8a27 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -68,7 +68,10 @@ cpu_flags_x86_ssse3
 cpu_flags_x86_xop
 
 # ppc arch specific USE flags
-altivec
+cpu_flags_ppc_altivec
+cpu_flags_ppc_vsx
+cpu_flags_ppc_vsx2
+cpu_flags_ppc_vsx3
 ppcsha1
 
 # mips arch specific USE flags
@@ -106,9 +109,6 @@ cpu_flags_arm_vfpv3
 cpu_flags_arm_vfpv4
 cpu_flags_arm_vfp-d32
 
-# [old] arm arch specific USE flags
-neon
-
 # nVidia XvMC requires nvidia-drivers/nvidia-legacy-drivers
 nvidia
 
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index 5a92cd7a0e0f..74077c891ff1 100644
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -54,9 +54,11 @@ gnuefi
 appindicator
 
 # These flags should only be used for ppc
+-cpu_flags_ppc_altivec
+-cpu_flags_ppc_vsx
+-cpu_flags_ppc_vsx2
+-cpu_flags_ppc_vsx3
 -ppcsha1
-# Unmask the Altivec instruction set
--altivec
 
 # Incompatible Use Flags
 #
diff --git a/profiles/package.mask b/profiles/package.mask
index 72ab56ae5c15..41f326ed0daf 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2022-07-15)
+# No activity upstream since early 2021, uses deprecated Go eclass,
+# open bugs: bug #680358, bug #844694. Removal on 2022-08-15.
+dev-util/docker-ls
+
 # Bernard Cafarelli <voyageur@gentoo.org> (2022-07-14)
 # Dead upstream (last release in 2013, no tarballs or git download)
 # No reverse dependencies for a long time, several test and build failures
@@ -294,11 +299,6 @@ dev-util/cligh
 # Masked for removal in 30 days. Bug #851708.
 media-gfx/jpeg2ps
 
-# John Helmert III <ajak@gentoo.org> (2022-06-15)
-# Open security bug with patches for years. Upstream seems dead since
-# 2020. Removal on 2022-07-15.  Bug #718550.
-sys-cluster/csync2
-
 # Matt Turner <mattst88@gentoo.org> (2022-05-30)
 # libwacom-2 broke ABI compatibility; reverse dependencies need to be updated.
 # Bug #848501
@@ -402,7 +402,7 @@ net-p2p/arti
 # Dev channel releases are only for people who
 # are developers or want more experimental features
 # and accept a more unstable release.
->=www-client/chromium-104
+>=www-client/chromium-105
 
 # Anton Fischl <github@fischl-online.de> (2022-02-23)
 # Version 2.5.* is not meant for production according to upstream
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/use.mask b/profiles/prefix/darwin/macos/10.5/ppc/use.mask
deleted file mode 100644
index cb5937b71a2e..000000000000
--- a/profiles/prefix/darwin/macos/10.5/ppc/use.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
--altivec
diff --git a/profiles/prefix/windows/winnt/use.mask b/profiles/prefix/windows/winnt/use.mask
index 96fe791477a6..5466fd4b5e09 100644
--- a/profiles/prefix/windows/winnt/use.mask
+++ b/profiles/prefix/windows/winnt/use.mask
@@ -11,7 +11,6 @@
 3dfx
 acpi
 alsa
-altivec
 apm
 bluetooth
 caps
diff --git a/profiles/use.desc b/profiles/use.desc
index 52f51fa3cdbe..015860fbd20a 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -14,7 +14,6 @@ acpi - Add support for Advanced Configuration and Power Interface
 adns - Add support for asynchronous DNS resolution
 afs - Add OpenAFS support (distributed file system)
 alsa - Add support for media-libs/alsa-lib (Advanced Linux Sound Architecture)
-altivec - Add support for optimizations for G4 and G5/ppc970 processors
 ao - Use libao audio output library for sound playback
 apache2 - Add Apache2 support
 aqua - Include support for the Mac OS X Aqua (Carbon/Cocoa) GUI
@@ -208,7 +207,6 @@ mysqli - Add support for the improved mySQL libraries
 nas - Add support for network audio sound
 ncurses - Add ncurses support (console display library)
 neXt - Enable neXt toolkit
-neon - Enable optimization support for ARM NEON processors
 netcdf - Enable NetCDF data format support
 networkmanager - Enable net-misc/networkmanager support
 nis - Support for NIS/YP services
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 734872cb39e5..005230df2dd3 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -7100,6 +7100,7 @@ sci-astronomy/psfex:plplot - Build with sci-libs/plplot to allow diagnostic plot
 sci-astronomy/scamp:plplot - Build with sci-libs/plplot to allow diagnostic plots during processing
 sci-astronomy/sextractor:modelfit - Enable profile model fitting, needs sci-libs/atlas and sci-libs/fftw
 sci-astronomy/siril:heif - Add support for the HEIF image format
+sci-astronomy/siril:libconfig - Require dev-libs/libconfig to read old configuration files
 sci-astronomy/siril:wcs - Add supprt astrometry features using sci-astronomy/wcslib
 sci-astronomy/stellarium:deep-sky - Install extra deep sky objects catalog (may affect performance)
 sci-astronomy/stellarium:media - Enable sound and video support
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 76d70d85312b..b8ecfb0906b6 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index 54bb916b9f6c..bbad7ff33456 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1,5 +1,9 @@
+AUX siril-1.0.3-dependencies.patch 4623 BLAKE2B a6a92adfdf0f3166325516036b5b15a683456d567653cc1a08e52f4754a4b59dede1a894f32eb1fb2b92dc0b9ca729e3705927889a040608602455d648e8c5e2 SHA512 bb73384fbc4f092ffb07dc6b0e4d2edd564b9fc1ec462f54b6fc28ce933a939e8f72cd8830a36f3e1bd73cac83dad5d80af1ca3b673c39e90a5730bc56a10f0e
+AUX siril-9999-dependencies.patch 5217 BLAKE2B 3f9753c47b8ee337c75ea47d811c5df7e4a08fabdbd8d53546fbe94a56a298a74067ea34cfe98d8c443741fdb36a735e897534b078959f8747fbfb5b1b4114b8 SHA512 c2c695ff725a8c761c1a1f3bfc0e0952ad6faa29201aaec07ba61d1b6387f8ed847c0786299cc40f3a0fef2b7f6ea087186d1177c11a509c3a80ba7ec32dc221
 AUX siril-docfiles.patch 433 BLAKE2B 3c781f4a0604f56ada235094eb481b4b51912921719ee198c7d2400a7dffbb4034d34505f5d7221b033efbbbe11b07332938a6dc0bc616bb6f6480e41475653e SHA512 2d770a2cb86d95c291beb6077ab01560e118bc84d838dfeef50bc9a812469fea568cdfe1c9b5d1a90b778527b65a397aac1656008739cff88ffc80ba6fd09c72
 DIST siril-1.0.1.tar.bz2 2846127 BLAKE2B 15c87e9d3ae175170ad67c1fc65abcca43220d8320df3ba2351cc49d495f9b9dde85d4143b2aa52950b92eb36f10e0ca6548d10e22e072e00596b8fdb535ce1c SHA512 ea35940b370b35802816a90789982dd328ba20d322d092c623c244de949b08810e3ad9552ce3dcc4cc6e2d6b5bf128ac668cbe4ff6ef78d22a4e6ed94b850ffa
+DIST siril-1.0.3.tar.bz2 2900334 BLAKE2B 7ec4995ae0f2b66a8575ac6d680dd639bc6d4c429428c2b29eebf8ea1989dae4669bf81b957d4be7889616b09a3b4febb7c1f1da950d36c68bbec152d4cc0041 SHA512 bd8e5d1bba71b0f14f9284a5072e7524d6005c22c55bed45a8e0113456c94ea5ac2a2befbe84c1e827fa410ee9031215343183d2d49f52df681ee4f5dc1a478a
 EBUILD siril-1.0.1.ebuild 1609 BLAKE2B 933c63c2afe10cb6948bfa94e3599fc70477ff1e9ed78e4acf3fd460e8de4464c2494d055693d8d0883b723a49e8ff8aed3b2710f529affdc732b5a09b5cdd64 SHA512 e6d718dc597bf50ce8a78b6ac06c57e4986004c7fbf569e94bd819369670b8423074c9ea11fa8385b1159ad1b361c326345b8d0fe24f2580aff3ea20e8d56530
-EBUILD siril-9999.ebuild 1609 BLAKE2B 933c63c2afe10cb6948bfa94e3599fc70477ff1e9ed78e4acf3fd460e8de4464c2494d055693d8d0883b723a49e8ff8aed3b2710f529affdc732b5a09b5cdd64 SHA512 e6d718dc597bf50ce8a78b6ac06c57e4986004c7fbf569e94bd819369670b8423074c9ea11fa8385b1159ad1b361c326345b8d0fe24f2580aff3ea20e8d56530
-MISC metadata.xml 1193 BLAKE2B 9f96f4e276f27e19f5e3d5d9807a8d7f18ae50b5baa2f158130d3fac1dbda96aa70a7fb9126f6987fc518f214d4a6cfcee548c0d22beac74e434f25c001ae990 SHA512 4fb382297b5098d66c12ffdbda55e6fa6e085c9cc050ec0584497020ee4820d76cefc7a93de504642c4a27181685f69cc0d31eb3398a5d168aa15ea7c3ea72db
+EBUILD siril-1.0.3.ebuild 1888 BLAKE2B 034555c7cf929d1725e745c5f767c0b24f744826c5c736525b1abeb9e07ddc28e2507bf9a6d4e3d4fe346a4d9976c808d4162956fe08d58107546b93bd7f5814 SHA512 eb67bdfb163e863b4f94e4394eafb17273809a5b7a2af539ad55d5ab668b6fa84fa63a6a1c3f71b02936674acee830de498d7640100cef3f4971a03500180a76
+EBUILD siril-9999.ebuild 1944 BLAKE2B 502cf3e442b0c0c171edc8044d7a5af3852fc4346fcf6f87bc8e5fe407596358381ae70765a2a0d61840451ef5f5c3202a4a48c40a2de30789093ea0d1eb6357 SHA512 76c9542cf1018d004e1e4a35033a30e3fa5a44efa1ca8ace70222f553b5f7dd004fe128b1a061d5da2f7989470b069ce8b4c54af70085c7324b010dd91213dc8
+MISC metadata.xml 1295 BLAKE2B fa25ab59a14b1fcf3fefcb2d94c5b4c18d6925c6c38643db8a8ab7472d276d62a0576893540c95301d6fa9845f49be51cf9cca6593bbcb61581d7c1a0fdb404e SHA512 ba7d178394de1bc3326969647108771efe82c4b4bc3c293592840d55fa9ec5f6fafcb852f4fd0e427e445cc5984c74df436f7d95538631942a145f7f9dfd3dc3
diff --git a/sci-astronomy/siril/files/siril-1.0.3-dependencies.patch b/sci-astronomy/siril/files/siril-1.0.3-dependencies.patch
new file mode 100644
index 000000000000..84595472e63f
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.0.3-dependencies.patch
@@ -0,0 +1,177 @@
+diff --git a/meson.build b/meson.build
+index 3d8e5508..5572bf61 100644
+--- a/meson.build
++++ b/meson.build
+@@ -42,7 +42,16 @@ srcInclude  = include_directories('src')
+ 
+ warnings = []
+ 
+-enable_openmp = get_option('openmp')
++enable_openmp    = get_option('openmp')
++enable_libraw    = get_option('libraw')
++enable_libtiff   = get_option('libtiff')
++enable_libjpeg   = get_option('libjpeg')
++enable_libpng    = get_option('libpng')
++enable_libheif   = get_option('libheif')
++enable_ffms2     = get_option('ffms2')
++enable_ffmpeg    = get_option('ffmpeg')
++enable_wcslib    = get_option('wcslib')
++enable_criterion = get_option('criterion')
+ 
+ # General version
+ siril_version = meson.project_version()
+@@ -257,32 +266,67 @@ if enable_openmp
+     siril_cpp_flag += ['-Xpreprocessor', '-fopenmp']
+     siril_c_flag += ['-Xpreprocessor', '-fopenmp']
+   else
+-  openmp_dep = dependency('openmp', required : false)
++  openmp_dep = dependency('openmp', required : true)
+   endif
+ else
+   message('OpenMP disabled')
+ endif
+ 
+-libraw_dep = dependency('libraw', required : false)
+-libtiff_dep = dependency('libtiff-4', required : false)
+-libjpeg_dep = dependency('libjpeg', required : false)
+-libpng_dep = dependency('libpng', required : false, version: '>= 1.6.0')
+-libheif_dep = dependency('libheif', required : false)
+-ffms2_dep = dependency('ffms2', required : false)
+-ffmpeg = [
+-  dependency('libavformat', required : false),
+-  dependency('libavcodec', required : false),
+-  dependency('libavutil', version : '>= 55.20', required : false),
+-  dependency('libswscale', required : false),
+-  dependency('libswresample', required : false)
+-]
++libraw_dep = no_dep
++if enable_libraw
++  libraw_dep = dependency('libraw', required : true)
++endif
++
++libtiff_dep = no_dep
++if enable_libtiff
++  libtiff_dep = dependency('libtiff-4', required : true)
++endif
++
++libjpeg_dep = no_dep
++if enable_libjpeg
++  libjpeg_dep = dependency('libjpeg', required : true)
++endif
++
++libpng_dep = no_dep
++if enable_libpng
++  libpng_dep = dependency('libpng', required : true, version: '>= 1.6.0')
++endif
++
++libheif_dep = no_dep
++if enable_libheif
++  libheif_dep = dependency('libheif', required : true)
++endif
++
++ffms2_dep = no_dep
++if enable_ffms2
++  ffms2_dep = dependency('ffms2', required : true)
++endif
++
++ffmpeg = []
++if enable_ffmpeg
++  ffmpeg = [
++    dependency('libavformat', required : true),
++    dependency('libavcodec', required : true),
++    dependency('libavutil', version : '>= 55.20', required : true),
++    dependency('libswscale', required : true),
++    dependency('libswresample', required : true)
++  ]
++endif
++
+ libcurl_dep = no_dep
+ if enable_libcurl
+-  libcurl_dep = dependency('libcurl', required : false)
++  libcurl_dep = dependency('libcurl', required : true)
++endif
++
++criterion_dep = no_dep
++if enable_criterion
++  criterion_dep = dependency('criterion', required : true)
+ endif
+-criterion_dep = dependency('criterion', required : false)
+ 
+-wcslib_dep = dependency('wcslib', fallback : ['wcslib', 'wcslib_dep'], required : false)
++wcslib_dep = no_dep
++if enable_wcslib
++  wcslib_dep = dependency('wcslib', fallback : ['wcslib', 'wcslib_dep'], required : true)
++endif
+ 
+ ################################################################################
+ # Configuration
+diff --git a/meson_options.txt b/meson_options.txt
+index cd4b9cc1..5e48ae1f 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -12,9 +12,63 @@ option('openmp',
+  description: 'build with OpenMP support'
+ )
+ 
++option('libraw',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with LibRaw support'
++)
++
++option('libtiff',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with TIFF support'
++)
++
++option('libjpeg',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with JPEG support'
++)
++
++option('libpng',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with PNG support'
++)
++
++option('libheif',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with HEIF support'
++)
++
++option('ffms2',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with FFMS2 support'
++)
++
++option('ffmpeg',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with FFmpeg support'
++)
++
+ option('enable-libcurl',
+  type: 'combo', 
+  value: 'platform-default',
+  description: 'Use libcurl instead of GIO',
+  choices: [ 'yes', 'no', 'platform-default' ]
+-)
+\ No newline at end of file
++)
++
++option('criterion',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with criterion support'
++)
++
++option('wcslib',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with WCSLIB support'
++)
diff --git a/sci-astronomy/siril/files/siril-9999-dependencies.patch b/sci-astronomy/siril/files/siril-9999-dependencies.patch
new file mode 100644
index 000000000000..b9ed88f98e8a
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-9999-dependencies.patch
@@ -0,0 +1,198 @@
+diff --git a/meson.build b/meson.build
+index fdfc3745..c8823c6f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -42,7 +42,17 @@ srcInclude  = include_directories('src')
+ 
+ warnings = []
+ 
+-enable_openmp = get_option('openmp')
++enable_openmp    = get_option('openmp')
++enable_libraw    = get_option('libraw')
++enable_libtiff   = get_option('libtiff')
++enable_libjpeg   = get_option('libjpeg')
++enable_libpng    = get_option('libpng')
++enable_libheif   = get_option('libheif')
++enable_ffms2     = get_option('ffms2')
++enable_ffmpeg    = get_option('ffmpeg')
++enable_libconfig = get_option('libconfig')
++enable_criterion = get_option('criterion')
++enable_wcslib    = get_option('wcslib')
+ 
+ # General version
+ siril_version = meson.project_version()
+@@ -256,33 +266,72 @@ if enable_openmp
+     siril_cpp_flag += ['-Xpreprocessor', '-fopenmp']
+     siril_c_flag += ['-Xpreprocessor', '-fopenmp']
+   else
+-  openmp_dep = dependency('openmp', required : false)
++  openmp_dep = dependency('openmp', required : true)
+   endif
+ else
+   message('OpenMP disabled')
+ endif
+ 
+-libraw_dep = dependency('libraw', required : false)
+-libtiff_dep = dependency('libtiff-4', required : false)
+-libjpeg_dep = dependency('libjpeg', required : false)
+-libpng_dep = dependency('libpng', required : false, version: '>= 1.6.0')
+-libheif_dep = dependency('libheif', required : false)
+-ffms2_dep = dependency('ffms2', required : false)
+-ffmpeg = [
+-  dependency('libavformat', required : false),
+-  dependency('libavcodec', required : false),
+-  dependency('libavutil', version : '>= 55.20', required : false),
+-  dependency('libswscale', required : false),
+-  dependency('libswresample', required : false)
+-]
++libraw_dep = no_dep
++if enable_libraw
++  libraw_dep = dependency('libraw', required : true)
++endif
++
++libtiff_dep = no_dep
++if enable_libtiff
++  libtiff_dep = dependency('libtiff-4', required : true)
++endif
++
++libjpeg_dep = no_dep
++if enable_libjpeg
++  libjpeg_dep = dependency('libjpeg', required : true)
++endif
++
++libpng_dep = no_dep
++if enable_libpng
++  libpng_dep = dependency('libpng', required : true, version: '>= 1.6.0')
++endif
++
++libheif_dep = no_dep
++if enable_libheif
++  libheif_dep = dependency('libheif', required : true)
++endif
++
++ffms2_dep = no_dep
++if enable_ffms2
++  ffms2_dep = dependency('ffms2', required : true)
++endif
++
++ffmpeg = []
++if enable_ffmpeg
++  ffmpeg = [
++    dependency('libavformat', required : true),
++    dependency('libavcodec', required : true),
++    dependency('libavutil', version : '>= 55.20', required : true),
++    dependency('libswscale', required : true),
++    dependency('libswresample', required : true)
++  ]
++endif
++
+ libcurl_dep = no_dep
+ if enable_libcurl
+-  libcurl_dep = dependency('libcurl', required : false)
++  libcurl_dep = dependency('libcurl', required : true)
+ endif
+-libconfig_dep = dependency('libconfig', required : false)
+-criterion_dep = dependency('criterion', required : false)
+ 
+-wcslib_dep = dependency('wcslib', fallback : ['wcslib', 'wcslib_dep'], required : false)
++libconfig_dep = no_dep
++if enable_libconfig
++  libconfig_dep = dependency('libconfig', required : true)
++endif
++
++criterion_dep = no_dep
++if enable_criterion
++  criterion_dep = dependency('criterion', required : true)
++endif
++
++wcslib_dep = no_dep
++if enable_wcslib
++  wcslib_dep = dependency('wcslib', fallback : ['wcslib', 'wcslib_dep'], required : true)
++endif
+ 
+ ################################################################################
+ # Configuration
+@@ -546,6 +595,7 @@ summary(
+     'FFMPEG'    : ffmpeg_found,
+     'libcurl'   : libcurl_dep.found(),
+     'wcslib'    : wcslib_dep.found(),
++    'libconfig' : libconfig_dep.found(),
+     'criterion' : criterion_dep.found(),
+   }, section: 'Optional dependencies'
+ )
+diff --git a/meson_options.txt b/meson_options.txt
+index cd4b9cc1..07b4b904 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -12,9 +12,69 @@ option('openmp',
+  description: 'build with OpenMP support'
+ )
+ 
++option('libraw',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with LibRaw support'
++)
++
++option('libtiff',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with TIFF support'
++)
++
++option('libjpeg',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with JPEG support'
++)
++
++option('libpng',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with PNG support'
++)
++
++option('libheif',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with HEIF support'
++)
++
++option('ffms2',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with FFMS2 support'
++)
++
++option('ffmpeg',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with FFmpeg support'
++)
++
+ option('enable-libcurl',
+  type: 'combo', 
+  value: 'platform-default',
+  description: 'Use libcurl instead of GIO',
+  choices: [ 'yes', 'no', 'platform-default' ]
+-)
+\ No newline at end of file
++)
++
++option('libconfig',
++ type : 'boolean',
++ value : 'true',
++ description: 'build with libconfig support'
++)
++
++option('criterion',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with criterion support'
++)
++
++option('wcslib',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with WCSLIB support'
++)
diff --git a/sci-astronomy/siril/metadata.xml b/sci-astronomy/siril/metadata.xml
index 580487d37ad5..3279b152afca 100644
--- a/sci-astronomy/siril/metadata.xml
+++ b/sci-astronomy/siril/metadata.xml
@@ -22,6 +22,7 @@
 	</longdescription>
 	<use>
 		<flag name="heif">Add support for the HEIF image format</flag>
+		<flag name="libconfig">Require <pkg>dev-libs/libconfig</pkg> to read old configuration files</flag>
 		<flag name="wcs">Add supprt astrometry features using <pkg>sci-astronomy/wcslib</pkg></flag>
 	</use>
 	<upstream>
diff --git a/sci-astronomy/siril/siril-1.0.3.ebuild b/sci-astronomy/siril/siril-1.0.3.ebuild
new file mode 100644
index 000000000000..4954c6f5912e
--- /dev/null
+++ b/sci-astronomy/siril/siril-1.0.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature toolchain-funcs xdg
+
+DESCRIPTION="A free astronomical image processing software"
+HOMEPAGE="https://www.siril.org/"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/free-astro/${PN}.git"
+else
+	SRC_URI="https://gitlab.com/free-astro/siril/-/archive/${PV/_/-}/${PN}-${PV/_/-}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+LICENSE="GPL-3+ Boost-1.0"
+SLOT="0"
+IUSE="curl ffmpeg heif jpeg openmp png raw tiff wcs"
+
+DEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=dev-libs/json-glib-1.2.6
+	>=dev-libs/libconfig-1.4[cxx]
+	>=media-gfx/exiv2-0.25
+	media-libs/librtprocess:=
+	>=media-libs/opencv-4.4.0:=
+	sci-libs/cfitsio
+	sci-libs/fftw:3.0=
+	sci-libs/gsl:=
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.20.0:3
+	curl? ( net-misc/curl )
+	ffmpeg? ( media-video/ffmpeg:= )
+	heif? ( media-libs/libheif )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	png? ( >=media-libs/libpng-1.6.0 )
+	raw? ( media-libs/libraw )
+	tiff? ( media-libs/tiff )
+	wcs? ( >=sci-astronomy/wcslib-7.7 )
+"
+RDEPEND="
+	${DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-docfiles.patch"
+	"${FILESDIR}/${P}-dependencies.patch"
+)
+
+DOCS=( README.md NEWS ChangeLog AUTHORS )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dffms2=false
+		-Dcriterion=false
+		$(meson_use ffmpeg)
+		$(meson_use heif libheif)
+		$(meson_use jpeg libjpeg)
+		$(meson_use openmp)
+		$(meson_use png libpng)
+		$(meson_use raw libraw)
+		$(meson_use tiff libtiff)
+		$(meson_use wcs wcslib)
+		$(usex curl -Denable-libcurl=yes -Denable-libcurl=no)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature "gnuplot support" sci-visualization/gnuplot
+}
diff --git a/sci-astronomy/siril/siril-9999.ebuild b/sci-astronomy/siril/siril-9999.ebuild
index 9f673bad189f..ebbd20b9dcf6 100644
--- a/sci-astronomy/siril/siril-9999.ebuild
+++ b/sci-astronomy/siril/siril-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit meson toolchain-funcs xdg
+inherit meson optfeature toolchain-funcs xdg
 
 DESCRIPTION="A free astronomical image processing software"
 HOMEPAGE="https://www.siril.org/"
@@ -17,14 +17,13 @@ else
 	S="${WORKDIR}/${PN}-${PV/_/-}"
 fi
 
-LICENSE="GPL-3+"
+LICENSE="GPL-3+ Boost-1.0"
 SLOT="0"
-IUSE="curl ffmpeg gnuplot heif jpeg openmp png raw tiff wcs"
+IUSE="curl ffmpeg heif jpeg libconfig openmp png raw tiff wcs"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2
 	>=dev-libs/json-glib-1.2.6
-	>=dev-libs/libconfig-1.4[cxx]
 	>=media-gfx/exiv2-0.25
 	media-libs/librtprocess:=
 	>=media-libs/opencv-4.4.0:=
@@ -36,6 +35,7 @@ DEPEND="
 	curl? ( net-misc/curl )
 	ffmpeg? ( media-video/ffmpeg:= )
 	heif? ( media-libs/libheif )
+	libconfig? ( >=dev-libs/libconfig-1.4[cxx] )
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	png? ( >=media-libs/libpng-1.6.0 )
 	raw? ( media-libs/libraw )
@@ -44,14 +44,14 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
-	gnuplot? ( sci-visualization/gnuplot )
 "
 
 PATCHES=(
 	"${FILESDIR}/${PN}-docfiles.patch"
+	"${FILESDIR}/${PN}-9999-dependencies.patch"
 )
 
-DOCS=( README.md NEWS ChangeLog LICENSE.md LICENSE_sleef.txt AUTHORS )
+DOCS=( README.md NEWS ChangeLog AUTHORS )
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -63,8 +63,22 @@ pkg_setup() {
 
 src_configure() {
 	local emesonargs=(
+		-Dffms2=false
+		-Dcriterion=false
+		$(meson_use ffmpeg)
+		$(meson_use heif libheif)
+		$(meson_use jpeg libjpeg)
+		$(meson_use libconfig)
 		$(meson_use openmp)
+		$(meson_use png libpng)
+		$(meson_use raw libraw)
+		$(meson_use tiff libtiff)
+		$(meson_use wcs wcslib)
 		$(usex curl -Denable-libcurl=yes -Denable-libcurl=no)
 	)
 	meson_src_configure
 }
+
+pkg_postinst() {
+	optfeature "gnuplot support" sci-visualization/gnuplot
+}
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index da0f930bf8e8..7c88bfc04f5c 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/uchime/Manifest b/sci-biology/uchime/Manifest
index ee70a3428de9..5cc58cb44bbc 100644
--- a/sci-biology/uchime/Manifest
+++ b/sci-biology/uchime/Manifest
@@ -1,4 +1,4 @@
-AUX CMakeLists.txt 589 BLAKE2B 183caf5f107482c410296eee8136271e261696a3c11255960b840bd4db16cf461c386fa7374b3a2afb3fd38e97593ad98f9efc621104106cfe4463939c6d0d31 SHA512 06e9f9c8806c27b268968b28fb6059fc6d52295a5d38635612728ac577656fcfae5eb6b15c63e3e9de57e1c8cac832cd4dff70d8a6f3182358a5eb06eb354642
+AUX CMakeLists.patch 834 BLAKE2B 1d522463bda3a0dca822c59ade24a7443f7e1b5901a091e0a4a5c86221e4fce91ed968229ba752e5980e202b633ea762b5dfeb758b4c83add0ac15706b7bdcb1 SHA512 f4939dc4b211742c8e1b592b13ad2c24cd7efa050b64c8eedaa99d61a8f60f54645c0f97185a33d13976201ac55249bfdf7edabb14f08e8487412d1b63c20841
 DIST uchime4.2.40_src.tar.gz 66772 BLAKE2B 9133853d616ab6e1e6a397da78fc846ba00fc70c2c375eb16a98fbdec25ba6034bd1c876b7ec4a99305e76e47cf7984c1aa30b64bdc96e125f661a0150bae060 SHA512 c3afecb23d164d9c3db6229f54faa13120ac4d88132d9aef707f8d043091099db4205ac80f60242920af6efc23813b3e7e4966d562bdb75ff53244fd525e656b
-EBUILD uchime-4.2.40.ebuild 654 BLAKE2B d9ddacb096c43c43858f4b4f572304543c7f5ae059fe9c4a8696d1debcd3304af88f360f312fd470ee9f3c733460840537835dfa67a446a18e4bdab6b460a278 SHA512 a7274df383897140b4db99610a2f0fea6b5364799f32b660b78c2e8ef6d9f59b8e629e331629b3b5877380f0e9700967180216e7ad9235f308389c754bc083e9
+EBUILD uchime-4.2.40-r1.ebuild 464 BLAKE2B 24ad55ba2ddb2d67a1411936538938de2d3b0e67af516c372631cd38533abc666a712dc7c42f5056d199f1b5c4dface6f40e010ebb1f6b2e0514630423109ccb SHA512 eb8c6cafee8784f8a29cc4b51e6b2806d8c80332e9ee9ed9bb2db0c01bdb1ee472d606d00d02246a2f277862721e60b30a4d3b83cfb364fe7a3e316281d2f514
 MISC metadata.xml 897 BLAKE2B 26b02bb269f1861d54e723709c38bf2f0f14f146f1175cbfa4d9205ae9a9abec9799d782f715a05c79978a033da8b4c4e8a49461c10091855c5dc1b68475fec2 SHA512 951065ffbcd5a5f974669044acb3b6b73cfa99c375f563707a93277752a0b414521a7e4dda3b40b9272d635cf105212b1053c188e141b0d5674ebcd3d48e66ed
diff --git a/sci-biology/uchime/files/CMakeLists.patch b/sci-biology/uchime/files/CMakeLists.patch
new file mode 100644
index 000000000000..c33af8c7e827
--- /dev/null
+++ b/sci-biology/uchime/files/CMakeLists.patch
@@ -0,0 +1,21 @@
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,18 @@
++cmake_minimum_required(VERSION 2.8.12)
++project(UCHIME LANGUAGES CXX)
++
++include(GNUInstallDirs)
++
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FILE_OFFSET_BITS=64 -DUCHIMES=1")
++
++# "myutils.h: error: reference to byte is ambiguous""
++# bug #786297
++set(CMAKE_CXX_STANDARD 14)
++set(CMAKE_CXX_STANDARD_REQUIRED ON)
++set(CMAKE_CXX_EXTENSIONS OFF)
++
++# Simply copy the source files from the mk script
++add_executable(uchime
++				addtargets2.cpp alignchime.cpp alignchimel.cpp alnparams.cpp alpha.cpp alpha2.cpp fractid.cpp getparents.cpp globalalign2.cpp make3way.cpp mx.cpp myutils.cpp path.cpp searchchime.cpp seqdb.cpp setnucmx.cpp sfasta.cpp tracebackbit.cpp uchime_main.cpp usort.cpp viterbifast.cpp writechhit.cpp)
++
++INSTALL(TARGETS uchime DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/sci-biology/uchime/files/CMakeLists.txt b/sci-biology/uchime/files/CMakeLists.txt
deleted file mode 100644
index a9319293e10b..000000000000
--- a/sci-biology/uchime/files/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12)
-project(UCHIME)
-
-include(GNUInstallDirs)
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FILE_OFFSET_BITS=64 -DUCHIMES=1")
-
-# Simply copy the source files from the mk script
-add_executable(uchime 
-				addtargets2.cpp alignchime.cpp alignchimel.cpp alnparams.cpp alpha.cpp alpha2.cpp fractid.cpp getparents.cpp globalalign2.cpp make3way.cpp mx.cpp myutils.cpp path.cpp searchchime.cpp seqdb.cpp setnucmx.cpp sfasta.cpp tracebackbit.cpp uchime_main.cpp usort.cpp viterbifast.cpp writechhit.cpp)
-
-INSTALL(TARGETS uchime DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/sci-biology/uchime/uchime-4.2.40.ebuild b/sci-biology/uchime/uchime-4.2.40-r1.ebuild
index 9b346f4fbc8d..fe35819b5eed 100644
--- a/sci-biology/uchime/uchime-4.2.40.ebuild
+++ b/sci-biology/uchime/uchime-4.2.40-r1.ebuild
@@ -1,30 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit cmake
 
 MY_P="${PN}${PV}_src"
-inherit cmake flag-o-matic
 
 DESCRIPTION="Fast, accurate chimera detection"
 HOMEPAGE="https://www.drive5.com/usearch/manual/uchime_algo.html"
 SRC_URI="https://www.drive5.com/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	cp "${FILESDIR}"/CMakeLists.txt . || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	# "myutils.h: error: reference to byte is ambiguous""
-	# bug #786297
-	append-cppflags -std=c++14
-
-	cmake_src_configure
-}
+PATCHES=( "${FILESDIR}"/CMakeLists.patch )
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 3c098b4384f1..6916e2fb712c 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index 930e192e293b..60aace02e58a 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,7 +1,5 @@
 AUX linux-gpib-modules-4.3.4-kernel-5.17.patch 853 BLAKE2B 501282329fdf34d2bb0ccbed9f8bb865711d505ba2a444d659fc97deffae27d179cad522239efd4c63767705e45881c6fb6e1d2f6815085204215bbcbd89606b SHA512 275c693b35885f4913345de26ca17c88deecd3e8513e73787342808fb4ed021dbfc88e6233b5f04cd6b892e43a601a24de27fd656ba6085b3027acbe96c7bc55
-DIST linux-gpib-4.3.3.tar.gz 1381420 BLAKE2B 0ee8c4d740272a55be03f07bd49c9a93d0ec4808465c9b0abc4ede2ee9ef4bcb8a48fb8c98617d007c8b7af970eae185de65094a8814b05cb81bfc983bf9df3e SHA512 91b2c345dc82778b757122dc41ae74138831223a73057ddf9f04d10b8f6a059760e17134378df46a1ecb13c42bec1383aced0f2446f803af425391193a77066e
 DIST linux-gpib-4.3.4.tar.gz 1395770 BLAKE2B 3c7182ac127851ebf0f5416ea639d7f858c160ba00f01aa7f7e423f6fb7b3be5b089424d3a473497562d040c194483ebc93d8a2a0f64582fb8907b42e2c4b832 SHA512 397ad86883bf562b004673ae47218108d392f2a15121c95926ea38764e7a76b382cb199fd48c35c9777f34c8eb99965e3d4ea2028e86ce02bcda4bd23127cbd5
-EBUILD linux-gpib-modules-4.3.3-r1.ebuild 1345 BLAKE2B 5c52c4e59e407c34a390783ffdd4c32bb3119f8d4fbf5fabe33cd724029a0549081feab3e0f194607bafe40556359b7025f61d6c3e74b3381907427887c0d72f SHA512 ed908311a79d77acb579a93536978f07a059de92a2d77dbb9c664f95c7429d74f4c84eefe33de5622c6925a668c9b23cdd36a526b36376f0aa205b7d9b6ddd0c
 EBUILD linux-gpib-modules-4.3.4-r1.ebuild 1334 BLAKE2B 592bf2c852575e7da96bd8a5ba2af12be7443287930c73f09cc8627071da1f9c88e7bd9f90bb3093a3c83030a88d37daef19da0fd2975585d55530c38f7badcb SHA512 d21bfe260d126a3e846da56d183ed21e6f84a406f3b547c9a6b997f22d689b609da4abc07f23b71d9861fd7698ad5b94e043517b181952fa4663da2e41605992
 EBUILD linux-gpib-modules-4.3.4.ebuild 1345 BLAKE2B 5c52c4e59e407c34a390783ffdd4c32bb3119f8d4fbf5fabe33cd724029a0549081feab3e0f194607bafe40556359b7025f61d6c3e74b3381907427887c0d72f SHA512 ed908311a79d77acb579a93536978f07a059de92a2d77dbb9c664f95c7429d74f4c84eefe33de5622c6925a668c9b23cdd36a526b36376f0aa205b7d9b6ddd0c
 MISC metadata.xml 481 BLAKE2B 5ee2924d1131f188c19c84bbfa8a3e2c6093387d15db5a0bc86ea14d4b0c0f36924df7525fb26f0b6660efe1a75f20e19afbd71270386795bd6af82bc5cd38f8 SHA512 dd41ed66cff7ad48e4a107f512e1121fb630f6487ef7872aeab219ff39d6cdb4b5dc14fa19c1b7931697c555702c2bd8bb8ec553b060c11581f02d8a46f76ef4
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3-r1.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3-r1.ebuild
deleted file mode 100644
index a5c44ee72549..000000000000
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info linux-mod toolchain-funcs
-
-DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware"
-HOMEPAGE="https://linux-gpib.sourceforge.io/"
-SRC_URI="mirror://sourceforge/linux-gpib/linux-gpib-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="debug"
-
-COMMONDEPEND=""
-RDEPEND="${COMMONDEPEND}
-	acct-group/gpib
-	!<sci-libs/linux-gpib-4.2.0_rc1
-"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/linux-gpib-kernel-${PV}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is -lt 2 6 8; then
-		die "Kernel versions older than 2.6.8 are not supported."
-	fi
-}
-
-src_unpack() {
-	default
-	unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz"
-}
-
-src_configure() {
-	set_arch_to_kernel
-
-	my_gpib_makeopts=''
-	use debug && my_gpib_makeopts+='GPIB-DEBUG=1 '
-
-	my_gpib_makeopts+="LINUX_SRCDIR=${KERNEL_DIR} "
-}
-
-src_compile() {
-	set_arch_to_kernel
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		docdir=/usr/share/doc/${PF}/html \
-		${my_gpib_makeopts}
-}
-
-src_install() {
-	set_arch_to_kernel
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		DEPMOD="/bin/true" \
-		docdir=/usr/share/doc/${PF}/html \
-		${my_gpib_makeopts} \
-		install
-
-	dodoc ChangeLog AUTHORS README* NEWS
-}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 5b045cc665d8..34bfb04710f4 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index bc1ee5862fc8..48ab6bccb9c8 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -11,9 +11,11 @@ DIST singular-4.2.0p3.tar.gz 16641923 BLAKE2B 4dd7e1a42c71bbba625e171aee656580b4
 DIST singular-4.2.1.tar.gz 16643430 BLAKE2B 2cfc33bd59a5e8756c7ce022ad2b38477a0d7a6747b3c4fd4b1b168cfd179ace52121506cda2c4d5f318abca72231c74f649ede349b17b5f138083428d9da766 SHA512 48bebbe9c886ee56bb2f7bdd9e356bd33e357a2d707c976b8496200f422a2ba25d7c9bba22a261574428abf73a8b6b111d35236fca647e32619659059e861916
 DIST singular-4.2.1p3.tar.gz 15042102 BLAKE2B 9958c1c432f8a3516387cfe7b258d2e22e8e9fdf3874de53a803b34e353088a3ce246a90b78db43f186717985b503d2355f524ee80784e63b186d53217fdeead SHA512 1e6533fcf966499e9ad145b640e7e5878eb9738bd65535aaa517c5e98dedb09bc99bf832359e9b6dca2fff615237f855bd861820e592a885341aa82e7a9a9168
 DIST singular-4.3.0p1.tar.gz 15097535 BLAKE2B 0afc8adea054ccdf68f276b3c4c25e55f938ef9cf9c85fbab86163c6d6839dcfb3d8e1632c135d4d3c978477f165d58727d35c6aaac2f39b4b6f942ca8bbb062 SHA512 af4d3377e9ea8f0b5f34db42c36817e8cf47717accba40c151b68213d8e0832bee71e480e22c60fcc6ced619f6117c24f6d18b87cf66406a175b38e3a7aece69
+DIST singular-4.3.1p1.tar.gz 15090370 BLAKE2B d4e40378b3892b98b1f78c3928c8a40484336ea25ea4dcd4b3a1e5f651281d2cdb06d92c9cc64427ce76e91c5bf4eaa1c3b643df174a24c188823ae808817ad9 SHA512 d27d8e042ea085e49aed6a0697056c36e78e62ea0b9d17751cdf4c556cf4f6efce3b34b411c77aef97c6d90675bea11c97651eb7009634cb8a9b630ec820a06e
 EBUILD singular-4.2.0_p1.ebuild 2259 BLAKE2B 2237245fe2550f398a20a14ae599bcc668288aa6312925cee725e2571dc53f8f62f88bdff0cdf8cd303c72baaf2861a2c560ce54978da720e93cbe459769b7d1 SHA512 2a6b8e478f32ff9e3df96e0188cd137b16d9be1a8c18c9f5367a81b96dc8b0cc01d34771246001eee9e8ec9832f8832539e921879ec56fe8a51ebb42c0d29389
 EBUILD singular-4.2.0_p3-r1.ebuild 2428 BLAKE2B af72aae39de23df410fe1d6dfe475c3179f6355fffe1775d4d408bec6fe80aa37022e6a9838a45014488666b56cfaa627f1fc1d007d360fbbe6987f4b3ead197 SHA512 0921b4991019b449054fb7c7c60a9bd39ec6434a19321b79f63470f2e15889945f24bc15f48e12ba16a24ff23c368a73b0b062d0150104d39aa715511766bc55
 EBUILD singular-4.2.1.ebuild 2571 BLAKE2B 7ccf61735ce3bfd5472b646dceb77239430d44bff9816ea2c1a5cd1cd4807c0138ec2396a193c98b7c3b456a36ee72c6351ff95f949f3afa318b5955a14a014b SHA512 1aad8be5aee15235c8f4a865ec8e3e19c3cac61ae6c8db39e7a7f614119fa2dfc1869a7ce9cc6fb896a5ffb455c65e90b2fc91cf98d5b0a3e193941deadc807c
 EBUILD singular-4.2.1_p3-r1.ebuild 2628 BLAKE2B 5ff968e3c06d722d2f1c0c872ea4c541e9e5e90bda4e8af8e54ba38aba21464ed8f7cfea727883de0ed34831f12c780ed45dd2a038856a19d142200d0073688e SHA512 8d0e74684f138c08288ac642ad0450a364c5b0deb6f805680289408d54fee563cadd32a81297a48e8148679b537903190e8abba069a60e38e06cb8bc10b6ee75
 EBUILD singular-4.3.0_p1.ebuild 2442 BLAKE2B 414fb3fe1752c58e0eb776e337ce3c8fb1f36488856a1f103d71a52495b9200b83bf73c3bca369681584ba65642cb54ba7996c0362f54791d242077ef5cb14e8 SHA512 e9d0287082cfcd5143858033dff722ec98d48091cb21145b7bbc5cfd66c4eca745e73033134a3c23e3a7c9081a9b489aac1c0ef8d1cea7d52403fc7f27a3e2ee
+EBUILD singular-4.3.1_p1.ebuild 2296 BLAKE2B 4c1cacc1976fa42355106d381764b0ce6bb7ac78d0c540b83b634036456af4c8dc7404fc73bf0187c39a8c3eeeb94f451590afd687fd512e3aba3056a5b35ead SHA512 9e944311c909a6cfeee4a5efc97714b2c5f9c3c3ec2104435685cde4bdaa527ffcf3ea7db9cbacea59fe7c4afe6023c1059261b29143be97391111b213704acf
 MISC metadata.xml 782 BLAKE2B 7f10704c78b5a55cff9d07ffc3456a57aba4001ffd337dfbbb712e32608446ab9ae8039d14143939ad41710dcc6d4725992db2c80bcd1678397e563fefa929b4 SHA512 3c4904a4a8f63ff073745409caf9a9a68aa5d46861b8e8d77a538716a7a6a099d87137d604e52a3b8ce4ab81b7333f95389cd888ccbabe52017b6e8b1e4a77d0
diff --git a/sci-mathematics/singular/singular-4.3.1_p1.ebuild b/sci-mathematics/singular/singular-4.3.1_p1.ebuild
new file mode 100644
index 000000000000..fb5b4a7f3ed2
--- /dev/null
+++ b/sci-mathematics/singular/singular-4.3.1_p1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common
+
+MY_PN=Singular
+MY_PV=$(ver_rs 3 '')
+# Consistency is different...
+MY_DIR2=$(ver_cut 1-3 ${PV})
+MY_DIR=$(ver_rs 1- '-' ${MY_DIR2})
+
+DESCRIPTION="Computer algebra system for polynomial computations"
+HOMEPAGE="https://www.singular.uni-kl.de/ https://github.com/Singular/Singular"
+SRC_URI="ftp://jim.mathematik.uni-kl.de/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_DIR2}"
+
+LICENSE="BSD GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~x86-linux"
+IUSE="emacs examples polymake +readline static-libs"
+
+RDEPEND="
+	dev-lang/perl
+	dev-libs/gmp:0
+	dev-libs/ntl:=
+	sci-libs/cddlib
+	sci-mathematics/flint
+	emacs? ( >=app-editors/emacs-23.1:* )
+	polymake? ( sci-mathematics/polymake )
+	readline? ( sys-libs/readline )
+"
+DEPEND="${RDEPEND}"
+
+SITEFILE=60${PN}-gentoo.el
+
+src_configure() {
+	local myconf=(
+		--disable-debug
+		--disable-doc
+		--disable-optimizationflags
+		--disable-pyobject-module
+		--disable-python
+		--disable-python-module
+		--disable-python_module
+		--enable-factory
+		--enable-gfanlib
+		--enable-libfac
+		--with-flint
+		--with-gmp
+		--with-libparse
+		--with-ntl
+		--without-python
+		--without-pythonmodule
+		$(use_enable emacs)
+		$(use_enable polymake polymake-module)
+		$(use_enable static-libs static)
+		$(use_with readline)
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	if use emacs; then
+		pushd "${S}"/emacs
+		elisp-compile *.el || die "elisp-compile failed"
+		popd
+	fi
+}
+
+src_install() {
+	# Do not compress singular's info file (singular.hlp)
+	# some consumer of that file do not know how to deal with compression
+	docompress -x /usr/share/info
+
+	default
+
+	dosym Singular /usr/bin/"${PN}"
+
+	# purge .la file
+	find "${ED}" -name '*.la' -delete || die
+}
+
+src_test() {
+	# SINGULAR_PROCS_DIR need to be set to "" otherwise plugins from
+	# an already installed version of singular may be used and cause segfault
+	# See https://github.com/Singular/Sources/issues/980
+	SINGULAR_PROCS_DIR="" emake check
+}
+
+pkg_postinst() {
+	einfo "Additional functionality can be enabled by installing"
+	einfo "sci-mathematics/4ti2"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 531a096f3c0c..9a9eff076890 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/xd3d/Manifest b/sci-visualization/xd3d/Manifest
index 4c2badcd25df..aad05db25e78 100644
--- a/sci-visualization/xd3d/Manifest
+++ b/sci-visualization/xd3d/Manifest
@@ -1,7 +1,7 @@
 AUX xd3d-8.3.1-cflags.patch 1950 BLAKE2B 8b4d45d990b8ea37bb3ab4959505c3a19ebe07898a3f0385a0890f16bdad1a96bd1df92a6547fba0a9d4257baaadd30fd9f13795f8bebc93cd8276e1629125c2 SHA512 d89639bca626f59f5b5281b64082ee268f2a576b222d0a2a52fa73de993b82c4700d3f2e60b540c4f2c99b8b4e4fcde53e1db05a416cf1229f5a95d336a2a517
-AUX xd3d-8.3.1-gentoo.diff 1768 BLAKE2B a223a496ef534650094ff368e4d327b4a896a1c051d2ffb0aa7127b57c7ed116aa5ff19c9a9965f3d07f7e2ab80c8b192dd4e989652da36273fd8b9fca6fa5cd SHA512 25af94a757f122c2ca98b1814701110ae6a9c3d387e8a6096ba54cc86bbbf8dbfe445c83feb157b071fc90230020c3b4fcd8313a3c915d5bbb314b67ab26be6f
 AUX xd3d-8.3.1-parallel.patch 2194 BLAKE2B b4706b43ab85cd312a2ec6399eac155ac23a53f0f7863117df14101ab59cc6001a0e218ffbc0b1fc3a36f5701ddfae6515e1e5266c2d8ba5609fce30de8bc7ab SHA512 d7516dd4fad56d35a0a24c5efb08e67d7c68642b72b6a48355a7c2b595f00e4b0b398c8759552eabf64a1d69072c5062f657b463dc4a2c788cae08d5813e790e
+AUX xd3d-8.3.1-r1-gentoo.patch 1780 BLAKE2B e6a3756aed9fa69fe901c84f08028b3195fd8e6f4070f0bc880aff20fa9f6d95faac99573474ced4c2b3004976ece879cbba1926f77c88ab447013ccee03d276 SHA512 30296610087736f9b09e466c4b4e884486f7cbcbdbf4a625cde5ef30e84eb6aec27371065b13ac0b03e522d22326f31006fcb71ec0d5090d935632215fe75116
 AUX xd3d-8.3.1-rotated.patch 241 BLAKE2B dbf15070238a3cd35c068ca2bc46a59ecc1cb3b60183a698992f72ad3b45dc2e044395238674a5caf249d9d9fe6755a743b7640f65e3bfe4fad753be86fcc2e7 SHA512 e5a1f0bc718543e577b1a4faea290f1dbb9e01f7341b1b81f8e90646156babdcd3a600fac9f195a29f97ad3052d432f2ea65d527a33f3e1685e914dc913630ec
 DIST xd3d-8.3.1.tar.gz 2188216 BLAKE2B 80db2b65e54dd0f0e7b0e1e6eec86d9d3756c60e0983e14b65d145876e3c6c5c06f050b2082d072a23fa7a4d250a2abc5f1c7564275ee14303719bb4f6cc8f36 SHA512 a02e1b53b1d393c8184866b0693394f596bb3c1eb5f49d00a41dd7bb972f08ba8d1621e7a1f197b015551d9483c9c76c07dac5e199961de775b9ff63c898c89e
-EBUILD xd3d-8.3.1-r1.ebuild 1236 BLAKE2B a2ca466cb3bebf7af6ae45eb03729077ddb9140cb9516d5d1ee436772ff2a594b44932871b0379590c49e26b81a0d7efb98134804b2ace36db97b5b13bf3cbdd SHA512 c19d1efe6e211bd8cc1fece0ea841bca7c9dbe17255c266e2faa2534f3f0222a90211d775b213b9bab51ab51cb16a1edfbbce62934993efbfeebef7e35ebebdd
+EBUILD xd3d-8.3.1-r2.ebuild 1284 BLAKE2B c7505e6602b5b7f5bf224d571e0e8672ba4c21e7b41997af07d383e037edfab1a58296232ddeafe67bbe29be187c358e8f93ff3d9bb44b287bbd58f61308a75d SHA512 b2cef08bf67ecf17a40edb1812b94fe1fe0e0b6dfdbe7625c8a691f98e059079a8e365eeb7b6fafa8407009c7635c8a9dde85c0d3196f6c00d52a93798928950
 MISC metadata.xml 720 BLAKE2B 0b501949897a5d0584797160d29fb1541a4fdd74bfffeb10430f95aa67eb5c1293fd69f00ba6043a58ca61523f8ea479452360be64c5a97f9ec86d53f5c91874 SHA512 5fa5e5e24e88117eb15864c4796279c608951a547f013b1740de7b89f4e9ce480f2484ada253d39bde41e7266ba8d521a630e18bfcb9632e7df92b4fbb8aa759
diff --git a/sci-visualization/xd3d/files/xd3d-8.3.1-gentoo.diff b/sci-visualization/xd3d/files/xd3d-8.3.1-r1-gentoo.patch
index 271fd0b8bd58..bca0beca64e6 100644
--- a/sci-visualization/xd3d/files/xd3d-8.3.1-gentoo.diff
+++ b/sci-visualization/xd3d/files/xd3d-8.3.1-r1-gentoo.patch
@@ -51,8 +51,8 @@ diff -Naur RULES.gentoo RULES.gentoo
 +# C compiler
 +#
 +COMPILC = $(CC)
-+RANLIB  = ranlib
-+AR      = ar r
++RANLIB  = $(MY_RANLIB)
++AR      = $(MY_AR) r
 +STRIP   = echo $@
 +
 +#
diff --git a/sci-visualization/xd3d/xd3d-8.3.1-r1.ebuild b/sci-visualization/xd3d/xd3d-8.3.1-r2.ebuild
index d46bcf3fdc4d..d6fdeab91c00 100644
--- a/sci-visualization/xd3d/xd3d-8.3.1-r1.ebuild
+++ b/sci-visualization/xd3d/xd3d-8.3.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit fortran-2 flag-o-matic toolchain-funcs
+inherit edo fortran-2 flag-o-matic toolchain-funcs
 
 DESCRIPTION="Scientific visualization tool"
 HOMEPAGE="http://www.cmap.polytechnique.fr/~jouve/xd3d/"
@@ -14,13 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
-RDEPEND="
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	app-shells/tcsh"
+RDEPEND="x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+BDEPEND="app-shells/tcsh"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.diff
+	"${FILESDIR}"/${P}-r1-gentoo.patch
 	"${FILESDIR}"/${P}-parallel.patch
 	"${FILESDIR}"/${P}-rotated.patch
 	"${FILESDIR}"/${P}-cflags.patch
@@ -28,31 +27,31 @@ PATCHES=(
 
 src_prepare() {
 	default
-	sed \
-		-e 's:"zutil.h":<zlib.h>:g' \
-		-i src/qlib/timestuff.c || die
-	sed \
-		-e "s:##D##:${ED%/}:" \
-		-e "s:##lib##:$(get_libdir):" \
-		-i RULES.gentoo \
-		|| die "failed to set up RULES.gentoo"
+
+	sed -i -e 's:"zutil.h":<zlib.h>:g' src/qlib/timestuff.c || die
+	sed -i -e "s:##lib##:$(get_libdir):" RULES.gentoo || die "failed to set up RULES.gentoo"
 }
 
 src_configure() {
 	tc-export CC
+
+	export MY_AR="$(tc-getAR)"
+	export MY_RANLIB="$(tc-getRANLIB)"
+
 	# GCC 10 workaround
 	# bug #722426
 	append-fflags $(test-flags-FC -fallow-argument-mismatch)
 
-	./configure -arch=gentoo || die "configure failed."
+	edo ./configure -arch=gentoo
 }
 
 src_install() {
 	dodir /usr/bin
-	default
+	emake INSTALL_DIR="${ED}/usr/bin" install
 	dodoc FORMATS
 
 	use doc && dodoc -r Manuals
+
 	if use examples; then
 		mv {E,e}xamples || die
 		dodoc -r examples
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 15f7e4102743..04d59cb583e4 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index a8c2c2c2a686..0147b799717f 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -9,5 +9,5 @@ AUX profile_wget.local 128 BLAKE2B d2069517fce414faec2b23f8704fe15683a956af210e6
 DIST firejail-0.9.68.tar.xz 477332 BLAKE2B 4d995715caa81b69bb9a16f604a2463b2db48fad5ba869bb5f353973ce8ec273dbabe07ee340b40094d6fe15bcef7e356cd07e7e7dfd0491d2d1632f64878a0e SHA512 8c03c145bb91fe696407052968bd1069defc44d274bd74d33fccebb28324121d259973fccc1d1cdc38fb2902bb842e921adc9440596a92a4aa13c4e06963e354
 DIST firejail-0.9.70.tar.xz 485096 BLAKE2B d5164ba5ee08e80415a84999e4152f1f9c897f50def669731098126cec117aed3cf4b21603aeb13ccbdb1bffa9d48de69dcb19fe7135691e891b9b83f48a5ca1 SHA512 a790ccb711da6c3e52677011d7eb38c482ffb5066498d4586018671ab4ee533e02edb31fda872e0647fd27c00014b04305eafcb56f1f1b07f470aa4fb701cbe5
 EBUILD firejail-0.9.68-r1.ebuild 3046 BLAKE2B 4cff4e74660fb224440831490502763abeaa7fdefc0e350f1480abf38ad842bd77df525effd479af9f8371a3d4c9ea95a8d663bbc95fc3022c144816c2157727 SHA512 a9f79e7f93fc9cbc9b4cce5784aa51b99c994b1262532c75fe6340d787b56fc6c85866c803a537c59909b80c53f17977de47bb1f97298e56f656d405411bdd2f
-EBUILD firejail-0.9.70.ebuild 3047 BLAKE2B e252a0c657c1e92a2420ed26bb67203a54ea08db7c1335cca477dbd745b04e627c7b8839f22b1c07e291fc0a369bdc660c9f4b9a079bb6224c713535a82e8d78 SHA512 736281c43fca7aa3ca757c2733e9062594b0c4994c569e28a4bbe56f0a0a072b9c146b0cb5d2b5bb8cb186f8d01b28f94b46e4660171fed09010fe0e4fa3aa0e
+EBUILD firejail-0.9.70.ebuild 3046 BLAKE2B 4cff4e74660fb224440831490502763abeaa7fdefc0e350f1480abf38ad842bd77df525effd479af9f8371a3d4c9ea95a8d663bbc95fc3022c144816c2157727 SHA512 a9f79e7f93fc9cbc9b4cce5784aa51b99c994b1262532c75fe6340d787b56fc6c85866c803a537c59909b80c53f17977de47bb1f97298e56f656d405411bdd2f
 MISC metadata.xml 1765 BLAKE2B db5d033abde3f31c928bbf08c847cae4f9f665fb8e71e5e1a2cbe8756f6b384246c5bd771424b55479f17c86c652b13560aae1735b5c70e54ae87fb417a2a290 SHA512 de1377a8b37facd99de364c8b70895c3358cd27755ba5df4217f0e8554da978754bdb85ddd98544450ad952c41db1bcfbd46c6382f76d05afb8181204dfcf143
diff --git a/sys-apps/firejail/firejail-0.9.70.ebuild b/sys-apps/firejail/firejail-0.9.70.ebuild
index 5c5a610f1024..1946f9ec29dc 100644
--- a/sys-apps/firejail/firejail-0.9.70.ebuild
+++ b/sys-apps/firejail/firejail-0.9.70.ebuild
@@ -9,7 +9,7 @@ inherit toolchain-funcs python-single-r1 linux-info
 
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/netblue30/firejail.git"
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 28f8f55e2aa7..a98e36a8acfc 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index b339216fb878..113b77b47f6c 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -1,6 +1,6 @@
 DIST nbd-3.21.tar.xz 523472 BLAKE2B 8601306966b75e5000e34d784175f287553d478e8367d488b9a3c1c11bcb7345a4ba898f02a94b8e927fbded1d3a563a4f0369ad7b49b14dcb6f5ea8d91812f3 SHA512 5dc238e6f45eb230a6f92493a8c3b4891dee98fc47e120e59c3ca31c0a698537ca03f78e43c5e7089d93d548a22b5e3853ba228536d2fc688c3edf4a590fdb3f
 DIST nbd-3.24.tar.xz 556928 BLAKE2B a07b0d8ce18cdea2e0778afbf9adfbc49f4fdc5746ec6f304f46d390adfc0a9ffb199e7c5cb6a72b3073a12a37f598e3780f0a1374b25c0e0a546653f7657d28 SHA512 b542733ca8bdfb6883591acd5cc82fd8fa64fed7ca85b01a961e0ad69b9655750e5317df9ec510b4147cc8b0b5cdfa0b43da53dd06c42863553555d710a3c85d
 EBUILD nbd-3.21-r1.ebuild 1386 BLAKE2B 94b7f258041f7cf8b0e492ff3ca9b590041b534aa8ef3b08d0ff7567eb4c673ee0512adf94a0bfd6b80bb00ed825b3172071a9a5aeeac3bd3be53116276b7553 SHA512 a5a5e49e15dc7111d5f0bf7c017180f06067172e11682e25de2a3b852ce15af3ec62edd8c0306f36f34b3b04b9bf55c3e858cec6930cd8a6bcddd032c92f5d46
-EBUILD nbd-3.24.ebuild 1526 BLAKE2B 18b7f47587ee6873b8b19a3b0a7090d86f9571b7487153c6eaa0fe6851a5a25f70c1ff38dc4f164af706cad24e71ea576de95aedf8c76d192c020076b70e9aeb SHA512 0fe662088839a0cc786a32fb0ee371e5c73b4858b9705ed497277e094bb9ebcba6cbee44a4384fff0ecb9ef695a15971bdd3ca8fa51172b45189696cae8f500e
+EBUILD nbd-3.24.ebuild 1523 BLAKE2B 5ea7a2ccc492cf7ac2177910d155878a1b7b9b726929ddc25ed07ce791d146b58028319b479bdfb213854552f8ef84565c5ed524515ea2956bafd3b4d4d6dbaf SHA512 be94852dae9d14e8954d0d7502f266c98297fa67f49c39fb19fb616657ba187dae3473148ff95c0578855c1c1468d55fa20d0bf4f39357187a43c099963f0a21
 EBUILD nbd-9999.ebuild 1526 BLAKE2B 18b7f47587ee6873b8b19a3b0a7090d86f9571b7487153c6eaa0fe6851a5a25f70c1ff38dc4f164af706cad24e71ea576de95aedf8c76d192c020076b70e9aeb SHA512 0fe662088839a0cc786a32fb0ee371e5c73b4858b9705ed497277e094bb9ebcba6cbee44a4384fff0ecb9ef695a15971bdd3ca8fa51172b45189696cae8f500e
 MISC metadata.xml 490 BLAKE2B b6fff304d62aee96038650fd12b2f4f9d82f7a8be72214766699437563da6f4d305effe58c0beba58ad1c537d8d3ec9ee4d3a698480977be6020317f3279335b SHA512 3e495bb823aae9aa2ce314b31cfe49dc40721e01f45b0d2179f18701b18fef89732d831cd1c0ebbdf1dcef1044a0b507262c586f81897e594ef1394a41211665
diff --git a/sys-block/nbd/nbd-3.24.ebuild b/sys-block/nbd/nbd-3.24.ebuild
index 04319fda899d..6e9e56b51102 100644
--- a/sys-block/nbd/nbd-3.24.ebuild
+++ b/sys-block/nbd/nbd-3.24.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]] ; then
 else
 	SRC_URI="https://github.com/NetworkBlockDevice/nbd/releases/download/${P}/${P}.tar.xz
 		mirror://sourceforge/nbd/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 179ede0e7878..18414e979751 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/csync2/Manifest b/sys-cluster/csync2/Manifest
deleted file mode 100644
index df018e6ea18d..000000000000
--- a/sys-cluster/csync2/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX csync2.initd 492 BLAKE2B 99058d692e34d5a9b59cb33726a06b8257ba8644f44ee299fbcb71364331ec213bc229fc89f8c2d3ecd92dc4c58c2ff8a57d28f5fe04daa42ea495abeb218438 SHA512 a189bdc921efb51734e66f8df808289850c6ce5c60c797c85abb7b3063a45630261a32edced1efd23fe367e8e91e4fe69c3d5e44a10d5b95112ae990e26fa916
-AUX csync2.xinetd 388 BLAKE2B ef926697fc0ebbfa15bc764372f88f279e02e6d6f05873d43c541fd057cd659b368486147f45c8d657eec0457d41c7b2af40e580b8ccbfd94f896379031cc08c SHA512 538bb8fc5b6b667a8afd708fbb35c9b1e98967cf0c1e5b139cdd15a19305000fd7fb7eab564131eb7cf3f562ba9189b08a06061aa31ef64e8e85ca13d6f3d583
-DIST csync2-2.0-github.tar.gz 108299 BLAKE2B ec06cf1284adfe63abd6c329deb4e53474d8f97998e4e6f7f6404321a6970f783d38e9feb46c02925c947834227516d40c928a457d2b43bd2b353ab3385fd150 SHA512 7555e2d958d6213e29cfa8b3b7415eea9a9868036865c519d724ae404006d913fba4aeeb61a916d3fc95669a6ca12160d4f52dc7d15bd59403e8a7de50ee8094
-EBUILD csync2-2.0-r2.ebuild 2814 BLAKE2B 8d7ec3b7ec6d2d760b0c3d65ab11f156a9f88b4238a5bbe26a60ef2b53b29865752ac1e6c97c8da1f3346ad136ce5c9acbba5ece61c230cbadb9d9a2c547c2e5 SHA512 2785f85d2eb19f06755e07360eef2a06ebda0acd7afec0e21211b689bff6a1bd24162b1959876576188f85f2eeacccf3ac509bc991ecef2fba2ab75786d4c093
-MISC metadata.xml 258 BLAKE2B b832ddd16b2a0a4c37b2384ee33e5270040e0221200f92a78c56dd23acf25a7aec5fbf4ccfca8b82eeb669629681684c19b23bf535bc8b05a4f0bd4fb3fcb53e SHA512 0b1852169d6b1f525065559dee560e10c3fd818f197536da258fd1e4486622ac962f5fdb82a514592d8f70c98f6ea1a3fc48bd1349b31bf186b729a0e53f9037
diff --git a/sys-cluster/csync2/csync2-2.0-r2.ebuild b/sys-cluster/csync2/csync2-2.0-r2.ebuild
deleted file mode 100644
index 6f71f731e737..000000000000
--- a/sys-cluster/csync2/csync2-2.0-r2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Cluster synchronization tool"
-HOMEPAGE="https://github.com/LINBIT/csync2"
-SRC_URI="https://github.com/LINBIT/${PN}/archive/${P}.tar.gz -> ${P}-github.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm x86"
-
-IUSE="mysql postgres sqlite ssl xinetd"
-
-RDEPEND=">=net-libs/librsync-0.9.5
-	mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( >=dev-db/sqlite-3.0 )
-	ssl? ( >=net-libs/gnutls-2.7.3 )
-	xinetd? ( sys-apps/xinetd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-SLOT="0"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--sysconfdir=/etc/csync2 \
-		$(use_enable mysql) \
-		$(use_enable postgres) \
-		$(use_enable sqlite sqlite3) \
-		$(use_enable ssl gnutls)
-}
-
-src_install() {
-	# Parallel install fails, bug #561382
-	emake -j1 DESTDIR="${D}" install
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/${PN}.xinetd ${PN}
-	fi
-
-	keepdir /var/lib/csync2
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-}
-
-pkg_postinst() {
-	if use xinetd; then
-		echo
-		einfo "After you setup your conf file, edit the xinetd"
-		einfo "entry in /etc/xinetd.d/${PN} to enable, then"
-		einfo "start xinetd: /etc/init.d/xinetd start"
-	fi
-	echo
-	einfo "To add ${PN} to your services file"
-	if use ssl; then
-		einfo "and to generate the SSL certificates,"
-	fi
-	einfo "just run this command after you install:"
-	echo
-	einfo "emerge  --config =${PF}"
-	echo
-	einfo "Now you can find csync2.cfg under /etc/${PN}"
-	einfo "Please move you old config to the right location"
-	echo
-	einfo "To start csync2 as a standalone daemon, simply run:"
-	einfo "/etc/init.d/csync2 start"
-	echo
-}
-
-pkg_config() {
-	einfo "Updating ${ROOT}/etc/services"
-	{ grep -v ^${PN} "${ROOT}"/etc/services;
-	echo "csync2  30865/tcp"
-	} > "${ROOT}"/etc/services.new
-	mv -f "${ROOT}"/etc/services.new "${ROOT}"/etc/services
-
-	if use ssl; then
-		if [ ! -f "${ROOT}"/etc/${PN}/csync2_ssl_key.pem ]; then
-			einfo "Creating default certificate in ${ROOT}/etc/${PN}"
-
-			openssl genrsa -out "${ROOT}"/etc/${PN}/csync2_ssl_key.pem 1024 &> /dev/null
-
-			yes '' | \
-			openssl req -new \
-				-key "${ROOT}"/etc/${PN}/csync2_ssl_key.pem \
-				-out "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr \
-				&> "${ROOT}"/dev/null
-
-			openssl x509 -req -days 600 \
-				-in "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr \
-				-signkey "${ROOT}"/etc/${PN}/csync2_ssl_key.pem \
-				-out "${ROOT}"/etc/${PN}/csync2_ssl_cert.pem \
-				&> "${ROOT}"/dev/null
-
-			rm "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr
-			chmod 400 "${ROOT}"/etc/${PN}/csync2_ssl_key.pem "${ROOT}"/etc/${PN}/csync2_ssl_cert.pem
-		fi
-	fi
-}
diff --git a/sys-cluster/csync2/files/csync2.initd b/sys-cluster/csync2/files/csync2.initd
deleted file mode 100644
index d718a4990921..000000000000
--- a/sys-cluster/csync2/files/csync2.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PIDFILE=/var/run/csync2.pid
-BINARY=/usr/sbin/csync2
-
-start() {
-   ebegin "Starting csync2"
-   start-stop-daemon --start --pidfile "${PIDFILE}" -m -x ${BINARY} -b -- -ii
-   eend $?
-}
-
-stop() {
-   ebegin "Stopping csync2"
-   start-stop-daemon --stop --pidfile "${PIDFILE}"
-   eend $?
-}
-
-restart() {
-   ebegin "Restarting csync2"
-   svc_stop
-   svc_start
-   eend $?
-}
diff --git a/sys-cluster/csync2/files/csync2.xinetd b/sys-cluster/csync2/files/csync2.xinetd
deleted file mode 100644
index d2a7adb8f5b9..000000000000
--- a/sys-cluster/csync2/files/csync2.xinetd
+++ /dev/null
@@ -1,15 +0,0 @@
-# default: on
-# description: csync2
-service csync2
-{
-       	flags           = REUSE
-        socket_type     = stream        
-       	wait            = no
-        user            = root
-	group		= root
-       	server          = /usr/sbin/csync2
-        server_args     =  -i
-       	#log_on_failure  += USERID
-        disable         = yes
-	only_from       = 192.168.199.3 192.168.199.4
-}
diff --git a/sys-cluster/csync2/metadata.xml b/sys-cluster/csync2/metadata.xml
deleted file mode 100644
index f5fb83321f9e..000000000000
--- a/sys-cluster/csync2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cluster@gentoo.org</email>
-		<name>Gentoo Cluster Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 5eca715fb8ce..839528c26623 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index e5aadcb02b33..b947b831e523 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -4,9 +4,9 @@ DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a8
 DIST btrfs-progs-v5.16.2.tar.xz 2334464 BLAKE2B a21809a840107c370f1598e19f8b07d8bdd704e8ff3ce4cb78431000e7560802e1047d8200c523a45a761d59a311f1ec384946bd585826a129b05a1a5fd0250e SHA512 c89a763e8b099e0e9d04ff239dfee156a15fc783c515bbd48597f5645f720c377dbb4f2dfe9065971a65d3ade9d8fcb24cf37d527811bf4204153a06f7c8c3a7
 DIST btrfs-progs-v5.17.tar.xz 2286016 BLAKE2B 013acc4f9ec294d8d88b04e9f0ee33c450bfa6621b029005d18885add7c0a1da7e645c1f984931749ebd8f3166e8d849ec128a0f95cc189c15878d45acc0901b SHA512 4c2bfafe0fcae47f01bad41910c2e2b3d48a12b88ca1891a9ea63ac1e65699c2e22f481492c7dd11fbea546647ab78718ab9b6997bb257fc29d1482fde9b08d1
 DIST btrfs-progs-v5.18.1.tar.xz 2293940 BLAKE2B ce2326cca51a4242895aada860e290c6af69a216dc6369673bb3321ab91bfe1c995fcc37dd0c1e15c8e28aabaedf3d6c9508bde393eb0ba4c7b9327c922f749a SHA512 265a03b0db00a231ad51bb75fb161dee0a7a51cd120a696ca0524f08ef635b18afe43b391fa9889a4a79734ccc3931e4374bd950eb26dc47ddc8482368efed0e
-EBUILD btrfs-progs-5.10.1-r1.ebuild 3047 BLAKE2B 8a303a3b29a3feff1023c95b7777361e3d9a267961fb8dc39290991f2856ceaba6862df281d636f9bea3448ac1a84105c6b050afdd961e4f316cf913d7f043ab SHA512 72f2a1cdaa286198d9d160515b5f1b0cd3887220e8d3498906141ea9f8f2c393d84b2a52304c05e4844b68991e4455f807619054b7407db3e2d0c0b09b75fcd7
-EBUILD btrfs-progs-5.15.1.ebuild 3085 BLAKE2B 5c2c91b9aa104a54967db818696acb8284ca7a4042e1d142a2e3db7b53b52a1b5530ecfade95cd51eae51ab1e095078415a36b650dd12430412f4d4fcbde3461 SHA512 4c700962937e4d45ed2b2cedec9c857ac38b2f716384916056abe091b36030cff9a609dbb54f60caf0ce1878a9fb6a3e887428bb44f3d63e0bbc0a2dbce8cf73
-EBUILD btrfs-progs-5.16.2.ebuild 3140 BLAKE2B 3725d3755fe9c1f55ac29c8e43ea71b4829cffad8f24939f5ac9bc222c7e52d44d95468da08945c3f9bf74b6ae62842adcfec4bd9f7a83976cfe226d38f02dca SHA512 bbe6a496de5092c6ce6ddf869418e738dc163e5bb5636921e9f475ceab4383cc30d868ea2fcfac9ca6abb0ccc748208194459d3f37c54a7800d9180c5012043d
+EBUILD btrfs-progs-5.10.1-r1.ebuild 3052 BLAKE2B 11e654a2bf6fa0256e844c6bde5b3b057a9ed6300fc532a896441550cc82f97fb7e9cd4c3cb4b8e7685d472c163a15489145805ca5242c81e9a65ef96cfad350 SHA512 e8e8fdd52f9ad1324fa297d4eab58d97c48f2bcf053b06105fabc24f5738cdbabf7d7be15594dcf47b8c518c8e61a37c6266fb4d4e81c3aeb1b9199a442c3ff1
+EBUILD btrfs-progs-5.15.1.ebuild 3090 BLAKE2B 206bd5d48607139125e423fa8d7d88dd961c87f2ecc8b1fde2cea01c683b9000d8e9b1bd41bc1ae96870edef1bd55cf45411136b652f5b63895d84a4f5768b22 SHA512 438c8d7bc27ea19dcc6698d5b6cab82742b11c9918506ed79d40c0c3553a2725aa29c74a00bf520d17295e6d81eb66877a0795382b831291679232ba31c78f78
+EBUILD btrfs-progs-5.16.2.ebuild 3145 BLAKE2B 6c3553cc850c61c0661712c648013c78e46e9151ba825f194e35566334dff5a18a1e0270e17a938fef669abf750fb01db7972c7dcdf7e12636d3a7d615279a45 SHA512 d5bca8a96f59eea41c9cf8ee1060f7a3a0b4ca30aae4fb399eb09e5f9ac05bb0710b37c6501c59733fe2a9afaaf73a0c16b6f82d6b3d9e7b316425901aea3ec6
 EBUILD btrfs-progs-5.17.ebuild 3114 BLAKE2B acecdd2560d5fd72f013e3604a23818608bf2cd87613f8fa4f282be2c6dfaaa5e0e3f7a8617610f11ff9a08dd9dce0fbf97b6c0941c6cf3ad476c4c37246fcaa SHA512 5ae0124a9f8ae4c448fa058c003be65225dc0281a50178bc1fb5cda5feccb684d85e10a86577b62c40341f07da13f06d72386eb876a14a7efce5277439d44818
 EBUILD btrfs-progs-5.18.1-r1.ebuild 3316 BLAKE2B 47162d7502cdcc51a5238d4138b5b84332054e73bb9ea60aa606a8a4019ad334d4e8760c6e639a942224f9c77fb2d311480b3d55a0e9eb940a6c4a1276b2a5fd SHA512 2a5a9821b0030515c1d16a621066457d242898e20077720186933747e7328c10aacaad1aee65254309d57929948b3ffd238f857b980d656c8a963563cff1a8ce
 EBUILD btrfs-progs-9999.ebuild 3316 BLAKE2B 47162d7502cdcc51a5238d4138b5b84332054e73bb9ea60aa606a8a4019ad334d4e8760c6e639a942224f9c77fb2d311480b3d55a0e9eb940a6c4a1276b2a5fd SHA512 2a5a9821b0030515c1d16a621066457d242898e20077720186933747e7328c10aacaad1aee65254309d57929948b3ffd238f857b980d656c8a963563cff1a8ce
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.10.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.10.1-r1.ebuild
index e1e6443d8c62..5d4c1636e492 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.10.1-r1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.10.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{8..9} )
 
-inherit bash-completion-r1 python-single-r1
+inherit bash-completion-r1 python-single-r1 udev
 
 libbtrfs_soname=0
 
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
index b009cd71b1d4..84960ddcbba8 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit bash-completion-r1 python-single-r1
+inherit bash-completion-r1 python-single-r1 udev
 
 libbtrfs_soname=0
 
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild
index b8bd29ede157..b5468068d747 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 # TODO: change to sphinx for docs in 5.17
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit bash-completion-r1 python-single-r1
+inherit bash-completion-r1 python-single-r1 udev
 
 libbtrfs_soname=0
 
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 3b12d97bd5fa..ac797bcf995c 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index a885a2aa7f46..1ca958e6e3ee 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -61,6 +61,9 @@ DIST genpatches-5.10-138.extras.tar.xz 3868 BLAKE2B d08d8e425e323df25f3bad59bf71
 DIST genpatches-5.10-139.base.tar.xz 3775368 BLAKE2B 5ac003f1346c1e9130511cdfb7ee75127f4dd67084176a6042c0c6fcbbe4a5c5c60fc26a86f21def7fcdf23116cf8b9b9680733ac657730af3f01e2a709749e9 SHA512 9719ef4cb81f0f2814b8b88a756bb4883fc33d5e8641f251796ea4edfcecb80240533b4737f2e81bafa7e495ac99da0764d013c6d767e6a6710c50352306488f
 DIST genpatches-5.10-139.experimental.tar.xz 16876 BLAKE2B 3248da0bb347496347992f9aefbbc417f3759352a7d1710c8d22581e80bedb2bcf39577714b7520601bc22c5c56d82e00e81ff07841bf346b19097f2aa87f9a2 SHA512 08357fba1d06872c154c91257c4c6bde6d4c20f4ef0dd316dcdfa07d662f9f8fccc1d1eb44a82f79debcf70e75e318547e6bd3cda193a5bb4bef7b57214151ef
 DIST genpatches-5.10-139.extras.tar.xz 3868 BLAKE2B d755c5346ea1fdc709f830a2a61e1b2c13fd5e5d180c9c7631e62e362db9610ce741d1358dc2b8a0104a83413bef919455390fbd0464db21b6bdd24701c8e62d SHA512 89152c2be3383630b6f69715f9ffd298015dbd3f46662d0ae079017d73e49e1bd7e5256e59fd688c3b5e9a30de95a82cf885866e40e4154b4e843a87017ab7b1
+DIST genpatches-5.10-140.base.tar.xz 3775232 BLAKE2B 1ea0b94e5acece92add1bfa728fab6f4252dea9bdf75696dc52afb4b9422a404fff906dceb31e3a21f6712eaca6ec61ff296d3619e257183db40e52c500e8551 SHA512 568c171f612ff5c59b8b56c2fec29fec36e05c7d35050b687d9a9d7b862d1899bff2fd505094b46969569921aeb69605fda5911883c6583f28405bae96348ad2
+DIST genpatches-5.10-140.experimental.tar.xz 16864 BLAKE2B efe2c4d4493f787a8f11796e140b756e5c273524bcefab29029c0738277a9506166470010f21f847625255e735d48d8511497743e0eec4d16a4ed9b864504b2c SHA512 24b964cd7546a85c29027721c46eb355cafee2db2fdbf1dcffa913c4c0c1f62243f82d34fd8f6a84700595e7f67538df143f424cd42eadff388306e34ca1d06b
+DIST genpatches-5.10-140.extras.tar.xz 3868 BLAKE2B c5f78c7a2c3eb68695c6e2b0810addf286c66f94f53d1953efce2f12e69b04c4b0a43932d5114dec915342594750f0c40ad74a277f198c91c6ba6e5e5c1a6544 SHA512 98af36f68c8eff7432b4969d06c0a2a0d1ea00a18d18b0dc86f360d69bba2ecb08bf59eddde1534341cfe0a5e0de09fdacfae3816d7df1f431b70fe871eea8f6
 DIST genpatches-5.15-45.base.tar.xz 1826632 BLAKE2B 77bb4d997b63723f677f82b91b33afd0f35367d9304051999a0daa84da26feb99fc76a61af77a5e477a5a8ded1a5c12316450563cd56b6c93a93e6df6421b107 SHA512 9435803d4dd65fa78d8e14e992681aeb016d3672b81d589b293d1cbacc024605e18429529803ba344ecae1610bb77150a7b2405cd43f00fc905e9c6babef04c1
 DIST genpatches-5.15-45.experimental.tar.xz 5420 BLAKE2B 984a3e683708e1a1ec4e77fcacc592caca20d134a994e3922548b2cce0aea6b69e0dd3ae93899182b147e42a171b2dc5b230e601cb3b06b09ee6c8ca88bf489f SHA512 7305e4777e3001ea5526b059ed1684c16879e07f83f54536d1326c03a495915cd1f9776865d0bff024053312d9e9f4a94d27e4c047fffaff831995a5aa69561d
 DIST genpatches-5.15-45.extras.tar.xz 3932 BLAKE2B e2c4132995b7b39c9d135e17cd21315013cfa8b9de9b222206d9ff9a5780c4f35be294eb6d71130a9f4b9fbd9c2f31ded41c1c6dfecb2fdc4401118411a7485a SHA512 5b1cf3281df2fe24eac3827b0753c83305dd956b23351899be1dd37a89d00917c771475e3df3f9980f6b0fd210420b479c6196c7d1ea2ea9a0d711fab50cfb64
@@ -76,6 +79,9 @@ DIST genpatches-5.15-57.extras.tar.xz 3932 BLAKE2B 670c631eb992f3ea25caa61037c8e
 DIST genpatches-5.15-58.base.tar.xz 2355372 BLAKE2B 27cb7a5b7ecb66f55a6c9b294e77e14f8c231df39953e19e0c6375ffc084a92dcbdad22e430987d771c89516e4b66b2e938347ef13f932fd593c38fe7c670870 SHA512 70968b3808b1a08d3041f6e9aa08b96f54f98cc26932a66bc8eb91663f83054615057f4d14e03bdd7150f0d83ee371cf718a1bc70ae9f41124afe506287d754b
 DIST genpatches-5.15-58.experimental.tar.xz 5416 BLAKE2B ebbc84556ea7485818334baaf5946f5f756d325e9ab7c86998a555b7b47ae718ecb112fc9fa33a29ce749260a9c5a1a102e6df60445237cb70e040155b7cf975 SHA512 636fa3d586acaa3d7a2b946e4bba3f12216829dd74e8dedc0c50fb41c4d405e2c635013ca84d1b4f5520c648336945de8946f32801fcfe7a21a8eaa1c0474a3d
 DIST genpatches-5.15-58.extras.tar.xz 3932 BLAKE2B 00c41224b6449df6c03c51b0528ee7da9b718d3feaec3dae3f58177983645e2f798ce8221708d7a470a057e37f1d7ebfc3ac843d97b3ce920e671247ccb6bcde SHA512 194275a95d28aff48262aafbc770931b1add0861c1333122c1b82e95c5a39c318a1d57fb2bd5c986f806f84b417c2050287ba55d91d8d40e93541c41cffb7951
+DIST genpatches-5.15-59.base.tar.xz 2355388 BLAKE2B b7752f0691ff64a0bbffaa262a674942623b9b3aa5794b8ffdcc9aa23bc4cc63e65aad8d132e48ee765ab2a4711bb32735680794413166c1c358084e286f4f58 SHA512 d249a9e37ace3688f1f7f5aa368e45fb428220ab193d0ad569c2e1dbfa41b268348378928fda642d1d2521ff0cfacd5b7292b4a1e20555a1b0c7e5232bfd7410
+DIST genpatches-5.15-59.experimental.tar.xz 5416 BLAKE2B 2530a8f8e9922057638d824afa46b5adb3cfe4d80715a88a857e3b68ae18340a32da128fec85a81bccff354f2b76bb3e3f06b0bc53d2f456959e72c49c904bfa SHA512 b03d8843199931c325ae271f789c0553f34c9dd04346437edd1d7327faff1172ca1e8311305a733a0f471598c288c96654199a61278e4cb79ce846605706f82a
+DIST genpatches-5.15-59.extras.tar.xz 3932 BLAKE2B 7438a1bd3f63bd989b93b8d1bcc2474406670958291d7cbffaab792789461336d30465664e6d36c2cc91d77d82fb1ac521d13dfc7cf9691563dc417370dd3107 SHA512 127ab6f173b230c4b0656653af36a5086d021d3ac81d5549a60ca681c1873dba351aa33e3fe96da811dfa6e0a006cab14aa6894f03a9eac1a447df8f724d75cd
 DIST genpatches-5.17-19.base.tar.xz 1122576 BLAKE2B 62a8ef6da90d967676754daec496101b7638c1301ab5bbde5d94f8186d66f7f5672c55b8f97ca64cef9a83da00a46db7ab804cadff62d3137ecdd2bd41885be1 SHA512 b5aaa9013bf2372a658e885ce37e3171077002881e95bd81da87ff1a69645d4daed0f7717b4d35441f25ad647dcbbe92ecbd01318eb449101bdc415409c60e41
 DIST genpatches-5.17-19.experimental.tar.xz 5404 BLAKE2B f50ae6a0b623b38aa5a29fffdd55c53fdefcd451be59c7636c861fb397324bd8eaeb18fe3c476a180767cf4ee0ce9e4a06b3e6788928ceb16d283d38942463d9 SHA512 1a9d538ba714b60ebc8a5b0b8a80a21829d395a382a2cfa838bfce58c2437137deba661ec6b1622b674cc0fa67ced444256050392d5ce1b4d6a9f5b3dd988432
 DIST genpatches-5.17-19.extras.tar.xz 3932 BLAKE2B 87ea5b908c969c61d8da8067f13f0b674a4f72c4614b576a5b7648cf6d6880e88735931314faa43a3f4907c4d75baa3f705908bb609b95af3d9de582dfc7989a SHA512 191eed3aa27c2a2dff28b79a45db4d2c703bc45f5f63eaafbc6229541138601b6462df8262d808fcb5155eb7d632aed85e26d06e13a4095e305a493345dd02e3
@@ -91,6 +97,9 @@ DIST genpatches-5.18-13.extras.tar.xz 3928 BLAKE2B 21db8944e961dc054e69901d711a8
 DIST genpatches-5.18-14.base.tar.xz 610104 BLAKE2B 1bb79a0ab1239773023c353305c30c8c9ba5cc9ad50c539f1bceb069ad20e6feacc45bc8249b6d23f2f707d9ec3870afc5425140698411070f54593fa33b26f8 SHA512 b646dc8f7dd8177d2d97a52e8bff958ce036edcf1d1304164c8e9e7e6b796383593fb0838cf3ab16b3aadb31aede16eb763c915062763b78676c69a094234626
 DIST genpatches-5.18-14.experimental.tar.xz 69876 BLAKE2B 9e38a5a18642ebbce2c0463dc13157dfcff8c4cc9cdde604353333762c6987deb59c4427906176c0297cf4da968cf79a2c229ada5e99bdbe5eaf89c194e898c8 SHA512 00bace0749a8eb19743c1e17c034b46cf125f2f6f05c4f2a7aa550b022ec9cfd389b6af9fc54e19b9c2ae1926cc12363fa159bc07552561ff877aa9214a28184
 DIST genpatches-5.18-14.extras.tar.xz 3928 BLAKE2B 6daca2ba0f7a1a2f318f3a398a37303bc9e1524bcb9cfb2713642eeafc86f1919f2e16789815780b78a391607d2f6fc34a84682f257360fbb3793e34aa56c84a SHA512 58e6fe384be03255599468c196b89e8f3f266f113a6b7f623494937205892d5f7dd301361ead1569790f05c4bf0a6f3813b4511a11cc77294dfc2d2e69590140
+DIST genpatches-5.18-15.base.tar.xz 610660 BLAKE2B d3a1d9a432ffc110af26d74e96b042abb28a79f77d3b6984c20c5a880e29f05c372a9d499646915eabb71a51441734067b0e271a13d111f15c65f6efdca79a40 SHA512 53856c12e3c10733f6ae78e6408af7d628aca7dac8fce5569eed5b3f35ce58bd465d5e40da2183fd06ce70775c199b93f88f73324c68f73c7303d2bc7c71acfa
+DIST genpatches-5.18-15.experimental.tar.xz 69900 BLAKE2B 0d2f07da169d237a1e9e921f1898ec232fb78cf4a6f6e1cb29cdd684f3636b0f5d03a487d47a9ec39ddcf8e817f3eddfcacdd90272c0b3aeb7a2858ce4e8ba52 SHA512 187db100844d331a8957927f3ebdb72ef2844277992602d553d9cc374ad9be2b705444e3959ba424258c9a8dfaa23e0374a60f28636fc5665bb2addf38c86c30
+DIST genpatches-5.18-15.extras.tar.xz 3928 BLAKE2B da2016d84154d129ef32595c04f06f861aa91c7981f9122e8120284a04ac0064785ebb2a4717d544c475f63388e36aa2d2012dc426a9a8f9f66492a507e1755c SHA512 743610e02ce92f053bf41351253d27966de5c3dc0a5499e00328debb2d64f7bb41d29dc5670f11e63dbe2e8baf466a7b99fd2b70ba37a7698f53b25044790196
 DIST genpatches-5.4-199.base.tar.xz 4683396 BLAKE2B e1e66ce10c436bb196a5890e08d5beb8d0a1ece7f19f8fb3b1027747509cc7b6102ace634abdbd299dd48fbc8750f3bc127abe55014410b1d558b4aec497f475 SHA512 8a16d67794e864749fdcdbf413ec0fe996d3c4fb5f04f8c8a2d3001377c8b5d4d7007a96efaa3590fd4b595cccdea36d83c6dc292629566e5398f322658d80f4
 DIST genpatches-5.4-199.experimental.tar.xz 16904 BLAKE2B 496602e26da272a8b58a61402eba0fc9871a96e78005014bd49b4e4354336269e17eeb6828a393c74f0d0cded080247f561a1bae7f6ed22c22d575cc12659ed6 SHA512 fb23e903b297b7660df9aed9aa3a7c94e100c2aa8061e7591823b4abbca82c898f2775b42e319908e4380bec45138acb44972e1f2d09927c96c141a4ba6deff6
 DIST genpatches-5.4-199.extras.tar.xz 1812 BLAKE2B 03b9ebf9d306256e58c895006038f4bb3d908590ef2f603487d9b970963c24acfbe78fbe862b2b493ab477e6e901aba332dc69916eb881fc42a79a62d7f81da4 SHA512 d100e876a9b64d662331d4a78b8531a71144bb70b789e0ab0b76e6957c368ee3a88025e040cd622dd4cf6e4da358a3636571ddf55b94e42dbc250a62a629baee
@@ -106,6 +115,9 @@ DIST genpatches-5.4-209.extras.tar.xz 1812 BLAKE2B c1cb92a600e0827b133735f3c04a9
 DIST genpatches-5.4-210.base.tar.xz 4896412 BLAKE2B cea81eeeab39b8f83386bf5c700f1237e1de2987294a0bfd3fd8b578bdfc384b587639a833a6f6085cc8e3840f71e2e56295c8c060f11d0fa6fa2381f4f7b59f SHA512 b045f3690cad21a61382d41bd5ca8037bd9ac4c83acb8da62317da1cf25aa0550598e366c74f89239f8d0042ec7cb6c76c3cea77e4b173c1cdf038213e2979dc
 DIST genpatches-5.4-210.experimental.tar.xz 16904 BLAKE2B 52c11c240c4cf9336f585687e7711688bdae420184e7e793e98b02b332017f1f9abd685923b4fe485682530b208b5dff27fb2d54675c1f50865e4e7f9dd7b7b7 SHA512 f5ffee070f4de79bcf3172ea4d48c1abdbf8e23c242ba6a8ea0d4576b926890609c48377cad9af2d808d324c06b5b0459a5b15b7c8841b35607514d2f5107010
 DIST genpatches-5.4-210.extras.tar.xz 1812 BLAKE2B 23abb8d1adc1ef226844f9d53611793396102dedf0d4472d4adfda32277ccb60c1e270ed3716d7e5a3f1e4d29c9a1c8a6999cfd6a19613c4953e0bd88b4b316c SHA512 a95429ccd7b7cec7f45cc1adeedd9ea90c33f4e32997d954b8f29a599f59c21914aabc3798ba66688e62215b5843213a5c08120431ff672588c9f79718cd4d4c
+DIST genpatches-5.4-211.base.tar.xz 4898356 BLAKE2B be058cf67ca37dd3eecc242039e184242f0d76e7e3300af10a4068635a02c9a8e22e08780249c00c4cd0542f5e7e0c6f97ae8f0885d0429415e87bf4dbc55a9f SHA512 5c90b96b9acd5b8c9b8ebeff0b7371029ec7615f462dc042e5d636a68e23f274c1c9b05c89df94a49d7972cce905a81442705b4b564ba9fb674cf7107bc316f6
+DIST genpatches-5.4-211.experimental.tar.xz 16892 BLAKE2B bdd6078422561ce309bfeb18d73621581816ddea87ad416f28a7bba28643f2467925c14499ec93cd4ea68eb4c00842e24df9681e9157bcb9fabec394f30d0a91 SHA512 8cb62ac827d58e4c1bd9507f86e8b4db3a2d3893d602dc38d316fc2e46f57c230d86552d75f2041166a53626edd03d0bcba26ae112548020de63b4e4756f4070
+DIST genpatches-5.4-211.extras.tar.xz 1812 BLAKE2B 3edd098fdbae33053dad710c08bafba66b3fff66e2e87935e904c6c5c4ecc2749d8f3135d10ffa6afae15711cdc92c725a08178eae6091355b81e93375d1cbc3 SHA512 264c25cde7a7371726350b0eeab9cc087fb0e0194e92905e1ef2ebe1467ef7ca3a0cd654b65e3fe35f49113882ab9f4041bbbd02095c935baae93b5a37f986cf
 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.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
@@ -135,14 +147,17 @@ EBUILD gentoo-sources-5.10.127.ebuild 749 BLAKE2B 5ed5605a616fb7158303af0b7b0ee3
 EBUILD gentoo-sources-5.10.128.ebuild 742 BLAKE2B 24427c09689e5ef8e14c1eddc4a38dd9538221f2a9284e736da271667fe7dfabea725800e9401591906578a0f47ae6f9f85e067c47e0c64b1015bc04d0923128 SHA512 166d903f07230c7c7b2287c1b01a6f93332ea2f4ab2bd87cdc2a7d9f09cd92898603367a12b79c60d8f4478ac486a0ef4790a81dbe4ce4469c574c8b6503400a
 EBUILD gentoo-sources-5.10.129.ebuild 749 BLAKE2B f8c3ce5ad3771bdabc7b92e74e2a35b6aa0beaf9d9f6c9be13c858653607b623f3287ee6ce0fda82ec1e7f93e534af1d76158f2722da4d71cf21fcb02d922129 SHA512 26a733d2e3c4d3583c91caaef4dba26b878fb2364b404d5a4b3e011ac4f7743d176c696d36e452cbb96f10cd4a9228f9857d3daa140a148171d0ae9b41090f36
 EBUILD gentoo-sources-5.10.130.ebuild 749 BLAKE2B 10810e23b779de11d2f70e774fc81725e89a485b5905481d7c137ba4b35dac63b6d6d3a82106f55c6091edc6e9adfe0668ab8cd69b825aa64ea375db7eb60e4f SHA512 70127e2df6bbea8b8ff57ba2acc5f05940982e2a64c62073051a8ac8fbffd5690ebba1c43eee975dad52d8eef98838ea34df8389045a599cf792627a2ba05056
+EBUILD gentoo-sources-5.10.131.ebuild 749 BLAKE2B 17f8f743b95a36eac42f06dfdd1cb8abad5585aa279c6963e1082211bc69f5471fd7e37dfab00e4b766ab2caa0a353e83b056bdca9c4f099b25e82eada4e85a4 SHA512 61a3cfdf1ab154ab8478f8f919afa3ba8dfb57c759a690202b2d2dee17658fe2269fd4a8070d63557cb68209a15fa76ab6bb88f3dfced39256705c4d602d5f60
 EBUILD gentoo-sources-5.15.41.ebuild 666 BLAKE2B 54a0154beb3416c7d8043c92cb51f8e844216d5e0ce8966dc7bfead0efe84af53c6a9fe5d5d381b46ff5744dfddd9ed00314d1f329141e1567882a6801d453dc SHA512 d2af7925054fa71204d0542976955f32aeee5002b6be5f4c2498bc1e8cfbf9603f87a0ea1f708f05b00fe73fdce3d12f7a4c54206bc255086dc45bad50a0bfbb
 EBUILD gentoo-sources-5.15.51.ebuild 748 BLAKE2B 0011235955d7b0b496ee4882edbe6964e1eb6d578224ac32fe69321386d373e1211b91ad28d829e013760c54d9f9efa9e98e22b6070f565aeb5c0a66101d7a24 SHA512 0157620c50d2a6dfd401b5d9282736852e536aa4900f02315d62b62dd77d0540d5ca0418ff4aaf6c9f387dc1ad5d3f24707f11646e815140cf6918dfd6aa1bbf
 EBUILD gentoo-sources-5.15.52.ebuild 741 BLAKE2B f0807bb2c48707668b147d0478dcb519b706283fb6c4e720bfc43148f3957a0007ced878593ff6a694df4389904539cd42c1328c9786b9fce24edd0c514ebd0a SHA512 d9fa36c265693a77d20a22009621785328078674f87173a831333f1c4519073a01233d9922eaf79737958e36d5b1f370a0fb4b2c877c3ebea018d1b4afa5d09f
 EBUILD gentoo-sources-5.15.53.ebuild 748 BLAKE2B 8741ba0a4d822d557c334683408c67bc00067c7c9bb6a1b5db7c80c2a1bbdfb5773046a899da346e8b7dc8f4d225abd32b9b8393ca4510a38502860566026252 SHA512 456df5470f80e81f1c6c3352bddaadf4a2b13e15ed74439465ebbb42acca9f5d3ff1c7da1935b15c5aa4b0ac1bdecf590f65bc1d4df582c60fa27fdff7faba67
 EBUILD gentoo-sources-5.15.54.ebuild 748 BLAKE2B c81d62582f0a42a3d80c13dc65ed85e45c0a5116d7c02ff0dba8c7bdc669e4b037f5a4c5543e6646b6d9133c0130e023ede137be715f7c54ddfcfc0ec662f196 SHA512 3ea22dc47aa3a5da0d8dc050255fa7161fcfe6dc881221e49959f05933578f944c027489ded510211e619542b401059317c853117e496d16b6159a9ef10abdd4
+EBUILD gentoo-sources-5.15.55.ebuild 748 BLAKE2B 3cfb357a78f45b9c6581470fb08d165325d26910e4ea8d0d5d590f9f0031ca1da5c9ad704585a7b911cf0fc0f1ecf08e0b34f1ea96a6acb17139efb11e9b13fc SHA512 a3ed9c831130d51dbf03e5f67f5d1404e1e7f66a8e7ed15936baf74473b68a3a1f2469c64b1b9f53b494854528612371049e3a196a21968b72a029d2278f1618
 EBUILD gentoo-sources-5.17.15.ebuild 742 BLAKE2B 09390111bf79b7d6192bb16fc2c27afd5e3d3446d595cae4e475770f84416fc4de320acbaaffceee168bcd0564377fa3d8bb9781c10d357b04f201e6f1e9897e SHA512 63aa56ccc9ca8263e44c96fd374187894f57d8baee3e6c1a70a679f55a6b26cf489f69aae648241ab414eb901fca95ba60b708f56e704c1240dd48ded28cbc14
 EBUILD gentoo-sources-5.18.10.ebuild 742 BLAKE2B a776c8acf62c71990205444dbcc91ee6497b129f0cffe91a46a656ce9d376299985831d32da405790c53f8bf332560fd10c2a5a389e8fb0bc076292d6835fa3a SHA512 7eeb9ffbb469c44d42769beda98c1afa022475b7fc55690b4d76b64acbe0ad884a288bce5b4da4e8baa9f67ccd762eb79c738218886bdf59440491995e8233be
 EBUILD gentoo-sources-5.18.11.ebuild 742 BLAKE2B 31d367e09b24a52e3bc3a9537ad829850dea730cd589626fcdd6209c3c3d2864bba9866240892d685a55132ea0f265604fb375337c0a8a2da5e99edb59d76037 SHA512 c9dd14bb7e31f6aee7214a74c8195f663dfac0db16f7fa01fc77cdf649171c2433157d1287c420120e6695061b9eaa97519121c97fed34ea7b400af9194d7ea9
+EBUILD gentoo-sources-5.18.12.ebuild 742 BLAKE2B 63381debe04b3b6a2550c64d745c5124c311a8f3372d32c7d1e3dde4134d1980f7b5223ccc40396ec2e93e82fb49cdee9eb72af33906e84507be8f62b0a199be SHA512 4f868b2a033fc7c1bf7f22fb03b01d6aa75c85615c4bd29c11df250d27fdfe2e9cb1ca675683e2172ab37e1b1b1fdb2ed51f0e439c58464b0c2e4380fc06c122
 EBUILD gentoo-sources-5.18.8.ebuild 742 BLAKE2B 227a639a956829c3fdd0cdd4529ff974db99c58b36a50bdf6b81a162cd14f33fa3032815d4e16ac9abaa8e46e86c13825370a27550806b0687e45b302c7f040f SHA512 77657c173f204d57907181881139b199ed7e81939987cbc10254f7df31414df49d60f451d80e423558909e9a99ec80b7a07337a860128eec389987050bd808a4
 EBUILD gentoo-sources-5.18.9.ebuild 742 BLAKE2B 95e0f99a778f310f85ff86fd862bb4d418aa40a0c0230800f9a417c9e89827791a8e0d87a17d3d607a777172ad00650f8dbb62de1dbd98a47b3aa0c2de21b1db SHA512 3dd8b4a3c88451fbe76b85742c870d491ebac0a1bb0e9a1b28c10254b596abc79ac201f043d4e258322257a55290096c97dce2c8c1f926b35af8b25b8f287f6a
 EBUILD gentoo-sources-5.4.195.ebuild 667 BLAKE2B fcdafc6d942cb657315e9de05f6b8f479bcfadadfd7427fea2dec8459e440d0b32363ef70564a62be1f9368d3c666b30cdb9307ce430f58b23e41ab606e46fd3 SHA512 1bc0f17971e9a6335299b27c0841bf56b3b82369ddad474ddaf762a373cf4f66f47a7f2b9bc5bec01197da4bdbd21845825a802fe1afba134eb5b454e276557b
@@ -150,4 +165,5 @@ EBUILD gentoo-sources-5.4.202.ebuild 742 BLAKE2B 10708aba18cb6fbf67640d80fc0cf56
 EBUILD gentoo-sources-5.4.203.ebuild 735 BLAKE2B e5c80c672c24f56773e209717e53d70cca3e06956a698e53faaa720b5582266cb98ea3c449f50a6e195325770308d5cea37cc4fd75150be3a1f4781a8e81377b SHA512 c569b36f3a3c722113355b307dc89ea86b1284507c7f152136bbc2fd37aff1cd8ec30f3ae2a8b59b4f773c51ca5d113dc8a9a91362bf6b45750d4de384710539
 EBUILD gentoo-sources-5.4.204.ebuild 742 BLAKE2B c1901b9bca3aea2e66a1c297f944513912c73ba0fe53bb978c7c165d247153ccf9edfcc4fec1fd38c7f2b77e72feae595bd802a6cb90addad5303760682123ec SHA512 8a3671c0bc59b64ad979088397a0243ca687cff145a03dffa612b57f26ea2657cddc3dd756b44609cd45485ba179c8cad20fc3e0a4e3f3e32c40bfa0e828428a
 EBUILD gentoo-sources-5.4.205.ebuild 742 BLAKE2B 55b01acd03516a5b17d1887e9964a350390b0ebf697b2e2484088e34d415c3be4e57accc27f48f4e93b7cd3d201580baa592fa219d54d7d8cd014120cc60a3c6 SHA512 e9e6ce2371f2de20d4cc897a62daf67d047215f7089a892beea49b89c260b63945fd827465788ee282b2595de626804145f8540869f9c8a2245726d1bccf43cc
+EBUILD gentoo-sources-5.4.206.ebuild 742 BLAKE2B af27e3794b3f997453cf7d7175b5c38931464171b27aa86d27e27124db8fab9dc079d073ed5c8cacaca87ac95c3a4ddfd97c4b6080f446c5793f5ae76dc3d6e0 SHA512 cd771f3bb727a2aaaa30894c5624b5182d9b0b3b2c62eb50da0dcda5a5e56b36b25ebe0f682d29858f3ea104bbfcc03ef3cc4a55b44ffca614ffdd081590715d
 MISC metadata.xml 501 BLAKE2B f5363c8a19540d5bb924b38bdebeb8dbc60c84e58d1d87a9148a3e7abb09b0a1b733c98b130b778b8ab3a88375598444aa9d537d8c5338864a3d4497600d7836 SHA512 bc1ba0d75dbf5b95b3f93e666389c6408f20aebeec99bc8ec00653758b67588e07214285ed106fd9e5aed2c8d57c625d666c797212fda51e1ab98ce1df816467
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.131.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.131.ebuild
new file mode 100644
index 000000000000..b9c11ba394cb
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.131.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 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="140"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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.15.55.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.55.ebuild
new file mode 100644
index 000000000000..6dee888eb82b
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.55.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 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="59"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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.18.12.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.18.12.ebuild
new file mode 100644
index 000000000000..d636235670d0
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.18.12.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 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="15"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.206.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.206.ebuild
new file mode 100644
index 000000000000..0262ec24c2d0
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.206.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 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="211"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index d2b8a57897c2..859759139439 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -3,23 +3,20 @@ DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c03418
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
-DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
 DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST patch-4.14.288.xz 4826824 BLAKE2B c158824c6eadddc162f8af6000cb7a27166cd8948f254f552ea82a9584c180d8ec6ec370123b7257c73528bec7ebff302c95553271628265044ebb7cc5363a8b SHA512 4be5a9981ec2e0f5d4856e878e5c18992f947a7bfa6124d9f558e64c7ea7a7a6514a8764f92e2ac71b3bc9a7589cfc69e64a8575046136e40b9085e77a034d95
 DIST patch-4.19.252.xz 114289 BLAKE2B 87c97cfe8fcf4fd55f41311b784c36b00d4f910597af1e950a9f00338f8fac4649e9e1ef7608cf18aa49c3afd9347d598e5fee1349e3c954c31c45dfda6010ff SHA512 db2864c2e79b44df3415c39ca9af5bd24d9070bf5de0ac36378fcad34c455c3fd4f652ec9d5f1132ed99e86eeb57e2c893f1343a514921239d9a02cf02b9d3ba
 DIST patch-4.9.323.xz 4420308 BLAKE2B b4a3016fd022247462782cbedd72385aadb06370489558d650d3d38c51178625c2e9e6d6ca6f9cd54d93c871ddf699d0a9acb9cd0ff664d7f1ffe69b94e4d328 SHA512 fb27b26284083447587d28f4f49b4d8401b52e4fa2cb5a2ae2767009ba59f648f773be4fb22f29816bff4ed68acfd8d9836e459e0dda39d9f9289ab007b66a06
-DIST patch-5.10.130.xz 3385804 BLAKE2B a7da929d7538b4d3ff754a4e475ad2b93bd952f1426f9b5cc7fb17758fc1ce3e2bcf87fd36907c0e8b7f5aa2dc851a06e75602445958e9338ea6f00bf59e8178 SHA512 125417afa2406630c95065aaab0a4eaab2c113eaad0ed6e43daae8c05ae46d2ffee40e50606d379805d725086044606a67d483b183b36baabaea2d376c9df28c
-DIST patch-5.15.54.xz 2199248 BLAKE2B 89f633844002bd750a08af30b4a19ec92e258ffa78346096a7552d3fece2fadf11a72e1f04dabc78a79ffe4c16148836357a49f357f5704298cb17061ac3e245 SHA512 813b17a7f403a9f4139b1ce67fd8acf7b0e73cfdd68a36c100e438e7d446b5ab08de70ffddf386ed6ac437b436a3e99c2ff2481ed727bda3663b6595a198239f
-DIST patch-5.17.15.xz 1084564 BLAKE2B 72713c22da50783beac854ca3c4b48d016e4b8eb2ec641dd44f56f32be888723e8125ed3f830a114eb63086717a3a00f6188b1a58d09e0d2e4a0f0337149555b SHA512 63680c60851687980dcbbee4534ad8272efc0b0d80bdd6e1c74e61c343b16182f6636942fde3c1177c4607b176c3d342d646876ce4ed72397080f90a816678ca
-DIST patch-5.18.11.xz 595980 BLAKE2B 74b305bd21c71c9328f02183c3b098ee1e476c1d58e79120b5d9e9ab53da5c32ffe4bba6f4e4c0d75188f187b81fc898fe9fd29762695254e23702caa824f0aa SHA512 5a4972b96438b38aa2bd6b1893557aab528bc465464613ba2c1ef069e501761d995efb26b9a910f638383a821d249d1f6c748e1da993b428c0c4bcbb24621415
-DIST patch-5.4.205.xz 4101696 BLAKE2B 9e7863f6e53582dac18d417ae6beb50e426c7e42f375bd0cd72dd50e597fb43d351c3d6cd2704ee37b763020db416ad918cd729c59fa4ce4f0e2557031d209fb SHA512 3703eed5c6756d0da6ada9ca85d315be697d030db6ce963d7ed10904c8c9d1c4e35a3e0dfcd51105bb4fcfc81778d7d764dd0a1c3b5185082c238d9e2764bff7
+DIST patch-5.10.131.xz 3385312 BLAKE2B 525121ea96691308ee052b79e4e1fc77c84a5f9477639a4e7aac5ef2d043cad0fe321e203add00d24da302747f33e7ac7f05e99ee75fe90ef514501efe5750b0 SHA512 fc45127c2b3b5b7b596b80544aef38dac2e838f139c92f59e5f068b3431fadd9ac3f249f58f35ff6bb60003ed48b0a57f969d12d0c793d64060b27ff8616b493
+DIST patch-5.15.55.xz 2199420 BLAKE2B c190a25360df8be15a33c3bcff69c86d3def4d41490d6b382eb3d5e9e09265ca29233b327e8099f73a3630b7c2c8641874fd76c03ff26d8f05c26aafd23f35a3 SHA512 ca57514bc525f1fae396ee4ff445a9c9d24e3ad8cf424a1cec39a905d85a81dc7e04f17052214cd4554301946b489e5fe3b671d35b64512c75b590b8382c29ef
+DIST patch-5.18.12.xz 595800 BLAKE2B 48e329dfb46b0d71a2b6bf052797fe2462a0498d0a7498b27c50eaa1d3ffd9a234a56c5ef6742b0d3b8b2e9a4752d275a71d422889bb2c3a2657349cd67c89cd SHA512 f05070722545b324cdf5d59288b752c896916301b767fd7323e398ab814f1c1e43e6670e450f8aacf2602b5de54659d0ebec008147135f665016ea43e9671779
+DIST patch-5.4.206.xz 4101432 BLAKE2B b69adee9535add95694ade301ef8d6a8ee250d3d6155aa2b8a1e24d8ba11a81a00ec5b87c91be8ccb3aff3a6bdde49a55931484a2ca44c28052b1c4a33333544 SHA512 4aacfb0f6ca6f4735f5f4f58ca33e43b61a82da9266282b2583b2ae10ab9dafd6245bc07a6090d9a36aa9f1e09193124afdd214c9298f97bd186ac7ce7e667e2
 EBUILD vanilla-sources-4.14.288.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 EBUILD vanilla-sources-4.19.252.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 EBUILD vanilla-sources-4.9.323.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.10.130.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.15.54.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.17.15.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.18.11.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.4.205.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.10.131.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.15.55.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.18.12.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.4.206.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 MISC metadata.xml 340 BLAKE2B e283ab9d2ebb7212e3ba37850c93761f165b4697a2ee6dbf07a67ce907df8ec71b3290a411cb81af8d8d8869b7e45c572487d4d2667dc0a0971986f0f6d1aa8e SHA512 bd0f7f570230dd5bd9f6e270345a3ebc556eb2dbcd19b04e33b5c6df8d9e6735a6e23fe934b39d9ef130ab5e78c6fdd29d7a167cb8ee4ac8ce919c75cec7425c
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.130.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.131.ebuild
index 39693afef068..39693afef068 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.10.130.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.10.131.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.15.54.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.15.55.ebuild
index 39693afef068..39693afef068 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.15.54.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.15.55.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.17.15.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.18.12.ebuild
index 39693afef068..39693afef068 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.17.15.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.18.12.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.205.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.205.ebuild
deleted file mode 100644
index 39693afef068..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.4.205.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.18.11.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.206.ebuild
index 39693afef068..39693afef068 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.18.11.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.4.206.ebuild
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 62705587dc69..7dead09a7268 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/perl-Compress-Raw-Zlib/Manifest b/virtual/perl-Compress-Raw-Zlib/Manifest
index 36ff9adbffdb..043d2c36b709 100644
--- a/virtual/perl-Compress-Raw-Zlib/Manifest
+++ b/virtual/perl-Compress-Raw-Zlib/Manifest
@@ -2,5 +2,5 @@ EBUILD perl-Compress-Raw-Zlib-2.101.0-r1.ebuild 544 BLAKE2B 59cb2334b18918ce83a3
 EBUILD perl-Compress-Raw-Zlib-2.103.0-r1.ebuild 532 BLAKE2B 0fe458c05766be2861c2724de4bd09ef3971f1860266fbae1ea7e0c169847bcc23ddef36d4b44b1c84a988207ab927f0d9f09c0259beee131c58a91829e49942 SHA512 d35b1a59841f0bfb2229356915cababf325e4a2a2ea58b9a993d4f972ab7a2dd59bb8ed9e8385edf6503303249346e3b2e6ac0e30fcdb042bdb2ec98c6f7c27b
 EBUILD perl-Compress-Raw-Zlib-2.105.0.ebuild 536 BLAKE2B 6d0dd3ed17890340518416594b6e5277fb0c63dc60204f259f3abef0f3bf003c3dd0a51a5e937150ae5696dcb92fa966e80a19e0336dbf10a9ad9adb8ee8add3 SHA512 4faf85dae4fa8fa59cde84b02690be17f635ec5237c1c0142d26d585678a5634c376746b84bff18e67b8d15c1c67b584ca62835e330cb4ab62abef8d2afa9f41
 EBUILD perl-Compress-Raw-Zlib-2.201.0.ebuild 508 BLAKE2B 370b08f4893edd195b4dbdf62b8b9118d7817323ef7cfbf8242dbfb6749eb72adff01fc67fc4866a746167257cea7e551facb39b738ee0e9dee8ae1b86c3d331 SHA512 cebc681869f4657f1f2fc8c09d9c7112fd3819486f51b3bc30d46e2d1c44aa62ccf8984354f03b9cd0dcf49696cfbfa53592a542bbd64e4c16e52a710686dcb2
-EBUILD perl-Compress-Raw-Zlib-2.202.0.ebuild 508 BLAKE2B 370b08f4893edd195b4dbdf62b8b9118d7817323ef7cfbf8242dbfb6749eb72adff01fc67fc4866a746167257cea7e551facb39b738ee0e9dee8ae1b86c3d331 SHA512 cebc681869f4657f1f2fc8c09d9c7112fd3819486f51b3bc30d46e2d1c44aa62ccf8984354f03b9cd0dcf49696cfbfa53592a542bbd64e4c16e52a710686dcb2
+EBUILD perl-Compress-Raw-Zlib-2.202.0.ebuild 502 BLAKE2B bcde3b65e053ee0eb48f859decdde77999c6dc5fe0c8fe8739160d1e82b466787b4df780a6398c060db75d3e724c12bd4ae507e81d8fd2337595d41f2ea8807f SHA512 8b4f4e2fd132d482eb3d3d9eeb33b4b250cf8f0e1aebe16885f83587ab7e2348d329e88abd4ed42ea09006b1644312ea1c365068bf8c2d25b1e771a9c4a843e6
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.202.0.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.202.0.ebuild
index 5eb3fbc0be32..07af10c82ad8 100644
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.202.0.ebuild
+++ b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.202.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	~perl-core/${PN#perl-}-${PV}
diff --git a/virtual/podofo-build/Manifest b/virtual/podofo-build/Manifest
index 6644355fc6e3..76c62c6e4809 100644
--- a/virtual/podofo-build/Manifest
+++ b/virtual/podofo-build/Manifest
@@ -1,3 +1,3 @@
-EBUILD podofo-build-0.9.6.ebuild 474 BLAKE2B c5ed2937d6c5f87e4c0d5674b05a193e0d70f7d3e25af8f91946331955a9b10e2dbd1ccfe003416e8a1b2a71f7d588a3ef36c09ce14aef2cd9913ff9ab466727 SHA512 59b2aae40e16e7cecfa175688f0116e2886cd980284d53161028d389a0240de15db609d1316e5fc8163dd880f736bae318c44905a96f5e5f665cea2c7674a32f
-EBUILD podofo-build-0.9.7.ebuild 478 BLAKE2B a831c38f9810251c6718b79b702133a157af14eb9d527b612702310130abb7e1e90d5f75445127d4fdc25200a34fcc45149069cee4397a9a9fd6a8c4f8823866 SHA512 eb93d4065a3f52275bd0f3affbf16b0f40d5e7dd0f49fdfd7b4a58e4ccae43100f6089589bbc0327405a0af168c3397774246cc299916358949e1da0114ad35e
+EBUILD podofo-build-0.9.6-r1.ebuild 475 BLAKE2B 48b7e0cf01ba4366142e7976cbade89dd6f5362c6d137d53943d3af120974f7f1768c8ebeadf27ebff4e1ce5b1201e0d95435ccd317c805e02c24a13b5a3e59d SHA512 e7868eda8499b1529f55d60a16f67fb0e12b2bc464ee20a82d7a9c67b5c32db27d931764a9c847f467bbc0e8b0c9a1259de84050216cfb9ab073044d36f3201b
+EBUILD podofo-build-0.9.7-r1.ebuild 479 BLAKE2B 9feedd278cdaa42e51f064a79d4fe954b5a79111885823de45f90f8aec324f3aa73d9760ceb23a18f20fc93b91a365bfbed806605e5d34523a1a4488b0dd55ca SHA512 62a7f2ea61bcb968bfa20ee16a5c3682817b840c6c0991dbc62de0b036affb90b97459b02ab0b9809b9bff28cc77431d08dc55e414044ea47a4b2ab3ad525321
 MISC metadata.xml 372 BLAKE2B 5f93c35f3681beccfc801a33d48959c8399a2faa7fc46a73cd97a7157bd653a0cbb6320627f855a5c2b2db9513e25bf1dcb245525968753338b6d572379b6ef9 SHA512 7109bb6f1bd498171437e194e91ee86faaa5b0d83db09bb8ab965330edf0e91c7752efac7ddac36045e0cde223a85e231360b566145844eb43071045b55b2e04
diff --git a/virtual/podofo-build/podofo-build-0.9.6.ebuild b/virtual/podofo-build/podofo-build-0.9.6-r1.ebuild
index 1904880ae188..43fe60930c2e 100644
--- a/virtual/podofo-build/podofo-build-0.9.6.ebuild
+++ b/virtual/podofo-build/podofo-build-0.9.6-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Virtual package for building against PoDoFo"
+
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="+boost idn debug test +tools"
diff --git a/virtual/podofo-build/podofo-build-0.9.7.ebuild b/virtual/podofo-build/podofo-build-0.9.7-r1.ebuild
index 2eb20b281468..ef9f93e39312 100644
--- a/virtual/podofo-build/podofo-build-0.9.7.ebuild
+++ b/virtual/podofo-build/podofo-build-0.9.7-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Virtual package for building against PoDoFo"
+
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+boost idn debug test +tools"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 88f9c4974c4d..a73093cd289f 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index e3e201783bbc..fc4c31f44ed0 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -3,6 +3,6 @@ AUX kibana.initd 1019 BLAKE2B f57bce1793768f2936dc8cd3437aacbb4d4e034ac53612f010
 AUX kibana.initd-r1 1040 BLAKE2B 12fc93fcb8f79fc5013fab36eb74335a967f5573d7361dbfce78bde08d53e536eb63a068c047dad3c04e19b973b70d2af2b1e9757ebf9155951dea5c850d5783 SHA512 04cc2571d4c37cb7e270b1ef64e6fb26fa22d4ed259bc74eb165c8f2c49fb8ef9e1a3fbb0a7e45b04ed88309382429b2e78bdc5fe5cc51bf97ffcd5b17f387bf
 AUX kibana.logrotate 186 BLAKE2B e0446247e29b474dcab5756ac26f10fd8f46300e144386ff54a4e25fc1c2678ce0d21196b7365b01417cd0304a3f1edd6841800256e931bdc10f7d4e0f4ccd49 SHA512 1e0a51a83798e30b3807f496245b5733bc60a7bd1a529d2548a187ff8d3fa56d60bc23abf516d239ef76a8e9b66358ed84c687040a7b04c7818ea63417d33a1e
 AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242c0ed3b53c6586099c121c286b23f0a3be67dc481a3e95c6f87486cd1601df997126d3cfd14435c1 SHA512 0b7754ebfa7e3538e64843436d8abe32a6ce38a9ab5e252e52657a99d97fa1801777db4502c1af5ec6082d83f0b3a0613e074f6ebe28624832bd0c258a478899
-DIST kibana-7.17.3-linux-x86_64.tar.gz 263671680 BLAKE2B fe044050ffbc7f83428cb75f27bcab0afbabbe6ee69603067ceeffb13c673973f7413b8ea13ee6534bc1e96898b2955da0f16c41f254e7e8a56ea58d74032903 SHA512 ad675a4f7ae05dba56517435057d7698c967f71c5b4bca722583bc0075dde15b54757fb99cfa7ed64c488a1cc62b00a617cbd645b052829062be1cb30fc023cc
-EBUILD kibana-bin-7.17.3.ebuild 2507 BLAKE2B be8dfcce97d27cdc3ea405edb9213c9c317bbb6fafd8594b9d035a5e0e104933bc319cae10e05114bee4612bb50abe0c68a4b578011553a2c895be5202fe71ad SHA512 6b6b1ecf6cb208001f76a2f0a925e588f9e937f57755143673fec4df2171668e2cb4a87d245bed788c76bb84e0b21ab50acc5ea2d3311f3a2a64c1869d4440fc
+DIST kibana-7.17.5-linux-x86_64.tar.gz 263788794 BLAKE2B 7399fbfd5ce6c47421ec3f713dd5b12de5b32dd143ee980169c3fb2f4b7d00e6d9cc5a892e40b2efe28bb9148644d8dc921f753a33f941aee3ca90cb1f7eb7f4 SHA512 a1a00934b9ddd318b66129f682d8d678c51ff3c79b1953f72a72bd00d28600ef465e201e5ed434c31764a09cebcf5e76ae21d99915b5955158d573e6adffc2d7
+EBUILD kibana-bin-7.17.5.ebuild 2507 BLAKE2B be8dfcce97d27cdc3ea405edb9213c9c317bbb6fafd8594b9d035a5e0e104933bc319cae10e05114bee4612bb50abe0c68a4b578011553a2c895be5202fe71ad SHA512 6b6b1ecf6cb208001f76a2f0a925e588f9e937f57755143673fec4df2171668e2cb4a87d245bed788c76bb84e0b21ab50acc5ea2d3311f3a2a64c1869d4440fc
 MISC metadata.xml 477 BLAKE2B 427185c252047ce2b2bbee8ddf2dbc9e59a6c701d3f0c6dec44158627d41f8266f8cedbba9b330c34bbc77335a5763598897fda097f6991a78f96ed9cce1f826 SHA512 6e158be025d255cf1a189bd02d4c9679aa96cc6b15985c321af0102498a760333fa82f4cc90aa3370820626c0d5478fb821eeef24c603d8dac82996447dc7c2c
diff --git a/www-apps/kibana-bin/kibana-bin-7.17.3.ebuild b/www-apps/kibana-bin/kibana-bin-7.17.5.ebuild
index 6082bc86be56..6082bc86be56 100644
--- a/www-apps/kibana-bin/kibana-bin-7.17.3.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-7.17.5.ebuild
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 3c8615e45386..a4922dc4a493 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 6bdb453d8f0a..37499c6cba94 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -14,8 +14,10 @@ DIST chromium-103.0.5060.114.tar.xz 1470895580 BLAKE2B 4cdd99fe86f244097c71c3024
 DIST chromium-103.0.5060.53.tar.xz 1470748636 BLAKE2B 71f4e265afbe655ec41b1f2f8d46c8196b11d86f04fff5604b00167dd13c357058e7a60e8cb0f512a6a3ee32cd52421a5ce51dc0ad4d9e92d79949b5f84a5b64 SHA512 6a312f85e4fda49fc63b1b6bc74b1d6ea5be5a9db98f22c88ab0394968399df49daf1dfab19922b69a04a5afacc16eb9aa3f8af350f4cb1d2b0824c74efcf835
 DIST chromium-104-patchset-2.tar.xz 6168 BLAKE2B 57e9f2090315d2fa9baa0d285e40fd7809b35a897fba7684672d04850c2b59ea1bc11383654a8178ece2d4baa9bb2e248898d2435618b9e8a995461d6e92ac53 SHA512 f23effc604051c18acfad3bfb974efd4aa675b84135f4eb95e0dd97261dcc9099f283a8015854c375499370f4155bb9fad51fca59555ec2f41f2d7ab90be7208
 DIST chromium-104.0.5112.12.tar.xz 1482002228 BLAKE2B 128b711ff49b7c1155568d00bc4d8a1aba4ff8f61043560a7e771be80f5a3af9ca20b1eaf5ae7fb1034a13a32c3bc6d41e03ee82e70aae392abce504c772936c SHA512 058fb4b1016225fd8a10f7b4693207cca5fdb7aa2d8d0563cb597fb886472ab475e69b6c5fe1e5b7188a7cef6583dd454f45b3fec07be8b4924454a0eb379ba6
+DIST chromium-104.0.5112.48.tar.xz 1509278672 BLAKE2B 74f667f85bbe992969fc70320217eeb64fe7ba4cef783bfe4b9e82b08b7fc1411ec37ccd57543354009fa09b071b4a969840f2e8eaf257d1841d1a0ad74c84b3 SHA512 7cd51c476bd55abd430863435747c6919e7d2f335e32003e19837a9302b506f1d430364eb5b1efcdd175a909cc419c578fb41f32413199260e92437aebd0502f
 DIST chromium-profiler-0.1.tar 269066240 BLAKE2B 6897387b63ff9a724b67f2e8799fe803dc75da376da809e752d19d6f5cf98bd84ac24161d07ac4a967577279e9ad5a8a46f0825332a7ee933a27693d6dc95611 SHA512 3fb6132599d28455d1b5c04d856ea7623e49b0b0b96f021c31d0952c4ba57d69d0a1cae6f0b91470a235221c89cc0d3bb38303ff02594ed0739712e6e2f8dbcc
 EBUILD chromium-103.0.5060.114.ebuild 35069 BLAKE2B 2fa186000ed3f1055dfece193609b8555e4a6e0c0e9b54600be3f6c56496665e480ac6fc1fb2eb6cacd8ca2d2faab22182e6640de21a7c90718d693bb1e30058 SHA512 19ccacc0fe6c84e476f235e3f5bca32a41716606382fa30efcbeb05b68165972a6b619b6f4f16407c6148d84436bc97c53f3d5785a4c22d0e1f70176d3f147af
 EBUILD chromium-103.0.5060.53.ebuild 34972 BLAKE2B fa495fc19832487925ecd4d31cf6b0ccbf4e07933fae823899c8c434b213745e72c2977ab43559b91780ee2f44dc86d246d1bb476c7ab0995d6543329f141329 SHA512 f7c6067484fc053d6795cb32a5078b26b816eac9ab96a9740b0556f5ae269008adf311df6be09affeced991f5099fcb45f743cf29f2a46c17f7f6d91c502d9a8
 EBUILD chromium-104.0.5112.12.ebuild 37204 BLAKE2B 17dc921e6e2c6cd3bbbbc4e1ca379efa060739efb3bd949a4be25fd0809a8f9fdd894db61cb33aeafe01f2ef45103df81ed25e9e8f3552dcc3911d31ff05f7bf SHA512 b095801f0a9d09beae7b0879a8c538bf796cbf7ede5c4c44f3a66236e6db8f65a6567ad8cb2d27341eeb5ee7a0a2b43786a292a7f5cb30af065d7923fbc86008
+EBUILD chromium-104.0.5112.48.ebuild 37205 BLAKE2B 8f14fbd739aafc6ee531ba2e3dbba156214c7829f047d7d8c36488e160fa364c86d84199cda3c540a826b10574cd476b4d783d62ad20d2c30b52121a05767c33 SHA512 7fb4cb807e32419e5bf33b6e0eda89345d1b458cac387a96f943c4b045cf594826ab2c70e115af0045dcf003d7bcb0567753da45310091e580148f1ee69c5336
 MISC metadata.xml 2160 BLAKE2B 6ba2745b6d55ceda8ba586615cdf41afbfabe18ed828581332ad8f691632b8e67b364ff8edd5cc42331fcb257a4d8a370de9ad5a7f49d2f5b2f43dffceb294a0 SHA512 2858b94efa5b3b8d68deccbc9dc32e732756e4f5356297e22cb6fec16a9b7437acd3d351b5c89074b47d23b16ccc194a0a45631797a2df8a8fbed5b8051478ab
diff --git a/www-client/chromium/chromium-104.0.5112.48.ebuild b/www-client/chromium/chromium-104.0.5112.48.ebuild
new file mode 100644
index 000000000000..6ac1663f5605
--- /dev/null
+++ b/www-client/chromium/chromium-104.0.5112.48.ebuild
@@ -0,0 +1,1193 @@
+# Copyright 2009-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+LLVM_MAX_SLOT=14
+
+CHROMIUM_LANGS="af 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 ur vi zh-CN zh-TW"
+
+VIRTUALX_REQUIRED="pgo"
+
+inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx 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
+	pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )"
+
+LICENSE="BSD"
+SLOT="0/beta"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
+REQUIRED_USE="
+	component-build? ( !suid !libcxx )
+	screencast? ( wayland )
+	!headless? ( || ( X wayland ) )
+	pgo? ( X !wayland )
+"
+
+COMMON_X_DEPEND="
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXtst:=
+	x11-libs/libxshmfence:=
+"
+
+COMMON_SNAPSHOT_DEPEND="
+	system-icu? ( >=dev-libs/icu-71.1:= )
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	!libcxx? ( >=dev-libs/re2-0.2019.08.01:= )
+	dev-libs/libxslt:=
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2.11.0-r1:=
+	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
+	media-libs/libjpeg-turbo:=
+	system-png? ( media-libs/libpng:=[-apng] )
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/mesa:=[gbm(+)]
+	>=media-libs/openh264-1.6.0:=
+	sys-libs/zlib:=
+	x11-libs/libdrm:=
+	!headless? (
+		dev-libs/glib:2
+		>=media-libs/alsa-lib-1.0.19:=
+		pulseaudio? ( media-sound/pulseaudio:= )
+		sys-apps/pciutils:=
+		kerberos? ( virtual/krb5 )
+		vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] )
+		X? (
+			x11-libs/libX11:=
+			x11-libs/libXext:=
+			x11-libs/libxcb:=
+		)
+		x11-libs/libxkbcommon:=
+		wayland? (
+			dev-libs/wayland:=
+			screencast? ( media-video/pipewire:= )
+		)
+	)
+"
+
+COMMON_DEPEND="
+	${COMMON_SNAPSHOT_DEPEND}
+	app-arch/bzip2:=
+	dev-libs/expat:=
+	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:=
+	media-libs/flac:=
+	sys-libs/zlib:=[minizip]
+	!headless? (
+		X? ( ${COMMON_X_DEPEND} )
+		>=app-accessibility/at-spi2-atk-2.26:2
+		>=app-accessibility/at-spi2-core-2.26:2
+		>=dev-libs/atk-2.26
+		media-libs/mesa:=[X?,wayland?]
+		cups? ( >=net-print/cups-1.3.11:= )
+		virtual/udev
+		x11-libs/cairo:=
+		x11-libs/gdk-pixbuf:2
+		x11-libs/pango:=
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!headless? (
+		|| (
+			x11-libs/gtk+:3[X?,wayland?]
+			gui-libs/gtk:4[X?,wayland?]
+		)
+		x11-misc/xdg-utils
+	)
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+"
+DEPEND="${COMMON_DEPEND}
+	!headless? (
+		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
+		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
+	)
+"
+
+depend_clang_llvm_version() {
+	echo "sys-devel/clang:$1"
+	echo "sys-devel/llvm:$1"
+	echo "=sys-devel/lld-$1*"
+}
+
+depend_clang_llvm_versions() {
+	local _v
+	if [[ $# -gt 1 ]]; then
+		echo "|| ("
+		for _v in "$@"; do
+			echo "("
+			depend_clang_llvm_version "${_v}"
+			echo ")"
+		done
+		echo ")"
+	elif [[ $# -eq 1 ]]; then
+		depend_clang_llvm_version "$1"
+	fi
+}
+
+BDEPEND="
+	${COMMON_SNAPSHOT_DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	>=app-arch/gzip-1.7
+	libcxx? ( >=sys-devel/clang-12 )
+	lto? ( $(depend_clang_llvm_versions 12 13 14) )
+	pgo? (
+		>=dev-python/selenium-3.141.0
+		>=dev-util/web_page_replay_go-20220314
+		$(depend_clang_llvm_versions 12 13 14)
+	)
+	dev-lang/perl
+	>=dev-util/gn-0.1807
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	dev-vcs/git
+	>=net-libs/nodejs-7.6.0[inspector]
+	>=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}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-12"
+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}]"
+}
+
+needs_clang() {
+	[[ ${CHROMIUM_FORCE_CLANG} == yes ]] || use libcxx || use lto || use pgo
+}
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if ( use lto || use pgo ) && ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
+		einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && ( use lto || use pgo ) && llvm_pkg_setup
+
+		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 use pgo && tc-is-cross-compiler; then
+			die "The pgo USE flag cannot be used when cross-compiling"
+		fi
+		if needs_clang || tc-is-clang; then
+			tc-is-cross-compiler && CPP=${CBUILD}-clang++ || CPP=${CHOST}-clang++
+			CPP+=" -E"
+			if ! ver_test "$(clang-major-version)" -ge 12; then
+				die "At least clang 12 is required"
+			fi
+		fi
+		if [[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && use js-type-check; then
+			"${EPREFIX}"/usr/bin/java -version 2>1 > /dev/null || die "Java VM not setup correctly"
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="4G"
+	CHECKREQS_DISK_BUILD="10G"
+	tc-is-cross-compiler && CHECKREQS_DISK_BUILD="13G"
+	if use lto || use pgo; then
+		CHECKREQS_MEMORY="9G"
+		CHECKREQS_DISK_BUILD="12G"
+		tc-is-cross-compiler && CHECKREQS_DISK_BUILD="15G"
+		use pgo && CHECKREQS_DISK_BUILD="19G"
+	fi
+	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_${EBUILD_PHASE_FUNC}
+}
+
+pkg_pretend() {
+	pre_build_checks
+
+	if use headless; then
+		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "vaapi" "wayland")
+		for myiuse in ${headless_unused_flags[@]}; do
+			use ${myiuse} && ewarn "Ignoring USE=${myiuse} since USE=headless is set."
+		done
+	fi
+}
+
+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-InkDropHost-crash.patch"
+		"${FILESDIR}/chromium-98-EnumTable-crash.patch"
+		"${FILESDIR}/chromium-98-gtk4-build.patch"
+		"${FILESDIR}/chromium-104-tflite-system-zlib.patch"
+		"${FILESDIR}/chromium-104-swiftshader-no-wayland.patch"
+		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
+		"${FILESDIR}/chromium-shim_headers.patch"
+		"${FILESDIR}/chromium-cross-compile.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/cpuinfo
+		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/gn/webgpu-cts
+		third_party/dawn/third_party/khronos
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
+		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/distributed_point_functions
+		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/fp16
+		third_party/freetype
+		third_party/fusejs
+		third_party/fxdiv
+		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/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/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/pthreadpool
+		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/snappy
+		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
+		third_party/swiftshader/third_party/SPIRV-Tools
+		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/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/xnnpack
+		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-png; then
+		keeplibs+=( third_party/libpng )
+	fi
+	if use libcxx; then
+		keeplibs+=( third_party/re2 )
+	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 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
+		# requires git and clang, bug #832803
+		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g" \
+			generate_gni.sh || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+
+		pushd third_party/ffmpeg >/dev/null || die
+		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
+		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || 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
+}
+
+chromium_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 needs_clang && ! tc-is-clang; then
+		# Force clang since gcc is either broken or build is using libcxx.
+		if tc-is-cross-compiler; then
+			CC="${CBUILD}-clang -target ${CHOST} --sysroot ${ESYSROOT}"
+			CXX="${CBUILD}-clang++ -target ${CHOST} --sysroot ${ESYSROOT}"
+			BUILD_CC=${CBUILD}-clang
+			BUILD_CXX=${CBUILD}-clang++
+		else
+			CC=${CHOST}-clang
+			CXX=${CHOST}-clang++
+		fi
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Force lld for lto or pgo builds only, otherwise disable, bug 641556
+	if use lto || use pgo; then
+		myconf_gn+=" use_lld=true"
+	else
+		myconf_gn+=" use_lld=false"
+	fi
+
+	if use lto || use pgo; then
+		AR=llvm-ar
+		NM=llvm-nm
+		if tc-is-cross-compiler; then
+			BUILD_AR=llvm-ar
+			BUILD_NM=llvm-nm
+		fi
+	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\""
+		myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
+		myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
+
+		# setup cups-config, build system only uses --libs option
+		if use cups; then
+			mkdir "${T}/cups-config" || die
+			cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
+			export PATH="${PATH}:${T}/cups-config"
+		fi
+
+		# Don't inherit PKG_CONFIG_PATH from environment
+		local -x PKG_CONFIG_PATH=
+	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
+		libwebp
+		libxml
+		libxslt
+		openh264
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-png; then
+		gn_system_libraries+=( libpng )
+	fi
+	# re2 library interface relies on std::string and std::vector
+	if ! use libcxx; then
+		gn_system_libraries+=( re2 )
+	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)"
+
+	if use headless; then
+		myconf_gn+=" use_cups=false"
+		myconf_gn+=" use_kerberos=false"
+		myconf_gn+=" use_pulseaudio=false"
+		myconf_gn+=" use_vaapi=false"
+		myconf_gn+=" rtc_use_pipewire=false"
+	else
+		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)"
+		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
+	fi
+
+	# 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"
+	myconf_gn+=" use_custom_libcxx=$(usex libcxx true 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/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
+		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 -mno-xop
+		fi
+	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"
+
+	# Disable external code space for V8 for ppc64. It is disabled for ppc64
+	# by default, but cross-compiling on amd64 enables it again.
+	if tc-is-cross-compiler; then
+		if ! use amd64 && ! use arm64; then
+			myconf_gn+=" v8_enable_external_code_space=false"
+		fi
+	fi
+
+	# 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
+
+	# Disable unknown warning message from clang.
+	if tc-is-clang; then
+		append-flags -Wno-unknown-warning-option
+		if tc-is-cross-compiler; then
+			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
+			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
+		fi
+	fi
+
+	# Disable opaque pointers, https://crbug.com/1316298
+	if tc-is-clang; then
+		if test-flag-CXX -Xclang -no-opaque-pointers; then
+			append-flags -Xclang -no-opaque-pointers
+			if tc-is-cross-compiler; then
+				export BUILD_CXXFLAGS+=" -Xclang -no-opaque-pointers"
+				export BUILD_CFLAGS+=" -Xclang -no-opaque-pointers"
+			fi
+		fi
+	fi
+
+	# Explicitly disable ICU data file support for system-icu/headless builds.
+	if use system-icu || use headless; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Enable ozone wayland and/or headless support
+	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+	myconf_gn+=" ozone_platform_headless=true"
+	if use headless; then
+		myconf_gn+=" ozone_platform=\"headless\""
+		myconf_gn+=" use_xkbcommon=false use_gtk=false"
+		myconf_gn+=" use_glib=false use_gio=false"
+		myconf_gn+=" use_pangocairo=false use_alsa=false"
+		myconf_gn+=" use_libpci=false use_udev=false"
+		myconf_gn+=" enable_print_preview=false"
+		myconf_gn+=" enable_remoting=false"
+	else
+		myconf_gn+=" use_system_libdrm=true"
+		myconf_gn+=" use_system_minigbm=true"
+		myconf_gn+=" use_xkbcommon=true"
+		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
+		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
+		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
+	fi
+
+	# Results in undefined references in chrome linking, may require CFI to work
+	if use arm64; then
+		myconf_gn+=" arm_control_flow_integrity=\"none\""
+	fi
+
+	# Enable official builds
+	myconf_gn+=" is_official_build=$(usex official true false)"
+	myconf_gn+=" use_thin_lto=$(usex lto true false)"
+	myconf_gn+=" thin_lto_enable_optimizations=$(usex lto true false)"
+	if use official; then
+		# Allow building against system libraries in official builds
+		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+			tools/generate_shim_headers/generate_shim_headers.py || die
+		# Disable CFI: unsupported for GCC, requires clang+lto+lld
+		myconf_gn+=" is_cfi=false"
+		# Don't add symbols to build
+		myconf_gn+=" symbol_level=0"
+	fi
+
+	if use pgo; then
+		myconf_gn+=" chrome_pgo_phase=${1}"
+		if [[ "$1" == "2" ]]; then
+			myconf_gn+=" pgo_data_path=\"${2}\""
+		fi
+	else
+		# Disable PGO, because profile data is only compatible with >=clang-11
+		myconf_gn+=" chrome_pgo_phase=0"
+	fi
+
+	# user CXXFLAGS might overwrite -march=armv8-a+crc+crypto, bug #851639
+	if use arm64 && tc-is-gcc; then
+		sed -i '/^#if HAVE_ARM64_CRC32C/a #pragma GCC target ("+crc+crypto")' \
+			third_party/crc32c/src/src/crc32c_arm64.cc || die
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	chromium_configure $(usex pgo 1 0)
+}
+
+chromium_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
+}
+
+# This function is called from virtx, and must always return so that Xvfb
+# session isn't left running. If we return 1, virtx will call die().
+chromium_profile() {
+	einfo "Profiling for PGO"
+
+	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
+
+	# Remove old profdata in case profiling was interrupted.
+	rm -rf "${1}" || return 1
+
+	if ! "${EPYTHON}" ./chromium_profiler.py \
+		--chrome-executable "${S}/out/Release/chrome" \
+		--chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
+		--add-arg no-sandbox --add-arg disable-dev-shm-usage \
+		--profile-output "${1}"; then
+		eerror "Profiling failed"
+		return 1
+	fi
+
+	popd >/dev/null || return 1
+}
+
+src_compile() {
+	if use pgo; then
+		local profdata
+
+		profdata="${WORKDIR}/chromium.profdata"
+
+		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
+			chromium_compile
+			virtx chromium_profile "$profdata"
+
+			touch "${WORKDIR}/.pgo-profiled" || die
+		fi
+
+		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
+			# Remove phase 1 output
+			rm -r out/Release || die
+
+			chromium_configure 2 "$profdata"
+
+			touch "${WORKDIR}/.pgo-phase-2-configured" || die
+		fi
+
+		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
+			chromium_compile
+			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
+		fi
+	else
+		chromium_compile
+	fi
+
+	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
+
+	# Build vk_swiftshader_icd.json; bug #827861
+	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
+		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
+		out/Release/vk_swiftshader_icd.json || 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 X && 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 && ! use headless; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/MEIPreload
+
+	# Install vk_swiftshader_icd.json; bug #827861
+	doins out/Release/vk_swiftshader_icd.json
+
+	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 headless; then
+		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-features=WebRTCPipeWireCapturer"
+			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+		fi
+		if use gtk4; then
+			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
+			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
+			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+		fi
+	fi
+}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 83f468f50281..7559c3d75b42 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 0d250d0631b6..1c03a23bcf61 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -44,6 +44,6 @@ DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b
 DIST njs-0.7.2.tar.gz 584483 BLAKE2B 98f28e599f73aaacf2c155dd2a630b8dec9767725e47e6d93de05fb15b854277cd2fcc38ec915d8b04a769d40513725fe2061054521fed73967a6d61f04ce8e1 SHA512 7ff9c8f4e8cf1a3aeb0f2ed9f37e2b3f4966812966d1aca17dae8b454dd7fa725ccdc631b7dc1f3434f588e589f4cd419b9e087f3c745cd6ca092a683c92d82f
 DIST njs-0.7.5.tar.gz 592998 BLAKE2B 7e1178f928320741eb3af4a4b8692b061c9d223e2f905f2fb2b9f604924e7586f0fa4dc7dbdef9965f5f74f9a87bb87fc5550135ffe084aa71b25bebef5387fc SHA512 e33dbb285ff6216acddcd213fdbd73ffadd5730680bcec742b1598fa57b4d100da32c913b1c2648b3e87867fc29bf11075d70fa5655f85c62e42eb0a48d177f1
 EBUILD nginx-1.21.6-r2.ebuild 40087 BLAKE2B 112bb88ef710b36d6f742c4e530a9a7874c62e367cbe37c3cc5821a18871f3a0fd95c4ab341c81a6ca6e7058de487f00248eceb18731cf1d3a9ead827849a086 SHA512 9efb2473b925368ff022cc27a145d3fa9ec637bfc030aca3c765fd8359c92f1ac2a89e6490dcda601cfca5b1c0e5386d4e885c0ddef15b7297a930f200980362
-EBUILD nginx-1.21.6-r3.ebuild 40091 BLAKE2B 58a19050ed9b97d0a74a5a0dafd98f5a9b7bf46bf3b2de4db09283fbbde96c7bda8228dfeaf41f5333b9b612a23c87d693b2b4a584b509579e4a52144507ade3 SHA512 b88c2f44ce1a204d9cbd381c27250d01cc93c4a632351cef1c1f021ebab345bb5cfeb4bd5cad0739996d4a2a1aca8b9d3428b2f20d5d6a7353626ddf98dab8d3
+EBUILD nginx-1.21.6-r3.ebuild 40087 BLAKE2B d9113076a1ce7f0b20e90a11bfe91dc4ab198dc0fef75033602792182a517b3c62463a928063596738cdff6c001cdeedf89b47a458a35431713397c9b230fef4 SHA512 de32f0edf027bad5e95f80d23e04cf3b2c57f3347c7d332056036188648a50ed2c8d15c2b099cc6fd2fe242749b97e2a067ef1d7c3f0837450b867279566f868
 EBUILD nginx-1.23.0.ebuild 38641 BLAKE2B ca43dacc0759a0857e36d62e4070da9cf1e6b9d98c730783c06fbfeaa3dba86746d77b2ee75003b9a6acb1044407cf6b630c41fcb18c8524572f5334930f8fb2 SHA512 d1128f45f716d55c9859e1064bdf092dfaf944778e149808729054301241f3d67d867c0d373f1590fc2a19836bda83848c9b9ec65708fb061dcfe017f9810236
 MISC metadata.xml 957 BLAKE2B 082956c543d3bea969b687777c9aeda28771529c533bef4f1022aba2a7ff028c17fb9f0225838c7dc5469195d4d5f390fa86f729eede9dbca486035c9d76bdc8 SHA512 d2db106dafc55c0853e57616f830fb26fa26622a3b9cc7348a6dfb7c90c92e48bbbe6e4a87becd3b34dec1cfd60ac4ee1f923a828d0a48a8d4f24603f21cb250
diff --git a/www-servers/nginx/nginx-1.21.6-r3.ebuild b/www-servers/nginx/nginx-1.21.6-r3.ebuild
index 3a51c6cf2628..efd809f6074b 100644
--- a/www-servers/nginx/nginx-1.21.6-r3.ebuild
+++ b/www-servers/nginx/nginx-1.21.6-r3.ebuild
@@ -203,7 +203,7 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
 	nginx_modules_http_push_stream? ( GPL-3 )"
 
 SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 # Package doesn't provide a real test suite
 RESTRICT="test"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 755150d4df95..4f83c19a0e3c 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/idesk/Manifest b/x11-misc/idesk/Manifest
index 44dd3c5ad711..7a1bcc9e0f98 100644
--- a/x11-misc/idesk/Manifest
+++ b/x11-misc/idesk/Manifest
@@ -1,3 +1,5 @@
+AUX idesk-1-use-pkg-config-imlib2.patch 1054 BLAKE2B c126a0f13b2cc398b431cdf1dc94da4c00ace1bcbda167498d0ff4144c883c94867a7601fd16c48ae272464fa4f9761350d83c24b0bf2ad58c149673c6a2dd38 SHA512 a6e1b6b68a160df2427eaaf0b6704564a63d569b69face75478535e09fcb2d119af38ca437ccdf50619ea75834b39155b9d0f3215a688033a15feee350d2a540
 DIST idesk-v1.tar.gz 195147 BLAKE2B 2b2b0dacbfb1d8fb950c88d990e3674bf8b4cf82d9022ed2f7be1f32082c46ae32d8200957e2e19d0d21ea1e4d59ec092f4cba90e712f79700a04f05c3a3aa14 SHA512 3190fca7a5c9fb36b66159107d22b5f6e50b4573afa21a3a4d8b8e3e5953dabda077c924e45d2607b849ee5fea141eb80f5b89ce5288ebc2490679f319edf768
+EBUILD idesk-1-r1.ebuild 910 BLAKE2B f0b258bac8b21cfeac384fe59a9822f67606dc7e6bdfb39ed6778cba47d3e5e1e4f9f25dddc235adeaee98c841e174a2ea2075a53abf79cb27566ee8a7a15b1c SHA512 e3fd15e4959d67504ca6a6b95b64171493e473d2f558c30f8ed77ac83b95fac51a4ec1ed333d66b8edde0150548287082a669db45b7d5c0ce7f537b1a5ce4b85
 EBUILD idesk-1.ebuild 792 BLAKE2B dc2ac6e6aa9e7044aff7c0e941e3f93ff92cd53a874f997a89cfc27763d4e16d4dee3b042cff9e0ec0ffbd4832a5d7f0278c6a27eb1b1ec3253c5c6f2f6008ee SHA512 ecfd30726a6f93f5428d1d240cb4651ad1becd9f9a76824c357bd39696bbec3590ed578da7323f6317d6add56d071090872bee8612536159f23851b26c051852
 MISC metadata.xml 256 BLAKE2B 9cc198243be9a95645c1e88dd2838b1f70afe3cdb08cae721e59b4942a5b4b561a5bbc129baaaa52c023fde708be5629e47230eb335084c9e24bd0ff8764a7d5 SHA512 878114abde4788d790a6b61c20cad1421f652c383fcd57b63926c6bc7c906ccd22e461c50d9e2459d06077e80d29215b17f9d35fbb18db9a2e794093e8db9de7
diff --git a/x11-misc/idesk/files/idesk-1-use-pkg-config-imlib2.patch b/x11-misc/idesk/files/idesk-1-use-pkg-config-imlib2.patch
new file mode 100644
index 000000000000..36e088972543
--- /dev/null
+++ b/x11-misc/idesk/files/idesk-1-use-pkg-config-imlib2.patch
@@ -0,0 +1,38 @@
+https://github.com/antonialoytorrens/idesk/pull/1
+
+From b13626bbe2669b8a267ad53df93f1060379a462e Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 15 Jul 2022 08:22:12 +0100
+Subject: [PATCH] build: use pkg-config to find imlib2
+
+imlib2 1.7.5+ drops imlib2-config, hence pkg-config
+must now be used to find it.
+
+Bug: https://bugs.gentoo.org/828962
+--- a/configure.in
++++ b/configure.in
+@@ -94,19 +94,10 @@ LIBS="$LIBS $Xext_lib"
+ 
+ dnl Imlib2 detection
+ 
+-AC_PATH_GENERIC(imlib2, , [
+-    AC_SUBST(IMLIB_LIBS)
+-   AC_SUBST(IMLIB_CXXFLAGS) ],
+-  AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?
+-               You need Imlib2 to build Idesk.  Verify that you have Imlib2-dev))
+-
+-dnl the above doesn't work for some reason :/
+-IMLIB_LIBS=`imlib2-config --libs`
+-IMLIB_CFLAGS=`imlib2-config --cflags`
+-AC_SUBST(IMLIB_LIBS)
+-AC_SUBST(IMLIB_CXXFLAGS)
+-
+-CXXFLAGS="$CXXFLAGS $IMLIB_CXXFLAGS"
++PKG_PROG_PKG_CONFIG
++PKG_CHECK_MODULES([IMLIB], [imlib2 > 1.0])
++
++CXXFLAGS="$CXXFLAGS $IMLIB_CFLAGS"
+ LIBS="$LIBS $IMLIB_LIBS"
+ 
+ 
+
diff --git a/x11-misc/idesk/idesk-1-r1.ebuild b/x11-misc/idesk/idesk-1-r1.ebuild
new file mode 100644
index 000000000000..6b94e84161c4
--- /dev/null
+++ b/x11-misc/idesk/idesk-1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}-v${PV}"
+
+inherit autotools
+
+DESCRIPTION="Utility to place icons on the root window"
+HOMEPAGE="https://github.com/antonialoytorrens/idesk/"
+SRC_URI="https://github.com/antonialoytorrens/idesk/releases/download/v1/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="
+	dev-libs/glib
+	dev-libs/libxml2
+	media-libs/freetype
+	media-libs/imlib2[X]
+	media-libs/libart_lgpl
+	x11-libs/libXft
+	x11-libs/gtk+:3
+	x11-libs/pango
+	x11-libs/startup-notification
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1-use-pkg-config-imlib2.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's,/usr/local/,/usr/,' examples/default.lnk || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-libsn
+}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 4f7b62b233ae..17798ae69290 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/papirus-icon-theme/Manifest b/x11-themes/papirus-icon-theme/Manifest
index 61f29effc5f8..b8b8037a0c22 100644
--- a/x11-themes/papirus-icon-theme/Manifest
+++ b/x11-themes/papirus-icon-theme/Manifest
@@ -1,7 +1,7 @@
 DIST papirus-icon-theme-20211201.tar.gz 30608183 BLAKE2B 1af77049995fdbc4acfbf72df706faaae507cb1c07624993073bbcf053bad8fd8eaae7fc2e228b57919e3bac041a0056fae6a1cf693040459d72c3285b7725ad SHA512 746055e9db0ef11c996fd90892582ca5ffd3e7c77aa08a43de2dd162364e915c73b3e1ab139c8caa4295e0857b4b5a6e273606f41ae5ab91de9dd160598ec621
-DIST papirus-icon-theme-20220302.tar.gz 31555519 BLAKE2B 6c8377c45df01437715df199e4d204ee1e6d5778a694368d2123de16af4f7f825d87579208dbb0f5e8ef9cc8567688e5b758d2609abfcd473f7ed52687607dee SHA512 54793eb6b890931cc2e11c741b0144c485b8446673c8568eb95cf2a546d14d68bf8446d22953d63ee19c2ccd072dfa2d6443bb401a03e81c56c5776e4d30145d
 DIST papirus-icon-theme-20220508.tar.gz 31951563 BLAKE2B ad470e8c3865cc78a0a83bab5ed01744ad8b1e68fab30a75a2caad62e6e58256f5d36ab8e78b85a8c668cdb28caf5bcabcd58860f87e644684c15529b66a2fd6 SHA512 f456119b7890bdab57d6dd40c6f7b6e8d1a1bcb4b0b3d61ab8feadba62d029cabf80bab88cf59b29e720f1967508ddd19cb9d4fec036b4078a24b037c5f19004
+DIST papirus-icon-theme-20220606.tar.gz 32364864 BLAKE2B 2cf8381619dff73d0bcd44bde98dcecbb1daca5db19251537d136f0d22929d52db2527f0cd932338047eeb16a86ee98444b856ff03edc13cbe5073911757e6f0 SHA512 ccf786a478e5a97052f11999c8fc48bde4c677a036bad3cb3cb908b5cde1055565cdb2914d70dd52029c4c4cb2c60fb1da0daa6dfa076176b5a5aced1665d0c0
 EBUILD papirus-icon-theme-20211201.ebuild 615 BLAKE2B 043e8c03a984aceea47c42d3a9958eabd96765bcd8194db38108fa7fc07cd2c8c00c211e9fd293215e83c3e2ee7e1ba830642e3696574d1d66ab5dd73b9d29eb SHA512 c00455618be454828d554a80f15ca00180e7bda7ba228fa05c075908fd12b7d0b9d67faa497979ae970197647922530828ca3450972c8d80ab6a40fb6afe5ed6
-EBUILD papirus-icon-theme-20220302.ebuild 619 BLAKE2B 4f363738eff620b5ec88f3f7b542b01570eb208841701bff54bc9f757e5ba6596b9f00255e0c616058ddc5818f85665a44b3fa5e656809e87b0d605bbe830f50 SHA512 3fc6e92728b4026c239a555361431681d9e5f8fe1af0732860802500b7f2842358f5cf0f9427b2de0205fc40b42c66f0f2dc811c110f56b5c03ef88b669f7f77
 EBUILD papirus-icon-theme-20220508.ebuild 619 BLAKE2B 4f363738eff620b5ec88f3f7b542b01570eb208841701bff54bc9f757e5ba6596b9f00255e0c616058ddc5818f85665a44b3fa5e656809e87b0d605bbe830f50 SHA512 3fc6e92728b4026c239a555361431681d9e5f8fe1af0732860802500b7f2842358f5cf0f9427b2de0205fc40b42c66f0f2dc811c110f56b5c03ef88b669f7f77
+EBUILD papirus-icon-theme-20220606.ebuild 619 BLAKE2B 4f363738eff620b5ec88f3f7b542b01570eb208841701bff54bc9f757e5ba6596b9f00255e0c616058ddc5818f85665a44b3fa5e656809e87b0d605bbe830f50 SHA512 3fc6e92728b4026c239a555361431681d9e5f8fe1af0732860802500b7f2842358f5cf0f9427b2de0205fc40b42c66f0f2dc811c110f56b5c03ef88b669f7f77
 MISC metadata.xml 387 BLAKE2B 20fe242ee294bb30712274f9a8c99ebf35399c4cc1bc6507c60bf00a621d8e18b78344c374fdadf28ef6a3f62a6569df791713170d95603922af75bb0328936c SHA512 5124d3c6a8b1ab334da52fc49b1e78d41e25bb0e38ee8a27e3e240e5d966cd4f3c93f2c8c3f645cb40b7aa70305e7b32b26870a742d545aaa373ee37cedf7057
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20220302.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20220606.ebuild
index b3be9a3ea230..b3be9a3ea230 100644
--- a/x11-themes/papirus-icon-theme/papirus-icon-theme-20220302.ebuild
+++ b/x11-themes/papirus-icon-theme/papirus-icon-theme-20220606.ebuild
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index a8cd8a9e1c6f..7633a98f8133 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfdashboard/Manifest b/xfce-extra/xfdashboard/Manifest
index 8202cd679482..a6603fb26807 100644
--- a/xfce-extra/xfdashboard/Manifest
+++ b/xfce-extra/xfdashboard/Manifest
@@ -1,5 +1,7 @@
 DIST xfdashboard-0.9.5.tar.bz2 3397335 BLAKE2B 5e65206c73f85ce9d4305e459ca837c287c43f95bbb16df632109eee998524d5858c5de8a6c390713d118ed3f7bb7f184d88650cec78e7bc03a6859fe7e44a39 SHA512 9929bdcef6a9766799b900b61e009b43ef901f1aebd6dbe9291c3342edebfa1d599340222da25bbac17810f4ef7b001743b4daec0c25f585203f0b69f2bc17d6
 DIST xfdashboard-0.9.90.tar.bz2 3411068 BLAKE2B 6deee633c03d0265f34532edd20d5e29fe270aa82bcd197bbe398138977fa95c5e502b0484c835a43b93b34defcfedf2d717cf11ea8b25021803e25213731a31 SHA512 5fd4a67998477c2a168d15ca05f173b42eb1a87432228feea461ec563f0662441f17df7ac6efd4b4afd181eba4e99927adc018fca0f2bf8df804fc52c87b4034
+DIST xfdashboard-0.9.91.tar.bz2 3421906 BLAKE2B 10b5bb09fa4d4bbbe242d1d36ad073e08384845e67331994c9ae622d70de27e873ce2f476d8baebde4bd4ae55db77cb35336a1a1725b4e40b1c814066ab4e72c SHA512 56e18c70a1282ff8f45df8304993fdd5e9097429f7edd6b9c7fc5c20681d1043b57251b5ce327346e612bc1069823ba4c76a5665529eeb2807e106c8fa747ba6
 EBUILD xfdashboard-0.9.5.ebuild 969 BLAKE2B c89d968e6269f0baf97e63580a5326aaa3265701877fea85955299c1875f1ffa8c9412037f2910a8e337d0849820eeacc0aff76632360da6dea031e5030bf147 SHA512 3ea9960a40752ef6ac736784808c3551dc974cd000bb4e50a295c4cd28c79db297e59191870f444976e295703b0263c18bbd305fb2badc6bc7b8426c05d45bfb
 EBUILD xfdashboard-0.9.90.ebuild 975 BLAKE2B aac8e77da14c2a4dbfe1048505655868703329478e0a17cc4769dbf274f166c4baeafe6b4e070e8e8a1a63bb37e53f304ff3700bdeb07d323f027a0b3faa1ff5 SHA512 0e129783c0dce4cf0e761b2b774ef50700652e63c95a3e87ae369bbb2f475e920f84e5c26c28b1a9edf2882553e754b138b1530139541aa5971500514fa0e32d
+EBUILD xfdashboard-0.9.91.ebuild 978 BLAKE2B 1e8d9416c321d0db5f0f6baac34a1bbed6f5e29514a7b18dbff5997f277b84bdce7911a916c11bf4154564b36bc2d2eb557a3edede80c685b160519de3c8ef5e SHA512 ce197e49b70d8b4273bf9e0f02b7dd7bad549755f463d60d57be061435347ed80b54d3321d5ff685b6d0246365c5267fa708056bbe27e022404b9ec954c05190
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfdashboard/xfdashboard-0.9.91.ebuild b/xfce-extra/xfdashboard/xfdashboard-0.9.91.ebuild
new file mode 100644
index 000000000000..f725a7560151
--- /dev/null
+++ b/xfce-extra/xfdashboard/xfdashboard-0.9.91.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Maybe a GNOME shell like dashboard for the Xfce desktop environment"
+HOMEPAGE="https://goodies.xfce.org/projects/applications/xfdashboard/start"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.2:3
+	>=media-libs/clutter-1.12:1.0=[gtk]
+	>=x11-libs/libwnck-3:3=
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXdamage:=
+	x11-libs/libXinerama:=
+	>=xfce-base/garcon-0.2.0:=
+	>=xfce-base/libxfce4ui-4.10:=
+	>=xfce-base/libxfce4util-4.10:=
+	>=xfce-base/xfconf-4.14:=
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-07-15 13:42:19 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-07-15 13:42:19 +0100
commit	bd8ca999980e9c0c9ae40a11789c858bb58769e3 (patch)
tree	355d68a84921e04a81231e74fc062f229f76a733
parent	b3f2504c1d05b5999b74b2135860fc721e3adf68 (diff)