gentoo auto-resync : 15:09:2023 - 10:49:51

717 files changed, 4475 insertions, 8696 deletions

diff --git a/Manifest b/Manifest
index 43b9388c7363..b67637a27b1a 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29284 BLAKE2B 55fa59b2c21b8d96bf1112edf0a6ca394ff97c9e5998730da400f002a84d8c153d5d001d4832764540cb6587cd22d934f892b6080b3434296b3dc61a2a67e311 SHA512 ecba1fdb2186863d8443856a65cac5c6364ebc80c2f622d3fda3c9e2553eb16206018c1fdeea71e4cc9a46c19784171c60b0e461c48cbc1de5ac9101eb36c6a1
-TIMESTAMP 2023-09-15T03:10:00Z
+MANIFEST Manifest.files.gz 29278 BLAKE2B 110a105f4c19a87077f7b12164c6c173ca93a882469e4fca1466a36961d96fec5d6932d611b4c9f93108a33cc1481b0858c5a83e8baed8ddf44d394090c5d927 SHA512 a0358a8937376baac7b169523fdb8988612e302179e79cc34ecdc7be4e9e175a13e0694b3cdb46d12f944f76090da8f18b112cc6a164c935a511c64717a3df0f
+TIMESTAMP 2023-09-15T09:10:12Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUDywhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUEH3RfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAY8RAAmnyyBFzrS5hZWgbSaePPy5kyW3SfMPesLDeyG/8cuHqTQL7/DdDP2YU0
-nerGiUL5p1Gg9WA8R/NsOxNB6hOKz6qCa92FNZILw6yeofO9B3feuybb8Fks25wY
-I2Ck380q+8PJZhiEMxmFSkkkNvPCgQexstkfGlVTeDGQhZutZbfn60O7NM0BNM1t
-tEcXVaHjh8JmID9cTafd0Y35QayY7B1MYQlW2I+G7SdHoFibTHKP5CPS8GRGtejs
-qafhfufPCEYBAXCDUp8P1kiz7qaEBvciEUJDrsnGwWyCM5hUK13cYVBehxG8hLB5
-DahVQ+Rn5OWnWQDeK1idfGpB94RYoLajHMGsIgFZvZsSz93Mg69fKhRm3ojwxE/u
-O6rdRGJurDoSv+cYKkt7NL/xm4b+0I1SXFiXvf+abz2cTEull+blRSUNAHmyInRq
-//pAKbsDciRg8IEGKf1E4vO2+gX3QoKqFtvHcy0/yt+Mub+kQGDdpLYwTuZ1U9kj
-LWOH/BfauQpG7KoF2vyqL99iRFFJY2Uzac2py7yatxWVIvgMHgBtbVnLBPmFuA+X
-wFur+qUXLG1lhz92C9QA9ViHJYt24tpFouN5hJOUV5pVZvhviedsbDqbEEYIvoYn
-sNLpG88fpqrHh0uAbT34HRB2S20j+7L1VtNS9rRvP89H+8zBwkg=
-=upSh
+klCJdA//cmoq6CWMtgXVWKlOo5O8VoDOrpOO1J03pLxSAAYPyfDjdve4xL0qSPvP
+4/jifrZY+UJQdDUcWS7KcoxgRVKkmIN8sf3DU9ns+7geqmw2O4az363GOd2BxPbn
+CyxAa882/RqcksH/jPZp3CHnNxbbUgJX/uVg2AWmo0nxCWQtFea3tL3gXOQGv9+X
+3vfsQw0jEYYrDnk3FHEOVt04an6XxZS5RTi9KwW7dkAxxI3dkbtpXTpH0WFYUdrM
+VFa6dMdnPMpu2X4qsbayj1YxQ98GnyA3yX8UgauHZY/kJ7/Efz00MrCm8NbqlAML
+Hz/JRFabbNEzM+IhkHWpDO3ZfzadkpJNiOUnAWa6qSNzuzjYkt9WaCG3nQWaMjR/
+z2SYJ8ygsN8HPf3IYgrK2WMCPG4bYJX0yIdPaiLdtffb29A3xsvfC1x74lorjIn7
+ycd7ZWR+rUnJGPOpKZtpelY4ClnIrVIYkEHCqLHA8et4SDVs5X9AkoWuoePIRpYd
+Zc20qofcobjzfvi0RKV4rKkoVKpPRdK8YXoQfyyp3QTnA3y8CIURzF2tM+7/tcWN
+8Bcc6on+3dU5uxTamGtn1JjrEff649u2JpTPpT82w2PzQGeOLw23csLXgR3+dAsH
+pK52Lc8xALhwVTW5O6Y5H0Dku51IL/1JYpywJ3H3XL0+3tsgTec=
+=J4hO
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 3d2bc7d38c7f..cc8da570604c 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 698e0a6dba4a..a0f1bc470c63 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 3ba0ce9bf3c4..1bd1d2a1eaf7 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -10,6 +10,7 @@ DIST aws-cli-1.29.44.gh.tar.gz 2530834 BLAKE2B f2cb6eb13deb07b3f4ad3e7c5cea71d71
 DIST aws-cli-1.29.45.gh.tar.gz 2531194 BLAKE2B 458c6a847c67fdaa882154bcb0bf2744c5f15d811d82c1da221b9fbd10c300efe1ba58795bddd991e2768056b369f428efeff690fc0323ab466ee0f6c10066b8 SHA512 e34730f78b2580637fc64ba1e905ec8b3b107031d0a2fcf6baf0805ede2f8861ec32ee4b43b77d68acd74d2d2d8f88cd8286b9025dc346fe04d0168987a411e5
 DIST aws-cli-1.29.46.gh.tar.gz 2531529 BLAKE2B ece1fe47627f1034a8e4c29780cef8b9055776d9477a4bdf63e06e461391ebf712609dc007c68de5c42906e1a02606399bec2ec83045f86797c33051e72316bb SHA512 345832da8b760be4bb27c5f32ac1ffad14369fb1ebe4da7587308f3f3978cc7a8042e34e887300e7d1626e38c6fba1e213f623a8ad717372d381ea3c0ef95b3d
 DIST aws-cli-1.29.47.gh.tar.gz 2531859 BLAKE2B dd7ae6999c33773d8b1dd9869a7ccb8c79f364e6d1bc77e6ae4dd9b7159896ed85217b26029c5d1b587d4bdfe0f68d1ac87c0050dc7f734f2ee8c39f5c8e87e9 SHA512 75cccfe7221fd6c3166e60d23fe7971ad5d54749039383f88b24acd6b51c87b21f19e6fe4872cadade19acedb1eea99dbe9a66cf1a33476e8c35b1585bca1d68
+DIST aws-cli-1.29.48.gh.tar.gz 2533414 BLAKE2B a7089339eb48c01ec8b2e8d6db3354c872d1b5b4f7d8e005c5939e26ddf677480e455691609ad1ceb2d5c0f6bf831a5a1f6503fdab59ccd0398b0429173a7f67 SHA512 68c6f20eeb7eef12edaf9259aa425d4132a735c804d8dd79ee5276ebbfa9bd7b63877db11a2190ac6abcfd6aae7ec1a7cd5a17159de7d90cf4abef146128d5b9
 EBUILD awscli-1.29.30.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.29.35.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.29.38.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
@@ -22,4 +23,5 @@ EBUILD awscli-1.29.44.ebuild 2209 BLAKE2B 780bf6dd2cc61d02f3794c499bec6497b0c715
 EBUILD awscli-1.29.45.ebuild 2209 BLAKE2B 780bf6dd2cc61d02f3794c499bec6497b0c715a7427e11773d715be7f04458c349f9eec08420795a88478bfc6155d031eada9aae68995714813c867c707f0926 SHA512 a129feaf2ed7b420c698a4d3ad12622ee7f3e467d8aea80a4fa75c2700ac4861e70bca70729a6dfc0d1ac22195b425185a70d26835f64db460f943fcb0f83a51
 EBUILD awscli-1.29.46.ebuild 2209 BLAKE2B 780bf6dd2cc61d02f3794c499bec6497b0c715a7427e11773d715be7f04458c349f9eec08420795a88478bfc6155d031eada9aae68995714813c867c707f0926 SHA512 a129feaf2ed7b420c698a4d3ad12622ee7f3e467d8aea80a4fa75c2700ac4861e70bca70729a6dfc0d1ac22195b425185a70d26835f64db460f943fcb0f83a51
 EBUILD awscli-1.29.47.ebuild 2209 BLAKE2B 780bf6dd2cc61d02f3794c499bec6497b0c715a7427e11773d715be7f04458c349f9eec08420795a88478bfc6155d031eada9aae68995714813c867c707f0926 SHA512 a129feaf2ed7b420c698a4d3ad12622ee7f3e467d8aea80a4fa75c2700ac4861e70bca70729a6dfc0d1ac22195b425185a70d26835f64db460f943fcb0f83a51
+EBUILD awscli-1.29.48.ebuild 2209 BLAKE2B 780bf6dd2cc61d02f3794c499bec6497b0c715a7427e11773d715be7f04458c349f9eec08420795a88478bfc6155d031eada9aae68995714813c867c707f0926 SHA512 a129feaf2ed7b420c698a4d3ad12622ee7f3e467d8aea80a4fa75c2700ac4861e70bca70729a6dfc0d1ac22195b425185a70d26835f64db460f943fcb0f83a51
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.29.48.ebuild b/app-admin/awscli/awscli-1.29.48.ebuild
new file mode 100644
index 000000000000..401bb2515e83
--- /dev/null
+++ b/app-admin/awscli/awscli-1.29.48.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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() {
+	local EPYTEST_DESELECT=(
+		# broken xdist (signal() works only in main thread)
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
+}
+
+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/makepasswd/Manifest b/app-admin/makepasswd/Manifest
index ba337aa30932..43262ea1a22b 100644
--- a/app-admin/makepasswd/Manifest
+++ b/app-admin/makepasswd/Manifest
@@ -1,3 +1,3 @@
 DIST makepasswd_1.10.orig.tar.gz 12382 BLAKE2B f38e181da077650af760123e86cdbc2f39259db82d06198280ac37f5391a7de00ca7009a69b491a150ec9e542c25b7538141941819ef540714e2a6cd75ddd4c2 SHA512 215b8c3941f395c02be43044aed972425db8fe8472ec9f4f39f7f574d9f36c5a1af5bba495dd10570363e923bfe42c26d7571741ae2ef350e660c9973ac0a5ac
-EBUILD makepasswd-1.10.ebuild 521 BLAKE2B f3124d65ce0b3ad92eb9fb6f05df6f40834cb9c0f2bd8e120cdbf5a122b31f2b380f8f622d60f80c0f44e4d03e93b5bc0199cee7136591499f1c9da57bb119ae SHA512 91de55f4b21f0ef8f7368e49c5d7852608ea5f8e1dbf09d70ac3330da78851510610ad763e7f8055ff9620c9628b4ba3673a66c363b2afe70fe3123bfcd4790b
+EBUILD makepasswd-1.10-r1.ebuild 513 BLAKE2B edcf7960de9b827fc85c780665ef387ca2b6d3d0d79687710ce684c529d70ca25d20deb6c6c94b3e13467c3baab578b72dfd6b9db89d6d38068a49952765c395 SHA512 b23c7335225d5265a9790072b3d1fd64a5cf68db3a8060fbf3dc3aecff066a26ee3235931e5f871b9dad401ebe6cfe91d57582cfcf5fc6f71fc36fc786beabe7
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-admin/makepasswd/makepasswd-1.10.ebuild b/app-admin/makepasswd/makepasswd-1.10-r1.ebuild
index 775fd2d3b614..6c7d6c2668a6 100644
--- a/app-admin/makepasswd/makepasswd-1.10.ebuild
+++ b/app-admin/makepasswd/makepasswd-1.10-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Random password generator"
 HOMEPAGE="https://packages.debian.org/stable/admin/makepasswd"
@@ -10,7 +10,6 @@ SRC_URI="mirror://debian/dists/potato/main/source/admin/${P/-/_}.orig.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
 RDEPEND="dev-lang/perl"
 
diff --git a/app-admin/paxtest/Manifest b/app-admin/paxtest/Manifest
index 70a23d511dd4..9fdadb70925d 100644
--- a/app-admin/paxtest/Manifest
+++ b/app-admin/paxtest/Manifest
@@ -1,4 +1,5 @@
 AUX paxtest-0.9.13-Makefile.patch 508 BLAKE2B dddbe4e9c2cf761c4abcff5f2d708a90750a0f11dc685cd99d162ef4a90a3beaa9a3c12f01994ff34202ba33b8a04554c59213d4bbcb48491528ca957c443c10 SHA512 ed28fc2d852ef0f4da5268c8f66e9a5c5f2b75509cb67627ab1afbd9c3b89609a0e88686cb317f3e6e48874e02d5593b7a7661160ef849859cb9e77be375a6fc
 DIST paxtest-0.9.15.tar.gz 37929 BLAKE2B 0b0290212fa27b8f27bea62c209423b6ea57e9c3e7d972fd069f0213b3963eb7a65921c669ac402b5d83f6556ba9ede90375b58f0f7ec6daf6cc3a293372edf5 SHA512 e152f5ada943f69b3745b51ac6d80f35a4c1aff777e93360287ef18b117d07861216d9d0d2075d2511d33e2cb4ea07168bb9ff2f00e79de6060e546b6806c487
 EBUILD paxtest-0.9.15-r1.ebuild 914 BLAKE2B 5b863582a7776d353c5d7fadd3a49f5ec5c30759b83fcc6df152d11812a55b4ca956901a0da560a21025c4aa9f4d919a4b05ef211d74a6641bb4c01edff81516 SHA512 4c41de979d2c2ecc0a04cf227743f19dd672cfd1132f24d151f9d7bcb535f34c975bdaf886bdf2f14aba76a7be5fddbe33ae77b54567facebf6af87421bc7706
+EBUILD paxtest-0.9.15-r2.ebuild 908 BLAKE2B e71ae4360fd4f6927815a3cdadc58724aaf23cec969151707dd9e4c4ca6ff5e4fa2d5576b250a79ec95dbbdc9a2e62335ae04e99b8c5615d5623135fb779ade7 SHA512 434c99fd3f6f697d8d23ec8f8a18a0d400237eb82b2109fd4265ba45702d062f8c081e2028185cba0794b6777cc68514baa2213c37725af26965d6f9982c173d
 MISC metadata.xml 1061 BLAKE2B 98187daea73bbcc99bcca7fffe6f9d78baffc624d0c999a15e430ba338b12891e2dac4b3cd62a40251540cb3535022270afd506a79079409688759ca8e8cd1ca SHA512 e2365784f83565e203a8b7c4c5d013e65f4d5ac390b9beb7955556cf6926d1d1597f4d4dda433ea049431aa3f95cbaebfe6baae2f1ce53f90de6833e96ed782b
diff --git a/app-admin/paxtest/paxtest-0.9.15-r2.ebuild b/app-admin/paxtest/paxtest-0.9.15-r2.ebuild
new file mode 100644
index 000000000000..0cc7aa297a4e
--- /dev/null
+++ b/app-admin/paxtest/paxtest-0.9.15-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="PaX regression test suite"
+HOMEPAGE="https://pax.grsecurity.net"
+SRC_URI="https://grsecurity.net/~spender/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="sys-apps/paxctl"
+
+# EI_PAX flags are not strip safe.
+RESTRICT="strip"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.13-Makefile.patch"
+)
+
+src_prepare() {
+	mv Makefile.psm Makefile || die
+	default
+	sed -e "s/^CC := gcc/CC := $(tc-getCC)/" -i Makefile || die
+	sed -e "s/^LD := ld/LD := $(tc-getLD)/" -i Makefile || die
+}
+
+src_compile() {
+	emake RUNDIR=/usr/$(get_libdir)/paxtest
+}
+
+src_install() {
+	emake DESTDIR="${ED}" BINDIR=/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest install
+
+	newman debian/manpage.1.ex paxtest.1
+	dodoc ChangeLog README
+}
diff --git a/app-admin/pprocm/Manifest b/app-admin/pprocm/Manifest
index fe14cbcbcc30..113fa24c4d2a 100644
--- a/app-admin/pprocm/Manifest
+++ b/app-admin/pprocm/Manifest
@@ -1,3 +1,4 @@
 DIST PProcM-1.0.tar.gz 29007 BLAKE2B 511934eedb0f2269d505affbe15d9ba151ba4e6647885787caf045bdb52080ca26072f5a8986e8fdbd12fc8a0516d9c35f0d0dfd1d42ec268777c1288c55b00f SHA512 d592455719babb9dd55c0d63ea097fb110747eb481e81b237779543f7bc90c8fcc0a4e7ecb94e3287afe9ac9f707e1e90c28ab634dd8d0e2bd7708aee8e79277
 EBUILD pprocm-1.0-r2.ebuild 618 BLAKE2B cfa998d54cd7f680456b4407a09f2217f0c7b746d171dd6b5e5a5d4c826231ca96c643c8a5a5c2ce37b81d11cc35193cb4232274a012a91dc84f1f9a8d3521e4 SHA512 c384fcbfa1870d8eb54269431168462d743da0a0c35ae0f40f8784208132b2e0dc64562863623ba02518469434df4de42a81e79fffd694b35e864dda3df7c6c9
+EBUILD pprocm-1.0-r3.ebuild 570 BLAKE2B 8830957f18441fe3457c600a9b3ded21130f00b8efa8a155642a68c6f9e4cc09541ca978bdd0a3d6e43e00802ada29576fde908368df30413601e772a6741aac SHA512 f6b22c64b7387b74dbc170f75eba7661202228a2470d2f0e0dc95028b31f128739e279afaab22b76094b838a41bb2016e346233ebf9e5988c9b94d406ee8af41
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-admin/pprocm/pprocm-1.0-r3.ebuild b/app-admin/pprocm/pprocm-1.0-r3.ebuild
new file mode 100644
index 000000000000..89f614ee5a50
--- /dev/null
+++ b/app-admin/pprocm/pprocm-1.0-r3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="PProcM"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="ncurses-based program to monitor CPU, disk, network and memory usage"
+HOMEPAGE="http://www.fusedcreations.com/PProcM/"
+SRC_URI="http://www.fusedcreations.com/PProcM/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/IO-Pipely
+	dev-perl/POE
+	dev-perl/Sys-Statistics-Linux
+"
+
+src_install() {
+	newbin "${MY_PN}" "${PN}"
+	einstalldocs
+}
diff --git a/app-admin/restart-services/Manifest b/app-admin/restart-services/Manifest
index 960462e6c493..66159dd2006b 100644
--- a/app-admin/restart-services/Manifest
+++ b/app-admin/restart-services/Manifest
@@ -1,3 +1,4 @@
 DIST restart-services-0.17.0.tgz 25643 BLAKE2B 5999e12e38207d00266928504da05c00482c8297b7fee634f302f09cfa09e206bcf9d5a558d2a91e5de1d97318025fa995fbc3a61f0d0e74b8dfb1af3db8670b SHA512 c11ca431fbbc6899ab268e8979049144448479d953ed7373cc7483cca2c03cd4041a1ca1e47c0e810f91a18a43aa32cc305a4ea791e8b992246f972e0fbb19ab
+EBUILD restart-services-0.17.0-r1.ebuild 1915 BLAKE2B cc98be8943bce051ff758ad5b3aa0d2313a679d137e240512a93d45067019483cd512718ed6a951896c6c9a73b06006b3c14eed5ff89f1f81deec2a1a762a95b SHA512 b6baa83273e2219cecab42f7e47140a8443edc6f5de638c771fe48b774e88934f702886689fc0828ebab406af162449f8ca8610461a37cc68ffcbd2cdac14c93
 EBUILD restart-services-0.17.0.ebuild 1858 BLAKE2B d250a17a9bce19d201d740e9739a8ca3225032e2a24b82857598dab21785ea692319f9d9dfbc1ef53d3b3814878f4ed20eaa4e7c040eed6a75cfb01c6f595d16 SHA512 2fd9eab9d1e096796470fdedb841072641200faae52011048294e3f065d067ae4b333ed7b4eae04583aee1e56597bf1c3af1bf90b976d255eeb4fe9513b92f74
 MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
diff --git a/app-admin/restart-services/restart-services-0.17.0-r1.ebuild b/app-admin/restart-services/restart-services-0.17.0-r1.ebuild
new file mode 100644
index 000000000000..7baedbc6e948
--- /dev/null
+++ b/app-admin/restart-services/restart-services-0.17.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Tool to manage OpenRC and systemd services that need to be restarted"
+HOMEPAGE="https://dev.gentoo.org/~mschiff/restart-services/"
+SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	app-admin/lib_users
+	app-portage/portage-utils
+	|| ( sys-apps/openrc sys-apps/systemd )
+"
+
+src_install() {
+	dosbin restart-services
+	doman restart-services.1
+	keepdir /etc/restart-services.d
+	insinto /etc
+	doins restart-services.conf
+	dodoc README CHANGES
+
+	sed -i -e 's/^#include/include/' "${ED}"/etc/restart-services.conf || die
+	cat > "${ED}"/etc/restart-services.d/00-local.conf <<- EOF || die
+	# You may put your local changes here or in any other *.conf file
+	# in this directory so you can leave /etc/restart-services.conf as is.
+	# Example:
+	# *extend* SV_ALWAYS to match 'myservice'
+	# SV_ALWAYS+=( myservice )
+	EOF
+}
+
+pkg_postinst() {
+	# migrate config data for versions < 0.13.2
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+
+		if [[ $(ver_cut 1 ${REPLACING_VERSIONS}) -eq 0 ]] \
+				&& [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 14 ]]; then
+			local have_old_config=0
+			ebegin "Checking for old config"
+			if [[ -f /etc/restart_services.conf ]]; then
+				have_old_config=1
+				ewarn "Old config file found: /etc/restart_services.conf"
+				ewarn "It will be ignored so please migrate settings to a file in"
+				ewarn "/etc/restart-services.d/ and/or remove /etc/restart_services.conf"
+			fi
+			if [[ -d /etc/restart_services.d ]]; then
+				have_old_config=1
+				ewarn "Old config directory found: /etc/restart_services.d"
+				ewarn "It will be ignored so please migrate files to /etc/restart-services.d"
+				ewarn "and/or remove /etc/restart_services.d"
+			fi
+			eend ${have_old_config}
+		fi
+	fi
+}
diff --git a/app-admin/sxid/Manifest b/app-admin/sxid/Manifest
index 967d48cd72f7..f55574cfce8b 100644
--- a/app-admin/sxid/Manifest
+++ b/app-admin/sxid/Manifest
@@ -1,3 +1,4 @@
 DIST sxid-4.2.tar.gz 41827 BLAKE2B c436ffd1b05306508c0ab0e4236cb3968d4456ae0686357a3a2c2a587fdbdaf8e760d5ff8198188c23854b080a91a35fc27a9717ab28f6907deb887a7b455cea SHA512 ed2832a0ffa89a41eba39e116122878b830c46ee7bfb906652606cff61fe16bc28ab6e6b4a802cc2436d9b3a7bdd734a827f007e6f1ce14ca84a9015d3a37a69
 EBUILD sxid-4.2-r2.ebuild 818 BLAKE2B a4d7c7526543af0f2b4412a5fbd8d48df1f622d11ce45b7f773832918ec818c9bc3816d1a34dc608fb7f6d102cd22b3b8866b60b2bd98570fdff19d7c00e5c73 SHA512 97692d6ea1a14679557791fb94679e3b72fc64ca41dbffbe43241e40557f5187896b65ecbf6b9598a5bd23890ca4fdfc09c9c9c44f9569c1d91f98a8d00b2865
+EBUILD sxid-4.2-r3.ebuild 884 BLAKE2B 56b8cd14d909a7405a4d2ea8ac1d4b154392143b849a3963fb40d8121817d5ea2d1d1f74705ba6eaa5f044821d7d00d42a180fb3b79da7910d19b93c654b6c76 SHA512 456ad7cf4002cd9f0c2df1ec36ecfacbdd4f06d175ce90894a1af5154d2b7a04404e759507c135505daddfe0572849eebbac796f9908c768e855947e2b653058
 MISC metadata.xml 242 BLAKE2B 28b070032e8f2246f59bd293e4532f476be22498928b7cff399446ac31594f29432e4578cbc86750fc92b1c7bdffc040086e60aea5791456cc3a0d41f15cfb51 SHA512 9d92e613111f8de98ea05cc6e64fe1bc2078ddb8838200d4b8068ffd35811dba14125be3023503601539b84ddf3fd41d247a551df7e945da35a26ff33a1d07b9
diff --git a/app-admin/sxid/sxid-4.2-r3.ebuild b/app-admin/sxid/sxid-4.2-r3.ebuild
new file mode 100644
index 000000000000..b62bc5855760
--- /dev/null
+++ b/app-admin/sxid/sxid-4.2-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="suid, sgid file and directory checking"
+HOMEPAGE="https://linukz.org/sxid.shtml https://github.com/taem/sxid"
+SRC_URI="https://linukz.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="selinux"
+
+RDEPEND="
+	virtual/mailx
+	selinux? ( sec-policy/selinux-sxid )
+"
+
+DOCS=( NEWS README docs/sxid.{conf,cron}.example )
+
+src_prepare() {
+	default
+	# this is an admin application and really requires root to run correctly
+	# we need to move the binary to the sbin directory
+	sed -i 's/bindir/sbindir/g' source/Makefile.in || die
+	sed -i -e 's/configure.in/configure.ac/g' Makefile || die
+	eautoreconf
+}
+
+pkg_postinst() {
+	elog "You will need to configure sxid.conf for your system using the manpage and example"
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 98dd1bba50de..69e7b86eb634 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index e32754b4c39a..44d5c29dff1d 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -14,5 +14,5 @@ EBUILD xz-utils-5.2.12.ebuild 2848 BLAKE2B 7e6c6dd50418e2a374edd75b4a4796d242126
 EBUILD xz-utils-5.4.2.ebuild 3178 BLAKE2B 855fa2339a86f5bc9ac2f5586a1c027d0ec9f7f62fbb159dc54cf05d5cd86dc408cf510aea3bafcfeea3f08cbaab5a998e65165dd5f3103a5a9ee6e9db72e0eb SHA512 eaa9b7aaf79ac42bc2ce22c713d7206c594872e31c66873d3c0e7560698d84bb9a629f44f5be6f2fb247ee9eb8656618af1f1902d750663d4b611fc51935a703
 EBUILD xz-utils-5.4.3.ebuild 3101 BLAKE2B 202af6f29ace1257358e1dad13d9b2d1ad1f2865adfc85028c31e0664f00d78561acf282281305b71e4ffc4ea5059f0d8993b7ca13c80ded5643b75dbcb2fe2d SHA512 0dfedc2a2a65e9b4caf1453dc52361e2c97bc96961152d7afb058821c8f1d8661909bf7149a9296eed3f2269e5856eb2da44955d8095c5845c360e3d8c6b28ec
 EBUILD xz-utils-5.4.4.ebuild 3109 BLAKE2B e3d9f2270337ee5d0893ba967d58c6dfc2a0fae133783fca17b7200be292329f949b33cbd2bfd8d7f9d7c0f7f00c2f33e7187858b588593ae1c21edb5be4dc54 SHA512 3755957951ac9385e24c079669bb3522d2fb18de2f4c8686f56ba2bf63bee0d052bd27c366ee08031c9f71b21cd9cccebac6d2398f1907b31266fdc407e911c6
-EBUILD xz-utils-9999.ebuild 3109 BLAKE2B e3d9f2270337ee5d0893ba967d58c6dfc2a0fae133783fca17b7200be292329f949b33cbd2bfd8d7f9d7c0f7f00c2f33e7187858b588593ae1c21edb5be4dc54 SHA512 3755957951ac9385e24c079669bb3522d2fb18de2f4c8686f56ba2bf63bee0d052bd27c366ee08031c9f71b21cd9cccebac6d2398f1907b31266fdc407e911c6
+EBUILD xz-utils-9999.ebuild 3291 BLAKE2B fe0aedcf0b0bb2ecd39163702da7f596fa31d527e6491dfa8287bba635094a7f5c8ad1e233c3e198389baadf3bd1e16b857b8fb4dc2d980cca4a8aea6f6eaa97 SHA512 4287fc4db25ecae08f6aa69b15fd57c10e85e7071e8ce717772cee77cfec3c758546bde5f2684e331a01306be7df24c42744cb58da90ab70de17da567760e4f8
 MISC metadata.xml 663 BLAKE2B 7a6625813cb3bdbab8a37845c9c64ac53ff377db394f776357d4fff60fbfe7c7b0e954fdc15abcc8874dd6c0f9ee90bc6e179a00bc5d12cd2e7cedc6f998c019 SHA512 696e573853d5d401f22079492d8e2b5f3c27e9ec4b6095f5ff46f109366b1c65c11976123abed06f302b8f03aaa1b0c54884f0156fdfdce23f4bf28feaafd39c
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index 11ddc15f918b..1ab617815a91 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs usr-ldscript
 
 if [[ ${PV} == 9999 ]] ; then
 	# Per tukaani.org, git.tukaani.org is a mirror of github and
@@ -100,6 +100,10 @@ multilib_src_configure() {
 		myconf+=( --disable-path-for-script )
 	fi
 
+	# ifunc is incompatible w/ asan
+	# https://github.com/tukaani-project/xz/issues/62#issuecomment-1719489932
+	is-flagq -fsanitize=address && myconf+=( --disable-ifunc )
+
 	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 6effb115a620..a6932f9bcd59 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index ac7976aec052..7c8de9cdf2f9 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -3,6 +3,8 @@ AUX snapper-0.10.1-testsuite.patch 2525 BLAKE2B 0ece146356113d456ef0a56e46e76eae
 AUX snapper-0.10.3-boost-1.81.patch 505 BLAKE2B 51111b4a6738efd7b9604c54dbb5754d3bef45ce5559d47902ea11cc4e550e5d14b41f5a65db19e631f0a3911fcba4149f153b527c2056cbf7186d41cd44bbc6 SHA512 b9d98ba08aef66b9ecefb4c9781569c71d198116e035307f96b02feb94a5284cf4aa963a11459e3f7d1c2519bc91f6214eac363d32ee129730f971f12ad0662e
 DIST snapper-0.10.3.tar.gz 409277 BLAKE2B bc4963081a24572015ff888b5cb85f3afa071e487a89e89f1a72d5b96391be69ad982c79ddfd71f020203d0c50ca07d67cbeb535cd6e57bc3d6ee269ef5c788e SHA512 74cb04d045304021564a0452769fdcde1764595a52e30947396c37fe4c36b3fba08d10505734bc0bd631986e933ee2bfaf67c871cba93a96e498fbfe5e2c6985
 DIST snapper-0.10.5.tar.gz 422114 BLAKE2B 35c4772fc84920755d5fe87cad4a73792692ab7a55bcbcae65f20bf2e0cbcfb79429a423a5b55a89dbfeba1ff0474741c884bc632daa997fbb86cec52b68e3ef SHA512 e710069374b805394d691f8060d2852e35960a965fd49bb59768ebcc53a615af1f36269adac2d916b5e3f1b3e42fb2a53049d8f1b8a6a8430e992fa0de49c235
+DIST snapper-0.10.6.tar.gz 423867 BLAKE2B a7d0f8c62c60c0d03bf108a8c0692dd209f170cf8227512cbc3b80eb9f58ecca845aa585859032bc6582d67e4c6ff15b75443a9ee9291d1b970efec15513571f SHA512 6eedfb9408260331f042f0a429a1104136cb88dac450f320641b0941cd06faf52f67cad2397cf4122f919876bb994455da0cfd3bb099f82217050e07b4c77d2e
 EBUILD snapper-0.10.3.ebuild 2083 BLAKE2B 78d21c76ce6f1cc5e2e852a4c9d0ec89d7f408e508abe0822614980b3407c9cd6cdd4f584e71e1009a3fc3b7e8f65195188a068672b443d8912e4b137879aca7 SHA512 994e79d4db8a382919a22088bfb7c79a2793d73a62be1bd12c6dcd1c30fe68149a054306cc002fdad356005d50bd5865700122f27ede96d4df5bdd5d269b0a85
 EBUILD snapper-0.10.5-r1.ebuild 2039 BLAKE2B f86263297ef14cd8a0ff5ab243dbf6c9ed8488ce3909863b7f918faf8ec8d94aefe94b701c374d24d6f8a168e14c06159b457467e440008525fd3b9e927a11a7 SHA512 39c725b5937065d0a2e846ae5113cb5bfd65dd5ddf3c6e1201561c7fbf2015271589d07940d10aec63ed329dcba567813e28c1a74e5580bbf2e9daf7ccf6669f
+EBUILD snapper-0.10.6.ebuild 2049 BLAKE2B 795e6947da7d2d2c68d24e612ce442fdec03c22584c1d4b85a8d36413b2e555ca4719c6223591cf92e441c15b6069cd29bd869519c99b2f23d54fd0fbb4225e0 SHA512 101ad55fd0be1fa87923bb57114280e626cf84ac22c0a7056f002276b71061e2ad0b3573e9d56dd500bff4b419a180a6c9c70b6be7d44340953f863249dfe93b
 MISC metadata.xml 1331 BLAKE2B 891a27fbae2ed364a26952def66b3e9e62be7025580d7b89f559f284888efed53476f4a8f5bcd7209c3c4de8494913a05354059004ef6c3aa6c1829a3e093efb SHA512 add8dffdf453f079d09f06608cae732ce61e04a5fac1988afb0733c8d60a943efe054a4973e54ca1cf304ad3d3778fd8aa6b01fc16815a1f42f83048d58adb63
diff --git a/app-backup/snapper/snapper-0.10.6.ebuild b/app-backup/snapper/snapper-0.10.6.ebuild
new file mode 100644
index 000000000000..9d04eeeb2e14
--- /dev/null
+++ b/app-backup/snapper/snapper-0.10.6.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
+HOMEPAGE="http://snapper.io/"
+SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="lvm pam test systemd xattr"
+RESTRICT="test"
+
+BDEPEND="app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+RDEPEND="dev-libs/boost:=
+	dev-libs/json-c:=
+	dev-libs/libxml2
+	dev-libs/icu:=
+	sys-apps/acl
+	sys-apps/dbus
+	sys-apps/util-linux
+	>=sys-fs/btrfs-progs-3.17.1
+	sys-libs/zlib
+	virtual/libintl
+	lvm? ( sys-fs/lvm2 )
+	pam? ( sys-libs/pam )
+	xattr? ( sys-apps/attr )"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/cron-confd.patch
+	"${FILESDIR}"/${PN}-0.10.1-testsuite.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
+		-i data/Makefile.* \
+		|| die "Failed to fix systemd services and timers installation path"
+	eautoreconf
+}
+
+src_configure() {
+	# ext4 code does not work anymore
+	# snapper does not build without btrfs
+	local myeconfargs=(
+		--disable-silent-rules
+		--with-conf="/etc/conf.d"
+		--enable-zypp
+		--enable-rollback
+		--enable-btrfs-quota
+		--disable-ext4
+		--enable-btrfs
+		--enable-doc
+		$(use_enable lvm)
+		$(use_enable pam)
+		$(use_enable test tests)
+		$(use_enable systemd)
+		$(use_enable xattr xattrs)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# Existing configuration file required to function
+	keepdir /etc/snapper/configs
+	newconfd data/sysconfig.snapper snapper
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "In order to use Snapper, you need to set up"
+	elog "at least one config first. To do this, run:"
+	elog "snapper create-config <subvolume>"
+	elog "For more information, see man (8) snapper or"
+	elog "http://snapper.io/documentation.html and"
+	elog "https://wiki.gentoo.org/wiki/Snapper"
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 5df2456115ea..9829b70b9e55 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/boxes/Manifest b/app-misc/boxes/Manifest
index 6a28a972e8be..88fbc6123171 100644
--- a/app-misc/boxes/Manifest
+++ b/app-misc/boxes/Manifest
@@ -1,4 +1,6 @@
 AUX boxes-2.2.0-fix-clang16-build.patch 309 BLAKE2B cde9c190dfbb57b94a48a8d68d459ccb6521fa2eacd5103e624acc1974346e3ecd3d8ec91431309a7e09d1e421babdac3307f05a9ac081fcffb84d2ff8b184c0 SHA512 84c0f84e3c07094f0e27b1d89a8094d43712c12d6b9bd79586d73440ae92f330eada9bf4d4438bfd7eaa8109f4197d0c8fbb7078f7678a2b5c97d2b87879923f
 DIST boxes-2.2.0.tar.gz 230099 BLAKE2B 4adb8ddde85cb31f32e98916d5ea2a57afcaa0470f796ba296cb3b80780f158a24b2bc5e9ba923b6a3b35b8f7781cd6ddacd89abadf6f2c07549be7ffe1458f4 SHA512 534d441c34316572d0c7e89f343a3bc5bb5a8466e4d4ed703fb2d14b714f5a6b224f7b0d408525d492da4610f9c5ffd8508e16d98a0781897567fb4aeb316f39
+DIST boxes-2.2.1.tar.gz 230900 BLAKE2B 65ab0c8ad52d2764279397135b072bfa6f4bf86e465cc3a4778d30c5b19ce2c0d7c5f8636173529eca92754ee16d38b46a83b067b94315b1ea82448e4b1ac0a8 SHA512 0afa115d5ec01944878ef4d8f33e2887d123b172a0589eda53a04ba671916d9ef1d8299f9df9aeac8989807f86ca1b96b1c34aed03856643a89a07586b82e3b6
 EBUILD boxes-2.2.0.ebuild 1003 BLAKE2B b93f215cadc9a867cd7012736546a33ebdaf3bde7230c2aacef465e8665436507e630b166056474875d6ec64fe95440a3c83a8a245d8f508793fd09c4952d974 SHA512 b385786a311625049e9665c2412398641de55df257f3b68601b55d8461de44fab2c739c1fad62c72ae3d4288452073255af0481ed6e2c347949a3fab9465673c
+EBUILD boxes-2.2.1.ebuild 962 BLAKE2B c54f5dad0654d38093b2e7453a510e2e7fba59f7a24210fdfbc52c26c3782fdaa66dce1837c7562a72e9596af92ec9fcf3523b7df7eccf503bfa51dac45598df SHA512 34b02921fbec88a965077f4c822584c43cfa08f8ec36ea07ad99c3fa17a616f0ae204207ac638a9b4f7b59209ca098737e0c977e662491b3593b252c6f8c2002
 MISC metadata.xml 900 BLAKE2B ed21e2f334f908418be9025531cb81b38eb20c29a2d6824db34b60bc9cab117cf7390c223942b0a97b00a94cbf0a3d56d5991599bdc6ee2ae779cafd2ee9f423 SHA512 ff396d6d3de85f836cd7af967d783ce51ce17f4a542e5a800aec5929f0de1a27eb823014f1452045183eb437c960347c1c120ce38b60bead7f9a38eaef24e261
diff --git a/app-misc/boxes/boxes-2.2.1.ebuild b/app-misc/boxes/boxes-2.2.1.ebuild
new file mode 100644
index 000000000000..fd1e85729afa
--- /dev/null
+++ b/app-misc/boxes/boxes-2.2.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Draw any kind of boxes around your text"
+HOMEPAGE="https://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes"
+SRC_URI="https://github.com/ascii-boxes/boxes/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libpcre2[pcre32]
+	dev-libs/libunistring:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	test? ( app-editors/vim-core )
+"
+
+src_prepare() {
+	default
+
+	sed \
+		-e 's:STRIP=true:STRIP=false:g' \
+		-i src/Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS_ADDTL="${CFLAGS}" LDFLAGS_ADDTL="${LDFLAGS}"
+}
+
+src_install() {
+	dobin out/boxes
+	doman doc/boxes.1
+	insinto /usr/share
+	newins boxes-config boxes
+	einstalldocs
+}
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 159dd5621b89..8b39f1f957de 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/urjtag/Manifest b/dev-embedded/urjtag/Manifest
index cdcdd22f91cd..5f9af4dacba9 100644
--- a/dev-embedded/urjtag/Manifest
+++ b/dev-embedded/urjtag/Manifest
@@ -1,7 +1,5 @@
 AUX urjtag-2021.03-fix-python-setup.patch 598 BLAKE2B 9c466950fb3dad58c1eeb0b781f8dc2217fd6d44446d8592a35ac70f5edc755e543f63e895f07f9fac004e522a2d15ff4d8fdbfdf42b71487ffd8cec251cf644 SHA512 5be37a5313ae26adf38fbe33518f3b4412e6b7a9709d04a98a7055d05b3515c643f2a9967c6b43faf0ffd69dae89d74c2900ae3bcd95198153a0a649763c2226
-DIST urjtag-2019.12.tar.xz 1208432 BLAKE2B 69963cbd39dcbec1abd73778fc6e98d743e36f6d4a17ba673b8691598ac0d4cec97e8b9c79068ad8971e6e07de81553bfd3bf5f684515b4a19303dd95ed477a2 SHA512 e149e53410a6591bdadc2c0138c6f81dac0fd6e35601461e19d356decdb820ec8e6bd53d59a1fd9781dfa1fee88d23dcafbd8df9adc0f8e51256c626d2ee0f36
 DIST urjtag-2021.03.tar.xz 1208440 BLAKE2B 68d0f0ec15c25ef351e0523eea21c18e723871032a046d31c031809a2774b0b8339b0b5d1a6f11a681ab3d3074b7f5f4fcd819fa7de1fdcac5f20ab39c6a40dd SHA512 baf203e556d1d41437539d3f5c018b35fbb496f71391c2bec2786ffa47bff33d38654b3e7d106e38bcf36d075d86fc02b18eaaf634cdb65e2840ff50ca0da8b2
-EBUILD urjtag-2019.12.ebuild 1148 BLAKE2B 3f210baaa90c97bea2c2de5f3088cf55e005871a19a0f7cee62293f4c4dcea51c24a106633fb8638874183f9563965b4b14afcf4130be11f9e73032fa33a9294 SHA512 62b506b74a8ad33eb2ce39342079e4f734ced5ef20a8e31553340def5533900e9b091e949ba85f9ac3852effd21b9ceb81233b18339b298e59d270ab2d1e8d23
-EBUILD urjtag-2021.03.ebuild 1695 BLAKE2B f827bcbace050c20a0dc1b9486003cae60f21e1e97f78e84af63a27d1b77a99c46df9b8ff5b76670e57a036d8164d1b3b1dd7b0698e7db465ee93b7c952b00b6 SHA512 862bc01164c74261b57dbaa0fef067be67c0f86643048b2d17d1234f6ab644a62c74611b03bb639c2bb63ebc2fcd970f1da5ed0cdeb1e63e4919dd3e430958b2
+EBUILD urjtag-2021.03.ebuild 1694 BLAKE2B f13f841bc1d32d741c98be9739f2e834d4e8fdeb1c8025b371e33694ed39edde1c15b119545f518d6216e6c5a651cf4ba642ad9bfe454668f5ade337610d35de SHA512 25d288e8bcfe535f88460ce7add98981c6e4a3d0bd080c9ced6f2bb0fdfab073673af8665adf9ed968a6e0f9b3b7c7ffffd5298406d70c70fee9b29ae84d89c4
 EBUILD urjtag-9999.ebuild 1698 BLAKE2B aecea688ff1bf9e24885f3a23c1ee79e7581158ca3bcd18e64ec270f1adefc5e9ea5604de41a0fabc0a34abb70bead2ce45ed50f672730346219550296d9c36a SHA512 98b64310e34b26584e7ca9db1abddc4f762123c619c905bf5a64a92a6a2d712a6dbdfef0940c1f29248dd209398a34ffda6c435b78167aa5c354c7f375011b7a
 MISC metadata.xml 541 BLAKE2B d55c3fb90be36d6e3f26aeff7e82f1a62cf0cedbf5b7260674b33fcf6269fa758c5012d106db60fa69cc9f7ae6b1f62290814948231c7339b3699700ba4cde88 SHA512 4c88c663470a1c04f6d94a28ddaf16f69d6fdc4c660a58c0e2d7daac5b92f9c8639e1287c2ca314d943bf1fd8409ea7aab3dedbf51439ffbeb7324db0662c73e
diff --git a/dev-embedded/urjtag/urjtag-2019.12.ebuild b/dev-embedded/urjtag/urjtag-2019.12.ebuild
deleted file mode 100644
index f492e5056148..000000000000
--- a/dev-embedded/urjtag/urjtag-2019.12.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/urjtag/git"
-	inherit git-r3 autotools
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="mirror://sourceforge/urjtag/${P}.tar.xz"
-	KEYWORDS="amd64 ppc sparc x86"
-fi
-
-DESCRIPTION="Tool for communicating over JTAG with flash chips, CPUs, and many more"
-HOMEPAGE="https://urjtag.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-# TODO: Figure out if anyone wants the Python bindings
-IUSE="ftdi ftd2xx readline usb"
-
-DEPEND="ftdi? ( dev-embedded/libftdi:1= )
-	ftd2xx? ( dev-embedded/libftd2xx )
-	readline? ( sys-libs/readline:= )
-	usb? ( virtual/libusb:1 )"
-RDEPEND="${DEPEND}
-	!dev-embedded/jtag"
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == "9999" ]] ; then
-		mkdir -p m4 || die
-		eautopoint
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		--disable-python \
-		--disable-static \
-		$(use_with readline) \
-		$(use_with ftdi libftdi) \
-		$(use_with ftd2xx) \
-		$(use_with usb libusb 1.0)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-embedded/urjtag/urjtag-2021.03.ebuild b/dev-embedded/urjtag/urjtag-2021.03.ebuild
index d9f559bac301..722255ff17da 100644
--- a/dev-embedded/urjtag/urjtag-2021.03.ebuild
+++ b/dev-embedded/urjtag/urjtag-2021.03.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="mirror://sourceforge/urjtag/${P}.tar.xz"
-	KEYWORDS="amd64 ~ppc sparc x86"
+	KEYWORDS="amd64 ppc sparc x86"
 fi
 
 DESCRIPTION="Tool for communicating over JTAG with flash chips, CPUs, and many more"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 0ae16378e986..c40729227747 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/javax-persistence-api/Manifest b/dev-java/javax-persistence-api/Manifest
new file mode 100644
index 000000000000..c02406c43513
--- /dev/null
+++ b/dev-java/javax-persistence-api/Manifest
@@ -0,0 +1,3 @@
+DIST javax.persistence-api-2.2-sources.jar 257011 BLAKE2B 022d70134c8cd9cb8afd0f65f1530e8937dd3535ba533d98f59409f28a39b9238dc23e10b8f86378b1e817520839c25647aad4c01b9234dc65be4bd68bdc9bb6 SHA512 07a31f509fc7215e3f671579ce63161ac3e776171a240c9d087e8f47423d65f590026fe7c2fcd67365894ee906eb4b39e81f070d7f795346e18697775efdf428
+EBUILD javax-persistence-api-2.2.ebuild 811 BLAKE2B dfe41e4d5ee6a03c769d9ab75f9cfa61846678cca0474de23c4e4d05763e7d75bcd59b609a5d6e7b3af255f2adb2a77909748dc8b9e06e60e5a1946a41fb3dff SHA512 98d2c6b76b091a847707c2962eb8f9d53d95458f0f7d233526c60b6142324e4e83486cc025f44d9cf6604475160767eabaea0e086a809d1c0b4ffdd9f986ff53
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/javax-persistence-api/javax-persistence-api-2.2.ebuild b/dev-java/javax-persistence-api/javax-persistence-api-2.2.ebuild
new file mode 100644
index 000000000000..3d5530cc261e
--- /dev/null
+++ b/dev-java/javax-persistence-api/javax-persistence-api-2.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="javax.persistence:javax.persistence-api:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Persistence API"
+HOMEPAGE="https://www.jcp.org/en/jsr/detail?id=220"
+SRC_URI="https://repo1.maven.org/maven2/javax/persistence/${PN/-/.}/${PV}/${PN/-/.}-${PV}-sources.jar"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND="app-arch/unzip"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_RESOURCE_DIRS="resources"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	# java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS
+	mkdir resources || die
+	find -type f \
+		-name '*.xsd' \
+		| xargs cp --parent -t resources || die
+}
diff --git a/dev-php/pecl-propro/metadata.xml b/dev-java/javax-persistence-api/metadata.xml
index 222c77f3742a..75321cfb5598 100644
--- a/dev-php/pecl-propro/metadata.xml
+++ b/dev-java/javax-persistence-api/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
+		<email>java@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/osgi-cmpn/Manifest b/dev-java/osgi-cmpn/Manifest
index 65e81d58c3c4..aed4776e8600 100644
--- a/dev-java/osgi-cmpn/Manifest
+++ b/dev-java/osgi-cmpn/Manifest
@@ -1,3 +1,4 @@
 DIST osgi-cmpn-8.0.0.jar 1897102 BLAKE2B efc22960e4f56e85c2ab5dd392c3793c69055e4c1fe19522f00863c59ebc27be817fffe678ebff876be114ae38cd09c561eb6efba3c25a5ebda96732330eec3b SHA512 194ce255a42c04f6515bfe982ea4685dbcfa6227a07572d17ead7fd0e5b07ca4c29a1cec7edf61a5d4e99fbd1bfadecdbf5a2128f73ace3812092ef9e310b727
+EBUILD osgi-cmpn-8.0.0-r1.ebuild 991 BLAKE2B 486c51db1573d600a49e64ec41f0c7940f5b9379706d5667dd8b3a76c260b6d9b236961787e16449adbb25266074a340e7b8d36b21e32735d26973816ea99996 SHA512 240b518761e48fad1f5a24dee38767548142a8c1aad00fc3003d7944f973ddfc5b569b91c662525ef603e09ef846f30d8e5f8f7e51ad095de7e336ebc7b62228
 EBUILD osgi-cmpn-8.0.0.ebuild 987 BLAKE2B 866b048e793d32dd0d3000dbe232b6b475282fd0c6d3f985b1ee66e6cf8b083f2bd31268e83e47930e042d364b8db7d2873e9ceed4e6df74b17da5d125cca690 SHA512 cd631482289e6a9c77f258a7d1fadc87eb15e08b0d832b269338deaf4cc415c121ac7452e742d8973a78ac20e404a4a70c1fc630e328f19b8b0b98ffb588b948
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/osgi-cmpn/osgi-cmpn-8.0.0-r1.ebuild b/dev-java/osgi-cmpn/osgi-cmpn-8.0.0-r1.ebuild
new file mode 100644
index 000000000000..00651e5ccc58
--- /dev/null
+++ b/dev-java/osgi-cmpn/osgi-cmpn-8.0.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.osgi:osgi.cmpn:8.0.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OSGi Service Platform Compendium API (Companion Code)"
+HOMEPAGE="https://docs.osgi.org"
+SRC_URI="https://docs.osgi.org/download/r$(ver_cut 1)/${PN/-/.}-${PV}.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0 OSGi-Specification-2.0"
+SLOT="8"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/cdi-api:0
+	dev-java/javax-persistence-api:0
+	dev-java/jakarta-servlet-api:4
+	dev-java/javax-inject:0
+	dev-java/jaxrs-api:0
+	dev-java/osgi-annotation:0
+	dev-java/osgi-core:0
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-11:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+JAVA_SRC_DIR="OSGI-OPT/src"
+
+src_prepare() {
+	default
+	java-pkg_clean org
+	sed \
+		-e 's/javax\(.enterprise\)/jakarta\1/' \
+		-i OSGI-OPT/src/org/osgi/service/cdi/*/*.java || die
+}
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 9d3f1273c35f..e67e6a96386e 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,13 +1,7 @@
-AUX tomcat-native-2.0.3-slibtool.patch 1085 BLAKE2B a23d3756071916a550c8418ab1ded93077106313b399545c7e8c5c91201c4d61b5a8c4ae550f197b50186012d64c0be1057cb9099e762f72c3f1dea32f047734 SHA512 c0bb7146e41f4c2785d6675bd46c5c7ba9279119ea8d81db0271c9874d4da9c4d60d8df219adfe02d59d19f5be1be4e659ee3bf50475052a60d43c3d029487dd
-DIST tomcat-native-1.2.37-src.tar.gz 438373 BLAKE2B 89ec571fea09b5ee0cf5f5ffec8f5547b08da301e713361687d7aad96f70b3b789a5f26061e2277b90b845f9df1c7c140fdee4c83f1ba05d168bcabf2cf1f549 SHA512 e845239f1b6a1dab22885d39f4fd131e464c38b0d52faca0d960f99fe3e8b7d732c0112f25e5eb81ff8dc71a5e3c6799bfdf867e617d8f934068ed107036fd0b
 DIST tomcat-native-1.2.38-src.tar.gz 439234 BLAKE2B 603a905db25b86792717023707598abb4da125ad16b7e69e4a48ec0eb9056bc0b566520d4df004566bbc15c8bcfe843992baebb6bd1c86b210ce9f0fc0733ca0 SHA512 973c0dc8d241827aa98f72026d4de67928344c221570abbb7f97380fe56a9ad602b159a5448c6048d88d73fa0ade8c1ab12df293fee513d0e4896847b16206e6
 DIST tomcat-native-1.2.38-src.tar.gz.asc 873 BLAKE2B 6b7ccf31b7b0b7ac9493c4751309c6b62c269332f5fd49a9df391846a140f2797e1587e3c644b4aa65fa6eef8dfea8fe19b7f5714ffb5ddcf836c601f281bc5b SHA512 b6a7c12ac7387c4ee17e5b5d50d588b16470874f70bcb49b96a25159bab8b51ff5a5dc7d33fa73c8eb33e673e2b947aad4b603b1e8755f7e186052763c2575f5
-DIST tomcat-native-2.0.4-src.tar.gz 318845 BLAKE2B 44cd99ff52d5b402c2d8caa6819e2e420c84399f7f3cc0be38cd2a40985ddaaf89093005454527976ad2cf083c90d39c9c4d600671a8e5c7c07d0834b23d93e0 SHA512 276133e44ae9f9d3e853b66120937865c675eed6dd6b5b7d8a94ef741f037c0b3d99a6c065a1303c0ca42b65c109aef35b6bd370a2af0b7b2752eadf85b1d880
-DIST tomcat-native-2.0.4-src.tar.gz.asc 873 BLAKE2B 509c63dce69c767d3dd694d7994c8b2cbb4f84d40095ff89373a165d592449fc028402b17bf0e25c9ffe40d5ca8383cda50703054fcdfb2fd4cb36bdcecdff0c SHA512 80768307fd1d46ca822151977b3d9fecdb3121929e97338a78c39bc439f914694dedbfff087cd512f986532567734f04422b4764ea215ad5dbb0319380fa05d2
 DIST tomcat-native-2.0.5-src.tar.gz 539017 BLAKE2B 405a4064bcf49ee04a7670c516adc64b19ebebbbfdc50735952c057d36b475c785bd9976778f491796b3fce5bd5aa158199ec624f20e8adbc65f920974543533 SHA512 03ed1951597bb6a6ade8d715546a0d635d261381737abd27b63aa552c69f9ca49405d0252b6bc2d878bfd64e87439f146ecd84ccbfc82661ba16379c493615a4
 DIST tomcat-native-2.0.5-src.tar.gz.asc 873 BLAKE2B 2e043d011f482ab963088441a37d2cfddec973253f7c909a747afac71393b76bc2e33ff37e9a18e8f9b6caac8ba86ab3a076ea722577416e4b409d8e44d56e24 SHA512 22a87c14c31bc62383cfb227e8dbd106fe017f84d802ec0e4d22d48af6ad4dd0d020bc59bed3a8335e2b4b15e0fd44ec3a4062bf86c73bbf00151c4ff0d12d7c
-EBUILD tomcat-native-1.2.37.ebuild 1193 BLAKE2B 4dc4ce63f539bb24d6750adfc1fe24b2f3f64470c5b0d16eb2faf69bd9a9d17692b86d23dc643004b4d7a6dacaf22405fe9f10e9a2e46a107875bbfbc53bff17 SHA512 77aaec34bcd9172b57289f8b0a02e82bf29ed385e21be352b959162241944593a15efa103c4a7704019e71be2fd9c24d3e95ec78198d489705de78046d0ddc4d
 EBUILD tomcat-native-1.2.38.ebuild 2164 BLAKE2B 2efd68a9c1c26688744b26f5f6cf2791e1c2782d4625899dd49e132eb61c242dd942179e26b69d5a33934a0b06567ec0804b9cee17c93393820aa303e3dac3e5 SHA512 684f2fdf65429c7d990188a64aba88a5c8bdfe3a6065920ec115aa8f3684a87f92cd71c519d6ebfd6d871afc24cde405644547230768b6d72015417a95574e54
-EBUILD tomcat-native-2.0.4.ebuild 2168 BLAKE2B ecba20a3e0a5c3472c93a639019a810f99660e6b0bcc6280d0c712f99dee71ba53e913145680000e3a59394c636f7c83444dbfc45eb19913d3491236e20d1232 SHA512 bdabcb7c4fe756a4ed6d051bfcd1ed8409f147c1ba5aa5b2e0d90f19083b1ee2c7c1cfb982879f31ef4c57e98b6a014ff8ff2c4bad3f5d4b0bbc65bf7df4acdb
 EBUILD tomcat-native-2.0.5.ebuild 1982 BLAKE2B 068abb8ad2d7b087d19cb4efb9532689254513947ca34a26c24245c5d49fabc5d688c6ba5a08080f4591864520988ad9372867625e27a741bc48a01f4e6b316f SHA512 42de7c04a707295abe901edd0be127ad937636f8f10baaedfc6db605d1599691b9b98b17117c0739364199d2e2af72d8c145c44d28009b42560a89dd16b06d25
 MISC metadata.xml 1096 BLAKE2B cc5973c26004db986d1cd7020212163380883cb3b01ed08b518d87abaf43a1e875de226064a123b9a5792e0e2285e70eeb50234654049ad22d906c4c5c454928 SHA512 f19053a4c75f84fa8491aee4f74d7334e369bb38125c69f6c839d37cc3b6c90ce348039845a3635d0b637b50c379efaee22dd811c46c49645fc6f8192e7a01cc
diff --git a/dev-java/tomcat-native/files/tomcat-native-2.0.3-slibtool.patch b/dev-java/tomcat-native/files/tomcat-native-2.0.3-slibtool.patch
deleted file mode 100644
index cd090afb9854..000000000000
--- a/dev-java/tomcat-native/files/tomcat-native-2.0.3-slibtool.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Upstream-PR: https://github.com/apache/tomcat-native/pull/14
-Upstream-Commit:
-https://github.com/apache/tomcat-native/commit/4f7fb7f442de3d9a9bb2f72b5dabc2f4bc8e3384
-
-From 54dccd3a4dc01801d9311b3160808305ec9fc2cf Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Thu, 21 Jul 2022 17:59:14 -0700
-Subject: [PATCH] native: Fix the build with rlibtool
-
-When building tomcat-native with slibtool using the rlibtool symlink the
-build will fail. This is because rlibtool requires the generated libtool
-script to determine if the build is shared, static or both.
-
-Gentoo bug: https://bugs.gentoo.org/778914
----
- native/configure.in | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/native/configure.in b/native/configure.in
-index 567894b10..e082ae6d2 100644
---- a/configure.in
-+++ b/configure.in
-@@ -50,6 +50,9 @@ AC_SUBST(TCN_CONFIG_LOCATION)
- AC_CANONICAL_TARGET
- AC_PROG_INSTALL
- 
-+dnl Generate the libtool script which is needed for rlibtool
-+LT_INIT
-+
- dnl
- dnl compute the top directory of the build
- dnl note: this is needed for LIBTOOL and exporting the bundled Expat
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.37.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.37.ebuild
deleted file mode 100644
index e2093e095560..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.37.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/native-doc/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/apr:1=
-	dev-libs/openssl:0=
-	>=virtual/jre-1.8:*"
-
-DEPEND=">=virtual/jdk-1.8:*
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${P}-src
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_configure() {
-	local myeconfargs=(
-		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
-		--with-ssl="${EPREFIX}"/usr
-	)
-
-	cd native || die
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	eant jar
-
-	cd native || die
-	default
-}
-
-src_install() {
-	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
-	cd native || die
-	default
-
-	! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-pkg_postinst() {
-	elog "For more information, please visit"
-	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-java/tomcat-native/tomcat-native-2.0.4.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.4.ebuild
deleted file mode 100644
index c1ee9d7ecc61..000000000000
--- a/dev-java/tomcat-native/tomcat-native-2.0.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit autotools java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/native-doc/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz
-	verify-sig? (
-		https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/tomcat-native-${PV}-src.tar.gz.asc
-	)"
-S=${WORKDIR}/${P}-src/native
-
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="2"
-IUSE="static-libs"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-RDEPEND="
-	dev-libs/apr:1=
-	dev-libs/openssl:0/3
-	>=virtual/jre-1.8:*
-"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
-
-JAVA_RESOURCE_DIRS="../resources"
-JAVA_SRC_DIR="../java"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="../test"
-
-PATCHES=(
-	"${FILESDIR}"/tomcat-native-2.0.3-slibtool.patch #778914
-)
-
-DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} )
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
-	sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \
-		../build.xml \
-		| sed "s:\${version}:${PV}:" \
-		> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
-	default
-
-	# Needed for the slibtool patch
-	sed -i 's/configure.in/configure.ac/' configure.in || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
-		--with-ssl="${EPREFIX}"/usr
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	default
-}
-
-src_test() {
-	JAVA_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" )
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_doso .libs/*.so*
-	dodoc -r ../docs
-	! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "For more information, please visit"
-	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 5288f38ecac5..e64bf8e43e55 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/eisl/Manifest b/dev-lang/eisl/Manifest
index d9ace10d9d34..9073a2cd4992 100644
--- a/dev-lang/eisl/Manifest
+++ b/dev-lang/eisl/Manifest
@@ -4,7 +4,7 @@ DIST eisl-3.40.tar.gz 2287448 BLAKE2B 10b9f6b74a313f0ecb724c09d5ade3ee81b6aa4b1f
 DIST eisl-3.45.tar.gz 2427103 BLAKE2B 3a87b3b075dc75e8bc408f2a9ba78fe1cdbe12f40c7901aa546fb4cc0f1e6d06ec9ce65cee229517f518b05c99eaf327d2caf9277b82c2f9ab06ca3d9426bf33 SHA512 fa939d02466c6f3164066deb50b519376cd7464f1330b7633ef8450c0c23a89d0a7626cc3b79d570b3643ac098bc0fee5ecc27b1c62bf89f92335e8a09e2107b
 DIST eisl-3.50.tar.gz 2428194 BLAKE2B bab17dc6ab00f894cd4e9558a1bbc4bca9eb2770de46eb30d015e9e7542c774f2d55427bea05d5c5c6d910eec9a9de3d84568f9ec12043f20bbcdc542f0294ff SHA512 53d23a86a5b15ff04c268db348b5edb61eb0709cb1ef21e5b9ca7eda8954a0ab2b9dad345c3a9d80325cbfe35e879516b0d8d98609cf68dcad8898b5ce10c175
 EBUILD eisl-3.30.ebuild 998 BLAKE2B 1e725a17e5904c483f2779e81d66204ec183b84cdfe5b7fe83d9e9c0d4ecd9b93fd13f3b8851296bb43b5337ef471bb3f6457e413499f3a70c8c8a712acecd1f SHA512 caaddb4d8cdf118e1e3fa1a942bcf2349264113b41a3d2f136c22e2080fad502d32553839ba4d19a71ef36dea32ea721894bb906e2c6da4b2aee8af6cd6d43e5
-EBUILD eisl-3.40.ebuild 999 BLAKE2B 21d34e1a7d23a40dd779098282230a358203183c855f71ae91fef97fd6e1b61b321cb8644d62a04c7a1c1b6846d218ea956e887d9b5a9c8710f6cc79fee18dde SHA512 21343f2866e7988267ba157c1d56d73c0f87d567bfae4cb306752f9739ad47774a5a38611cd770432f912580438c094f22d0c453a9667f964ee86c40c33dbd3b
+EBUILD eisl-3.40.ebuild 998 BLAKE2B 1e725a17e5904c483f2779e81d66204ec183b84cdfe5b7fe83d9e9c0d4ecd9b93fd13f3b8851296bb43b5337ef471bb3f6457e413499f3a70c8c8a712acecd1f SHA512 caaddb4d8cdf118e1e3fa1a942bcf2349264113b41a3d2f136c22e2080fad502d32553839ba4d19a71ef36dea32ea721894bb906e2c6da4b2aee8af6cd6d43e5
 EBUILD eisl-3.45.ebuild 999 BLAKE2B 21d34e1a7d23a40dd779098282230a358203183c855f71ae91fef97fd6e1b61b321cb8644d62a04c7a1c1b6846d218ea956e887d9b5a9c8710f6cc79fee18dde SHA512 21343f2866e7988267ba157c1d56d73c0f87d567bfae4cb306752f9739ad47774a5a38611cd770432f912580438c094f22d0c453a9667f964ee86c40c33dbd3b
 EBUILD eisl-3.50.ebuild 999 BLAKE2B 21d34e1a7d23a40dd779098282230a358203183c855f71ae91fef97fd6e1b61b321cb8644d62a04c7a1c1b6846d218ea956e887d9b5a9c8710f6cc79fee18dde SHA512 21343f2866e7988267ba157c1d56d73c0f87d567bfae4cb306752f9739ad47774a5a38611cd770432f912580438c094f22d0c453a9667f964ee86c40c33dbd3b
 EBUILD eisl-9999.ebuild 999 BLAKE2B 21d34e1a7d23a40dd779098282230a358203183c855f71ae91fef97fd6e1b61b321cb8644d62a04c7a1c1b6846d218ea956e887d9b5a9c8710f6cc79fee18dde SHA512 21343f2866e7988267ba157c1d56d73c0f87d567bfae4cb306752f9739ad47774a5a38611cd770432f912580438c094f22d0c453a9667f964ee86c40c33dbd3b
diff --git a/dev-lang/eisl/eisl-3.40.ebuild b/dev-lang/eisl/eisl-3.40.ebuild
index 987db06ada03..05fe23762b19 100644
--- a/dev-lang/eisl/eisl-3.40.ebuild
+++ b/dev-lang/eisl/eisl-3.40.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://github.com/sasagawa888/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 2dc05b622992..622e7fdbda38 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,27 +1,18 @@
 AUX 20php5-envd 208 BLAKE2B 7d876903c7f58ab148e1d6bb2b0d86cb9f5ecd241bc00e92138d30e6272b277fddbe2ee233c82e6420c1ea42d493b872d975ed06295ba7502be5c26afa458f5a SHA512 5ddd373d586800a112666b21e449342028ccf60f4f7f1a87f4913e75f718ded881590bed79cbeff75c581a24acb8b46403f2bf496cd05f264b4f9f1e6c5e86fe
-AUX bug81656-gcc-11.patch 1953 BLAKE2B d682840f380693799fa1cf214d199b08862396bc795e88ac9a6ed0c0d12c6b04883301414ea5c3a2d28e204225787d546d3505322280df27105af3ce9d299139 SHA512 11e4c777538b00080cbdfb1a759064368582f894711fc1ff7828a0289d25770bc7a49c768a2a5fef2f89a04b3d9392a78ca0649dd05c67c30cb298320b115edb
-AUX php-7.4.33-CVE-2022-31631.patch 1836 BLAKE2B 63a250c6ec5c1b3608f5e2b61118d8903fce8b37764088c57bb6acc82a068b326af4235bd05f21c35a5399616a06dce34a81db71a2b2f558365e220529fc216b SHA512 aca1d76f9674f1602bd8be090bc20f66a64672ea1e6b2a3f76213f285bc8c52159b5495ae1c8c47320229c4c018b73b4d97e4d94837e1876602fa13e39df1cd1
-AUX php-7.4.33-CVE-2023-0567.patch 2780 BLAKE2B a35b8f7d24cfb8a325f65e465bd440930876f4b188d1ea5c12d616da39ec75809c13f9e37d08dc5245c7412f21899018f867681ecf89213fc5e7a1b01cb0dd41 SHA512 cdbbe235791027b804c8bbc71a203f954628cbf27af99be34c750dab3c8bf8e3928af87adb87ffe09b2d011c19ed5b339e345d5a55a7053fc82d4c72ba08e8b7
-AUX php-7.4.33-CVE-2023-0568.patch 1327 BLAKE2B ab7ad1f83bfeef8da091f159d41371d0f89e3dbcb79c1b7bec7bb76b329c60d2d10e0c6ef9c5c959a57846466a778345e697099e5c2a9555733918cc2faf41f4 SHA512 6015f6025e4e5e29aa699ef9a4b4b28a8f756cca0e83a4e2311c1735f25ef89395d4ea2c143ec45b375128f66b99a4b788e8bfb28d9ee74566345696a1a3c2f0
-AUX php-7.4.33-CVE-2023-0662.patch 1992 BLAKE2B d436b763a0131c1992e69821df1f8c5d7cfdc151c9470671189dd76acdf295d3108030a273d2c3314bf97c0e06a286541a64312a95d6b9bdea0c912a90db7e0d SHA512 71cda55f019b7dd3d74c598dc93e81674bf6954bee4fb37c325ca4b8449b6a1340d61ccd1f9b9f0ba86b9cb3069221614f9b50a01de674c157bf47d7906e25a7
 AUX php-8.2.8-openssl-tests.patch 790 BLAKE2B fcfa6f361470f2baa65d2bbbde7c9629841546a560aa6f88d85b68727004e24949f9516340eba0339e575dcf06077d08540a7a6d58a0cda42d5cd26bf48d9e46 SHA512 d29b5334abee8bcbef62c88c01c9eaf887f25901763db75e754f6690e24138c9e45783943d32402f693bd7e4564d737521a8b0b8034d5401bac73ff30f453050
 AUX php-capstone-optional.patch 2497 BLAKE2B f23236130be88d28d933d5482f1925c4e32e09c5022544ac2dec62465e9296baabe64f57fedd7ccb9f4499d354bd466d10cfb66596e8be029be6fa4f82dbc1a1 SHA512 a9000d789a7bc54d4b6cf8ed287dcfd71958dfc85c6417737dcd66b9461be5b1aa2568a19f5a9cd29927fe9d955ac24d04e2f64f1c4018110a8f81a6eb4813c5
 AUX php-fpm_at-simple.service 316 BLAKE2B 0ba10f3e3b004fbf14956e1e4f04f59b8a127e6717fe6b92c09b9f931033a11551c75fbbee9010f6b694c5a8758ca0eec9eed457ae304ba0dea8f2c256c3b8d4 SHA512 7367a3f8d3874f8e0c76f331ba613a0250db02f60ad9f87affaf448dcb5bc34bcecb91d88f415764a12b24b46ae3d1b738a002af9f77a4b707e916e83a0021fd
 AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd2355061d0fdc303604c6b02ad42d7301180d86c977d5e585f5dd685343c592e37a6e0f44933707be79e0b77e0 SHA512 27982f9e2d958bfa75c89c7d3531e48d17fc388b1cdcbc8e09051b236b1184ee2baabdfcc567c19d9fcd067d4b3b86f171015616d8da42fccdabd89432d865e8
 AUX php-iodbc-header-location.patch 481 BLAKE2B 9ea6a5d529dc7a8c78eeee800900372bc14309a05e352b2838da32e1384b61b507fdb623c9400094aa5b637eb1a87da92c72600eff79b18b8989ef90af56a0fa SHA512 86469f657d8807f005c28fd2149770c881add8f243fdfea087956c7987277597fe400a7af23f624f26da270356604717ed9cd04771154d7cf2ffe7237972372b
 AUX php80-firebird-warnings.patch 1949 BLAKE2B ab1b693afe26b6529aab8628f9a614478c388ed23603ad1dd4d17b63154d535a3e4c2db04fe27fb22a3d7e1335e368ffd383ed24647ac53ac05170ec3e1beb75 SHA512 d37815ea529167d4959aef056a3a0be6902ee4cda809a48c24299b05ff6477ee82e8ed8dcf49051b8e74ba5c31e3985454591ea751d4550df3d2e3639ec0d616
-DIST php-7.4.33.tar.xz 10420144 BLAKE2B e75817e79c698628c873c90afb3b5677480d03ecf07e8f2e26a062bc5b91affc6079e792e864f28cf12d45f86e5d01ede289ecdcefc06477986d193d22c982ef SHA512 499b63b99e5d8e8082ff89d3a91b4cb9a593ea7553b96e48863414c13d2e50275904ed29070e2232e529ee91160f505e6060a4d129cb5bf098aa5b6ea0928d3d
 DIST php-8.0.29.tar.xz 10803592 BLAKE2B 6e15ce459aa5a51b2a07a4bfa1f6dba076dbbd4828ccdcb8dc4796f64ad3dbda6ee2b6789880591847a7de0d077072e63c46f13399b5b44a4ec34c83172fb6ac SHA512 5f849753bbcc12e253160af072213bc1ede32e5051684129707d32fd6ce8e12867fcf7a5f6790b25071fdda0508dfffd3344e4bb850a747cb8f3c9aee970311d
 DIST php-8.0.30.tar.xz 10821076 BLAKE2B 9a914ce99ec1d5d554f063ba324d95bd6d39912a13f34f9b3e09fa020c96c0a50ff919e8d829fd663522be2b68bea8934d7f67c52ad45b64d72946f0ba5f3925 SHA512 fb816e0a4e4dc506b0ea4425f26690edc6afadb5474ac84df0a1aa293abecd50d128b36074e3e0740c7228109d486ca446869a9c920419610a20ab5989870782
 DIST php-8.1.20.tar.xz 11793228 BLAKE2B ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096 SHA512 d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558
 DIST php-8.1.23.tar.xz 11871960 BLAKE2B b01939aa00a88a26b2d21831871b884284c2c6653f370faae8e9399a167108ea7369494bc7352ae6a7f99dbcbb497e4f8c0a139ff240b2f3be34b0815c0d3801 SHA512 deb1c205c289d5457e6341680d1a3344f21ff8abf904b45b78391fdae6e0c172c5d760f0b639669722f9a8600286515d63bdea46043e5d7b4db4666bc2dde7ea
 DIST php-8.2.10.tar.xz 12041348 BLAKE2B 25ef7b30a05749c2d8fa511de1a4f7eebab25a058a0bd19748da3d2d4d7199ac9f018064cbd3b02d0d6e22c0dc983f8e2efa6cb5b27ece9dfe7c7310e128ec23 SHA512 b9123f63afc99fdce34182f49a022611d584bd4a26f624d0010785599e9b10af7924f8307bbca920d75cb7b0cc23fa57efd5d6ef1d2dd89d5a508578bd36b146
-EBUILD php-7.4.33-r4.ebuild 21345 BLAKE2B 07cbf045eb598131ca13920582d0fbfaac23d78c387bb831409ccbfb4e839b79ca4d48b66e287fab01e9ded7d548467629838c6bc52cbc7afd2ab9859ec3e2c3 SHA512 329cec6bf3a0f3fd4e07df911efa6f7b1ac062605dff603a42abc456b6c3720ecb15224e27628a49a736cf05199f91f49100cbb4ddf6ea028cf989dd1cec211e
-EBUILD php-7.4.33-r5.ebuild 21533 BLAKE2B 2246f60ecb54284555e74ac458551729e9a98000c21c5200df2db511e35429c907f0e1a22fa1fccaab2a99215ab8ee40e17c29843d2a703e0e50745b2ed828a2 SHA512 03bb839e682daa74e1a1cca3ae0843ea61e7b57836302e2726710b5ab2dcf11862e52c5b8012dd6178607d7f62343116e75e5e0d243b29631b76e0570faa7456
-EBUILD php-7.4.33-r6.ebuild 21502 BLAKE2B e8e5f58105088783b8ed435f4705ecb3891ad8ea17ecf63c9bac6b911a256f4615964325df7af2d63a925e842a57ee8cf2c7de1fb4bc1d11a2afbf9b5fa086cd SHA512 98f75d9ac14141407a8b8fdbc94bcf06b7b0325a0feb90acde5fbbdbdf669b1e5208f293eb43bc3ba58332f8b5fee29972884e4fbdcd941625cca78b96778bfb
 EBUILD php-8.0.29.ebuild 21848 BLAKE2B 304c8ed923e338a1bfab922bd8e98e24a5cc38d95126d748d955d022cc39c11d6687c4c9a6b7c9f7d848deba5d9eae100760f54b4fbd95c266707cc006960b1f SHA512 85cf24ec2773412555331bd1d94b7695076b21f3864fba46764f85e1b6722908d439fec1ea773a748f0f4ce68be59f65612add14b19b1f3a17ec7f7110033b49
 EBUILD php-8.0.30.ebuild 21942 BLAKE2B 827699ea72d9adc7d65eaa24699a40d809ae70e9cc5fb0b2f3e6527644fe9afd5538f74ff4b86773937992b56d52b042d409d4ac9ce6d488fcbf636f463177d0 SHA512 b4b1c5839f67d25bc621f693906f2238acb9203604f5ea78b248cd84f2e8e111c191e7b085e8b8210cbf18dda64695c2d755bb43663cd66296f531ee5365cc2a
 EBUILD php-8.1.20-r1.ebuild 21910 BLAKE2B e6a524d34d9a13d561d759ef67a9b5e54d7de24102802deb4446d1caa6d997dd9b5e31960abc0a05a80c5f41d2d10cad1abb5f982e90cc9e80f58ef13bd1eff5 SHA512 45fefb29283621baa9796d454bd104e070bce921f64c1627fa46bc238faf17019d8f9a251222e7f1ef51d1de3fbc61c49a84da0ce93b290852c63fa27463205d
 EBUILD php-8.1.23.ebuild 21996 BLAKE2B cf5c46780aae16a099cf97b803a18e06229976395b96c96781a5c7f7a6678b8f76f70e466e5ab419471f0c83a587ac0d1ea7d0b438cc2c90ff9008335147af33 SHA512 707a40a4ba96d6b8ea5e423a1ebde2b54c9b33eb2a6dc8b1134fb2748f4563b39f38aff96117ec4b27ee9294af03db8a0de0b4d7c41e831839eaef1b3fa2bd95
 EBUILD php-8.2.10.ebuild 24825 BLAKE2B 17fa43e5d68ed2246e1b92488b86c56ac1d8be8b54eafb3daa3a27a51c1a3941214172a28880c488561271a88deb590e0c95979a46c5f5dfb79c94c499616520 SHA512 5632dfd9191cb9ddd2552acb86f0cc51a807041c945b4dee3116e0d10985ac4efc6c2288474f8a87c4e299d71e88c4c482e783ec3af3e2d6e7e9b8fc4d827f09
-MISC metadata.xml 4018 BLAKE2B a2413be53cf35069736693b31b2ef8d4277c25c1cb4ea75d949e3a50809e77b9fae2dceeb8a71bcd0ea4c74131cfcaeaefa09ca67f312bd7eb934c2e07156502 SHA512 ba8385d8596d5e71d6b5cc7e225d2afbbed0cde36ea1b49a43efd16c03141d63baa26b440ddfeb39dea04313467077353c5ac6b8b75307bb64ea0c09fe456933
+MISC metadata.xml 3929 BLAKE2B f533869f9fcc3d20e2851f7cfdd69b4be1bc3f322c543f640a6e29a0c67971abb4f4af79ee85258bdc4800259cb65d011901b1b391f88b324326c4fec6649f1a SHA512 4fdd2b48706c3bb9b2fe8ae8fde8093ed741a7e1eca22f4a96ee684171fad73ae346c2b1f429e89d1e6898a919fef7e733d2db322c30104dc71b056c2f0eb721
diff --git a/dev-lang/php/files/bug81656-gcc-11.patch b/dev-lang/php/files/bug81656-gcc-11.patch
deleted file mode 100644
index 8dfe1deb2b33..000000000000
--- a/dev-lang/php/files/bug81656-gcc-11.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From bb00a649e0c1ac57718cd9971e7e6f933cb2dadd Mon Sep 17 00:00:00 2001
-From: Michael Wallner <mike@php.net>
-Date: Thu, 25 Nov 2021 07:43:14 +0100
-Subject: [PATCH] fix #81656: GCC-11 silently ignores -R
-
----
- build/php.m4 | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/build/php.m4 b/build/php.m4
-index 3af2b8b72d47..4697c5df9274 100644
---- a/build/php.m4
-+++ b/build/php.m4
-@@ -279,25 +279,25 @@ dnl
- dnl Checks for -R, etc. switch.
- dnl
- AC_DEFUN([PHP_RUNPATH_SWITCH],[
--AC_MSG_CHECKING([if compiler supports -R])
--AC_CACHE_VAL(php_cv_cc_dashr,[
-+AC_MSG_CHECKING([if compiler supports -Wl,-rpath,])
-+AC_CACHE_VAL(php_cv_cc_rpath,[
-   SAVE_LIBS=$LIBS
--  LIBS="-R /usr/$PHP_LIBDIR $LIBS"
--  AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],[php_cv_cc_dashr=yes],[php_cv_cc_dashr=no])
-+  LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS"
-+  AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],[php_cv_cc_rpath=yes],[php_cv_cc_rpath=no])
-   LIBS=$SAVE_LIBS])
--AC_MSG_RESULT([$php_cv_cc_dashr])
--if test $php_cv_cc_dashr = "yes"; then
--  ld_runpath_switch=-R
-+AC_MSG_RESULT([$php_cv_cc_rpath])
-+if test $php_cv_cc_rpath = "yes"; then
-+  ld_runpath_switch=-Wl,-rpath,
- else
--  AC_MSG_CHECKING([if compiler supports -Wl,-rpath,])
--  AC_CACHE_VAL(php_cv_cc_rpath,[
-+  AC_MSG_CHECKING([if compiler supports -R])
-+  AC_CACHE_VAL(php_cv_cc_dashr,[
-     SAVE_LIBS=$LIBS
--    LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS"
--    AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],[php_cv_cc_rpath=yes],[php_cv_cc_rpath=no])
-+    LIBS="-R /usr/$PHP_LIBDIR $LIBS"
-+    AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],[php_cv_cc_dashr=yes],[php_cv_cc_dashr=no])
-     LIBS=$SAVE_LIBS])
--  AC_MSG_RESULT([$php_cv_cc_rpath])
--  if test $php_cv_cc_rpath = "yes"; then
--    ld_runpath_switch=-Wl,-rpath,
-+  AC_MSG_RESULT([$php_cv_cc_dashr])
-+  if test $php_cv_cc_dashr = "yes"; then
-+    ld_runpath_switch=-R
-   else
-     dnl Something innocuous.
-     ld_runpath_switch=-L
diff --git a/dev-lang/php/files/php-7.4.33-CVE-2022-31631.patch b/dev-lang/php/files/php-7.4.33-CVE-2022-31631.patch
deleted file mode 100644
index 6aa309549c88..000000000000
--- a/dev-lang/php/files/php-7.4.33-CVE-2022-31631.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 921b6813da3237a83e908998483f46ae3d8bacba Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Mon, 31 Oct 2022 17:20:23 +0100
-Subject: [PATCH] Fix #81740: PDO::quote() may return unquoted string
-
-`sqlite3_snprintf()` expects its first parameter to be `int`; we need
-to avoid overflow.
----
- ext/pdo_sqlite/sqlite_driver.c     |  3 +++
- ext/pdo_sqlite/tests/bug81740.phpt | 17 +++++++++++++++++
- 2 files changed, 20 insertions(+)
- create mode 100644 ext/pdo_sqlite/tests/bug81740.phpt
-
-diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c
-index 4233ff10ff2e..5a72a1eda23f 100644
---- a/ext/pdo_sqlite/sqlite_driver.c
-+++ b/ext/pdo_sqlite/sqlite_driver.c
-@@ -232,6 +232,9 @@ static char *pdo_sqlite_last_insert_id(pdo_dbh_t *dbh, const char *name, size_t
- /* NB: doesn't handle binary strings... use prepared stmts for that */
- static int sqlite_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, size_t unquotedlen, char **quoted, size_t *quotedlen, enum pdo_param_type paramtype )
- {
-+	if (unquotedlen > (INT_MAX - 3) / 2) {
-+		return 0;
-+	}
- 	*quoted = safe_emalloc(2, unquotedlen, 3);
- 	sqlite3_snprintf(2*unquotedlen + 3, *quoted, "'%q'", unquoted);
- 	*quotedlen = strlen(*quoted);
-diff --git a/ext/pdo_sqlite/tests/bug81740.phpt b/ext/pdo_sqlite/tests/bug81740.phpt
-new file mode 100644
-index 000000000000..99fb07c3048b
---- /dev/null
-+++ b/ext/pdo_sqlite/tests/bug81740.phpt
-@@ -0,0 +1,17 @@
-+--TEST--
-+Bug #81740 (PDO::quote() may return unquoted string)
-+--SKIPIF--
-+<?php
-+if (!extension_loaded('pdo_sqlite')) print 'skip not loaded';
-+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-+?>
-+--INI--
-+memory_limit=-1
-+--FILE--
-+<?php
-+$pdo = new PDO("sqlite::memory:");
-+$string = str_repeat("a", 0x80000000);
-+var_dump($pdo->quote($string));
-+?>
-+--EXPECT--
-+bool(false)
diff --git a/dev-lang/php/files/php-7.4.33-CVE-2023-0567.patch b/dev-lang/php/files/php-7.4.33-CVE-2023-0567.patch
deleted file mode 100644
index a0e72f380089..000000000000
--- a/dev-lang/php/files/php-7.4.33-CVE-2023-0567.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff --git a/ext/standard/crypt_blowfish.c b/ext/standard/crypt_blowfish.c
-index 3806a290aee4..351d40308089 100644
---- a/ext/standard/crypt_blowfish.c
-+++ b/ext/standard/crypt_blowfish.c
-@@ -371,7 +371,6 @@ static const unsigned char BF_atoi64[0x60] = {
- #define BF_safe_atoi64(dst, src) \
- { \
- 	tmp = (unsigned char)(src); \
--	if (tmp == '$') break; /* PHP hack */ \
- 	if ((unsigned int)(tmp -= 0x20) >= 0x60) return -1; \
- 	tmp = BF_atoi64[tmp]; \
- 	if (tmp > 63) return -1; \
-@@ -399,13 +398,6 @@ static int BF_decode(BF_word *dst, const char *src, int size)
- 		*dptr++ = ((c3 & 0x03) << 6) | c4;
- 	} while (dptr < end);
- 
--	if (end - dptr == size) {
--		return -1;
--	}
--
--	while (dptr < end) /* PHP hack */
--		*dptr++ = 0;
--
- 	return 0;
- }
- 
-diff --git a/ext/standard/tests/crypt/bcrypt_salt_dollar.phpt b/ext/standard/tests/crypt/bcrypt_salt_dollar.phpt
-new file mode 100644
-index 000000000000..32e335f4b087
---- /dev/null
-+++ b/ext/standard/tests/crypt/bcrypt_salt_dollar.phpt
-@@ -0,0 +1,82 @@
-+--TEST--
-+bcrypt correctly rejects salts containing $
-+--FILE--
-+<?php
-+for ($i = 0; $i < 23; $i++) {
-+	$salt = '$2y$04$' . str_repeat('0', $i) . '$';
-+	$result = crypt("foo", $salt);
-+	var_dump($salt);
-+	var_dump($result);
-+	var_dump($result === $salt);
-+}
-+?>
-+--EXPECT--
-+string(8) "$2y$04$$"
-+string(2) "*0"
-+bool(false)
-+string(9) "$2y$04$0$"
-+string(2) "*0"
-+bool(false)
-+string(10) "$2y$04$00$"
-+string(2) "*0"
-+bool(false)
-+string(11) "$2y$04$000$"
-+string(2) "*0"
-+bool(false)
-+string(12) "$2y$04$0000$"
-+string(2) "*0"
-+bool(false)
-+string(13) "$2y$04$00000$"
-+string(2) "*0"
-+bool(false)
-+string(14) "$2y$04$000000$"
-+string(2) "*0"
-+bool(false)
-+string(15) "$2y$04$0000000$"
-+string(2) "*0"
-+bool(false)
-+string(16) "$2y$04$00000000$"
-+string(2) "*0"
-+bool(false)
-+string(17) "$2y$04$000000000$"
-+string(2) "*0"
-+bool(false)
-+string(18) "$2y$04$0000000000$"
-+string(2) "*0"
-+bool(false)
-+string(19) "$2y$04$00000000000$"
-+string(2) "*0"
-+bool(false)
-+string(20) "$2y$04$000000000000$"
-+string(2) "*0"
-+bool(false)
-+string(21) "$2y$04$0000000000000$"
-+string(2) "*0"
-+bool(false)
-+string(22) "$2y$04$00000000000000$"
-+string(2) "*0"
-+bool(false)
-+string(23) "$2y$04$000000000000000$"
-+string(2) "*0"
-+bool(false)
-+string(24) "$2y$04$0000000000000000$"
-+string(2) "*0"
-+bool(false)
-+string(25) "$2y$04$00000000000000000$"
-+string(2) "*0"
-+bool(false)
-+string(26) "$2y$04$000000000000000000$"
-+string(2) "*0"
-+bool(false)
-+string(27) "$2y$04$0000000000000000000$"
-+string(2) "*0"
-+bool(false)
-+string(28) "$2y$04$00000000000000000000$"
-+string(2) "*0"
-+bool(false)
-+string(29) "$2y$04$000000000000000000000$"
-+string(2) "*0"
-+bool(false)
-+string(30) "$2y$04$0000000000000000000000$"
-+string(60) "$2y$04$000000000000000000000u2a2UpVexIt9k3FMJeAVr3c04F5tcI8K"
-+bool(false)
diff --git a/dev-lang/php/files/php-7.4.33-CVE-2023-0568.patch b/dev-lang/php/files/php-7.4.33-CVE-2023-0568.patch
deleted file mode 100644
index 67c172ae214f..000000000000
--- a/dev-lang/php/files/php-7.4.33-CVE-2023-0568.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a92acbad873a05470af1a47cb785a18eadd827b5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= <tim@bastelstu.be>
-Date: Mon, 23 Jan 2023 22:13:57 +0100
-Subject: [PATCH] crypt: Fix possible buffer overread in php_crypt()
-
----
- ext/standard/crypt.c                                   | 1 +
- ext/standard/tests/password/password_bcrypt_short.phpt | 8 ++++++++
- 2 files changed, 9 insertions(+)
- create mode 100644 ext/standard/tests/password/password_bcrypt_short.phpt
-
-diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
-index 8c105cf910e8..8316c8b96063 100644
---- a/ext/standard/crypt.c
-+++ b/ext/standard/crypt.c
-@@ -135,6 +135,7 @@ PHPAPI zend_string *php_crypt(const char *password, const int pass_len, const ch
- 		} else if (
- 				salt[0] == '$' &&
- 				salt[1] == '2' &&
-+				salt[2] != 0 &&
- 				salt[3] == '$') {
- 			char output[PHP_MAX_SALT_LEN + 1];
- 
-diff --git a/ext/standard/tests/password/password_bcrypt_short.phpt b/ext/standard/tests/password/password_bcrypt_short.phpt
-new file mode 100644
-index 000000000000..085bc8a23904
---- /dev/null
-+++ b/ext/standard/tests/password/password_bcrypt_short.phpt
-@@ -0,0 +1,8 @@
-+--TEST--
-+Test that password_hash() does not overread buffers when a short hash is passed
-+--FILE--
-+<?php
-+var_dump(password_verify("foo", '$2'));
-+?>
-+--EXPECT--
-+bool(false)
diff --git a/dev-lang/php/files/php-7.4.33-CVE-2023-0662.patch b/dev-lang/php/files/php-7.4.33-CVE-2023-0662.patch
deleted file mode 100644
index a6de37c27305..000000000000
--- a/dev-lang/php/files/php-7.4.33-CVE-2023-0662.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/main/main.c b/main/main.c
-index 40684f32dc14..c58ea58bf5ac 100644
---- a/main/main.c
-+++ b/main/main.c
-@@ -836,6 +836,7 @@ PHP_INI_BEGIN()
- 	PHP_INI_ENTRY("disable_functions",			"",			PHP_INI_SYSTEM,		NULL)
- 	PHP_INI_ENTRY("disable_classes",			"",			PHP_INI_SYSTEM,		NULL)
- 	PHP_INI_ENTRY("max_file_uploads",			"20",			PHP_INI_SYSTEM|PHP_INI_PERDIR,		NULL)
-+	PHP_INI_ENTRY("max_multipart_body_parts",	"-1",			PHP_INI_SYSTEM|PHP_INI_PERDIR,		NULL)
- 
- 	STD_PHP_INI_BOOLEAN("allow_url_fopen",		"1",		PHP_INI_SYSTEM,		OnUpdateBool,		allow_url_fopen,		php_core_globals,		core_globals)
- 	STD_PHP_INI_BOOLEAN("allow_url_include",	"0",		PHP_INI_SYSTEM,		OnUpdateBool,		allow_url_include,		php_core_globals,		core_globals)
-diff --git a/main/rfc1867.c b/main/rfc1867.c
-index b43cfae5a1e2..3086e8da3dbe 100644
---- a/main/rfc1867.c
-+++ b/main/rfc1867.c
-@@ -694,6 +694,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
- 	void *event_extra_data = NULL;
- 	unsigned int llen = 0;
- 	int upload_cnt = INI_INT("max_file_uploads");
-+	int body_parts_cnt = INI_INT("max_multipart_body_parts");
- 	const zend_encoding *internal_encoding = zend_multibyte_get_internal_encoding();
- 	php_rfc1867_getword_t getword;
- 	php_rfc1867_getword_conf_t getword_conf;
-@@ -715,6 +716,11 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
- 		return;
- 	}
- 
-+	if (body_parts_cnt < 0) {
-+		body_parts_cnt = PG(max_input_vars) + upload_cnt;
-+	}
-+	int body_parts_limit = body_parts_cnt;
-+
- 	/* Get the boundary */
- 	boundary = strstr(content_type_dup, "boundary");
- 	if (!boundary) {
-@@ -799,6 +805,11 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
- 			char *pair = NULL;
- 			int end = 0;
- 
-+			if (--body_parts_cnt < 0) {
-+				php_error_docref(NULL, E_WARNING, "Multipart body parts limit exceeded %d. To increase the limit change max_multipart_body_parts in php.ini.", body_parts_limit);
-+				goto fileupload_done;
-+			}
-+
- 			while (isspace(*cd)) {
- 				++cd;
- 			}
diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index 5783b3b852f7..99d06f8f9319 100644
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -67,9 +67,6 @@
     <flag name="jit">
       Enable PCRE JIT support
     </flag>
-    <flag name="json">
-      Enable the JavaScript Object Notation extension
-    </flag>
     <flag name="ldap-sasl">
       Add SASL support for the PHP LDAP extension using
       <pkg>dev-libs/cyrus-sasl</pkg>
diff --git a/dev-lang/php/php-7.4.33-r4.ebuild b/dev-lang/php/php-7.4.33-r4.ebuild
deleted file mode 100644
index 7fbca4442887..000000000000
--- a/dev-lang/php/php-7.4.33-r4.ebuild
+++ /dev/null
@@ -1,749 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_rc/RC}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
-	enchant exif ffi +fileinfo +filter firebird
-	+flatfile ftp gd gdbm gmp +iconv imap inifile
-	intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-# The Oracle instant client provides its own incompatible ldap library.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	!cli? ( ?? ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	xmlrpc? ( xml iconv )
-	xmlreader? ( xml )
-	xmlwriter? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	oci8-instant-client? ( !ldap )
-	qdbm? ( !gdbm )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-	firebird? ( pdo )
-	mssql? ( pdo )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre2-10.30[jit?,unicode]
-	fpm? ( acl? ( sys-apps/acl ) )
-	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
-	argon2? ( app-crypt/argon2:= )
-	berkdb? ( || (  sys-libs/db:5.3 sys-libs/db:4.8 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( <app-text/enchant-2.0:0 )
-	ffi? ( >=dev-libs/libffi-3.0.11:= )
-	firebird? ( dev-db/firebird )
-	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( net-libs/c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11:= )
-	ldap-sasl? ( dev-libs/cyrus-sasl )
-	libedit? ( dev-libs/libedit )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
-	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	session-mm? ( dev-libs/mm )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	sodium? ( dev-libs/libsodium:=[-minimal] )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( <dev-libs/openssl-3.0:= )
-	tidy? ( app-text/htmltidy )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.7.6 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt )
-	zip? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-PHP_MV="$(ver_cut 1)"
-
-PATCHES=(
-	"${FILESDIR}"/php-iodbc-header-location.patch
-	"${FILESDIR}"/bug81656-gcc-11.patch
-)
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "../ext/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Emulate buildconf to support cross-compilation
-	rm -fr aclocal.m4 autom4te.cache config.cache \
-		configure main/php_config.h.in || die
-	eautoconf --force
-	eautoheader
-}
-
-src_configure() {
-	filter-lto # bug 855644
-
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		--without-valgrind
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype)
-		$(use_with curl)
-		$(use_enable xml dom)
-		$(use_with enchant)
-		$(use_enable exif)
-		$(use_with ffi)
-		$(use_enable fileinfo)
-		$(use_enable filter)
-		$(use_enable ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl)
-		$(use_enable ipv6)
-		$(use_enable json)
-		$(use_with kerberos)
-		$(use_with xml libxml)
-		$(use_enable unicode mbstring)
-		$(use_with ssl openssl)
-		$(use_enable pcntl)
-		$(use_enable phar)
-		$(use_enable pdo)
-		$(use_enable opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_enable simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap)
-		$(use_enable sockets)
-		$(use_with sodium)
-		$(use_with sqlite sqlite3)
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer)
-		$(use_enable xml)
-		$(use_enable xmlreader)
-		$(use_enable xmlwriter)
-		$(use_with xmlrpc)
-		$(use_with xslt xsl)
-		$(use_with zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype)
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg)
-		$(use_with xpm)
-		$(use_with webp)
-	)
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_enable gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl)
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	if use odbc && use iodbc ; then
-		our_conf+=(
-			--without-unixODBC
-			--with-iodbc
-			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
-		)
-	elif use odbc ; then
-		our_conf+=(
-			--with-unixODBC="${EPREFIX}/usr"
-			--without-iodbc
-			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
-		)
-	else
-		our_conf+=(
-			--without-unixODBC
-			--without-iodbc
-			--without-pdo-odbc
-		)
-	fi
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite)
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit)
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-external-pcre affects ext/pcre
-	our_conf+=(
-		--with-external-pcre
-		$(use_with jit pcre-jit)
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	local one_sapi
-	local sapi
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	local sapi
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi="", sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						# Install the "phar" archive utility.
-						if use phar ; then
-							emake INSTALL_ROOT="${D}" install-pharcmd
-							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
-						fi
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	local m
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.4.33-r5.ebuild b/dev-lang/php/php-7.4.33-r5.ebuild
deleted file mode 100644
index f59fb3340890..000000000000
--- a/dev-lang/php/php-7.4.33-r5.ebuild
+++ /dev/null
@@ -1,753 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_rc/RC}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
-	enchant exif ffi +fileinfo +filter firebird
-	+flatfile ftp gd gdbm gmp +iconv imap inifile
-	intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-# The Oracle instant client provides its own incompatible ldap library.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	!cli? ( ?? ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	xmlrpc? ( xml iconv )
-	xmlreader? ( xml )
-	xmlwriter? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	oci8-instant-client? ( !ldap )
-	qdbm? ( !gdbm )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-	firebird? ( pdo )
-	mssql? ( pdo )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre2-10.30[jit?,unicode]
-	fpm? ( acl? ( sys-apps/acl ) )
-	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
-	argon2? ( app-crypt/argon2:= )
-	berkdb? ( || (  sys-libs/db:5.3 sys-libs/db:4.8 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( <app-text/enchant-2.0:0 )
-	ffi? ( >=dev-libs/libffi-3.0.11:= )
-	firebird? ( dev-db/firebird )
-	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( net-libs/c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11:= )
-	ldap-sasl? ( dev-libs/cyrus-sasl )
-	libedit? ( dev-libs/libedit )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
-	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	session-mm? ( dev-libs/mm )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	sodium? ( dev-libs/libsodium:=[-minimal] )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( <dev-libs/openssl-3.0:= )
-	tidy? ( app-text/htmltidy )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.7.6 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt )
-	zip? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-PHP_MV="$(ver_cut 1)"
-
-PATCHES=(
-	"${FILESDIR}"/php-iodbc-header-location.patch
-	"${FILESDIR}"/bug81656-gcc-11.patch
-	"${FILESDIR}"/php-7.4.33-CVE-2022-31631.patch
-	"${FILESDIR}"/php-7.4.33-CVE-2023-0567.patch
-	"${FILESDIR}"/php-7.4.33-CVE-2023-0568.patch
-	"${FILESDIR}"/php-7.4.33-CVE-2023-0662.patch
-)
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "../ext/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Emulate buildconf to support cross-compilation
-	rm -fr aclocal.m4 autom4te.cache config.cache \
-		configure main/php_config.h.in || die
-	eautoconf --force
-	eautoheader
-}
-
-src_configure() {
-	filter-lto # bug 855644
-
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		--without-valgrind
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype)
-		$(use_with curl)
-		$(use_enable xml dom)
-		$(use_with enchant)
-		$(use_enable exif)
-		$(use_with ffi)
-		$(use_enable fileinfo)
-		$(use_enable filter)
-		$(use_enable ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl)
-		$(use_enable ipv6)
-		$(use_enable json)
-		$(use_with kerberos)
-		$(use_with xml libxml)
-		$(use_enable unicode mbstring)
-		$(use_with ssl openssl)
-		$(use_enable pcntl)
-		$(use_enable phar)
-		$(use_enable pdo)
-		$(use_enable opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_enable simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap)
-		$(use_enable sockets)
-		$(use_with sodium)
-		$(use_with sqlite sqlite3)
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer)
-		$(use_enable xml)
-		$(use_enable xmlreader)
-		$(use_enable xmlwriter)
-		$(use_with xmlrpc)
-		$(use_with xslt xsl)
-		$(use_with zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype)
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg)
-		$(use_with xpm)
-		$(use_with webp)
-	)
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_enable gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl)
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	if use odbc && use iodbc ; then
-		our_conf+=(
-			--without-unixODBC
-			--with-iodbc
-			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
-		)
-	elif use odbc ; then
-		our_conf+=(
-			--with-unixODBC="${EPREFIX}/usr"
-			--without-iodbc
-			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
-		)
-	else
-		our_conf+=(
-			--without-unixODBC
-			--without-iodbc
-			--without-pdo-odbc
-		)
-	fi
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite)
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit)
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-external-pcre affects ext/pcre
-	our_conf+=(
-		--with-external-pcre
-		$(use_with jit pcre-jit)
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	local one_sapi
-	local sapi
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	local sapi
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi="", sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						# Install the "phar" archive utility.
-						if use phar ; then
-							emake INSTALL_ROOT="${D}" install-pharcmd
-							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
-						fi
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	local m
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.4.33-r6.ebuild b/dev-lang/php/php-7.4.33-r6.ebuild
deleted file mode 100644
index 6986b0537557..000000000000
--- a/dev-lang/php/php-7.4.33-r6.ebuild
+++ /dev/null
@@ -1,751 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic systemd autotools
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
-	enchant exif ffi +fileinfo +filter firebird
-	+flatfile ftp gd gdbm gmp +iconv imap inifile
-	intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-# The Oracle instant client provides its own incompatible ldap library.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	!cli? ( ?? ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	xmlrpc? ( xml iconv )
-	xmlreader? ( xml )
-	xmlwriter? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	oci8-instant-client? ( !ldap )
-	qdbm? ( !gdbm )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-	firebird? ( pdo )
-	mssql? ( pdo )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre2-10.30[jit?,unicode]
-	virtual/libcrypt:=
-	fpm? ( acl? ( sys-apps/acl ) )
-	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
-	argon2? ( app-crypt/argon2:= )
-	berkdb? ( || (  sys-libs/db:5.3 sys-libs/db:4.8 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( <app-text/enchant-2.0:0 )
-	ffi? ( >=dev-libs/libffi-3.0.11:= )
-	firebird? ( dev-db/firebird )
-	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( net-libs/c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11:= )
-	ldap-sasl? ( dev-libs/cyrus-sasl )
-	libedit? ( dev-libs/libedit )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
-	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	session-mm? ( dev-libs/mm )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	sodium? ( dev-libs/libsodium:=[-minimal] )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( <dev-libs/openssl-3.0:= )
-	tidy? ( app-text/htmltidy )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.7.6 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt )
-	zip? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-PHP_MV="$(ver_cut 1)"
-
-PATCHES=(
-	"${FILESDIR}"/php-iodbc-header-location.patch
-	"${FILESDIR}"/bug81656-gcc-11.patch
-	"${FILESDIR}"/php-7.4.33-CVE-2022-31631.patch
-	"${FILESDIR}"/php-7.4.33-CVE-2023-0567.patch
-	"${FILESDIR}"/php-7.4.33-CVE-2023-0568.patch
-	"${FILESDIR}"/php-7.4.33-CVE-2023-0662.patch
-)
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "../ext/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Emulate buildconf to support cross-compilation
-	rm -fr aclocal.m4 autom4te.cache config.cache \
-		configure main/php_config.h.in || die
-	eautoconf --force
-	eautoheader
-}
-
-src_configure() {
-	filter-lto # bug 855644
-
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		--without-valgrind
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype)
-		$(use_with curl)
-		$(use_enable xml dom)
-		$(use_with enchant)
-		$(use_enable exif)
-		$(use_with ffi)
-		$(use_enable fileinfo)
-		$(use_enable filter)
-		$(use_enable ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl)
-		$(use_enable ipv6)
-		$(use_enable json)
-		$(use_with kerberos)
-		$(use_with xml libxml)
-		$(use_enable unicode mbstring)
-		$(use_with ssl openssl)
-		$(use_enable pcntl)
-		$(use_enable phar)
-		$(use_enable pdo)
-		$(use_enable opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_enable simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap)
-		$(use_enable sockets)
-		$(use_with sodium)
-		$(use_with sqlite sqlite3)
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer)
-		$(use_enable xml)
-		$(use_enable xmlreader)
-		$(use_enable xmlwriter)
-		$(use_with xmlrpc)
-		$(use_with xslt xsl)
-		$(use_with zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype)
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg)
-		$(use_with xpm)
-		$(use_with webp)
-	)
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_enable gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl)
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	if use odbc && use iodbc ; then
-		our_conf+=(
-			--without-unixODBC
-			--with-iodbc
-			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
-		)
-	elif use odbc ; then
-		our_conf+=(
-			--with-unixODBC="${EPREFIX}/usr"
-			--without-iodbc
-			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
-		)
-	else
-		our_conf+=(
-			--without-unixODBC
-			--without-iodbc
-			--without-pdo-odbc
-		)
-	fi
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite)
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit)
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-external-pcre affects ext/pcre
-	our_conf+=(
-		--with-external-pcre
-		$(use_with jit pcre-jit)
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	local one_sapi
-	local sapi
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	local sapi
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi="", sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						# Install the "phar" archive utility.
-						if use phar ; then
-							emake INSTALL_ROOT="${D}" install-pharcmd
-							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
-						fi
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	local m
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 37b61a756b6a..701027f4b898 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest
index fec636d6ec4b..4cac19bbb7ca 100644
--- a/dev-libs/libstrophe/Manifest
+++ b/dev-libs/libstrophe/Manifest
@@ -3,5 +3,5 @@ DIST libstrophe-0.12.2.tar.xz 400092 BLAKE2B 28b655e4bf3a279f837fd26e7c7ba34cd32
 DIST libstrophe-0.12.3.tar.xz 399056 BLAKE2B 9e7e344d46c78393ee2386a842895e29c417eeffbf41bd2e1c775f16bd40cb2387b59e56955a5331242af74932f61abb8afec2bda49c97063689b976b4892a52 SHA512 fa0fcb91c47197391f3b7f186b49ca4921f1937e2d1c9d25afdb73ee766bbeae5efbdeddde9cb6361eb58997c2fb136e2c1ed73a62f8c5618805a9555c473e0b
 DIST libstrophe-fix-configure-bashisms.patch 1274 BLAKE2B d9308e2687eab255f94ac2b0e030f4d0424e56c3d129f544eb75fb25addf57485de0e210afe12bad29d3b92db6bf4e7400c4152707f6316921a1f2d4aa1b9367 SHA512 a2fdea484ba4e5bce4982ae5d5699df6bf2169027e7f62865baa7a7049a264d16a9dcda05826bbd942a1cc256e8559c6dfb6883913edf7f4711f5ce2601b83c5
 EBUILD libstrophe-0.12.2.ebuild 1516 BLAKE2B b6d288af1ba33da119fb36a9d881b74103d29e3fb6c0a981eb55258be8a684c9cb522d980266446ace28833aa85a44f97776c4e7206a7d69431eb3057d1452ba SHA512 cd95366161631bfcfb24b70814bc84dba62915b020ed57b0d5fdc326d0933c35adc6eb3d6e0b5c076ff2a991b00b6afd04e5602d194ea4d2b19f48a8c7867a29
-EBUILD libstrophe-0.12.3.ebuild 1274 BLAKE2B 66c269e2ef8b4aed8bc65e84868fb73b3e5c489b22b8eca825be8f35739d4451962bca165243e8381a80baa5d6137097b38abf94e1ec9b711312409908d2a020 SHA512 3568bb705dd19ca13d5657b18048c2cd1166348d400e78af05202996789b3cfec409b630442c2eaca8eb592b02ccbcce4f3ea2156c5461d37deea51bfccdf1e7
+EBUILD libstrophe-0.12.3.ebuild 1273 BLAKE2B a0acf1c02c3ec4f3a4728476b98da32f2503de9614dd352456a95f5918c7bb32e70c30efdec4ed183650f2017d6d31c740ff88fde6e1b30bd0894b9ffa394a69 SHA512 86935ba23f329bc4d4bb7eaa73a754be02517b013176b5440632a6893675c36a9ddfb88bce5318dbbfc2626f7b148b0b9ced27c68a240253f345e80f19f1ba2d
 MISC metadata.xml 711 BLAKE2B 0fc95d72ff0d9dbf1765e8b2ddf7182d6543cecdd275798e79ad8bdf8bc494234f6fcd8acc76c6d3e87f6f4159d4b0ea0e70706932628173b1b75bed6c788701 SHA512 d8eb8fcbadee45ff2d411d766e3fba2afb18b2516eb4172ff2b072ef9b5469d7a92c32a4b70e989fd0b56eeaaad39d5f187748f7aedc6dca32493b1f2d0ca817
diff --git a/dev-libs/libstrophe/libstrophe-0.12.3.ebuild b/dev-libs/libstrophe/libstrophe-0.12.3.ebuild
index b469005aab46..91a9e0077adc 100644
--- a/dev-libs/libstrophe/libstrophe-0.12.3.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.12.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 LICENSE="|| ( MIT GPL-3 )"
 # Subslot: ${SONAME}.1 to differentiate from previous versions without SONAME
 SLOT="0/0.1"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="doc expat gnutls"
 
 RDEPEND="
diff --git a/dev-libs/redland-bindings/Manifest b/dev-libs/redland-bindings/Manifest
index c0a353e74d59..0c033b888d0b 100644
--- a/dev-libs/redland-bindings/Manifest
+++ b/dev-libs/redland-bindings/Manifest
@@ -1,6 +1,4 @@
-AUX redland-bindings-1.0.17.1-add-PHP7-support.patch 2359 BLAKE2B 04cc1122a8a22627ea49bd46b7600c9d289847a97f428abdc036c8647d23a5e70848d97db678c38872c841183dd871a00252c7949ca0c39920c15514d96e6eb1 SHA512 c18d8a4dbad433d96d396e1065c60fe85c1c0114adedb4f6151d1aeb65a3fedb5a2b94eb2e2a1e1b272c79e65ddd2d9128ee098d133e66452ae7fead62b73892
 AUX redland-bindings-1.0.17.1-bool.patch 502 BLAKE2B 09ab5d8b5b3cf2edd046830bbc88a275c2df804dbb9e09a411bada838afd7f30c592dc48f02995752822a5d738af35c208f124c9d9d008cbff3395bbcfd7b404 SHA512 158e06e58ad66ca88ac8eb4646df0628f423de8d22638e78a737be3ea12fd123fd3bcf63b75478ff7f82ec3b444773a2e8d467fd737b8de0ae9143ef79e60a65
-AUX redland-bindings-1.0.17.1-php-config-r1.patch 2249 BLAKE2B 83d9a65d6db9411531b827d25aaaec721b6756c4a5503179a477fa3d452fff4deaa1fdcaa78c66f5cef0b4cb0d36e06a89050e520a2e0fd36694121eb8a71669 SHA512 406e0d0d97c7c181a16c2a72ec291582ada1c1dbec1cdb53ca62ec73f954a1116462b97f3cf85ada4adfc4ebff35081ac4ce0ce9e2b7155e61402dbb64f57c20
 DIST redland-bindings-1.0.17.1.tar.gz 933290 BLAKE2B f58524c30958200af1fb3ec0f63b8aa9f3fd2120297321299cdd225ff9eb331f385c4418ed25987b955857e5046b5c6f0589210b807aae0dc6abe0b758d48cfc SHA512 c105d1232555d226d98efdc1e4edc1b6c953fdd004804e40926452b8f91d30159319a50af68fc3cfe242cf180d85383ef3ff925cc65ed5d0652096cc51f4d7c0
-EBUILD redland-bindings-1.0.17.1-r101.ebuild 3772 BLAKE2B 6c9546060d557a9e1b5b1bf54390cbe28c782b3561332bcc93f074685710548ea2356d1c6dc8fae9d11a4d389d27e12e66b1b9528a62ad430881ee53d3d60cd6 SHA512 3f7e1671a89df02c74336f9d71100ee4cdc7379017230a4282b5f47dc1c84945bf780a50bb4aa1f1dcb55080a547b4cc46a7d2dc63227c1037588852652281ba
+EBUILD redland-bindings-1.0.17.1-r101.ebuild 2758 BLAKE2B 8e9db3e2981b3373a18136035fee21eec310a3d212510c57fbbd2e81c139265d55a490528290456a54cef2772a958f662c25c0f5286cd1ecff2d25f4a633724a SHA512 864cf4a7c965498cbae0ccd80817b58cd70016128bd01478d79158b2ce45aa7729949e5b55294c10889a8f80779ed52cee2625165a20ae0114ef000dd7a3f428
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-add-PHP7-support.patch b/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-add-PHP7-support.patch
deleted file mode 100644
index af8e3d560d7b..000000000000
--- a/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-add-PHP7-support.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Origin: Based on patch from Petr Písař <ppisar@redhat.com>
-Date: Tue, 13 Jun 2017 15:29:15 +0200
-
---- a/php/redland-post.i
-+++ b/php/redland-post.i
-@@ -132,8 +132,11 @@ librdf_php_world_init(void)
-     exception_ce = zend_exception_get_default();
-     INIT_CLASS_ENTRY(ee_ce, "RedlandException", NULL);
-     redland_exception_ptr = zend_register_internal_class_ex(&ee_ce, 
--                                                            exception_ce, 
--                                                            NULL TSRMLS_CC);
-+                                                            exception_ce
-+#if PHP_MAJOR_VERSION < 7
-+                                                            ,NULL TSRMLS_CC
-+#endif
-+                                                            );
- #endif
- 
-     memset(&librdf_php_locator, '\0', sizeof(raptor_locator));
---- a/php/redland-typemap.i
-+++ b/php/redland-typemap.i
-@@ -1,17 +1,17 @@
--%typemap(in) librdf_uri* %{
--  if(SWIG_ConvertPtr(*$input, (void **) &$1, SWIGTYPE_p_librdf_uri_s, 0) < 0) {
-+%typemap(in) librdf_uri %{
-+  if(SWIG_ConvertPtr($input, (void **) &$1, SWIGTYPE_p_librdf_uri_s, 0) < 0) {
-     /* Allow NULL from php for librdf_uri* */
--    if ((*$input)->type==IS_NULL)
-+    if ($input->type==IS_NULL)
-       $1=NULL;
-    else
-       SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $1_descriptor");
-   }
- %}
- 
--%typemap(in) librdf_node* %{
--  if(SWIG_ConvertPtr(*$input, (void **) &$1, SWIGTYPE_p_librdf_node_s, 0) < 0) {
-+%typemap(in) librdf_node %{
-+  if(SWIG_ConvertPtr($input, (void **) &$1, SWIGTYPE_p_librdf_node_s, 0) < 0) {
-     /* Allow NULL from php for librdf_node* */
--    if ((*$input)->type==IS_NULL)
-+    if ($input->type==IS_NULL)
-       $1=NULL;
-    else
-       SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $1_descriptor");
- 
---- a/php/test.php
-+++ b/php/test.php
-@@ -26,11 +26,9 @@
- /* ------------------------------------------------------------------------ */
-
- print "Testing Redland...\n";
--$dlls = array("redland.so", "php_redland.dll", "redland.dylib", "redland.bundle");
--foreach ($dlls as $dll) {
--  if(file_exists($dll)) {
--    dl($dll);
--  }
-+if (extension_loaded('redland') !== true) {
-+    print "Redland extension not loaded. Cannot run tests!" . PHP_EOL;
-+    exit(1);
- }
-
- $world=librdf_php_get_world();
- 
diff --git a/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-php-config-r1.patch b/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-php-config-r1.patch
deleted file mode 100644
index 8f8dd409c0d3..000000000000
--- a/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-php-config-r1.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -58,7 +58,6 @@ AC_CHECK_PROGS(TAR, gnutar gtar tar)
- AC_CHECK_PROGS(LUA, lua)
- AC_CHECK_PROGS(PYTHON, python)
- AC_CHECK_PROGS(PERL, perl)
--AC_CHECK_PROGS(PHP, php)
- AC_CHECK_PROGS(RUBY, ruby)
- AC_CHECK_PROGS(SWIG, swig)
- # Gnome
-@@ -153,15 +152,28 @@ if test "X$LUA_VERSION" != X; then
-   fi
- fi
- 
-+dnl Find php-config script.
-+AC_ARG_WITH([php-config],
-+  [AS_HELP_STRING([--with-php-config=PATH], [Path to php-config [php-config]])],
-+  [with_php_config=${withval}],
-+  [with_php_config=php-config])
-+
-+if test "${with_php_config}" = "php-config"; then
-+  AC_CHECK_PROG(PHP_CONFIG, php-config, php-config)
-+elif test -x "${with_php_config}"; then
-+  PHP_CONFIG=${with_php_config}
-+  AC_SUBST(PHP_CONFIG)
-+  AC_MSG_NOTICE([found ${PHP_CONFIG}])
-+fi
- 
--AC_CHECK_PROG(PHP_CONFIG, php-config, php-config)
- if test "X$PHP_CONFIG" != X ; then
-+  PHP_VERSION=`${PHP_CONFIG} --version`
-+  PHP_INCLUDES=`${PHP_CONFIG} --includes`
-+  PHP_EXTENSION_DIR=`${PHP_CONFIG} --extension-dir`
- 
--  PHP_VERSION=`$PHP_CONFIG --version`
--  PHP_INCLUDES=`$PHP_CONFIG --includes`
--  PHP_EXTENSION_DIR=`$PHP_CONFIG --extension-dir`
--
--  if test $PHP_VERSION '>' 5.0.0; then
-+  if test $PHP_VERSION '>' 7; then
-+    PHP_SWIG="-php7"
-+  elif test $PHP_VERSION '>' 5.0.0; then
-     PHP_SWIG="-php5"
-   else
-     PHP_SWIG="-php4"
-@@ -200,6 +212,8 @@ if test "X$PHP_CONFIG" != X ; then
-   AC_MSG_RESULT(compile '$PHP_CFLAGS' link '$PHP_LDFLAGS' suffix $PHP_SO_SUFFIX)
- 
- else
-+  AC_MSG_WARN([php-config not found])
-+
-   # This allows 'make clean' in the php directory to work when
-   # php isn't available
-   PHP=:
-@@ -445,13 +459,17 @@ if test "X$with_php" != Xno ; then
-   with_php=yes
- fi
- 
--PHP_VERSION=`php-config --version 2>/dev/null`
--if test "X$PHP_VERSION" != X; then
--  languages_available="$languages_available php($PHP_VERSION)"
--  if test $with_php = yes; then
--    languages="$languages php"
-+if test "X${PHP_VERSION}" != "X"; then
-+  languages_available="$languages_available php(${PHP_VERSION})"
-+fi
-+
-+if test ${with_php} = yes; then
-+  if test "X${PHP_VERSION}" = "X"; then
-+    AC_MSG_ERROR([Failed to detect PHP version])
-   fi
-+  languages="$languages php"
- fi
-+
- AC_MSG_RESULT($with_php)
- AC_SUBST(PHP_VERSION)
- 
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r101.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r101.ebuild
index c230f35c004a..d9633b1acd8a 100644
--- a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r101.ebuild
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r101.ebuild
@@ -6,14 +6,7 @@ EAPI=8
 LUA_COMPAT=( lua5-{1..4} luajit )
 PYTHON_COMPAT=( python3_{9..11} )
 
-USE_PHP="php7-4"
-PHP_EXT_ECONF_ARGS="--with-php=yes --without-lua --without-perl --without-python --without-ruby"
-PHP_EXT_NAME="redland"
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_SKIP_PATCHES="yes"
-PHP_EXT_SKIP_PHPIZE="yes"
-
-inherit lua php-ext-source-r3 python-single-r1 autotools
+inherit lua python-single-r1 autotools
 
 DESCRIPTION="Language bindings for Redland"
 HOMEPAGE="https://librdf.org/bindings/"
@@ -22,7 +15,7 @@ SRC_URI="https://download.librdf.org/source/${P}.tar.gz"
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-linux"
-IUSE="lua perl python php ruby test"
+IUSE="lua perl python ruby test"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
@@ -33,10 +26,7 @@ RDEPEND="dev-libs/redland
 	lua? ( ${LUA_DEPS} )
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby:* dev-ruby/log4r )
-	php? (
-		php_targets_php7-4? ( dev-lang/php:7.4[-threads] )
-	)"
+	ruby? ( dev-lang/ruby:* dev-ruby/log4r )"
 
 DEPEND="${RDEPEND}
 	dev-lang/swig
@@ -46,8 +36,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-bool.patch
-	"${FILESDIR}"/${PN}-1.0.17.1-php-config-r1.patch
-	"${FILESDIR}"/${PN}-1.0.17.1-add-PHP7-support.patch
 )
 
 pkg_setup() {
@@ -63,8 +51,6 @@ src_prepare() {
 	# "error: redland_wrap.c: No such file or directory",
 	# have to copy the sources.
 	use lua && lua_copy_sources
-
-	use php && php-ext-source-r3_src_prepare
 }
 
 lua_src_configure() {
@@ -93,8 +79,6 @@ src_configure() {
 	if use lua; then
 		lua_foreach_impl lua_src_configure
 	fi
-
-	use php && php-ext-source-r3_src_configure
 }
 
 lua_src_compile() {
@@ -113,8 +97,6 @@ src_compile() {
 	if use lua; then
 		lua_foreach_impl lua_src_compile
 	fi
-
-	use php && php-ext-source-r3_src_compile
 }
 
 lua_src_test() {
@@ -133,17 +115,6 @@ src_test() {
 	if use lua; then
 		lua_foreach_impl lua_src_test
 	fi
-
-	if use php ; then
-		local slot
-		for slot in $(php_get_slots) ; do
-			php_init_slot_env "${slot}"
-			cd php || die
-			${PHPCLI} -v
-			${PHPCLI} -d "extension=./${PHP_EXT_NAME}.so" -f test.php || die "PHP tests for ${slot} failed!"
-			cd "${S}" || die
-		done
-	fi
 }
 
 lua_src_install() {
@@ -170,17 +141,6 @@ src_install() {
 
 	use python && python_optimize
 
-	if use php; then
-		local slot
-		for slot in $(php_get_slots); do
-			php_init_slot_env "${slot}"
-			exeinto "${EXT_DIR#$EPREFIX}"
-			doexe "php/${PHP_EXT_NAME}.so"
-		done
-
-		php-ext-source-r3_createinifiles
-	fi
-
 	local DOCS=( AUTHORS ChangeLog NEWS README TODO )
 	local HTML_DOCS=( {NEWS,README,RELEASE,TODO}.html )
 	einstalldocs
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 7ae0763593d3..3dcb4cc86f3b 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PHP_CodeCoverage/Manifest b/dev-php/PHP_CodeCoverage/Manifest
deleted file mode 100644
index c0405137dbe1..000000000000
--- a/dev-php/PHP_CodeCoverage/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PHP_CodeCoverage-7.0.12.tar.gz 237382 BLAKE2B 3051e7e473506a66d7b4720083274f3b3a64b9f480bb1a95682608220d19be60810a899d974ea3189270c0751f8af058f2503ed83c61d92180cbb41708b07536 SHA512 b105672dc50952c3c606010389fd6fb8ebfcbb78d99d72f9a21a1eef045314b0803fdb689bba1314671d0eeab0e5ed00bf416b09ca45d291688f4c59748c2ed1
-EBUILD PHP_CodeCoverage-7.0.12.ebuild 2765 BLAKE2B f6ed0284f90c4caebbe36bf883c63ab6a50f2e5b7d6d88bacaeb63187e9824a06813c4b4a2b1bcadc87ec9f17d5bbd74d054811218de9ac95889ad55abf1ad1a SHA512 c656352bd1dccf0695cd480cd18d628dd40a3567565397a75c9ceb5ae8323b25bbef778859cc8f10c09354f137e82096e7c91a70139836b4389efbdaad046612
-MISC metadata.xml 364 BLAKE2B 14892188c3e699a7b695baba4c55b1ef3157466185e691df938f7d44ec00bb06ef59175695f770b8c7b9a19c5da89700a09f86dfc93def7dd0487e662d5722ec SHA512 2a3f526b3ad8fbcab6386ec83b452a68042278422c3ef402837f30132bed87da938a4f9415b45490c43f59a319fbc3e2a9bd63d9ddf7dd0a0264b89ea2d8f284
diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.12.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.12.ebuild
deleted file mode 100644
index 3bc009200da0..000000000000
--- a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.12.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="php-code-coverage"
-
-USE_PHP="php7-4"
-
-DESCRIPTION="Collection, processing, and rendering for PHP code coverage"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-php/fedora-autoloader
-	>=dev-php/File_Iterator-2.0.2
-	>=dev-php/Text_Template-1.2.1
-	>=dev-php/PHP_TokenStream-3.1.1
-	>=dev-php/sebastian-environment-4.2.2
-	>=dev-php/sebastian-version-2.0.1
-	>=dev-php/sebastian-code-unit-reverse-lookup-1.0.1
-	>=dev-php/theseer-tokenizer-1.1.3
-	>=dev-lang/php-7.2:*[xml(-),xmlwriter(-)]"
-
-BDEPEND="dev-php/theseer-Autoload
-	test? (
-		${CDEPEND}
-		dev-php/phpunit
-	)"
-
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	phpab \
-		--output src/autoload.php \
-		--template fedora2 \
-		--basedir src \
-		src || die
-
-	cat >> src/autoload.php <<EOF || die "failed to extend autoload.php"
-
-// Dependencies
-\Fedora\Autoloader\Dependencies::required([
-	'/usr/share/php/File/Iterator/autoload.php',
-	'/usr/share/php/PHP/Token/autoload.php',
-	'/usr/share/php/SebastianBergmann/Version/autoload.php',
-	'/usr/share/php/SebastianBergmann/Environment/autoload.php',
-	'/usr/share/php/SebastianBergmann/CodeUnitReverseLookup/autoload.php',
-	'/usr/share/php/Text/Template/autoload.php',
-	'/usr/share/php/TheSeer/Tokenizer/autoload.php',
-]);
-EOF
-}
-
-src_install() {
-	insinto /usr/share/php/PHP/CodeCoverage
-	doins -r src/*
-}
-
-src_test() {
-	mkdir vendor || die
-
-	phpab \
-		--output vendor/autoload.php \
-		--template fedora2 \
-		--exclude 'tests/_files/Crash.php' \
-		--exclude 'tests/_files/source*.php' \
-		src \
-		tests \
-		|| die
-
-	cat >> vendor/autoload.php <<EOF || die "failed to extend autoload.php"
-
-// Dependencies
-\Fedora\Autoloader\Dependencies::required([
-	'/usr/share/php/File/Iterator/autoload.php',
-	'/usr/share/php/PHP/Token/autoload.php',
-	'/usr/share/php/SebastianBergmann/Version/autoload.php',
-	'/usr/share/php/SebastianBergmann/Environment/autoload.php',
-	'/usr/share/php/SebastianBergmann/CodeUnitReverseLookup/autoload.php',
-	'/usr/share/php/Text/Template/autoload.php',
-	'/usr/share/php/TheSeer/Tokenizer/autoload.php',
-]);
-EOF
-
-	local target
-	for target in ${USE_PHP//-/.} ; do
-		if [[ -x /usr/bin/${target} ]] ; then
-			${target} /usr/bin/phpunit -c phpunit.xml --no-coverage --verbose || die "tests using ${target} failed"
-		fi
-	done
-}
-
-pkg_postinst() {
-	ewarn "This library now loads via /usr/share/php/PHP/CodeCoverage/autoload.php"
-	ewarn "Please update any scripts to require the autoloader"
-}
diff --git a/dev-php/PHP_CodeCoverage/metadata.xml b/dev-php/PHP_CodeCoverage/metadata.xml
deleted file mode 100644
index 69fd27f3c89d..000000000000
--- a/dev-php/PHP_CodeCoverage/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">sebastianbergmann/php-code-coverage</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-php/PHP_TokenStream/Manifest b/dev-php/PHP_TokenStream/Manifest
deleted file mode 100644
index 039d269fafce..000000000000
--- a/dev-php/PHP_TokenStream/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX autoload-3.1.1.php 2833 BLAKE2B 594aafd23673466891934600e0620437390703a3a3e420c85b5b54de78c0b9a9a4ac39e72103c18e89b5cedb8d8c9c6c2441d6921f0f1034127ee9782967eaac SHA512 26ca45e5761c3a1fc9d89276271763fe5ef5b0c9107978e9e6415d4708da831b1b2f536d642b8e16f8a32cd4247630602d21ef5b5017de6684e8707613625d87
-DIST PHP_TokenStream-3.1.1.tar.gz 14275 BLAKE2B 5300768f79cba17a08f55a58a05744eef55df00fc0f0144612bddd3ba5d0494fe19bd5b74d56b57d345f5d98b63033aa05e6d157c0979be163e51dc7cc5ad19f SHA512 3a1e36d13b8d77d6fe7d1617fc43a8d59b68af6ee6182afdecf5c970c844f7cb63f3056ce7f6aaae17237b948c5ff9862438d823c2eda179e24c1bb4fc4f4e02
-EBUILD PHP_TokenStream-3.1.1.ebuild 1355 BLAKE2B eea837f2fd60cacd8d78326e3a0248465e7d147a94eff1e073190bb43028f3c2ac5c9c28a89d92d7d0c135bdd385e9090854fadcd47b98c63b33deceaae04f4e SHA512 036f161fe26a5364cc90792f7d6a69ec06f7b2a37061d81f5f0300827c7fb6287cd4807537e93244fd2d5606ab6154e1dc0d6a9d711f5ca95100fd1274dec724
-MISC metadata.xml 339 BLAKE2B c8412bdb4fd6eb5abb4aa094c112bd6e7b84b6e908d3bec20e5ee46447f2a437cd21b72b8f4ff1102c88756d578674539e6f51766773bda70406e2dbc3f0936f SHA512 e8d2655de47053d4054e6035d3e49a26a0c94eac3ea0322d792156da7dbf51d1d2a7b2fd69df68262fb199435adca9a917d508ae0fd3f6ba77ef837c257301d4
diff --git a/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild b/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild
deleted file mode 100644
index 3d8abd2336e3..000000000000
--- a/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_PHP="php7-4"
-MY_PN="php-token-stream"
-
-DESCRIPTION="Wrapper around PHP's tokenizer extension"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="test"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-	|| (
-		dev-lang/php:7.2[tokenizer(-)]
-		dev-lang/php:7.3[tokenizer(-)]
-		dev-lang/php:7.4[tokenizer(-)]
-	)"
-BDEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	sed -i -e 's/setUp()/setUp():void/' tests/Token/*.php || die
-	default
-}
-
-src_install() {
-	insinto /usr/share/php/PHP/Token
-	doins -r src/*
-	newins "${FILESDIR}/autoload-3.1.1.php" autoload.php
-}
-
-src_test() {
-	mkdir vendor || die
-	cp "${FILESDIR}/autoload-3.1.1.php" vendor/autoload.php || die
-	sed -i 's~__DIR__~__DIR__."/../src"~' vendor/autoload.php || die
-	for target in ${USE_PHP//-/.} ; do
-		if [ -x /usr/bin/$target ] ; then
-			${target} /usr/bin/phpunit -c phpunit.xml || die
-		fi
-	done
-}
-
-pkg_postinst() {
-	ewarn "This library now loads via /usr/share/php/PHP/Token/autoload.php"
-	ewarn "Please update any scripts to require the autoloader"
-}
diff --git a/dev-php/PHP_TokenStream/files/autoload-3.1.1.php b/dev-php/PHP_TokenStream/files/autoload-3.1.1.php
deleted file mode 100644
index 4e385c87ec24..000000000000
--- a/dev-php/PHP_TokenStream/files/autoload-3.1.1.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/* Autoloader for dev-php/PHP_TokenStream */
-
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-    require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-}
-
-\Fedora\Autoloader\Autoload::addClassMap(
-   [
-		'php_token' => '/Token.php',
-		'php_tokenwithscope' => '/Token.php',
-		'php_tokenwithscopeandvisibility' => '/Token.php',
-		'php_token_open_tag' => '/Token.php',
-		'php_token_util' => '/Token/Util.php',
-		'php_token_stream' => '/Token/Stream.php',
-		'php_token_stream_cachingfactory' => '/Token/Stream/CachingFactory.php',
-    ],
-    __DIR__
-);
-$_gentooFedAutoload = function() {
-$_fedAutoLoadtokens = [];
-$_fedAutoLoadtokenSubClasses = ['includes','function','interface','abstract','ampersand','and_equal',
-'array','array_cast','as','at','backtick','bad_character','boolean_and','boolean_or','boolean_cast',
-'break','caret','case','catch','character','class','class_c','class_name_constant','clone','close_bracket',
-'close_curly','close_square','close_tag','colon','comma','comment','concat_equal','const','constant_encapsed_string',
-'continue','curly_open','dec','declare','default','div','div_equal','dnumber','do','doc_comment','dollar',
-'dollar_open_curly_braces','dot','double_arrow','double_cast','double_colon','double_quotes','echo','else',
-'elseif','empty','encapsed_and_whitespace','enddeclare','endfor','endforeach','endif','endswitch','endwhile',
-'end_heredoc','equal','eval','exclamation_mark','exit','extends','file','final','for','foreach','func_c','global',
-'gt','if','implements','inc','include','include_once','inline_html','instanceof','int_cast','isset','is_equal',
-'is_greater_or_equal','is_identical','is_not_equal','is_not_identical','is_smaller_or_equal','line','list',
-'lnumber','logical_and','logical_or','logical_xor','lt','method_c','minus','minus_equal','mod_equal','mult',
-'mult_equal','new','num_string','object_cast','object_operator','open_bracket','open_curly','open_square',
-'open_tag','open_tag_with_echo','or_equal','paamayim_nekudotayim','percent','pipe','plus','plus_equal','print',
-'private','protected','public','question_mark','require','require_once','return','semicolon','sl','sl_equal',
-'sr','sr_equal','start_heredoc','static','string','string_cast','string_varname','switch','throw','tilde',
-'try','unset','unset_cast','use','use_function','var','variable','while','whitespace','xor_equal','halt_compiler',
-'dir','goto','namespace','ns_c','ns_separator','callable','insteadof','trait','trait_c','finally','yield',
-'ellipsis','pow','pow_equal','coalesce','spaceship','yield_from','coalesce_equal','fn'
-];
-foreach($_fedAutoLoadtokenSubClasses as $_fedAutoLoadi)
-	$_fedAutoLoadtokens["php_token_{$_fedAutoLoadi}"] = '/Token.php';
-\Fedora\Autoloader\Autoload::addClassMap($_fedAutoLoadtokens, __DIR__);
-};
-$_gentooFedAutoload();
-unset ($_gentooFedAutoload);
-
diff --git a/dev-php/PHP_TokenStream/metadata.xml b/dev-php/PHP_TokenStream/metadata.xml
deleted file mode 100644
index 92954eeb18a6..000000000000
--- a/dev-php/PHP_TokenStream/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">sebastianbergmann/php-token-stream</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-php/awl/Manifest b/dev-php/awl/Manifest
index c0ea4a5890ad..b8fc391dc849 100644
--- a/dev-php/awl/Manifest
+++ b/dev-php/awl/Manifest
@@ -2,6 +2,6 @@ DIST awl-0.61.tar.xz 124340 BLAKE2B af5d9c063280c93deb55929acf4826b6ba003676a15f
 DIST awl-0.62.tar.xz 126492 BLAKE2B f7077106c9bc527371aef9edbb34d5e9ff251c2439059449dd8c93b548f16b79b06875e71d36faafa2a206c74391ffef978254b5ec131761550be2e0d6a7d6c1 SHA512 b6676c4bf3998ea0448aa9dba31a02fd950a07639cafb3f46482bd38235d39edeb1ab481d657d200332828777ca27df17ecf354d5721347481c0c24f04451c6d
 DIST awl-0.63.tar.xz 126608 BLAKE2B feb785d6a97f1cb477cd6609495e44481563c575a5b4818d70f191df153f43360685aa86063ec59649ad4d0a0e1ef2bc9e9734a668f30bb46b7f8013c8a10369 SHA512 bf21303a5676e32874594bfe463c20be2653fc29c9aaa7586d31704c4504f5d9e6ad1e2ba103515af61ffa7d43776bfb45fea9b4752efb6441f888908f42452b
 EBUILD awl-0.61.ebuild 690 BLAKE2B 4d05a6e4cd627f8a5b197990e5619502a5102e391c81c171c57efd7eeedde4a4396b4a051449845e4e3c0e4b55cd8219d7cf8556f81de895d55341f2b5ac2d21 SHA512 7885a6ea48607e8afb12ae1f17a6ed58d225c9bc9225f1a91c0d26c12f97cbfbba01e2381af3aeecb9ab720170e511807ffab925a96822d62dcdbe6349291342
-EBUILD awl-0.62.ebuild 855 BLAKE2B 8a88fb72bb9aecb2c1db79201598ec81b1ed3c9ba5617a247a2e3f57353ffc7edcc52810476b03459e5f006fc47df56c586391b0e92c1b789ab9afc9ee64272f SHA512 1c29565ac049488e62968d23534a6e7020582fe860316157b84ac767140fc8bf5668b81c632b137022bd890fcba8d7e87fb7ea8f90925bf47d76a670a16f665f
-EBUILD awl-0.63.ebuild 855 BLAKE2B c4e2282b4203b062e415550648b492a4a76af1a27fa9065f3ec6e6c2ec3d7aa3f87d1f6ceb2d14a9b4775f4501084f4a806a8042bdfcb85f532a568e8259ff80 SHA512 f2efaf7d17d75ffff8e401916f9ffbb44aeecc60b379191f5702b2b42a104d9c822c93b2e5b75e0c2e0bd7de35ef4745c7e26fda00671a4191e7604d4b624226
+EBUILD awl-0.62.ebuild 841 BLAKE2B 422e252e7de705e3ead05d211af046b1d83207f9a2f495cb5909f8f2bda105e68d7a0fadb3f5873398b5072b19c4b44e66616b57524bdba5c57e189f00fbc0e1 SHA512 db7370871f653ffa24b9a34fccab78bf2d9739b5edc710968f59b4463a07fb41415eb10b37cf1eee3037694685c0e26e218f8a4d8defe15dfae13767e9321e9a
+EBUILD awl-0.63.ebuild 848 BLAKE2B 2228e0a3051919a2bcc492ef2e7a0fb661401c8f24a1fdc023b6f07ad0e44cf426bb69883fa45b44a7343fa37c108e16086c803e6bd6b1a97ac5ecf65a4c84b0 SHA512 9e05612338374387ac277b0d849809b526b1db31000765609c6f36ba73f20313431ac3f969e9548c7e7c7d9e27f247bc82a3d0c87d836f2dd77269471ac7540a
 MISC metadata.xml 726 BLAKE2B 4c8dcec5598619bfe9091ee57fc3fbe92daf968f89c053a4b65b44622b19be79b36cbfe6ddad902df708b824874f58ef4c1a4a02ecaae65e3e76097bc398e4bc SHA512 d7bb078e721b2b30d064a866289c65aaf25f08ca4d691c19110f4149950b7870e5cdd3d771deef7325a8f7a37f1eb16cbcaa267c7dd1b0ac761d4985d1ad0fd2
diff --git a/dev-php/awl/awl-0.62.ebuild b/dev-php/awl/awl-0.62.ebuild
index e4baa58f0208..4e252e4d02c1 100644
--- a/dev-php/awl/awl-0.62.ebuild
+++ b/dev-php/awl/awl-0.62.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Andrew McMillan's Web Libraries"
 HOMEPAGE="https://gitlab.com/davical-project/awl"
 SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.xz"
 
-USE_PHP="php7.3 php7.4 php8.0"
+USE_PHP="php8.0"
 
 LICENSE="GPL-2 GPL-2+ GPL-3+ LGPL-2+ LGPL-3+"
 SLOT="0"
diff --git a/dev-php/awl/awl-0.63.ebuild b/dev-php/awl/awl-0.63.ebuild
index 2730c69e19a0..819627d4818f 100644
--- a/dev-php/awl/awl-0.63.ebuild
+++ b/dev-php/awl/awl-0.63.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Andrew McMillan's Web Libraries"
 HOMEPAGE="https://gitlab.com/davical-project/awl"
 SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.xz"
 
-USE_PHP="php7.4 php8.0 php8.1"
+USE_PHP="php8.0 php8.1"
 
 LICENSE="GPL-2 GPL-2+ GPL-3+ LGPL-2+ LGPL-3+"
 SLOT="0"
diff --git a/dev-php/geos-php/Manifest b/dev-php/geos-php/Manifest
index d7c736e2a3e1..3a4880a4577a 100644
--- a/dev-php/geos-php/Manifest
+++ b/dev-php/geos-php/Manifest
@@ -1,3 +1,3 @@
 DIST geos-php-1.0.0_p20220909.tar.gz 43257 BLAKE2B b1ee853e6d09f2bcc2bc32ad5eea29c3cb35d742d3037f836c575099de0b806519dc23a1fc9c322d377eb39c4b935029b47043c3ee5ab232537196686c627feb SHA512 4beae67902eaf1201d997db4ccf8e332e98699da031377878e0e144ae2f488bdf00b4a4d58b87082140ee18a4c04211f61de029fd523db90531245a450839001
-EBUILD geos-php-1.0.0_p20220909.ebuild 826 BLAKE2B cb0a17494bde6121e5c01fc65c9ebd61013e0555a9860bb0b8a0b1758822466dea33a7ea4a6912950de2048f90a8ead98d45c68832b4b48f27b3c97bf9403fcb SHA512 a4bf5118ac405812184b69fb33d5460534fb9054e2f037d21be7d06af97d0456b19f234536bde601909566fe4e31174aba688b0fa5dd3020eb62d64893326f9b
+EBUILD geos-php-1.0.0_p20220909.ebuild 819 BLAKE2B 78cacc67017f0c928369d369164c0bd6b15a24e02960c899b7c6538294cfcc3dada9a5cd7abad7e3b3c98e145bae1d6203355d0ab3daf6d88211edb3203855a4 SHA512 80a32bfc624fa4d7802035a0fad9ca9247e3859cb1445386097c300948bb2e96d3e9331b439fd3827faac6f5b0bba0b3764d97fb4bec0dffd5a24c54b33a83f0
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/geos-php/geos-php-1.0.0_p20220909.ebuild b/dev-php/geos-php/geos-php-1.0.0_p20220909.ebuild
index 230ada5c529e..7ed6f75870ee 100644
--- a/dev-php/geos-php/geos-php-1.0.0_p20220909.ebuild
+++ b/dev-php/geos-php/geos-php-1.0.0_p20220909.ebuild
@@ -6,7 +6,7 @@ PHP_EXT_NAME="geos"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php7-4 php8-0 php8-1 php8-2"
+USE_PHP="php8-0 php8-1 php8-2"
 
 S="${WORKDIR}/php-geos"
 
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index f904a252aaf8..392e7acc8f77 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -1,5 +1,5 @@
 DIST igbinary-3.2.7.tar.gz 248481 BLAKE2B 40936fb78b9f01d717daac78f8b707f902d78714e5202fbb1344042c2d30a3b723f9c5b6fd982f7a5002aab65e414ba7f9bda354fec4db82ba3f03fc09663a43 SHA512 1bdb60fa4ac76ef405b55b4a7e7f07c73ccc945a3fad8635934cf83a05ae554ac1a0b64c4b55229f0bd2a3269189d3266a492b064a0338fdb2bf4dfe5c3733e4
 DIST igbinary-3.2.9.tar.gz 251747 BLAKE2B d44711ffc195572a83a000f225776191e7b421e4be3065a668287f356d46fd11536af0a0969a0fc219c38d027f13aec16cfe41f15ea778ef087f7082daa9b8dc SHA512 2789f8517aaefa4e4e736592944361e8bad1ce50687aed161bb4e17bcdfbfec2320df8069c7b39704fa96c614727bd66fb65185b15f72f8c96bb5fda88f2e66f
-EBUILD igbinary-3.2.7.ebuild 555 BLAKE2B 55ce93a92c908b1a3838cf8742be5135d35ecb8b3678fb20f21066930e0109c6a5ac584d5855b28d3cd66905de855915abd58b4929c3c7b15c7cff81f1b6c3a5 SHA512 39ae60c959d011cd92940fe786a5aee3fa58f47a9fe1b84fb228f5c02fb7b98b86f075db7cec657265fc9a55a0282e9cf0d2d0b652a1964a0046cecc524a34f6
-EBUILD igbinary-3.2.9.ebuild 529 BLAKE2B b56f39fe4ffae592db2c8830145b997ab1e4597e304d09e1ef4b5e2fc165d47f80561996c4615d4a6bac22ccacf988d5a8d5e1d92f3103cc045828c1819894fd SHA512 a80053ee666ab068f72604fb7e951f3f18dbd53c657c288b275e4549eb577a1bf3bf8b68db652b828cb3022da54acfdbf89781842441814537a2032be440d14f
+EBUILD igbinary-3.2.7.ebuild 548 BLAKE2B ca29789fb49c8870e628235d8493ff3607bc22bd70e74301ca3e1921bfbfa2c6ee9e328b5de6c898e6e311f2c1d34137c5bdecf7af5205b3d756a943192f11ed SHA512 1d1a519acce5ae6d3b72aa75085c25b64dbf8f0c622a6c3f1c040da00091719a99697cbfceaebe28d1b2b90b1fa967aac945aa40acad34b0b3ef23e116563e1c
+EBUILD igbinary-3.2.9.ebuild 522 BLAKE2B 6db4ac955fa5064b5049195c213877113a3b13b240788dc5a82c7e1caa67eb7c6dc6b920b11e233c4c40d0a8f037da9648be3b05700bc6bbc6a2335d436724e9 SHA512 25c50cf4e21ac386f55f3aaf0b5fd6d5110233e0de8d82dbf0ee3e30c1eef7a27815f405c0fa5717d93197cc22b84e7bbea0eeab8bc46bd5aaa3652f3448a182
 MISC metadata.xml 332 BLAKE2B dd842052dec2b48669fb7d85ee2637132f64d64d56ac9ece1394222211f3cc1a698e0d5e4dda6d4d5289a4debfe7a44c0c776ec2399d3384874be03278995af2 SHA512 0e2d8ac966bb0f3e40fcf96e0ff93ebd9353a0629129e14f9be2186fe7fc3db8cb5fafc3af795b59005332d66085f1636df62b5454998cb9bd09bfacc1ced0a6
diff --git a/dev-php/igbinary/igbinary-3.2.7.ebuild b/dev-php/igbinary/igbinary-3.2.7.ebuild
index e675bb47e592..37bce3420ad4 100644
--- a/dev-php/igbinary/igbinary-3.2.7.ebuild
+++ b/dev-php/igbinary/igbinary-3.2.7.ebuild
@@ -8,7 +8,7 @@ PHP_EXT_ZENDEXT="no"
 DOCS=( CREDITS NEWS README.md )
 PHP_EXT_ECONF_ARGS=( --enable-${PN} )
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-source-r3
 
diff --git a/dev-php/igbinary/igbinary-3.2.9.ebuild b/dev-php/igbinary/igbinary-3.2.9.ebuild
index 1206f5409a19..377afa6e8a76 100644
--- a/dev-php/igbinary/igbinary-3.2.9.ebuild
+++ b/dev-php/igbinary/igbinary-3.2.9.ebuild
@@ -7,7 +7,7 @@ PHP_EXT_ECONF_ARGS=( --enable-${PN} )
 PHP_EXT_INI="yes"
 PHP_EXT_NAME="${PN}"
 PHP_EXT_ZENDEXT="no"
-USE_PHP="php7-4 php8-0 php8-1 php8-2"
+USE_PHP="php8-0 php8-1 php8-2"
 
 inherit php-ext-source-r3
 
diff --git a/dev-php/libvirt-php/Manifest b/dev-php/libvirt-php/Manifest
index 2cb6080478f3..af2460f8dfaf 100644
--- a/dev-php/libvirt-php/Manifest
+++ b/dev-php/libvirt-php/Manifest
@@ -1,7 +1,7 @@
 AUX remove-imagick-check.patch 331 BLAKE2B 2d9c164055c3f54baf259326abe22d5aa478141df7f6ea05ba33f040701947038490c1898e89a7019cc1e41008fde5cb43c338730ef7ec3020f5005edd612d9c SHA512 1e949f8c704a2e6b541a276b8cb53e9cf09f009dadc01f4f50ad02e92258cfe30130b2d22b811e0b5b07e1bad4023fad05040c6031bd0063999212c2d6483bcf
 DIST libvirt-php-0.5.6.tar.xz 386372 BLAKE2B 30d6a1c8dd18a4bd9d46e9c20551978fa0c20f2d671a359fdbf86def5166df7f882e65c509087efe0acef7d0dc468b3eb520689f9e7ba552e966809c8f647390 SHA512 5d1b3a2afc697051a5a0d4750ce4d02b31f482b1c17ef2cf4a593b705de438d8ccb4b1543ce6b2520b450734b3634e64ccf9200227f5681cbd2daad5a9f5ee9c
 DIST libvirt-php-0.5.7.tar.xz 389380 BLAKE2B c8189ffdeb29a056ef959624cd46a18ce7e4e00df6a42bfb3d6349ee8aa3865a4d66b82aed9ee4f68aa7f9761adb8eb8b62bd15d7c6e8e17c187ae44eba71a86 SHA512 ecc640ce2c936f59824212eca36bbe3ae13c560854e0d86da9f1d4d02373751f974b374915ded57d74636c0443c09c895857e8701204fbf49c402c1f315ae0b7
-EBUILD libvirt-php-0.5.6.ebuild 1453 BLAKE2B 2d30fa5fe60d8015ad498cbd6368c059e0fc4f8345a0d56a17ce31de99d4f3ef5f4e659b085f51d5ebdb72854c5f7b72d7cc55c87a0f45c796857f882a1d7d96 SHA512 54aef6536f38ffdded99ee8fa4f5982adab87e88f68e8bbd57aa8ea3e7af68732d3431331433f3ac6bf3ab1d97b1e08aa6a794d1550413b49feb305aafa125f0
-EBUILD libvirt-php-0.5.7.ebuild 1288 BLAKE2B 28207036727113dd72ab1bdd43d5dbc49c420a196a81cdcf5504a582c606966fd3f8dc072c276acd634fcc702946334e918ab51d41b18b4b6f30962ec0abf747 SHA512 f9b4ec150e0fec95306aa19daecf808ad918df085c5d9151fa5caa919d177a59b344bbe41dc22190179840b98d49374a86b5338b3d471de3b0c8a4195f75c07e
-EBUILD libvirt-php-9999.ebuild 1298 BLAKE2B dd47a71214d22c05944114168975a05ffcea4b4399141991ad3c14b4b0af2cfcd825d530bf3ca56414b86e824865943f59267deaac7dd9087ee103913b9ecd4e SHA512 8bc659879969f65acfb147ad3650cf41f4f85e328f211e038b7b1d3ef404cfd9ff2b305c9d3820b9f975907dc542d23790293ace942c7bd4bb634c58bd14b0e2
+EBUILD libvirt-php-0.5.6.ebuild 1446 BLAKE2B 27fda1d7c53d6202344f9b83118a6df579c38b28f7a6d8fa011993fa962ea735ebecb73d577512bfd5dd9baf1d3c4c9b4ef90a424d7be9cb92e42059f16f4cff SHA512 800097c5acccdeff80a83ef9a015dd7f4a14e53117e79417bbdcbf325e298ba306f10966e890e742f55bd125d433906166998417fe4a558b3b3ba180deadbfa0
+EBUILD libvirt-php-0.5.7.ebuild 1281 BLAKE2B 39e15578a5fbe2c61265fed634066173a6c9775892c33dfde59733038617a84005180e46454266bb1b0642dbbb5af1049087164292e7b212a3030d5119d8de51 SHA512 b221ea44d98a33a9adc446e5e7669e36750714c96f6a3bdad0e40bfdc5b172a31bc0a0126015ec0545009899fc628088ddb75c1487ba60351e7e38eeb9116f5d
+EBUILD libvirt-php-9999.ebuild 1291 BLAKE2B 61e7b79d0e1f9ae47c7d0ef79a92ab257ee9d77c185124f5e1d7eb8387d4f4bd9647ba31e63b94cce0350bc5d75a694154ba374ced9b0ada9e680840556fd891 SHA512 8b78e97d9027bae65da028dc0add1e5b08718f8495782ac1ab79c5c97b9ecd8ff786642d954ce9453fea7461ad1e33f435abf238ac55efb03e7ee5a431ec8471
 MISC metadata.xml 456 BLAKE2B 845b0f2472da5b862a46a3ac26fdabe28229a0b6b190fdc293741732e36eaaa00efed4678b0ae06b3c0692ad4315240efb2050914a23c831a368e9c6e4589271 SHA512 b16080b8879f9db4e459214842b483c06aff8feedf9aa72785b1924225088e3ea58afb15afdd46334beb299c29db59a68308f5fec1ab26b5e62b8faff6b4f78a
diff --git a/dev-php/libvirt-php/libvirt-php-0.5.6.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.6.ebuild
index 9c565addf6bb..b2fb16dba7f4 100644
--- a/dev-php/libvirt-php/libvirt-php-0.5.6.ebuild
+++ b/dev-php/libvirt-php/libvirt-php-0.5.6.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 PHP_EXT_NAME="libvirt-php"
 PHP_EXT_SKIP_PHPIZE="yes"
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 PHP_EXT_ECONF_ARGS=()
 
 inherit php-ext-source-r3 autotools
diff --git a/dev-php/libvirt-php/libvirt-php-0.5.7.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.7.ebuild
index 96777d784f67..1b322d9cb702 100644
--- a/dev-php/libvirt-php/libvirt-php-0.5.7.ebuild
+++ b/dev-php/libvirt-php/libvirt-php-0.5.7.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 PHP_EXT_NAME="libvirt-php"
 PHP_EXT_SKIP_PHPIZE="yes"
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 PHP_EXT_ECONF_ARGS=()
 
 inherit php-ext-source-r3 autotools
diff --git a/dev-php/libvirt-php/libvirt-php-9999.ebuild b/dev-php/libvirt-php/libvirt-php-9999.ebuild
index 8dd8a850a9ca..c989b2563888 100644
--- a/dev-php/libvirt-php/libvirt-php-9999.ebuild
+++ b/dev-php/libvirt-php/libvirt-php-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 PHP_EXT_NAME="libvirt-php"
 PHP_EXT_SKIP_PHPIZE="yes"
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 PHP_EXT_ECONF_ARGS=()
 
 inherit php-ext-source-r3 git-r3 autotools
diff --git a/dev-php/maxmind-db-reader/Manifest b/dev-php/maxmind-db-reader/Manifest
index 419193ae59f5..d49235a50f1b 100644
--- a/dev-php/maxmind-db-reader/Manifest
+++ b/dev-php/maxmind-db-reader/Manifest
@@ -1,3 +1,3 @@
 DIST MaxMind-DB-Reader-php-1.11.0.tar.gz 23018 BLAKE2B 28e0ad3e8440a4bfad17292e71289224dc2a8deecaf510f887637760ed931a4d90e921f369bf6e37458e9a45212af82105a42925800577228797c47604b9135a SHA512 182c57d9d799b4303e7f5a6f5b47f64b953e216290b26f5891cfc9658dc030bc1f954c48a07777c71ebb9b8f34e4c275d2af794086d33c5bee8b3fe38c1ff56f
-EBUILD maxmind-db-reader-1.11.0.ebuild 2223 BLAKE2B 29894f195a5946275e8b0b801d0c64b72d6fdb7fcbbf684b0514b0b744c4997a8768971890c2fc160c901488ba40e5cf8e65bd43fdf97211e9eedd13dfbb4a05 SHA512 953259be4435ae743c0aa9713f227912b02b44c052b3f4e86ea67c7e5e57d79d07fa4c34abd2278733376a69efa77904cac19323c7319813cad36c3694e56270
+EBUILD maxmind-db-reader-1.11.0.ebuild 2216 BLAKE2B 023f61f9666fdbb8c9173d091979520821a2533f1c4b99c4ccb30992753492bdd1f573ee637ebe2dc144f9e359a969b6542d63313bad1015009b4690d960a376 SHA512 a4dae95a92471f9af8193282ac6850691c5b2ebf18b46a4522a471176ea5da51be467e5a18ee25c758e1fdc1cf7fc06de382ca6d4bc84dbef5a7dc025879bf4a
 MISC metadata.xml 586 BLAKE2B 69b8c42dc80e3b164f2287e0c65732ad0d5bc53ab1062e651dd85e21d5fdfb6a1e9990cd4d78077f2dcf73e2c8689e7be6a34c11cfd3ed8690a41a8a737e6246 SHA512 5604ac300486eaeb0bfd52d5a95438843b031eef15162438374e6126ace92327a64cb692a549d301f245fd6622856e973c9dbde60d2dcd398c667a9f8fa1fd5b
diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.11.0.ebuild b/dev-php/maxmind-db-reader/maxmind-db-reader-1.11.0.ebuild
index 5f26157309f5..223f479c9477 100644
--- a/dev-php/maxmind-db-reader/maxmind-db-reader-1.11.0.ebuild
+++ b/dev-php/maxmind-db-reader/maxmind-db-reader-1.11.0.ebuild
@@ -10,7 +10,7 @@ PHP_EXT_S="${S}/ext"
 PHP_EXT_NAME="maxminddb"
 PHP_EXT_OPTIONAL_USE="extension"
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-source-r3
 
diff --git a/dev-php/pecl-amqp/Manifest b/dev-php/pecl-amqp/Manifest
index 8b78b7bcc26b..76171c2d00c7 100644
--- a/dev-php/pecl-amqp/Manifest
+++ b/dev-php/pecl-amqp/Manifest
@@ -1,3 +1,3 @@
 DIST amqp-1.11.0.tgz 108493 BLAKE2B 5d06ee39f9fef03652ee668695378e30df8c01c57c4ce724b2934bf0754d2a2a9c5998d599a34b2782b5395a5a4bcb69925f6d578ff160dfe7407e7916d468ba SHA512 0f0220fc2f1f9109640e096ab38a4bb06b2569a336b83f527d18dae2b8c21efaf383dade807ee5bb3dbf4447bc3548c15f38ac18155762fe7920ef8939bc0321
-EBUILD pecl-amqp-1.11.0.ebuild 593 BLAKE2B c8b906654b555e057c4f68d35e7100566c63d202db5a219b244e9517941322ef8e936138951b81f5bc2b5f037bdb9f94fd26bb8493defeeb8fb52934bfa34293 SHA512 dd158f0d725e01ec07f134a5aec0cc79a1cb9a865182869b40cfb70d78e138c802b713a6164987b7e4aae42e509064a1ecd0fce9b867a5198b677b863e893fff
+EBUILD pecl-amqp-1.11.0.ebuild 586 BLAKE2B 32d5ccc8e265a7fb3c8a275e53a2df5e9553d5d39d376ba40baecf545581acc4fc50d3aaa86047fd7d5234b34f5ef4f2026bb283326a20ee3ddee5c0fce32295 SHA512 afd231c7e28ccd4258630a27cf8868d9be22674d07991cad8e808c4cf5b87f449b59efda661efc34cfdc25e5410032379e96c6067c09b1f090384b7478ff1936
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-amqp/pecl-amqp-1.11.0.ebuild b/dev-php/pecl-amqp/pecl-amqp-1.11.0.ebuild
index a65d3a6ae1a3..7983f213ab78 100644
--- a/dev-php/pecl-amqp/pecl-amqp-1.11.0.ebuild
+++ b/dev-php/pecl-amqp/pecl-amqp-1.11.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 
-USE_PHP="php7-4 php8-0 php8-1 php8-2"
+USE_PHP="php8-0 php8-1 php8-2"
 MY_P="${PN/pecl-/}-${PV/_rc/RC}"
 
 inherit php-ext-pecl-r3
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index 9f4abd46a09e..bc774654afa5 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,5 +1,5 @@
 DIST apcu-5.1.21.tgz 92516 BLAKE2B 32d73b89bde9ef4eb01c9ad766930e87300b86776c95929607a8aaefba5043e3a7947d064416ac083ff38876fdb41bb03dab1552ac000082e54f809269b4c925 SHA512 a6ffe8349760d27cde0d86017a59a68e9639bf385e606622d807094f4e5fb305bb25b9ce00077d0856f4d223d44329f7a6314c229b62c78d8e2b085593c92bb3
 DIST apcu-5.1.22.tgz 93926 BLAKE2B abc3b27c4224da14b6438df9243f6b7b8245102f7eee0208daf1317bead5463d8f454e33536b8c949a2825140487faf9bb79745180a26e1f0015494e0986acb9 SHA512 8f2f4292679bc359ea680ecaf397d69de32bf67d57d719a4839a026ab1b96d5ec4725e92c5c0d1972a117a7cd3d3c456a1f4ec03192fda4657e685de60b9e93e
-EBUILD pecl-apcu-5.1.21.ebuild 1377 BLAKE2B 8cf95367e4f9026d8b74cdb72858b0973dfef273aa96e6e829fff094d1bb1b3fa2d488f8e8ba27be371d98f1bd280f683a42b8150eb6415563bd8f154bf75f4e SHA512 6af888ef45a5b5623a7238c9b132477d2a439ec91b2892655be95c149524ac2dce688de3547c80786b61c85797aeee601da5056ce03b03c49acfc79c38159f32
-EBUILD pecl-apcu-5.1.22.ebuild 1385 BLAKE2B e196caa62b381e1176faf47406656e0b24ff70623978d5d06da1391f9b7e294f5af3e9159d2b9b31b61aafdfb84cbe61069a5aa525d414632562264aead12459 SHA512 739c76e865c694d33c57e920a5c46742e423f077b754d79cf1080232ca99daefda75acc81511fa2279aa8d92f7b080a54a851e8fbbfebc273f9c402cef6693d8
+EBUILD pecl-apcu-5.1.21.ebuild 1127 BLAKE2B a62bd629f93eb3936afee544150c3d31ef5a237aaec499b6cd230959d33088454e1d0bd1bbe18307667d56df20982474966cbf1ca88ae77156a646560b85925d SHA512 f15b5f95d9747528aa95c78e1e3f0df8eacaa0004a7ff3c6291f6fddc13258c55c2a0c9e995f87b88b27f2a08b055acdfd3a7f3f58f1f3eeef349f814d77df5c
+EBUILD pecl-apcu-5.1.22.ebuild 1134 BLAKE2B 99c39dbe679ab5ea51bfa13fdc843ff6fbd32ee6cc6d31f75cd7136b9e10c4b9a526df8900037022b5e950a0aa69bf2ef4defcab03e785e4fd2449c2e9a9ebdd SHA512 ef3b70ad09f20350f9ac46a22698b58e03442eb42b155d5a87e9e7e9aa44bdcb2ff3e3428f652b2bbfc9ebae7e508ef9fec17697aa306dfd780dea2cf39ee69c
 MISC metadata.xml 541 BLAKE2B 533f563e606b35d23c766aa177ea80b56b17ff352e907f2aed65c82be8bb6b01bcb61d69c6be6560b8e975ac279cf3a00ba5976d4a50c0f3ae68677ae7557cd8 SHA512 5dde6ecb39edb11fc4222cf869449f43fe3923623cea2a8ee4d4a4b8d7bf11bcc6d40f135cb5dc4cc81b161ed50489230bba443274c914d0015046ea44c868d8
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.21.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.21.ebuild
index f4a3ccca476a..f484397a2f04 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.21.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( NOTICE README.md TECHNOTES.txt )
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
@@ -29,15 +29,6 @@ IUSE="+mmap ${LUSE/lock-pthreadrw/+lock-pthreadrw}"
 
 REQUIRED_USE="^^ ( $LUSE )"
 
-src_prepare() {
-	php-ext-source-r3_src_prepare
-	# Remove broken tests from php 7.4 due to trivial output differences
-	if use php_targets_php7-4 ; then
-		php_init_slot_env "php7.4"
-		rm "${PHP_EXT_S}"/tests/apc_entry_00{2,3}.phpt || die
-	fi
-}
-
 src_configure() {
 	local PHP_EXT_ECONF_ARGS=(
 		--enable-apcu
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.22.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.22.ebuild
index ee48a184ed83..4181f3441b39 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.22.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 PHP_EXT_INI="yes"
 PHP_EXT_NAME="apcu"
 PHP_EXT_ZENDEXT="no"
-USE_PHP="php7-4 php8-0 php8-1 php8-2"
+USE_PHP="php8-0 php8-1 php8-2"
 
 inherit php-ext-pecl-r3
 
@@ -26,16 +26,6 @@ REQUIRED_USE="^^ ( $LUSE )"
 
 DOCS=( NOTICE README.md TECHNOTES.txt )
 
-src_prepare() {
-	php-ext-source-r3_src_prepare
-
-	# Remove broken tests from php 7.4 due to trivial output differences
-	if use php_targets_php7-4 ; then
-		php_init_slot_env "php7.4"
-		rm "${PHP_EXT_S}"/tests/apc_entry_00{2,3}.phpt || die
-	fi
-}
-
 src_configure() {
 	local PHP_EXT_ECONF_ARGS=(
 		--enable-apcu
diff --git a/dev-php/pecl-apcu_bc/Manifest b/dev-php/pecl-apcu_bc/Manifest
deleted file mode 100644
index 0a3d10ea7ae2..000000000000
--- a/dev-php/pecl-apcu_bc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST apcu_bc-1.0.5.tgz 7415 BLAKE2B d86c5a4949239d9196b4bfc22c19f97ff66b47ec87962540295a0d9f08c72c0f1213439dd6c4006355a73c7fa3dbdcc51e9f897b289f134116d33d9eb2c67cb7 SHA512 60ee1540c31873d7963fd8efa6293006eae19cb6c7815cea1f3b50b197a982840472a1e632cc7af5666f6af5522008bec30e48cd764920240a6c5a0d0eb0e6e0
-EBUILD pecl-apcu_bc-1.0.5.ebuild 1160 BLAKE2B e95aaa8e1706cb20c56cca9ec5a30592465763f3f0023533af44402b28c61beded902f3aea900f28ccc22c70153dc25c9aa9ee9d6c2e960f0b78da1095cc15d7 SHA512 4b517f886b429b6d88cb74335f5071c2e570eee37d42d3540dab621509ce276bc6737e11b35c45aa2a6b21f4773488b78a1d9740de1266deeb8173feb3ef8e0d
-MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-apcu_bc/metadata.xml b/dev-php/pecl-apcu_bc/metadata.xml
deleted file mode 100644
index 222c77f3742a..000000000000
--- a/dev-php/pecl-apcu_bc/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>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild
deleted file mode 100644
index c79e47fa1cda..000000000000
--- a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_INI_NAME="bc_apc"
-PHP_EXT_NAME="apc"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_EXTRA_ECONF=""
-DOCS=( README.md )
-
-USE_PHP="php7-4"
-
-inherit php-ext-pecl-r3 multilib
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="Provides APC backwards compatibility functions via APCu"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-php/pecl-apcu-5.1.18:7[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?]"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# This fixed version is necessary to have apcu load
-	# from the install before the tested apc.
-	# It is intentional to specify phpoptions twice.
-	# This mimics the Makefile.
-	local slot phpoptions
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		ln -s "${EXT_DIR}/apcu$(get_libname)" \
-			"modules/" || die
-		phpoptions=( -n -d extension_dir="${PHP_EXT_S}/modules"
-			-d extension=apcu$(get_libname)
-			-d extension=apc$(get_libname)  )
-		NO_INTERACTION="yes" TEST_PHP_EXECUTABLE="${PHPCLI}" \
-			"${PHPCLI}" "${phpoptions[@]}" \
-			run-tests.php "${phpoptions[@]}" || die
-	done
-}
diff --git a/dev-php/pecl-crack/Manifest b/dev-php/pecl-crack/Manifest
index 63600533614e..deabccc90727 100644
--- a/dev-php/pecl-crack/Manifest
+++ b/dev-php/pecl-crack/Manifest
@@ -3,5 +3,5 @@ AUX 0.4-php8.patch 9940 BLAKE2B a596f7f3329684f9c37c6ff43f392bd4936e32b3ce43bba9
 AUX fix-pecl-bug-5765.patch 375 BLAKE2B 6664659603006d260b578fc1169465007a600eb1b5ba4551339fc87488c7f94ac1ca49ebc829895ef2e6673fccbae2881e6f06a6cce4dfaa39db1350f2f4f0c6 SHA512 21f7d76242c630334e88c8bf1f6e4fe9718943c36c6886f8de6503c9c616beab7007e31127b40b1df66763893d692a65f20483addb1607e0cfc7ec7b92ff4500
 AUX fix-php-5-4-support.patch 674 BLAKE2B 5b2ce7a76aca15d6ff626ebced6e8844bac3d1fb959903c9882e1e59bdfc06027c6993431552deceb09df8d35e57e338818fa9b5ac11b31d4484369d3bd9d1e3 SHA512 ca2475557dc1d2f23a1e5745e7f3bac70855d0916a9d37d1a7efcd04e3bb973220b87aa2cc7ba8315473a2fd16dfd142c5c01608e94c595541ff15838c1e1d44
 DIST crack-0.4.tgz 25524 BLAKE2B 99e2289413a672d4dc3d8f9d70866efb499902a0d27379ac7b59d2873013c918d535851d8c3dbf2592596d6483f2abafe2f7bbd31fff40ce9827c7a97e16b8bc SHA512 0dec64d1ce859bb3d7e2b834e4bcc4ef8c6f3e88e5b61884e40dddc366a992a7c85bfad4227224d4401aad7f26843678709f29acd2dcc75563658040b8067d7f
-EBUILD pecl-crack-0.4-r8.ebuild 607 BLAKE2B cbbeb041f453fc47e83abe789016ff4e9e0a06fbf651029f58df76f96f6a90c35a87ba5f3ee8133ba4756ccf4908b272eb7ec1401eb73d29b6505efa62eaef61 SHA512 49b793d735255b2fd3b987ecabebb5adc9aeb1f967094c9015e85fdba30c2984e786e7cfbe28bbe0354905b6468e7f4b6102822d62f19a223e702db46da1b222
+EBUILD pecl-crack-0.4-r8.ebuild 600 BLAKE2B 6f40c3c193a76116ce9ee063d47f02e811a47b76e43738ce775b8f3ad251290b845b7791833d9412293b302e1a104138c9a8f632293d8c82913eae445127329f SHA512 9b2a39421a17fac2d76b517d2341e325443a6e58a4b7ef1c04f0cb9d3849100589c8e3cd98ef53be8880c280364ae894e7260fcda6a86f0786cbdc46ba730591
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-crack/pecl-crack-0.4-r8.ebuild b/dev-php/pecl-crack/pecl-crack-0.4-r8.ebuild
index 47b9195fcf94..c5211d5881c8 100644
--- a/dev-php/pecl-crack/pecl-crack-0.4-r8.ebuild
+++ b/dev-php/pecl-crack/pecl-crack-0.4-r8.ebuild
@@ -9,7 +9,7 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_EXTRA_ECONF=""
 DOCS=( EXPERIMENTAL )
 
-USE_PHP="php7-4 php8-0"
+USE_PHP="php8-0"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-dbase/Manifest b/dev-php/pecl-dbase/Manifest
index 7c0418e08c94..cc569b8bfe57 100644
--- a/dev-php/pecl-dbase/Manifest
+++ b/dev-php/pecl-dbase/Manifest
@@ -1,3 +1,3 @@
 DIST dbase-7.1.1.tgz 37583 BLAKE2B 7131e6219aa263259e7892b8a4bb29051bf3b9688532e73c77032f6d0ef86c94bc6a4f75461c8901995383e86fcc4828d175132064cb181e3de9f9e57f502282 SHA512 bdcd0be903fec5760e23ba9cbaef9a0f21c8a5388c7ccee56b4932a0cbb1e35ec5424f1130fd94068c4074d38c4ecc387ff93f7f01f6249fce7a64af494af0bc
-EBUILD pecl-dbase-7.1.1.ebuild 276 BLAKE2B e53bcc405decb9b7ae2c8eb5e8d6ee247464d1e1441c9dabc043ca5fedfb0729d9b7bb82f69e86bfe8c1afe543735293a033bed95e3401830792d3037572150c SHA512 0ddbbfb484a5faf3d429e423a9c4cc00eda4518134029c8b1afae96cd4c572f93595e38f7d8593a9fd2bb6d7f80e1534503f64e3395318e369a54088520a4910
+EBUILD pecl-dbase-7.1.1.ebuild 269 BLAKE2B f0d6cb339eb59b000d0908c8f54336448e98653c343d1bbcf21125061f9c7cb3ba0fc570fc56e5edb7e9e7d3e1e38f9c893d3d37e4f1e34417f8146fa5c097f1 SHA512 6f43aa3fa7febb5adb5fadf8940db43ccb2fde59ed858278538613a21e9163e511e0770aa1337d9d67de97e9330228a5185bdd7dff9c64d310015ba5108a7a97
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-dbase/pecl-dbase-7.1.1.ebuild b/dev-php/pecl-dbase/pecl-dbase-7.1.1.ebuild
index c1d4f307c458..88c8685c4977 100644
--- a/dev-php/pecl-dbase/pecl-dbase-7.1.1.ebuild
+++ b/dev-php/pecl-dbase/pecl-dbase-7.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-dio/Manifest b/dev-php/pecl-dio/Manifest
index 8af16dd35ca3..e1af8f2194dc 100644
--- a/dev-php/pecl-dio/Manifest
+++ b/dev-php/pecl-dio/Manifest
@@ -1,3 +1,3 @@
 DIST dio-0.2.0.tgz 37328 BLAKE2B e7ad6be1a4c957c155753e834d79f51b985578a03781ddbc66f05961dc270d58b20abcc74c64a0e9744d5cfbb6e545c1a7ac2bc1d54009c74f26bf786587ef49 SHA512 172c2a2a84d348d684d84ca94f23b767952461ca848cd114e899ea3fd39503a35ac0624a2a774b9dc6fd2d463d3f6aa6937e780e2faa6a0955a8594aad27ec8b
-EBUILD pecl-dio-0.2.0-r1.ebuild 334 BLAKE2B 02121a21b52c78effeeab407a762f58e18993f9c0b136e2a6bb02e2af91744ed8635a464228624bff8da609d07bf6208f8c692d6e3b76ad534bfb54900a37463 SHA512 7b6cee7193f3cc003f4d770e3d00bbf15406849604d1c0975749ab999b96d09796f4701ab20b4782227305185e0e8e1ebc35a5aebb78cd42488959b0f6b10e75
+EBUILD pecl-dio-0.2.0-r1.ebuild 327 BLAKE2B f860d87a4d86b25d157cfc6923e5f7f2ceb141d7901490bef30e3f7cffe1ae60e6d470293623f85e48983abe4f834f195ed556d24c9f764c1b4dbe3daa93850a SHA512 15ff8432b330ba0751259f1a1f252a730a4cffcd53a76b942cdeb2c0bf940d31bf35306ea7f721f601ade0eb3e90ea5abb0e5ac5b895d418befeaf9679ab70fc
 MISC metadata.xml 236 BLAKE2B 55612da78a71f8cee31c387a5862636996734210d765fac66d8c7706acc5151e6a9e7ff5123aeb097c911495c6220ba3b5d2f1355f46e8ab6bdb240e1697e26d SHA512 2782b20a65dca663ff7c64b7e67db05641abed478fd5996e5750b2e52ba870829f89125baa8967dd29fd20ef9b46ad233b0dd08801308b7756717ec2f292446c
diff --git a/dev-php/pecl-dio/pecl-dio-0.2.0-r1.ebuild b/dev-php/pecl-dio/pecl-dio-0.2.0-r1.ebuild
index 73889dc9d598..b6ac6805c393 100644
--- a/dev-php/pecl-dio/pecl-dio-0.2.0-r1.ebuild
+++ b/dev-php/pecl-dio/pecl-dio-0.2.0-r1.ebuild
@@ -7,7 +7,7 @@ PHP_EXT_NAME="dio"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-eio/Manifest b/dev-php/pecl-eio/Manifest
index 2cd026c58190..9e18df152672 100644
--- a/dev-php/pecl-eio/Manifest
+++ b/dev-php/pecl-eio/Manifest
@@ -1,9 +1,7 @@
-DIST eio-2.0.4.tgz 74118 BLAKE2B 0228f0ca91ed6410614242e7ea1ddadaa1d1aa8211b3ea6f730c0711e4339bc158d661c5addee685d750a51e654874d35a04cf011d2a02ad06ab3f249b893753 SHA512 a74464752af5792c527b9149a7edff574952cac0b5b09e1e7ff3b7c0a2cc88ab171d916d94d508b9f92aa40bd5262a5b9f8d4ba239908f13ebcb89c6513da4d0
 DIST eio-3.0.0RC2.tgz 89591 BLAKE2B 7923f8715870cfd744148980e3ad6de8373384d85e45abc687be2cde22fd425a33b8c80fbd1226e23dbac417533826dfbf639fed751bfc2a88e118750e38d626 SHA512 23e7d88720222ac3f58015ba140e3338e100cf72cf64276fd7e0f0d63a5e50f878ab0a4a742eac7b51484c56ee438fcc3f7cbf7b1da5db44e0178a5098a4a6ae
 DIST eio-3.0.0RC4.tgz 89689 BLAKE2B 2b8cc414d212ec7d3345621a1190ef4e2b2a286ea76569dd39f6a1ce9a77e77bbb6959d9d25be59ab4fea617cb4c16bfcc726d6d1c8aee0dfa87c2cdcbd9f095 SHA512 126f189eb1ccce6093c764b9910bd844561ff644efeaeb762dd5eccb34122b0012160168f223f46d82dd6bf55ebcd1561c96bc69c408b2c8a37c0d2a04d619e4
 DIST eio-3.1.0RC1.tgz 99307 BLAKE2B dbadc519f43a38796994d5854ef5f5e0c2876aa1afe9f98a3933f89332c4dc7b6db7a675cb06e47039243130d39f12f26085f02d9ea871eda68580d8fdcf143f SHA512 2118eb47bfa24a753588e24691d96f46d07fde9e2ce409f1d93d77aa52494536aa06654c95831b7841d54f44a5cfd5c958efd4304a344a620c7f348cd5f7a368
-EBUILD pecl-eio-2.0.4-r1.ebuild 486 BLAKE2B 64b977272870a382ad6986d5238c430cd0eb933f73c89294d91a0d1728713cdb58b53998c92d21d9c54bc5a586bfd81f9cac5a7662f7211bcb3c3afdaba55b72 SHA512 ed0c6dfe2ec491c02debb16d98907dfe2f91b8a919c94b5fb627dad3a56a47f360c86e122ba22812e6f9c941073c6d4c19813256f920d9c689c073f37ebf0775
-EBUILD pecl-eio-3.0.0_rc2.ebuild 644 BLAKE2B 2e8760e89412e75ae1ccee1b122fbed808d3699d5e83bbbabf97177371e0761773c8143c982cc8125c89feae9ae1ee4eb2ac7c849356763821af00c0b8da298e SHA512 fb7ae82ae071c8bab6fc808428842bb1fa278658b7ee3ecd2276389c83d5d2c59104fafbaf65677b287f94688df60f30f8fb8031a9aa96e1c3c09d3ac0424416
-EBUILD pecl-eio-3.0.0_rc4.ebuild 651 BLAKE2B 938f660ea21a23b004b474ee81735732a37728935763921abe23a7f1927c67f27f9a869891771ec454303b07ae27d1b5bf9a5a2f72d4594e854cd9f4582d8cf2 SHA512 0f2bb9ddc94b3dba06f6bf8e62aaa8bb33fe60de781cb6c4868676d5bfb1dc92bb26103fe2335b965fdf5110612bc92eb574ff37f6049cf52cf56eefc8b34702
-EBUILD pecl-eio-3.1.0_rc1.ebuild 651 BLAKE2B 938f660ea21a23b004b474ee81735732a37728935763921abe23a7f1927c67f27f9a869891771ec454303b07ae27d1b5bf9a5a2f72d4594e854cd9f4582d8cf2 SHA512 0f2bb9ddc94b3dba06f6bf8e62aaa8bb33fe60de781cb6c4868676d5bfb1dc92bb26103fe2335b965fdf5110612bc92eb574ff37f6049cf52cf56eefc8b34702
+EBUILD pecl-eio-3.0.0_rc2.ebuild 637 BLAKE2B dcace932b3044f55f17363f76ea43b8738f71c7951ceda136152a965f2f274f051d488e7f48efdfafbc755f9983b839290ada2bdd491914965f7816d7f1199e3 SHA512 52e5d75aceb925fa6a690be2915cbb8e9995650f5a2b474a639cc0fc59674a929966a1117801e1712ef2d08b02bab31ddd8ae62b4ca0ea09fba22ee7bb17ac71
+EBUILD pecl-eio-3.0.0_rc4.ebuild 644 BLAKE2B dacf136119c4a64759165b237cae0419e57e49feaa27123e3da7f1af8a814c28e82f130d786e243449b2de40ae288c54533f29b8075154e4a2a46326ea917474 SHA512 813e515b2c12c5695cbec87ad31e02a563a1e62286f1e8e2fc513c3a17b75e0eb19b462dc4b5029c32f870191a5828c47908c26ebf0cc6226ed4f8ab1d7c593c
+EBUILD pecl-eio-3.1.0_rc1.ebuild 644 BLAKE2B dacf136119c4a64759165b237cae0419e57e49feaa27123e3da7f1af8a814c28e82f130d786e243449b2de40ae288c54533f29b8075154e4a2a46326ea917474 SHA512 813e515b2c12c5695cbec87ad31e02a563a1e62286f1e8e2fc513c3a17b75e0eb19b462dc4b5029c32f870191a5828c47908c26ebf0cc6226ed4f8ab1d7c593c
 MISC metadata.xml 409 BLAKE2B 1cf0f6ca2ff772e4be8f8d664d88ac0cfc5f7858f5011f41c436bdb8327820f93009f9e124f7521d9f805cce08914856da3053d1533e06d09e2f345fb26076e6 SHA512 48fa355975faf994325d4c37ef68a33856c13a8ca24a031b14d3a78d6d0f756a2647906581568ac638841b1a964424dfdf456039205add67ce3b7f0cded96b22
diff --git a/dev-php/pecl-eio/pecl-eio-2.0.4-r1.ebuild b/dev-php/pecl-eio/pecl-eio-2.0.4-r1.ebuild
deleted file mode 100644
index b027858127cf..000000000000
--- a/dev-php/pecl-eio/pecl-eio-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PHP_EXT_NAME="eio"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( README.md )
-
-USE_PHP="php7-4"
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="PHP-3.01"
-
-DESCRIPTION="PHP wrapper for libeio library"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE="debug"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=("--with-eio" "$(use_enable debug eio-debug)" )
-	php-ext-source-r3_src_configure
-}
diff --git a/dev-php/pecl-eio/pecl-eio-3.0.0_rc2.ebuild b/dev-php/pecl-eio/pecl-eio-3.0.0_rc2.ebuild
index a9410dc9aa5d..170f4580cb4b 100644
--- a/dev-php/pecl-eio/pecl-eio-3.0.0_rc2.ebuild
+++ b/dev-php/pecl-eio/pecl-eio-3.0.0_rc2.ebuild
@@ -12,7 +12,7 @@ PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
 PHP_EXT_S="${WORKDIR}/${MY_P}"
 DOCS=( README.md )
 
-USE_PHP="php7-4 php8-0"
+USE_PHP="php8-0"
 inherit php-ext-pecl-r3
 
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-php/pecl-eio/pecl-eio-3.0.0_rc4.ebuild b/dev-php/pecl-eio/pecl-eio-3.0.0_rc4.ebuild
index b280d73cb355..47a57328a455 100644
--- a/dev-php/pecl-eio/pecl-eio-3.0.0_rc4.ebuild
+++ b/dev-php/pecl-eio/pecl-eio-3.0.0_rc4.ebuild
@@ -12,7 +12,7 @@ PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
 PHP_EXT_S="${WORKDIR}/${MY_P}"
 DOCS=( README.md )
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 inherit php-ext-pecl-r3
 
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-php/pecl-eio/pecl-eio-3.1.0_rc1.ebuild b/dev-php/pecl-eio/pecl-eio-3.1.0_rc1.ebuild
index b280d73cb355..47a57328a455 100644
--- a/dev-php/pecl-eio/pecl-eio-3.1.0_rc1.ebuild
+++ b/dev-php/pecl-eio/pecl-eio-3.1.0_rc1.ebuild
@@ -12,7 +12,7 @@ PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
 PHP_EXT_S="${WORKDIR}/${MY_P}"
 DOCS=( README.md )
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 inherit php-ext-pecl-r3
 
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-php/pecl-event/Manifest b/dev-php/pecl-event/Manifest
index e50851d2a01e..5b38934c0bc7 100644
--- a/dev-php/pecl-event/Manifest
+++ b/dev-php/pecl-event/Manifest
@@ -1,3 +1,3 @@
 DIST event-3.0.8.tgz 199567 BLAKE2B 520949b55d27629e089993a49fe55114f8fb45cf5788dd57b30b0977fcfc9074757b4cc2efb6d5a126eea5343926f326d1651546650e9dbc8baa0ef7b06649f5 SHA512 45b4c07cac6dfca386cf9e6c792abc72c6f68d1443a1c67fd645f5e6f05ae9d45fb346b50b35cc6818ca70ebbff93c42afd801e70e9ebc63f997366996193593
-EBUILD pecl-event-3.0.8.ebuild 988 BLAKE2B f6cd44a561151b5d0e1ddb77fc719eb6e415deb7e0da0f41250d37c2187885d77a4824ecab616e260439b586a59546f81fb8b6f515dd0945cc622c73c292b6e0 SHA512 336f83465dd912db254401276046966ee3d914570ed38f16b5de661e4f184e26769d62236bcd332d92f1eacbb7cae2ae09ea50d00a2b260ca287abed81901f22
+EBUILD pecl-event-3.0.8.ebuild 981 BLAKE2B 5c9da131b411af0eabcd120c0f3a33aa85ffbef4167c6eb3e350b04868fc7854c5ca9aa05fe085d6d7ff134c03f4794c58bd69241aa3545aab37f9dd973a938a SHA512 55731a411f62aad32d27e589a94f810d4adaa0d309557e973f63c0aef0d86ad5d23312b3a8d84bdbf29f757fef172a90835fdacc1d4c7d7d339bada3013a5977
 MISC metadata.xml 664 BLAKE2B cf7f8cb25fee33ab477b7f172228dae753f82292cf8eecac36a26d15fd6bb844b3440632deaf6a072a252f901d4206233f138a7010c083213d355ee5abd80721 SHA512 dddc0fb3af21addc849aeb3d11d7ef67e1578fc8f2144fbe87a86046c27a3bb677b70836e2f1c5737432826438c86f123b6ff02455b66999aab896b724d70374
diff --git a/dev-php/pecl-event/pecl-event-3.0.8.ebuild b/dev-php/pecl-event/pecl-event-3.0.8.ebuild
index d43f18462dc9..0c31671cbd69 100644
--- a/dev-php/pecl-event/pecl-event-3.0.8.ebuild
+++ b/dev-php/pecl-event/pecl-event-3.0.8.ebuild
@@ -8,7 +8,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( README.md )
 
-USE_PHP="php7-4 php8-0 php8-1 php8-2"
+USE_PHP="php8-0 php8-1 php8-2"
 PHP_EXT_NEEDED_USE="sockets(-)?"
 
 inherit php-ext-pecl-r3
diff --git a/dev-php/pecl-gnupg/Manifest b/dev-php/pecl-gnupg/Manifest
index 52cb9e5f075e..40db1482e80a 100644
--- a/dev-php/pecl-gnupg/Manifest
+++ b/dev-php/pecl-gnupg/Manifest
@@ -1,6 +1,6 @@
 AUX php-8.1-support-1.5.0.patch 2427 BLAKE2B a33bbc7eadcc4555db41e37311978c7052af7a62f3b864fbf42d2099b26cb5837e0a33a6d5486131fd3e0d5d95f1dd0ce9b28db17d9f2372872714c018a68ef7 SHA512 991fd8c0d3e07097e3d73a1ddbba165e7afaa938d8dc25ba5c803a17a65d6022634a010388ac356a58efb6f41c2ef4eef50c4ec89efdb3ab9a87af32e23847fb
 DIST gnupg-1.5.0.tgz 37045 BLAKE2B 61031a493fc460b102c0a2e831e7523c4eeafc203d51a40d8aa902992740d96e3f1f46437a51a65dceefa283845d00d0b39db90163b7901a29cd133ddfc34d7c SHA512 1b4f9a39a2c585c5f8d749f8e2e2256d9765480ef8ef93c24c538b2f1284dacf8e9f71a42f96fa3150ace1a6ff37256a7a849f29a3e57332fe3b05656e4199cc
 DIST gnupg-1.5.1.tgz 37316 BLAKE2B 61aa965518909f436b3350f1ca9a10298dc739cf44140dec1bd0937e8f29c99fff1e3e117ab4100bd0c480e27c3c59d29fdb24be08fb9f8d285f9c0e93bd7b86 SHA512 93aa267e3ebf0307a700560c6ea170e6763e0a94c22730a27d39956c2d4472187018efd6393c2c9bd6c0518b92fade1b60323e3b3c24ada480f1c4d22d9e2072
-EBUILD pecl-gnupg-1.5.0.ebuild 575 BLAKE2B 3b21c36f237833c28b4707f09cdecf343dde87981e0e2d485e0c559dc33d24eeaf322c48629ec650d4d0c5d62f666a01776ac12c18b9a8dd6be26ab6a47f3eb0 SHA512 90e8a4d54cb8de840dc6a34e7f52048359222c9ead660c112ff0d6fdac91e149161a576e7aa551f419059816c441a5de6cb43b016a55759011498c10aadccaa8
-EBUILD pecl-gnupg-1.5.1.ebuild 520 BLAKE2B f49548190a11c053d217f6799716ea67cbe73b445b4463bace1b19d74c2dd46f23d70f25dd2f947f25f83f442e4f7fd06aef00f26041cbab660b6c3e31d3b0d5 SHA512 bf38b4ab2d495cee9c47d45ad3c7e296ce3e85be09962cbae9186d13e8f23a7d98ed87c1617c0d277801fda406f565aef70d024a362794b5b803e1c393af2a0c
+EBUILD pecl-gnupg-1.5.0.ebuild 568 BLAKE2B 2df486eb412517a7ca52b8ccf7dcfe87dd7e35f7c6152358ec8e7bc777fd91569411ea90787345b15d625ed880dbaa68dfd0137450266af79f0b6e05c043a79e SHA512 39abe6dab0ce50baee702f1b857445c8c468b57de9e6c27d9ae4b30f4225581ef3307664fe585520eecb58bd8e708e5bb2c838c0dcdfceee647714ae27a8f30b
+EBUILD pecl-gnupg-1.5.1.ebuild 513 BLAKE2B cd40538b0a763ed23a805eefb61aafc6fb0eda4eabe4524adfe6bb552896664294d10bfbe0722c25a9ab4e4a012b7959487ccce78faaa030c0e265a3d781c21a SHA512 af20aff9fb7e7361ce7873f0e803cbb4686ec7d020e400545baeedcd8a8bc2ec275082f9f450e7ff2e04869e7015d68e14f61b2f101848abd4efc740f265d0f4
 MISC metadata.xml 236 BLAKE2B 55612da78a71f8cee31c387a5862636996734210d765fac66d8c7706acc5151e6a9e7ff5123aeb097c911495c6220ba3b5d2f1355f46e8ab6bdb240e1697e26d SHA512 2782b20a65dca663ff7c64b7e67db05641abed478fd5996e5750b2e52ba870829f89125baa8967dd29fd20ef9b46ad233b0dd08801308b7756717ec2f292446c
diff --git a/dev-php/pecl-gnupg/pecl-gnupg-1.5.0.ebuild b/dev-php/pecl-gnupg/pecl-gnupg-1.5.0.ebuild
index 1d90c8a3e734..d426c390fbb0 100644
--- a/dev-php/pecl-gnupg/pecl-gnupg-1.5.0.ebuild
+++ b/dev-php/pecl-gnupg/pecl-gnupg-1.5.0.ebuild
@@ -10,7 +10,7 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
 PHP_EXT_S="${WORKDIR}/${MY_P}"
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-gnupg/pecl-gnupg-1.5.1.ebuild b/dev-php/pecl-gnupg/pecl-gnupg-1.5.1.ebuild
index fa5be3467ca2..cd0e546018b3 100644
--- a/dev-php/pecl-gnupg/pecl-gnupg-1.5.1.ebuild
+++ b/dev-php/pecl-gnupg/pecl-gnupg-1.5.1.ebuild
@@ -10,7 +10,7 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
 PHP_EXT_S="${WORKDIR}/${MY_P}"
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest
index aff17d81fff1..0a25cbc8ece5 100644
--- a/dev-php/pecl-http/Manifest
+++ b/dev-php/pecl-http/Manifest
@@ -1,5 +1,3 @@
-DIST pecl_http-3.3.0.tgz 225653 BLAKE2B b8d3875b2716edda98a2f813e2f5947e65684da12be087b2ec51c405223574b2e44dee3ae0a653a538e9c3acafafcec1ff40778d45d8389b239a1ea4578c2831 SHA512 e774ba0514994f219cbd2d8bef872308be8617ea22894db72473042154842c62d918d4c0b87f8c592182fa81fd1487b672252d587857e1b306dce6d38e2f53fb
 DIST pecl_http-4.2.2.tgz 224436 BLAKE2B 26ef3bb38778f0374938ba3f3bddba37c3a2044c7b9ffe2aacbca2566251d26d37882bf66773b8ed62d46855e8f14ad9b577cdb1ef3db9eba9850c0b30e57284 SHA512 1203367d590c7d80ffe7a21e7ac352ba053e3daeb778bf99e08fc13582e665e1429f850e51e36304bdec15e6646b648f2c444b46fa263e5441d008ac41a00f4b
-EBUILD pecl-http-3.3.0.ebuild 2136 BLAKE2B b4f6f3da060c35f9b4411da9353ff39303a07c57bd4f08977442510a7945414693f8adf75f9bbc203caac9e511f54a2566f1931548f772d8d706072a51226808 SHA512 30d5014abc38a14bc7b358200aca11166fa7fa744b4701313855218cfaf048d163a1267bc0454081bf8e03a021cca49ac2b046f5c8483459ddc38ad71d92ab5c
-EBUILD pecl-http-4.2.2.ebuild 2010 BLAKE2B e424cc8475448e2c0bd306b00f3d9f8ef12e103b14fcbf93c7b097c5cdae407bc74b41d5b2338095de30144cc6da8ff57d3df5c02f61f19d9c80af886966cba8 SHA512 4ca71e896dd02403cd7ae6f0438cd50ed65807531c80bcc8f11ebdbeec73a158a15ee193927ccdd6508380f47a150909ef7ae2a059f174cc2a78dc54ca39dfc5
+EBUILD pecl-http-4.2.2.ebuild 1704 BLAKE2B bdc079b712e6cacc4d4757eb5bf49ef8cb05bae5f11428da52d1c9015044b6f783fcc4ebcd648220dce479c1449fc9f27d7a84446b95835bfa7e40e1f6af0c82 SHA512 24279a5aca40cb112bfe3ed3b3c03c09f487672990df8d183bb5aac7b6dac3abfebf62525056fd2f5502adc2de48bef80477420bbeaeb490da3d939d6b7644bc
 MISC metadata.xml 318 BLAKE2B 42b746a7e1bece2295d3350d90feb75bde0fe414baaacc84b996483724f381a281299345debc2bf320488e3eaff141c1f12bbcc929de95a2fbc3caac2957cc06 SHA512 a47c085f27b112dce6f2fdabb1d14c5f9b65ce6453dc8500bc63be4862211ab83ace06ce7303afc4c65e2971cc6ddb468c1aea633f543399db57e1f9d4fb4017
diff --git a/dev-php/pecl-http/pecl-http-3.3.0.ebuild b/dev-php/pecl-http/pecl-http-3.3.0.ebuild
deleted file mode 100644
index 7005edf002ee..000000000000
--- a/dev-php/pecl-http/pecl-http-3.3.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PHP_EXT_NAME="http"
-PHP_EXT_PECL_PKG="pecl_http"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_INI_NAME="50-http"
-
-USE_PHP="php7-4 php8-0 php8-1"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php7-4"
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="Extended HTTP Support for PHP"
-LICENSE="BSD-2 MIT"
-SLOT="7"
-IUSE="ssl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl"
-
-# Patch gets cookies working with curl 7.77, but further interop work was done later
-# Just set min version for this short time to live branch
-COMMON_DEPEND="app-arch/brotli:=
-	dev-libs/libevent
-	dev-php/pecl-propro:7[php_targets_php7-4(-)?]
-	>=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-4(-)?]
-	net-dns/libidn2
-	sys-libs/zlib
-	ssl? ( >=net-misc/curl-7.77[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] )
-	!ssl? ( >=net-misc/curl-7.77[-ssl] )
-"
-DEPEND="php_targets_php7-4? ( ${COMMON_DEPEND} dev-lang/php:7.4[session(-),iconv(-)] )"
-RDEPEND="${DEPEND}
-	php_targets_php8-0? ( dev-php/pecl-http:8[php_targets_php8-0(-)] )
-	php_targets_php8-1? ( dev-php/pecl-http:8[php_targets_php8-1(-)] )"
-
-PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps
-	--without-http-libidn-dir --without-http-libicu-dir
-	--without-http-libidnkit2-dir --without-http-libidnkit-dir )
-
-src_prepare() {
-	if use php_targets_php7-4 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-4 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
-
-src_test() {
-	# Cannot use eclass function due to required modules
-	# All tests SKIP otherwise
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		# Link in required modules for testing
-		ln -s "${EXT_DIR}/propro.so" "modules/propro.so" || die
-		ln -s "${EXT_DIR}/raphf.so" "modules/raphf.so" || die
-		sed -i \
-			's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=propro.so -d extension=raphf.so/' \
-			Makefile || die
-		SKIP_ONLINE_TESTS=yes NO_INTERACTION="yes" emake test
-		# Clean up testing links
-		rm modules/propro.so modules/raphf.so || die
-	done
-}
diff --git a/dev-php/pecl-http/pecl-http-4.2.2.ebuild b/dev-php/pecl-http/pecl-http-4.2.2.ebuild
index 6f8fca855057..4b7e320a307b 100644
--- a/dev-php/pecl-http/pecl-http-4.2.2.ebuild
+++ b/dev-php/pecl-http/pecl-http-4.2.2.ebuild
@@ -9,12 +9,10 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 PHP_INI_NAME="50-http"
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
-USE_PHP="php8-0 php8-1"
-
 KEYWORDS="amd64 x86"
 
 DESCRIPTION="Extended HTTP Support for PHP"
@@ -33,19 +31,14 @@ COMMON_DEPEND="app-arch/brotli:=
 DEPEND="
 	php_targets_php8-0? ( ${COMMON_DEPEND} dev-lang/php:8.0[session(-),iconv(-)] )
 	php_targets_php8-1? ( ${COMMON_DEPEND} dev-lang/php:8.1[session(-),iconv(-)] )"
-RDEPEND="${DEPEND}
-	php_targets_php7-4? ( dev-php/pecl-http:7[php_targets_php7-4(-)] )"
+RDEPEND="${DEPEND}"
 
 PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps
 	--without-http-libidn-dir  --without-http-libicu-dir
 	--without-http-libidnkit2-dir --without-http-libidnkit-dir )
 
 src_prepare() {
-	if use php_targets_php8-0 || use php_targets_php8-1 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
+	php-ext-source-r3_src_prepare
 
 	# Respect LDFLAGS, bug 727134
 	export EXTRA_LDFLAGS="${LDFLAGS}"
@@ -71,9 +64,3 @@ src_test() {
 		rm modules/raphf.so || die
 	done
 }
-
-src_install() {
-	if use php_targets_php8-0 || use php_targets_php8-1 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-imagick/Manifest b/dev-php/pecl-imagick/Manifest
index 10bd0ddef354..c6b3726f3d58 100644
--- a/dev-php/pecl-imagick/Manifest
+++ b/dev-php/pecl-imagick/Manifest
@@ -1,4 +1,4 @@
 DIST imagick-3.7.0.tgz 360138 BLAKE2B 2c149f2ec771df92789d67e88c6f7180d3da7c9182561432bdd4e0a83f96982cc8fc95bc1a003e05e37a54fabe6ab0fe693a6b9208d2e481d36e6c334aeee023 SHA512 c84408e4e4a0c46d979240e06d58d264c6bb21f3b95e3d434c8a21cd808f6c495fd453ef9c07b5c44dac81c6f205b6697f8ecaf1a65a86ce4e9052328a389ebe
-EBUILD pecl-imagick-3.7.0-r1.ebuild 868 BLAKE2B cad4287946468965269a31eaed47485fccb70f05c9f3e1e72dd0a1430082fc5d872293a0f1b5602fe98277c8b2d7c58f5836b69ff5008680cd294ca54587d0b8 SHA512 230fadfea137a7a2bb30207dc26ae5a3dfc308f946a7c604472dec0d150eb5fbfb33e1229f72db9ac332ffcc6449189d7759d0a20c7b804b5dc0cf5bad932c0d
+EBUILD pecl-imagick-3.7.0-r1.ebuild 861 BLAKE2B ed4aed33ece25a1e77953874706fb7c33627d3edd5bdea2e7ae45fa3a478bba5c47f51a0340e253fdfba4576b4b5a6ebd22511ca7a94b540c6b7a0f2b21d8e50 SHA512 d94d202c939a3beb066498fab923eeb0c6f7e94be6d6ecdd96ff858cada4b934095c29ba2806ec5a7f9008124d2ac553a58eea571fd87292e53fb7ccd7ae6d74
 EBUILD pecl-imagick-3.7.0-r2.ebuild 921 BLAKE2B 0a3a4372343e20f7a8ea1fc02fecc0f1c8d4b7a97ee64cfcda976a57cb3dae5f6a25a0a1734888b469e0ea6e5c5683201efe3fadf4ba6e8a418ce85855af9e7b SHA512 85dac684dab0452f92eab3b756cd925402187ccfda944cd0d6ead557c8a7cc4e85ca72f1f862ccf7194e7f1c8c6e979013eb88e413c32c253cb4b89b20830a19
 MISC metadata.xml 443 BLAKE2B 208b9e5262b94da1cc49b6f4666e62b6d856c10643c8dc6c1572ee641fd671a2338ceec56ca88f4c56247cd06f7d4288684ab721547d86eb3bc84bd694c5f9ef SHA512 b8d47d2293ef17d2aaaf23cb78a58df295020fd854131e53b55feb727c850bea669ed1bd24cab97c02264028b8bcd335e928b1d86702e06245c72370ccf0507c
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.7.0-r1.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.7.0-r1.ebuild
index a0c683be62ab..c098e4d0c9af 100644
--- a/dev-php/pecl-imagick/pecl-imagick-3.7.0-r1.ebuild
+++ b/dev-php/pecl-imagick/pecl-imagick-3.7.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI="8"
 
 PHP_EXT_NAME="imagick"
-USE_PHP="php7-4 php8-0 php8-1 php8-2"
+USE_PHP="php8-0 php8-1 php8-2"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-lzf/Manifest b/dev-php/pecl-lzf/Manifest
index dd0fabd0cf51..3a79beea2a90 100644
--- a/dev-php/pecl-lzf/Manifest
+++ b/dev-php/pecl-lzf/Manifest
@@ -1,5 +1,5 @@
 DIST LZF-1.6.8.tgz 18071 BLAKE2B 83a12c44c02145baac75bc7b5172b09a6a15d4d02852f25d56ea97cf58a83709d59d56cb12be7df510fd687fd5ade760939527ee8151d3ecdb4407b7be2022e3 SHA512 c35543a40b2b44da4bd60e3142ba6ecf33e3460a8ea9f4f7fe6cdc4d728048593b33c423195d58707355975d655f614249642aff2d9b810af0e6a34d42fa1c43
 DIST LZF-1.7.0.tgz 18267 BLAKE2B c3d0a9383037e9e2bbe0a156fc4e23090ab0b5bc2ea31b402d3f56ea9d162b6ed938d754138dbae2a984d7237cb2a2d04b58a62679eea3c3f5b48718882494b8 SHA512 76a2bce7aa44f9aae40345f37c9294626d453879c7f98099ad6c31ae32abc638233934bf22ddd9bc0d4a6d285b25aa06dedc175ad5bb1544884a272e6b031ced
-EBUILD pecl-lzf-1.6.8-r1.ebuild 362 BLAKE2B eae73c9d2cacc65b92337ea77c839ae7af4957a3d19c9c531e6efb8add73c1f9767f5c5bafae42611525b4cfbc6a30f7016110526075e5d9b4ed044b23795ece SHA512 92fab334cf86d5cc68eae015d83bb78518c010205fef6311f110e38f1fd4be5ec24fa83d4daa71796e436764b84e5c990cf8f062f4e8b2ba6336c11016619971
-EBUILD pecl-lzf-1.7.0.ebuild 362 BLAKE2B 7df5e40d31c6e4f6ad8911bee83db0c409a5c6e238d7eadc283698c5be2f7aed0e94986e5f2bf61a3ef0560a262471292863ecea2aff2b2862708d4ed85ad12a SHA512 40765d1b5693407f8bf5e4aceb7dada5088b8ed6e34591ee9a20b2e39f651cc59ccbf49c3ec63d4669766c4341060db6ad35e5bda5c9edcc2ea4252c882b3ace
+EBUILD pecl-lzf-1.6.8-r1.ebuild 355 BLAKE2B e7d1edafeb4820f410a813a693d0b4bee4b635728d9577d521ab29c13a58688d570cda6183fb6f09af702e4053d15b1367d6e85394bf502095a6ea8b15063d41 SHA512 0eaf1a8aebeca6212c17f56686403b2febc23977d7a1c14bf6409ce3871be6de25b93ada014a71590d91699346df42fb7682f01cad50af005a0267307d62bb02
+EBUILD pecl-lzf-1.7.0.ebuild 355 BLAKE2B b329c7c3921778ce846f075f2c21a133351e14b3d6acf1bfe026e6a288af80e08ac0c1482419eaf0cee7af74ff500bb3fe68bf65c40e43c35518e5a53fdab97a SHA512 b39601d2e5fd404972993cef88233e3dc04bc69d3ab5f6544f99f8142394ecd21bedae797e8ffef25bccc2615caa930933474c5b4ce6de387fb3e95eda67743f
 MISC metadata.xml 236 BLAKE2B 55612da78a71f8cee31c387a5862636996734210d765fac66d8c7706acc5151e6a9e7ff5123aeb097c911495c6220ba3b5d2f1355f46e8ab6bdb240e1697e26d SHA512 2782b20a65dca663ff7c64b7e67db05641abed478fd5996e5750b2e52ba870829f89125baa8967dd29fd20ef9b46ad233b0dd08801308b7756717ec2f292446c
diff --git a/dev-php/pecl-lzf/pecl-lzf-1.6.8-r1.ebuild b/dev-php/pecl-lzf/pecl-lzf-1.6.8-r1.ebuild
index b3ba6a952841..b3df3a22b155 100644
--- a/dev-php/pecl-lzf/pecl-lzf-1.6.8-r1.ebuild
+++ b/dev-php/pecl-lzf/pecl-lzf-1.6.8-r1.ebuild
@@ -7,7 +7,7 @@ PHP_EXT_NAME="lzf"
 PHP_EXT_PECL_PKG="LZF"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-lzf/pecl-lzf-1.7.0.ebuild b/dev-php/pecl-lzf/pecl-lzf-1.7.0.ebuild
index e1216b314593..f2cd9d91cfd1 100644
--- a/dev-php/pecl-lzf/pecl-lzf-1.7.0.ebuild
+++ b/dev-php/pecl-lzf/pecl-lzf-1.7.0.ebuild
@@ -7,7 +7,7 @@ PHP_EXT_NAME="lzf"
 PHP_EXT_PECL_PKG="LZF"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest
index 6f90730fbd99..b5f39b9132c5 100644
--- a/dev-php/pecl-mailparse/Manifest
+++ b/dev-php/pecl-mailparse/Manifest
@@ -1,3 +1,3 @@
 DIST mailparse-3.1.3.tgz 943785 BLAKE2B 03cb7d4d4ac78d04f710155fdd9282250dc686dbab3a6d9dfb8e3ff82fda07faf02680ad86a810cd7ee2f38c8980fbdc9ad67399f3164506e523a98ce3ffb0a9 SHA512 93659e479d8ab61ae473f6dc002b7198903eebdcfb4aa515e76952f5050fd1a815baccfcb57bd32fb9be6108dfed6dc73172067a58c9e6098058999bb3802000
-EBUILD pecl-mailparse-3.1.3.ebuild 488 BLAKE2B 9e27d662beb636999f5ef7b3af2e8c6c9de40b386a717017e6b57b30bc7b53b4356edc74c78d834ff7890356b61c2f99caba8a2fac62834b3801d10b55688750 SHA512 65b5c72300315be8568c701431c0da512cd9e87c4cc6df574a9a1fdc1e7afe2f6a04b98867678053f11fd2187abba569e55bc162293101409c9d699398388678
+EBUILD pecl-mailparse-3.1.3.ebuild 481 BLAKE2B 7773b425e10fa182c75d6e328ff72911316178a7e65dbb6ff95bb9c161a9225f037c374897d526d0830e1d5c71c1b755dd7e05919cae136cc6517dcdc07248fe SHA512 49d0fadf91daff2412fac4cc79f00c142906e0bbd113a33e7e7e3e8d2c4580d64a620713c200fcfdcf59f9779578a5b4978756d77a4e080a21c0e4f04446d58a
 MISC metadata.xml 328 BLAKE2B ecc91fef2e9d4c34bc55d8326b50837f3177704b1180c16ce7909c0b93d5c5ce4ce02dfc283e378c248232d218d01434241794ee5886645e6294a8635b67d178 SHA512 b2d46eaee31deccdf478c8023ba5b190d446142084264cb328ea36c430f42c9b623e97171de2736e3979fad99f160bf15025d524a67fc912c2bf42e2f8e51cb6
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.1.3.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.1.3.ebuild
index fc03e67dc29a..c482283566e7 100644
--- a/dev-php/pecl-mailparse/pecl-mailparse-3.1.3.ebuild
+++ b/dev-php/pecl-mailparse/pecl-mailparse-3.1.3.ebuild
@@ -8,7 +8,7 @@ PHP_EXT_NAME="mailparse"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_ECONF_ARGS=""
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 PHP_EXT_NEEDED_USE="unicode(-)"
 DOCS=( README.md )
 
diff --git a/dev-php/pecl-mcrypt/Manifest b/dev-php/pecl-mcrypt/Manifest
index b7a0e72e0b19..e16ea38a5544 100644
--- a/dev-php/pecl-mcrypt/Manifest
+++ b/dev-php/pecl-mcrypt/Manifest
@@ -1,5 +1,5 @@
 DIST mcrypt-1.0.4.tgz 27056 BLAKE2B 3faa77299ef1b5ab3f5a427b57d64f5f5ec54bc41f83924bfd285289c168341c0f044970fb0c37ca8561e68be165a40b2d6fd423ed6d5aa74225d5a3fb349546 SHA512 6a8244761035640366041a5f26057ab14bb85eaaa973ddf604e152b786ef750ec775ae91d7582044700d6fdef902425f3a9d6839113a52e0a9f957bf9d0c189a
 DIST mcrypt-1.0.5.tgz 27056 BLAKE2B 0ed78eed5d5e1c848f554bf16bb5d94fd445081ab389b4a44f3b0ad0fdb11b25bd79eea77ed87a35120fb89b8409705b01d725923d7b2777dd32276f3a39238f SHA512 fe9afd0987ddbcbb0a9fc5e8313c08c65ac6afd606cce586fe30600ab149b4f4add917bb0319f803942833a88f520f65e2e94bbcc6c58e2075e829509e7dfac5
-EBUILD pecl-mcrypt-1.0.4.ebuild 521 BLAKE2B d7344229cfbf4e44ea082702b6081fbe1c0af7562ffc4ac001188561680ce4185b03a3641dc57d5f03d2160215a1efc91084dcf888e7067ae90945e2a72313b0 SHA512 6e0fde6f0500a5e2e12a72bde8d19e044fccd9adda865b9e35d9de0bd7b1a7115cff779d221ca8a1617564e3cccf2449435c92a8d854e34f6977f36219927a49
-EBUILD pecl-mcrypt-1.0.5.ebuild 546 BLAKE2B 0c6ae7311b814e4c1b9c1131175796df8ed0a6e12ab2c3692c5bd96730d1a1c2f7129b4ac6528d1fc5fbdfc58d81be928861ac0796f5f2811e314ecce6ecb82a SHA512 1b1a106f54337b5c8f49b492976f193b5828c88bec6488d2dccd02beafe28d0ccd741c5654e3a7a819e8213b6c53f6d2e931c804e8aca22211ce54a965826339
+EBUILD pecl-mcrypt-1.0.4.ebuild 514 BLAKE2B e6bccf2f93b919dbbbf73ae6f889063b3041b18b70a51c1b2cea65601d33f1602aec77b4e092c3db0631f0f8e5ee21bd5daf3e2e4eab95073675f6d1b4d68e26 SHA512 e22dfbb23fdebdde37a94dc2bfeb657692d3ebab589113c03f9a7b85fcb7b694648d9b859b29445a1ad90626c95888b9b5ea7d881ead96efb7c37f812a5fcb74
+EBUILD pecl-mcrypt-1.0.5.ebuild 539 BLAKE2B 59905e2be46902d371a49d83d6a0cf1d722d13d00d42913c05ae51b58689063b46e6bac368ad70773ec3a872a9633fc550fac700d96091104a6de4992277363d SHA512 996f5c04fb07340b379127ad5a8d6153497e81668d4f4cec66f9e73fe9ee433d99fe9ae99e1145af45966a6c9fd113dffa5a35da83b04ce714913aeff3fbaaf7
 MISC metadata.xml 410 BLAKE2B f833751f407d57c96e4e2f2dd05520c55037ba7874e753750df8a22d4c18a5edaf0925982b2b04c4e7e541bd691c6d7798bef0079fe980b35a9f71f5e2405793 SHA512 cf4f51a91d42ff06b0d628c44ee66463a1903de18e749d690a722e2fe77d95d83ba709595adc20e27976de502c5a5e232065d394eb41c03f9d39a8291a874841
diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.4.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.4.ebuild
index 0e79ba64b9b1..78fd2695947c 100644
--- a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.4.ebuild
+++ b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PHP_EXT_NAME="mcrypt"
-USE_PHP="php7-4 php8-0"
+USE_PHP="php8-0"
 MY_P="${PN/pecl-/}-${PV/_rc/RC}"
 PHP_EXT_ECONF_ARGS=()
 PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.5.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.5.ebuild
index 94e2afb39170..f9a0ae3b7e75 100644
--- a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.5.ebuild
+++ b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PHP_EXT_NAME="mcrypt"
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 MY_P="${PN/pecl-/}-${PV/_rc/RC}"
 PHP_EXT_ECONF_ARGS=()
 PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
diff --git a/dev-php/pecl-memcache/Manifest b/dev-php/pecl-memcache/Manifest
index 14305419b1f8..0f9217eb3c2e 100644
--- a/dev-php/pecl-memcache/Manifest
+++ b/dev-php/pecl-memcache/Manifest
@@ -1,7 +1,5 @@
 AUX 8.0-patches-20211123.patch 5706 BLAKE2B 66b9671357963c0f7c0f32f3b578f4b38acda7024e8c33bb03e328b4177c20841b8318482122b343d407d6dc5e4182d8fc74ae3dfc186ad8d606372d024a4807 SHA512 6e66664ca4aa7d3578facbdad012506b3b12fdae7460c9cad5f515228f697e511bbb02fe7f9a2efcfc3066877688bd7092e81a26199d5e26097f365806079eab
-DIST memcache-4.0.5.2.tgz 75061 BLAKE2B fbf96fd182ff4b8764c4492edcdac53263176ebe6d63a27e9f3fb32110a016b221722c246e7c1ae49ee973a6e4cdff045876d1c6119f410f2fa3e796c0580e02 SHA512 93e163acf3a6c28f16b5f0982105f6f558cceeb314b3f09ad71655d8a5adf64d23959f1a2f3589eb7e7a7e18c88ba8132014e13f697a737cd570cf9405137384
 DIST memcache-8.0.tgz 78448 BLAKE2B fb2d68d5ff4c6343dd2e66ae5c3f84fed22455b8614dce04dde2e10c164bf1f8d276776b74beaa387dd794cf82f6b897a88c8bed058376b9032e0452c2e94b06 SHA512 d5eea13b85d8d35ef6aab8c5699bdcc4707cf8debf4052cbbeac26e7e2360a4d3d4e55e8bd0b40cf19fe014ba1fc42d5417deabbe22a199f0c6aa98b67d132d4
-EBUILD pecl-memcache-4.0.5.2-r1.ebuild 1755 BLAKE2B 59efdf7e9fb877787795af1c7f0f60efb5a5c90dc5c6689bcb5c94165537363ec93de19b2a64710c8d87b7086a3c1aa48ab9c00e22f0c9a0323f8376c12d3584 SHA512 c3b62081a8ba583e29ce0b46eb178948963cdee28d7c8251ea46fe13c53c40e90101ddb361ac5920825c65f77979d32fe32117a12d2b754e46ef585f703311ea
-EBUILD pecl-memcache-8.0-r1.ebuild 1862 BLAKE2B 88c2ab7256521c8de5b8e06ee032b290f67f098e90008086076dd95d625482c621ac95d505d6f7dc53431559544d7d13bddc3d64b20984431bb848dba74a955c SHA512 80b34315f949cada1fe6229c47691bc7081acefff3401f796fb695556e7194c23a894c3a258819f42ba48788a85a428001837716cbd7f2f7409a197693b0685f
-EBUILD pecl-memcache-8.0.ebuild 1675 BLAKE2B c65d0f475d06fb1b51a7b6542f660f570e1d2407d81cd531b81839312fdfebe277286757139d2d402b1e217741683b107448295cc149d4ad4021a7eda7a99681 SHA512 b7bbd069e26f59505fb0077bf422f3f98a2ce6d146101c8dc29fea288b629c3e04a5f0a0cb4d879913429fb49c823898a24fed5ed1e337ca3c75abdb88274201
+EBUILD pecl-memcache-8.0-r1.ebuild 1756 BLAKE2B 3a74d6df4bd2b8014ecbaa3ec60c5a792198bebe76c20292e7cb9d19c66460da0785fbe668489968403a3e7e2e5707b76f095c13860a864b14e141ab821f8ec8 SHA512 fd43111a8d3849c235acc802b444bb7cec1ebb99d287ff805fd92e4dded56f86a352345c40208ae211176e1cdf7882085d3707a3f3ad7b09de0b17e04724497f
+EBUILD pecl-memcache-8.0.ebuild 1576 BLAKE2B 3f0becc77c24a002deb94a7de2500ed39521d9611e91e22ffad85d88ea674db9b8ea5b68d6dfa3611a416ea3c5832fa3eda6554ff00e8a4030be2f34b1293347 SHA512 ca03bca8f011501972596d4bbcddb4b82c19779209fdf39e8b91b1832dbc11ed56f8f0e5740022076d9d95419e2d716c14b336de56ed49f6018666a9dfc4c8cb
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-memcache/pecl-memcache-4.0.5.2-r1.ebuild b/dev-php/pecl-memcache/pecl-memcache-4.0.5.2-r1.ebuild
deleted file mode 100644
index da8213cc9cdc..000000000000
--- a/dev-php/pecl-memcache/pecl-memcache-4.0.5.2-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PHP_EXT_NAME="memcache"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_NEEDED_USE="session(-)?"
-DOCS=( README example.php )
-HTML_DOCS=( memcache.php )
-
-USE_PHP="php7-4 php8-0 php8-1"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php7-4"
-
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
-
-DESCRIPTION="PHP extension for using memcached"
-LICENSE="PHP-3"
-SLOT="7"
-IUSE="+session"
-
-DEPEND="php_targets_php7-4? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	php_targets_php8-0? ( dev-php/pecl-memcache:8[php_targets_php8-0(-)?] )
-	php_targets_php8-1? ( dev-php/pecl-memcache:8[php_targets_php8-1(-)?] )
-"
-
-# The test suite requires memcached to be running.
-RESTRICT='test'
-
-src_prepare() {
-	if use php_targets_php7-4 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default
-	fi
-}
-
-src_configure() {
-	if use php_targets_php7-4 ; then
-		local PHP_EXT_ECONF_ARGS=( --enable-memcache --with-zlib-dir="${EPREFIX}/usr" $(use_enable session memcache-session) )
-		php-ext-source-r3_src_configure
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-4 ; then
-		php-ext-pecl-r3_src_install
-
-		php-ext-source-r3_addtoinifiles "memcache.allow_failover" "true"
-		php-ext-source-r3_addtoinifiles "memcache.max_failover_attempts" "20"
-		php-ext-source-r3_addtoinifiles "memcache.chunk_size" "32768"
-		php-ext-source-r3_addtoinifiles "memcache.default_port" "11211"
-		php-ext-source-r3_addtoinifiles "memcache.hash_strategy" "consistent"
-		php-ext-source-r3_addtoinifiles "memcache.hash_function" "crc32"
-		php-ext-source-r3_addtoinifiles "memcache.redundancy" "1"
-		php-ext-source-r3_addtoinifiles "memcache.session_redundancy" "2"
-		php-ext-source-r3_addtoinifiles "memcache.protocol" "ascii"
-	fi
-}
diff --git a/dev-php/pecl-memcache/pecl-memcache-8.0-r1.ebuild b/dev-php/pecl-memcache/pecl-memcache-8.0-r1.ebuild
index fc0048196784..dd2db9d8a731 100644
--- a/dev-php/pecl-memcache/pecl-memcache-8.0-r1.ebuild
+++ b/dev-php/pecl-memcache/pecl-memcache-8.0-r1.ebuild
@@ -9,12 +9,10 @@ PHP_EXT_NEEDED_USE="session(-)?"
 DOCS=( README example.php )
 HTML_DOCS=( memcache.php )
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
-USE_PHP="php8-0 php8-1"
-
 KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
 
 DESCRIPTION="PHP extension for using memcached"
@@ -26,9 +24,7 @@ DEPEND="
 	php_targets_php8-0? ( sys-libs/zlib )
 	php_targets_php8-1? ( sys-libs/zlib )
 "
-RDEPEND="${DEPEND}
-	php_targets_php7-4? ( dev-php/pecl-memcache:7[php_targets_php7-4(-)?] )
-"
+RDEPEND="${DEPEND}"
 
 # The test suite requires memcached to be running.
 RESTRICT='test'
diff --git a/dev-php/pecl-memcache/pecl-memcache-8.0.ebuild b/dev-php/pecl-memcache/pecl-memcache-8.0.ebuild
index 7d51a942b070..5d57ff2bad0e 100644
--- a/dev-php/pecl-memcache/pecl-memcache-8.0.ebuild
+++ b/dev-php/pecl-memcache/pecl-memcache-8.0.ebuild
@@ -9,12 +9,10 @@ PHP_EXT_NEEDED_USE="session(-)?"
 DOCS=( README example.php )
 HTML_DOCS=( memcache.php )
 
-USE_PHP="php7-4 php8-0"
+USE_PHP="php8-0"
 
 inherit php-ext-pecl-r3
 
-USE_PHP="php8-0"
-
 KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
 
 DESCRIPTION="PHP extension for using memcached"
@@ -23,9 +21,7 @@ SLOT="8"
 IUSE="+session"
 
 DEPEND="php_targets_php8-0? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	php_targets_php7-4? ( dev-php/pecl-memcache:7[php_targets_php7-4(-)?] )
-"
+RDEPEND="${DEPEND}"
 
 # The test suite requires memcached to be running.
 RESTRICT='test'
diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index ec6d51fb6228..e5fbe8156894 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -1,5 +1,5 @@
 DIST memcached-3.2.0.tgz 90722 BLAKE2B 5bc3ce40803004f45ad397684277862dbaffce467b3026e33d9737d4d93a82f2c89e32a256ebf6db3117a462ff8f81a517ed9950773cb4a0e927aa8af4e834be SHA512 ece5759a9d6d52afd46beb0821811e5d4830e75ad8564af395e2107fd349e271c6e6cf20eeacd9ad15ee2e99ccf0118ccc83c5810e2f3fa7c61f1984b0b26514
 DIST pecl-memcached-3.2.0_p20230419.tar.gz 99453 BLAKE2B 3fb0e0316c9d6de9d727f9fd3a5f723d00aef33adcfa815c6571b99b9f536e9e02e9e7d37c73252dca3d5415aea554c8c16374a018210a1bbd2caa4a0c1263d8 SHA512 74e1b53f2078f343367a6c83e287c2fd29427d42f3db3eac01d3c5dea1eef1cd94130e2e59eaa3bdb368aecac740391ef4961224d5751d81306881291818fa9c
-EBUILD pecl-memcached-3.2.0-r1.ebuild 1570 BLAKE2B f4ff4997fdec5cd231e24f6a84f6dbcc089674d55f82581eff4edf16581f44a4132bc63186c38b36e96d4e627c7cd75f870a528ac0f10caa73c2a330a244a7fb SHA512 d907e85e0891702c7b1f96879fdded271ec044f7cbaf89bf110d407b2065e24e522cfc142799943a507519bdb1efa54dbbceff56aef6a02bfef4fb72531c4a44
-EBUILD pecl-memcached-3.2.0_p20230419.ebuild 1798 BLAKE2B b84b1e866641ac0f11f33776082ff0b193c248b66b337c1aef8cd30ca6d189fcb207d2c90ad0bde04baca19696335f430876088a9a558c17ec28ff109a13f163 SHA512 cae9fb4105add4219cd7cd42442a3af335bb3722aafbdb8f828da8849d0ab7536d3bef53410cc4ad69d4f2ce2bc1cd4a3d47aa735d983b09e0ed333b1a06b220
+EBUILD pecl-memcached-3.2.0-r1.ebuild 1540 BLAKE2B c5045e092d8da662e1df3615167c89f4d3c6302d99038a095c886c5c89255edc6a368483d72fd2597ffcc19544278c77b8834ad1f350862e32dafae46fda602f SHA512 5d0635385fa702494b11f28b92199b34224f672ce5e4be9eb897125992d1cecce2a33d7de91e7aa6c53c9cbf5dd118b076657a33fffb877d1189e4dba21ee18f
+EBUILD pecl-memcached-3.2.0_p20230419.ebuild 1768 BLAKE2B a594aa472c6b266b8350d0f2a717a3a40280f11eef0ab39c1625390c2ed642f1f03f301c1bdf3c66e715ef1f0abcf341c9abe5307a68078375f8ead2b35dc66f SHA512 8984268298345fd9606393b85cac423ed23dc8ab553acf59c35712bbe80517170167d5274181816f26221f3f181781e4e367d2ed6ec023a6379f6b16f3141f1b
 MISC metadata.xml 569 BLAKE2B 686b6c91f4d91fb82bd90b08af6627a8211e9676139417551e8a8425da410c15a77b79ff51760c2a16815c84c55c1e81ff462af17282ffa198db0829b20566c6 SHA512 8f3154fc7f3c9d1707b121ddc8d94d8d5570f7ca0cc93c0f732cda3ba6a756ed421a6facd96000ade0c22af9a78efbdd69ec118bd195c4c83fc523f2cd7e1cc7
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.2.0-r1.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.2.0-r1.ebuild
index cd2ba2165947..6fd24a25676c 100644
--- a/dev-php/pecl-memcached/pecl-memcached-3.2.0-r1.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-3.2.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 PHP_EXT_NAME="memcached"
 DOCS=( ChangeLog README.markdown )
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 PHP_EXT_NEEDED_USE="json(+)?,session(-)?"
 MY_P="${PN/pecl-/}-${PV/_rc/RC}"
 PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
@@ -23,7 +23,7 @@ RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="|| ( dev-libs/libmemcached-awesome[sasl(-)?] >=dev-libs/libmemcached-1.0.14[sasl(-)?] )
 	sys-libs/zlib
-	igbinary? ( dev-php/igbinary[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] )
+	igbinary? ( dev-php/igbinary[php_targets_php8-0(-)?,php_targets_php8-1(-)?] )
 "
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.2.0_p20230419.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.2.0_p20230419.ebuild
index 98a7335e675a..5dd447775b95 100644
--- a/dev-php/pecl-memcached/pecl-memcached-3.2.0_p20230419.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-3.2.0_p20230419.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 PHP_EXT_NAME="memcached"
 DOCS=( ChangeLog README.markdown )
 
-USE_PHP="php7-4 php8-0 php8-1 php8-2"
+USE_PHP="php8-0 php8-1 php8-2"
 PHP_EXT_NEEDED_USE="json(+)?,session(-)?"
 MY_P="${PN/pecl-/}-${PV/_rc/RC}"
 PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
@@ -26,7 +26,7 @@ RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="|| ( dev-libs/libmemcached-awesome[sasl(-)?] >=dev-libs/libmemcached-1.0.14[sasl(-)?] )
 	sys-libs/zlib
-	igbinary? ( dev-php/igbinary[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?,php_targets_php8-2(-)?] )
+	igbinary? ( dev-php/igbinary[php_targets_php8-0(-)?,php_targets_php8-1(-)?,php_targets_php8-2(-)?] )
 "
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
diff --git a/dev-php/pecl-mongodb/Manifest b/dev-php/pecl-mongodb/Manifest
index d8df10d1b59b..b5ce3eaf9d3c 100644
--- a/dev-php/pecl-mongodb/Manifest
+++ b/dev-php/pecl-mongodb/Manifest
@@ -1,5 +1,5 @@
 DIST mongodb-1.10.0.tgz 1331177 BLAKE2B 8593392d50fce99059888e25d6400d2e7a35e93a1e4b74abf9b427ff43dbd2484380ecdbd7b7ce6abec643351a9c3bba572e2e0b551a88b18efbcf4c2b133767 SHA512 72527087dc3d1e1d48d6236592c1fbafa68354e2b8e070e85180d79ffcaa82740641450808a235bb711ded16ff65ec0cbd53fb66f0da18837351a3d402c3976f
 DIST mongodb-1.16.2.tgz 1907341 BLAKE2B 273ca2a5d92a195938cea103d12e9279c4a6aae43107f9b04d6e74752f82af5c258a3eff259ffc6a8381275be214bcc6cd577050ba1a908e202dda54ed31dae9 SHA512 3c81882c609b09cde534315aa4b1fe3c47e18e4ed26a940bf60a6bdbf4e53b2204d8e4e113a9b0a3469b60793ead9f8dff703920b86280e78448e07d6535a277
-EBUILD pecl-mongodb-1.10.0.ebuild 1231 BLAKE2B 64fbc3be8e7cfcecbf7ca7d059f4e9be96e5e3e5ee8908d0c1016d4e78634c99b1e5e9e732544a699cd8eb84a992ba3c0d6b6cdb470df6fb753de47c8b189379 SHA512 a7c6e3da23e364cbaf55fc6495a612e0262bc854e3864d9430ebe5bbf7cfb8e79dc139ed40d5813265779d972cbae3549e4fc5381cd34f41a389101f9ccbd4a2
+EBUILD pecl-mongodb-1.10.0.ebuild 1167 BLAKE2B 4d2018ce66d683151ab20422f7364f62e092f40d04a5cd04df8f16612054bc8720fcb12ec7c0c91d08076068d50ac89c19ec32db869d61d928fe7af9c6755469 SHA512 a91f4b1a6df43ed40f91aa26c1d4a341dd48ab65f093bf53358af625029fb699e4f4057d336234920e9a744d777a0a40b05ee0ab55d00ecbc5e1390bbf579265
 EBUILD pecl-mongodb-1.16.2.ebuild 1286 BLAKE2B 97f75301812ba1f67da0f676ce0db6473d57cd8532563e93bc7b8dad02278fc235fc0ed8afabf54dca828f980021652c8a04cb28aa4db07252d2085466711a97 SHA512 e0cea0997922d699a4289c937d24d409148194a3790d940559323952e773e4ff739eedd65cd5d0e1a192c68b07f03c3444b61f188c60deb418cf8370299f7696
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.10.0.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.10.0.ebuild
index 9c932976b367..95c226452057 100644
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.10.0.ebuild
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.10.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PHP_EXT_NAME="mongodb"
-USE_PHP="php7-4 php8-0"
+USE_PHP="php8-0"
 
 inherit php-ext-pecl-r3
 
@@ -16,7 +16,6 @@ KEYWORDS="amd64 x86"
 IUSE="sasl test"
 
 PHP_DEPEND="
-	php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] )
 	php_targets_php8-0? ( dev-lang/php:8.0[ssl,zlib] )"
 COMMON_DEPEND="${PHP_DEPEND}
 	>=dev-libs/libbson-1.18.0
diff --git a/dev-php/pecl-ncurses/Manifest b/dev-php/pecl-ncurses/Manifest
deleted file mode 100644
index 274055d91150..000000000000
--- a/dev-php/pecl-ncurses/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX pecl-ncurses-1.0.2-php7.3.patch 4739 BLAKE2B f12e64c0f3615ee9b58ca7d410031fdde63d08cb8221e71826136fdb98005f6ee4552e9e46ae4085cd00a563e47807728d93c20f4b03277d3a8f866af1b3504b SHA512 731ed4e80f248dffffb675f96b9137abc7734fa32540014e0660810f95a82c4b785ca4c01628705556b7516be942da8ce37d66f6f4abf1788ce9514b881430ac
-DIST ncurses-1.0.2.tgz 16226 BLAKE2B 2b50fb953594f71e8ba2c93cc8ac1443168ea360c5c752eb4ebb941cdbd4e576bd6d5516722bbe06f31a5dd4732bf47c6fd740599af161cb33cbcb45493bbc5d SHA512 e1f684dcab2aa4dd3fded79fed02c78de1525f0384027fe64ad08759617f13ca6fb11742e3407723eecc431ed99847c0c98ae559797dc98ce373a01ba8413bf2
-DIST pecl-ncurses-1.0.2-php7.patch.xz 5096 BLAKE2B 8034121b97cc1769534923570c929444c0cd01238615e51c47845b9b10db4b62353a853a17d8ddd44c8ad47e68c44363321f7d08c2dfdd0e2948ddc7d33b2b9d SHA512 1f1dcaaa61033d7db55048f97e48029a335d5d191447038324eb170c9877da62a7b03cec20ea7496c073b76d7ba1009b4374b088c87e1838ee2dc433749c41fa
-EBUILD pecl-ncurses-1.0.2-r5.ebuild 515 BLAKE2B 547bda0cd0bec92f3a769ca569718260d97706dd1d061c1a25b1f8134c9a67bfb2ba1d15580cbb634da4c6c92d50f2ce633adcf37eee8f1ebf15ffb0920818b0 SHA512 9971c329c415fffcc77a20703d7766b9a72a1e0d2c9cf1c5a9891e4b409a489f75bf7ec15799179fe853ba7550fd75f1ef7ebf83ccdecc157b0f521b29969b91
-MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-ncurses/files/pecl-ncurses-1.0.2-php7.3.patch b/dev-php/pecl-ncurses/files/pecl-ncurses-1.0.2-php7.3.patch
deleted file mode 100644
index 9b4f8a6274b5..000000000000
--- a/dev-php/pecl-ncurses/files/pecl-ncurses-1.0.2-php7.3.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-diff -aurN a/ncurses_fe.c b/ncurses_fe.c
---- a/ncurses_fe.c	2012-06-16 13:05:19.000000000 -0400
-+++ b/ncurses_fe.c	2019-02-06 10:41:09.000000000 -0500
-@@ -123,7 +123,9 @@
- 	PHP_FE(ncurses_savetty,			NULL)
- 	PHP_FE(ncurses_termattrs,		NULL)
- 	PHP_FE(ncurses_use_default_colors,	NULL)
-+#ifdef HAVE_NCURSES_SLK_ATTR
- 	PHP_FE(ncurses_slk_attr,		NULL)
-+#endif
- 	PHP_FE(ncurses_slk_clear,		NULL)
- 	PHP_FE(ncurses_slk_noutrefresh,		NULL)
- 	PHP_FE(ncurses_slk_refresh,		NULL)
-@@ -191,7 +193,9 @@
- #ifdef HAVE_NCURSES_ASSUME_DEFAULT_COLORS
- 	PHP_FE(ncurses_assume_default_colors,	NULL)
- #endif
-+#ifdef HAVE_NCURSES_DEFINE_KEY
- 	PHP_FE(ncurses_define_key,	NULL)
-+#endif
- 	PHP_FE(ncurses_hline,		NULL)
- 	PHP_FE(ncurses_vline,		NULL)
- 	PHP_FE(ncurses_keyok,		NULL)
-@@ -205,6 +209,10 @@
- 	PHP_FE(ncurses_waddstr,		NULL)
- 	PHP_FE(ncurses_wnoutrefresh,	NULL)
- 	PHP_FE(ncurses_wclear,		NULL)
-+	PHP_FE(ncurses_wscrl,			NULL)
-+	PHP_FE(ncurses_wsetscrreg, 		NULL)
-+	PHP_FE(ncurses_scrollok, 		NULL)
-+
- #ifdef HAVE_NCURSES_COLOR_SET
- 	PHP_FE(ncurses_wcolor_set,	NULL)
- #endif
-diff -aurN a/ncurses_functions.c b/ncurses_functions.c
---- a/ncurses_functions.c	2019-06-07 11:00:54.713250845 -0400
-+++ b/ncurses_functions.c	2019-02-06 10:41:09.000000000 -0500
-@@ -163,16 +163,25 @@
- 		*pscr = stdscr;
- 		zscr = zend_register_resource(pscr, le_ncurses_windows);
- 		ZVAL_RES(&c.value, zscr);
-+#if PHP_VERSION_ID < 70300
- 		c.flags = CONST_CS;
-+#endif
- 		c.name = zend_string_init("STDSCR", sizeof("STDSCR")-1, 0);
- 		zend_register_constant(&c);
- 
-+#if PHP_VERSION_ID < 70300
- #define PHP_NCURSES_DEF_CONST(x)    \
- 		ZVAL_LONG(&c.value, x);         \
- 		c.flags = CONST_CS;         \
- 		c.name = zend_string_init("NCURSES_" #x, sizeof("NCURSES_" #x)-1, 0); \
- 		zend_register_constant(&c)
- #else
-+#define PHP_NCURSES_DEF_CONST(x)    \
-+		ZVAL_LONG(&c.value, x);         \
-+		c.name = zend_string_init("NCURSES_" #x, sizeof("NCURSES_" #x)-1, 0); \
-+		zend_register_constant(&c)
-+#endif
-+#else
- 		zval *zscr;
- 
- 		*pscr = stdscr;
-@@ -188,7 +197,6 @@
- 		/* we need this "interesting" arrangement because the
- 		 * underlying values of the ACS_XXX defines are not
- 		 * initialized until after ncurses has been initialized */
--		
- #define PHP_NCURSES_DEF_CONST(x)    \
- 		ZVAL_LONG(zscr, x);         \
- 		c.value = *zscr;            \
-@@ -1904,6 +1912,66 @@
- }
- /* }}} */
- 
-+/* {{{ proto int ncurses_wscrl(resource window, int count)
-+   Scrolls window content up or down without changing current position */
-+PHP_FUNCTION(ncurses_wscrl)
-+{
-+	zval *handle;
-+	zend_long intarg;
-+	WINDOW **w;
-+
-+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &handle, &intarg) == FAILURE) {
-+		return;
-+	}
-+
-+	IS_NCURSES_INITIALIZED();
-+
-+	FETCH_WINRES(w, &handle);
-+
-+	RETURN_LONG(wscrl(*w, intarg));
-+}
-+/* }}} */
-+
-+/* {{{ proto int ncurses_wsetscrreg(resource window, int top, int bot)
-+   Set region for scrolling */
-+PHP_FUNCTION(ncurses_wsetscrreg)
-+{
-+	zval *handle;
-+	zend_long top, bot;
-+	WINDOW **w;
-+
-+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rll", &handle, &top, &bot) == FAILURE) {
-+		return;
-+	}
-+
-+	IS_NCURSES_INITIALIZED();
-+
-+	FETCH_WINRES(w, &handle);
-+
-+	RETURN_LONG(wsetscrreg(*w, top, bot));
-+}
-+/* }}} */
-+
-+/* {{{ proto int ncurses_scrollok(resource window, bool bf)
-+   Enable or disable scrolling of window content */
-+PHP_FUNCTION(ncurses_scrollok)
-+{
-+	zval *handle;
-+	zend_bool bf;
-+	WINDOW **w;
-+
-+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rb", &handle, &bf) == FAILURE) {
-+		return;
-+	}
-+
-+	IS_NCURSES_INITIALIZED();
-+
-+	FETCH_WINRES(w, &handle);
-+
-+	RETURN_LONG(scrollok(*w, bf));
-+}
-+/* }}} */
-+
- /* {{{ proto string ncurses_termname(void)
-    Returns terminal name */
- PHP_FUNCTION(ncurses_termname)
-@@ -2609,7 +2677,11 @@
- 	if (above) {
- #if PHP_MAJOR_VERSION >= 7
- 		zend_resource *id = (zend_resource *)panel_userptr(above);
-+#if PHP_VERSION_ID < 70300
- 		GC_REFCOUNT(id)++;
-+#else
-+		GC_ADDREF(id);
-+#endif
- 		RETURN_RES(id);
- #else
- 		long id = (long)panel_userptr(above);
-@@ -2643,7 +2715,11 @@
- 	if (below) {
- #if PHP_MAJOR_VERSION >= 7
- 		zend_resource *id = (zend_resource *)panel_userptr(below);
-+#if PHP_VERSION_ID < 70300
- 		GC_REFCOUNT(id)++;
-+#else
-+		GC_ADDREF(id);
-+#endif
- 		RETURN_RES(id);
- #else
- 		long id = (long)panel_userptr(below);
-diff -aurN a/php_ncurses_fe.h b/php_ncurses_fe.h
---- a/php_ncurses_fe.h	2012-06-16 13:05:19.000000000 -0400
-+++ b/php_ncurses_fe.h	2019-02-06 10:41:09.000000000 -0500
-@@ -158,6 +158,9 @@
- PHP_FUNCTION(ncurses_prefresh);
- PHP_FUNCTION(ncurses_pnoutrefresh);
- 
-+PHP_FUNCTION(ncurses_wscrl);
-+PHP_FUNCTION(ncurses_wsetscrreg);
-+PHP_FUNCTION(ncurses_scrollok);
- PHP_FUNCTION(ncurses_wstandout);
- PHP_FUNCTION(ncurses_wstandend);
- PHP_FUNCTION(ncurses_wattrset);
diff --git a/dev-php/pecl-ncurses/metadata.xml b/dev-php/pecl-ncurses/metadata.xml
deleted file mode 100644
index 222c77f3742a..000000000000
--- a/dev-php/pecl-ncurses/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>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r5.ebuild b/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r5.ebuild
deleted file mode 100644
index 007edf9f7a58..000000000000
--- a/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_PHP="php7-4"
-
-inherit php-ext-pecl-r3
-
-SRC_URI+=" https://dev.gentoo.org/~grknight/distfiles/${P}-php7.patch.xz"
-
-DESCRIPTION="Terminal screen handling and optimization package"
-
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:0="
-RDEPEND="${DEPEND}"
-
-PHP_EXT_ECONF_ARGS=( --enable-ncursesw )
-PATCHES=( "${WORKDIR}/${P}-php7.patch" "${FILESDIR}/${P}-php7.3.patch" )
diff --git a/dev-php/pecl-oauth/Manifest b/dev-php/pecl-oauth/Manifest
index d6040d9d527f..32a5890519b8 100644
--- a/dev-php/pecl-oauth/Manifest
+++ b/dev-php/pecl-oauth/Manifest
@@ -1,3 +1,3 @@
 DIST oauth-2.0.7.tgz 78926 BLAKE2B 2fbe8f9c6df19790b9f617af64a04ed2387e904c3775753ac23fcf3f796007891a546ad6d5fae9b04cab707905f5ff3e9cc56b5c0b4bd1d9bab8745428c683f8 SHA512 261bbe6d1c4299f44ce40030b3959e26f2535c70d01b7a4e870d14c84b0a01e68484e61907554d720667fa08a2ec00b7d43cf2f523800c832f02b093e7b6534a
-EBUILD pecl-oauth-2.0.7.ebuild 573 BLAKE2B 01454555da19bc2307cfcd24b8fa21ac441c128fe4b36d29315861f47486e591229ea741206819a70d7e34331ab6395d4fb2db617f5a9f04ad27703111fe3997 SHA512 fbbdbe7a6af028c3566b80ee5652d65051f894d5ee2a526d4e961c384670c3cbd8f86953af0054b8a78b73ec2b6b564d5aa6e634720708fbedb5b5cf12722dab
+EBUILD pecl-oauth-2.0.7.ebuild 566 BLAKE2B 29f58d2a38215b601db0f09d83a3a68f572fa29b0f5ceb76d0b76a649ffed2d0bed599b06ffa38f719fa013e359ae1043ef6ccfd154a4969c216da7b86596a2e SHA512 c63b4b647998a0ee190789375a00bf849a5d877e7de250a0f62039615ffe507348ed895fb92d3ea7d47ee11f4035908b4bbf943ae5bf140824f61958eb5d1c8f
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild b/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild
index 12181485d980..a76d725587b9 100644
--- a/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild
+++ b/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild
@@ -6,7 +6,7 @@ PHP_EXT_NAME="oauth"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-pam/Manifest b/dev-php/pecl-pam/Manifest
index dbdc09aa1117..d20fa7a6cdb8 100644
--- a/dev-php/pecl-pam/Manifest
+++ b/dev-php/pecl-pam/Manifest
@@ -1,5 +1,5 @@
 DIST pam-2.2.3.tgz 9422 BLAKE2B 4d10ad40bdfbaa54225723a46a78dbe1609d89cf75d0ca73345e3346fb437a5500e451357b3b0bbcce88c13f8a54dec5b39e9c0741a6e89c0b3936cbb05da91a SHA512 1adc72b1517e224f36f960134d3444d36e6fa5a6868ce4bc1b87edbbfb09406910774061988300094ebf637ee54c5f5a43e0c42c8e2ab78c81a0910063d48c51
 DIST pam-2.2.4.tgz 9500 BLAKE2B fca0bf17c8eb38344f3ae5b47b395caf1a6d0d5f2ad83446a39d62b101492b06ae9cd8834ca63ad6f5e445de3c31a8616ac8180ce7510b0b4220b29e7cb04297 SHA512 fa0dac46cc61a590de4ece925a68e6fbece8c77a00dc48766635190b2f32888cee501d7f798c51890983ee643e15e3514360a0b12d0b56d8a2294ea3fe6acd7e
-EBUILD pecl-pam-2.2.3.ebuild 682 BLAKE2B 5abd17240dfabff123d2bf541bd6c1aacdc081e204d0d987b1e5184cb4f5666ef5d2667bb0141dd1490634aa0305f8db8d633fd58c75e953b012ec659dce77bd SHA512 659d8f4838271b38682c63ecf5c166a40860020d6f0926a270f78a0a102bfa9ec9b26cb2d26ea43fd5061884525e941299db29f8d9fdaccc55206f8120a3f603
-EBUILD pecl-pam-2.2.4.ebuild 682 BLAKE2B 83f09a8d457a871f7ef01746e95da898235ff9380fe48c91416e6fefd397a446fac4dc66737e08f1cf59d3b3762269abfc2bfe64da37ed3089deb58999cb6c61 SHA512 2900be9fff80e389979f31d304a93dc2cdb7b5561101468579551f3b19892a7d1779440f0b7a8883e8c04cbbd450d007620f6d369406b7ef03bbb5035d6d4795
+EBUILD pecl-pam-2.2.3.ebuild 675 BLAKE2B 575c8d379d47b937712a6faa49632800baf8df70df9d7fe459be29afe10c0706539b4d7f2edf5202f49820e89ecf79263bdbb7d47c3cabdac1e0186b299ab8c7 SHA512 2eb549e7c88b7950f790f164d5e8a79448ec3eecca74df50eed6960d273dbb2fa509b373740412d3550a7e20d9bb4f19edd762e811aefbeeec563b0027679bfd
+EBUILD pecl-pam-2.2.4.ebuild 675 BLAKE2B 39665b4f0e4fd26ac3f984d876c278a818941670cf0d2fc1b83267e7018ef1a0f393f72c81724caff016a59091e3bfcdb3cb895f01897117c15b0cf77b1ae451 SHA512 05610fa8631c37696cb894e5002438a53f7449e75f6c00488a29ad229000ce323c32963a0cac4efad652ff2f98cbdf1a19856bbc42b6fc901e36607523b47184
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild b/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild
index 642415e3aa93..13517a44eb76 100644
--- a/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild
+++ b/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild
@@ -9,7 +9,7 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_ECONF_ARGS=( --with-pam=/usr )
 DOCS=( README )
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-pecl-r3 pam
 
diff --git a/dev-php/pecl-pam/pecl-pam-2.2.4.ebuild b/dev-php/pecl-pam/pecl-pam-2.2.4.ebuild
index f419bf23d24e..85deeae8b9c7 100644
--- a/dev-php/pecl-pam/pecl-pam-2.2.4.ebuild
+++ b/dev-php/pecl-pam/pecl-pam-2.2.4.ebuild
@@ -9,7 +9,7 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_ECONF_ARGS=( --with-pam=/usr )
 DOCS=( README )
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-pecl-r3 pam
 
diff --git a/dev-php/pecl-parallel/Manifest b/dev-php/pecl-parallel/Manifest
index ebecdcbb787f..3814989cb1de 100644
--- a/dev-php/pecl-parallel/Manifest
+++ b/dev-php/pecl-parallel/Manifest
@@ -1,7 +1,5 @@
-DIST pecl-parallel-1.1.4.tgz 58783 BLAKE2B 942c767ff4838c13e70829d6ac6599cee3185afaf71e9dc430064835102d31a3e50b99694e1632be652c6a019934a13ba0f5139041bba39d486a20615478b910 SHA512 6693f01b0d43de5153aa0953f90580717e519cfbe8ca5b0ba6abd9cc681e0efe9d7c6fcc601da98f74b570b5810dffdbf5100bedc8ab86c1f4bc61d48955ae77
 DIST pecl-parallel-1.2.0.tgz 61019 BLAKE2B 84b127e7c10f083bead7d12648b312b07d036fdd63239881ad299f4a111d98d1a62d781754c8a11614848ecb0042a3d403b40167072722261bc3734091920665 SHA512 a96e61c94fe5fb2e00f6c9007df553bb59d95a96c76a47fcd74e26d1c48b1ac0bd5359174035c6f534808367e7e0c74c9f0e74f8128de38126a008d26be2efa0
 DIST pecl-parallel-1.2.1.tgz 61948 BLAKE2B 47e36b4649b4787a52babc3ce8937f37fd3c0063762f41f36f865f89aab364d0541b1c01741dd43e6bb3cea60907e10169ff52e8576ffa30ab3c129de747139d SHA512 7dd85cf34daa7b1818235c1631eba7209d85f5b5e777810075c2f61dbaacf21a1211de44402d6750bac959c86940b97be57f022b318495724ff3d26cf3294d27
-EBUILD pecl-parallel-1.1.4-r1.ebuild 390 BLAKE2B c55cefe208d3daa28b48f408d2d1f1dd0e3f819e062b3489c9a5a8b4a745d25e3b7e79cef6ded6cfca13619ede4dc3007f5c14be0b3d77af697cc92154f62519 SHA512 82b274a8516011310d204326bbbde9031b198b415870c7ac2c82ed849fb23abc67804db26e81de9aecdf00c9378ddb139de03643322fe7fddc6225946fd185ad
 EBUILD pecl-parallel-1.2.0.ebuild 404 BLAKE2B 6367ddaa4e691521a0ded78482d02a80986c6f24ac01da0f12907d87f6dd5652ebae54b773c4f4623bd08c43e13901bd59ed2436dc6d59f29b2f688f3177353c SHA512 be1890691c2292cb4c713b7cf409f1f233d595967b6071b5cdd90c9b6bb255d5f73aac2c904d55de50001c5896752e9cbeaed3d447aaa15e12db33c26c3ba7b8
 EBUILD pecl-parallel-1.2.1.ebuild 406 BLAKE2B bee37bf4d11b7ccd79fe35511b099441184de2d0307bb945886b44b9612dc8546bd8e64dee5cfcfb90a74aaf83a5107768c7016b76268b15843ef3a5ce04ffd8 SHA512 d6b7e8a65aafff08526a45cb6a6cb67869da1880b20dce7d2e2a3c91f97271a3a845ef030744423d4a5a01325533bd484fceaaa095a193e6b897e0385ec3d346
 MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/dev-php/pecl-parallel/pecl-parallel-1.1.4-r1.ebuild b/dev-php/pecl-parallel/pecl-parallel-1.1.4-r1.ebuild
deleted file mode 100644
index 83bb89a2797f..000000000000
--- a/dev-php/pecl-parallel/pecl-parallel-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PHP_EXT_INI="yes"
-PHP_EXT_NAME="parallel"
-PHP_EXT_NEEDED_USE="threads"
-PHP_EXT_ZENDEXT="no"
-USE_PHP="php7-4"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="A succint parallel concurrency API for PHP"
-SRC_URI="${SRC_URI} -> ${P}.tgz"
-
-LICENSE="PHP-3.01"
-SLOT="7"
-KEYWORDS="amd64 x86"
diff --git a/dev-php/pecl-propro/Manifest b/dev-php/pecl-propro/Manifest
deleted file mode 100644
index 0b876b34f3e0..000000000000
--- a/dev-php/pecl-propro/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST propro-2.1.0.tgz 14253 BLAKE2B 44c9bde831486fa41520ce75b313865b90a057acd0d566ae7e5c2aca97240e089580ca79ef04842a57a5d8eb76a179e57c505e977913567c1e97260f87fe2165 SHA512 94fc97f7bf17661ec7ecbe4d13b4fc98b8381469140d121fef49d32a4b767e956ed87b9f5bbb794f27ca47ce4b7b3125ea2b9091eb9d1f0a52b5c8f9df7ee145
-EBUILD pecl-propro-2.1.0.ebuild 383 BLAKE2B 915906efb78b2dc6582e51b73cf3b61b00a47d8aa0efc614cd0d4c55d4bce946794b6bac04282ce10c9ce856f451f3b1fa0b934d3818781c33a1cf703dd33cec SHA512 ef4b35c80f8cee557c3c5fd038c6c33e06880300dddf9c76b4ed725825666f7b58b79a44371868341a67516c72b1df6feb1d54605eef97602c0b51f4de77eaf2
-MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild b/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild
deleted file mode 100644
index f5a310da3943..000000000000
--- a/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="propro"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_ECONF_ARGS=""
-PHP_INI_NAME="30-${PHP_EXT_NAME}"
-
-USE_PHP="php7-4"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="A reusable property proxy API for PHP"
-LICENSE="BSD-2"
-SLOT="7"
-IUSE=""
diff --git a/dev-php/pecl-ps/Manifest b/dev-php/pecl-ps/Manifest
index cdef36f83fe4..75734936d80c 100644
--- a/dev-php/pecl-ps/Manifest
+++ b/dev-php/pecl-ps/Manifest
@@ -1,4 +1,4 @@
 AUX ps-1.4.4-fix-gd-detection.patch 230 BLAKE2B b052d4dbb6e802c9d25620dd2516b03492a7493518af5d26a97b58b7a2990c558ec64cc3a6eb36aa62d93829e040980c11e56b3133bb345eb8cb7795e71a1f6c SHA512 b9ed97bf9fe8b841b4d25870db036b95f1a744f5d9fc0d59b89f43f76e23dd27d2cca877086b7e66b8dfddbd0fc0fbdf34ba490c9546c54087772d9e0eeb1537
 DIST ps-1.4.4.tgz 637247 BLAKE2B 19dd32a2321fd53224c662e68603c7c330fcf8fe0d3e4e3d4a6e75e211c876225f1f6cf9325b117f7a3713abd87e6acfe25c4c9b0c161e6d6717f94cc90b7649 SHA512 42ab1fff661da68afb42d90dc7fb07761698f191beaf09b6dd4b2c3e7e67949ef06b2f6389738a462f58722f863c6b80f55a00a57dddc860250a4500cbfecf8b
-EBUILD pecl-ps-1.4.4.ebuild 676 BLAKE2B edabe6526303af0df3524032b71ef217faf0ba07287b08cac68518a77bd08dd8273de180cf045ed256504162cd119762a85f6acd52ecab8353a5201c6ee3d898 SHA512 98c0bc65e90a98eb9f36e33a7a4fda40edb41b37b98d361aafb65ad03b9bdca8159bdb4f029e6a53397201c4b9e0f6d26fa1d7461aa2084923ca85272e22172f
+EBUILD pecl-ps-1.4.4.ebuild 669 BLAKE2B b77ee22da682d619e5fca9a53b214a6fa8f99b0c1c48e9fe863dbde4169ed825716a97fa87745570c0b45526966fe427302c8714a688199338ebafb800ed50e3 SHA512 3a8d59cb50e1191fce85902d07c30de94d67ce570289d63dd48ca1aae013e01a3046d0d5a87a6d1b9aefe16d6ff58a721e9204a38ea5c382ba0684d04a33fd63
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-ps/pecl-ps-1.4.4.ebuild b/dev-php/pecl-ps/pecl-ps-1.4.4.ebuild
index 140018ff2c0e..092be81c3bde 100644
--- a/dev-php/pecl-ps/pecl-ps-1.4.4.ebuild
+++ b/dev-php/pecl-ps/pecl-ps-1.4.4.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 PHP_EXT_NAME="ps"
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 PHP_EXT_NEEDED_USE="gd(-)?"
 
 inherit php-ext-pecl-r3
diff --git a/dev-php/pecl-psr/Manifest b/dev-php/pecl-psr/Manifest
index bbba5aea3a96..bb77e8d64d70 100644
--- a/dev-php/pecl-psr/Manifest
+++ b/dev-php/pecl-psr/Manifest
@@ -1,3 +1,3 @@
 DIST psr-1.2.0.tgz 28238 BLAKE2B c8a3b81b1442c0bda2041aa3ca8d0b37759ff44fd36dd896b3b639e2deeb0767f8baaa699f6b6db063c7deb2f7b217a665d0306a75cc5d783bb635c6c0bf72a4 SHA512 90d4bc1cd2364a15775024806ec5bc1b8f60ed44569162016a0a78fca89f4ad0f0e0b1f9f09ebdcfe6a803e888bddd1d8ce73100eec52ecc21c2e505a35ee5dd
-EBUILD pecl-psr-1.2.0.ebuild 423 BLAKE2B 0d0cd45b8e2291195c9d79863548c3ce293fbabae75c6a5d4465a5d50aad3c9129dddeadabfdff4a0187dd16a85db8e115fbf610a7e199e12ee73ca72aa22d1b SHA512 f95c860023ea19d4dc83bbca42590122926a6379c6302376de3fd703213234de134ddd1c3c82111fab6c1f28cc8ae66b39060f3557c351103a6b631a31c94890
+EBUILD pecl-psr-1.2.0.ebuild 416 BLAKE2B 5ffa4d6fbdde31342d42dfe4fb99e439fefded121d341a3bf6ae70f4068c0805f26941b201bb6803dfc169058090b38a31edbfd757018868a4de401c51fd2097 SHA512 799ac0490a52311b0b1486c0a2aebda2459f64cb9492493c8ed093728a8b6e79f206aff85840acab3a5202f192a32d4195439bce912e2b83af61d7005bd720b8
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-psr/pecl-psr-1.2.0.ebuild b/dev-php/pecl-psr/pecl-psr-1.2.0.ebuild
index 5c8d5d107d00..7b0513f92c3e 100644
--- a/dev-php/pecl-psr/pecl-psr-1.2.0.ebuild
+++ b/dev-php/pecl-psr/pecl-psr-1.2.0.ebuild
@@ -9,7 +9,7 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_ECONF_ARGS=""
 DOCS=( README.md CHANGELOG.md )
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-radius/Manifest b/dev-php/pecl-radius/Manifest
index 428fa3dffeb3..cf88f10293c3 100644
--- a/dev-php/pecl-radius/Manifest
+++ b/dev-php/pecl-radius/Manifest
@@ -1,4 +1,4 @@
 AUX 1.4.0-php8.patch 9226 BLAKE2B 35055bd21ee2763c1d4eb01b8df1f4c26c5a6f519d920fe1aa14e032f4b33d67cc94a423e712680097928301a4824f643f7573487c280a09ca610b08054fee74 SHA512 e99360b81b88ceeb5a965e3ff9c262bd2dcd6980442b039187967c3e3ad5989710c1044d002f5a207ee1513b14b25cab899873718b6e94cc266e13344d62ddcf
 DIST radius-1.4.0b1.tgz 50953 BLAKE2B 1f6f2a4c4cfa7600a37b8bc30e4d263b899a687becac83fd01bac2466de08cad4233984ca694dc73eaf20b64ef94e1e6a6ca7f843474c8f0c9de2c39df9d9705 SHA512 db6ebe928673db1ff4c565338010ef5acf6029844994eb240f2e8eaeda4aff734ed300a7ddf16c09e245671aad377283f99cf1c485569b3bad0c7c7b24a19664
-EBUILD pecl-radius-1.4.0_beta1-r3.ebuild 698 BLAKE2B 28961f98130b68be6d3a0fb27abe9205fc2704f294a588df067e4466c0d774dba49843ae73b0b1086ce684650ba271ad6e3cb328b700666dbade88082d03862b SHA512 8287208db6df1d92bab519e51c211966777a4edbd360924a48def39e5a1cd64c7e537fb3e3648cbc0eeb4bdad128356349ffe6f605b3368071596c8fa91d8576
+EBUILD pecl-radius-1.4.0_beta1-r3.ebuild 691 BLAKE2B 3b970e4c5c63516d19312f35abc2eef5a6d407145875379205afec17fe019da912e4f952e2891d85c1a341341b3e2f75d72a6ad73d94942a7d0f8be574de5020 SHA512 0c3f7a4625e8d9f06c53f7242234b56691ba6d9523dc2bee3a692c3bde48ad1971b146dd565fee746e118216aafadd070118b18f2da6e4f27a534a94c4d17ba1
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r3.ebuild b/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r3.ebuild
index 0cf8e5654389..6d8e44b14b12 100644
--- a/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r3.ebuild
+++ b/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r3.ebuild
@@ -7,7 +7,7 @@ PHP_EXT_NAME="radius"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php7-4 php8-0 php8-1 php8-2"
+USE_PHP="php8-0 php8-1 php8-2"
 PHP_EXT_PECL_FILENAME="${PN/pecl-/}-${PV/_beta/b}.tgz"
 PHP_EXT_S="${WORKDIR}/${PHP_EXT_PECL_FILENAME%.tgz}"
 PHP_EXT_NEEDED_USE="pcntl(-),sockets(-)"
diff --git a/dev-php/pecl-raphf/Manifest b/dev-php/pecl-raphf/Manifest
index f153695e4a6e..5393a5ef83c2 100644
--- a/dev-php/pecl-raphf/Manifest
+++ b/dev-php/pecl-raphf/Manifest
@@ -1,4 +1,4 @@
 DIST raphf-2.0.1.tgz 16003 BLAKE2B 4eaf9f89e6572e17e0df347543dc99221f68d45103444f89e59862b9078574722278fbb1e2841b0a5952ffd6dfc4ea0fa81298f2014ffbe8a6b51ed6887f6692 SHA512 0a609fc21a62880963e7afb75297eb75a2598aab2c816cb61e84d665b0453e4952aa9bf25fe2c818cc94492a4b94aed965053c67899fdb984d88661364fffb1e
-EBUILD pecl-raphf-2.0.1-r1.ebuild 406 BLAKE2B 2c0838d44fcc9531633a1f3e392befb89980e966397d2af34023ea9aafe3b6b274e83244b2468ffb103fb6f6dc2019b993881e87fab2ab0260e81a0e614c044c SHA512 4dd1d5d4dbd053a911b81cfa524602f8fbc75616b4c22d7d423ce0a1d249f6a4040ba3520b852848b33afc75eaee6023744d814c7490358c177e4a0fc2bf0dab
-EBUILD pecl-raphf-2.0.1-r2.ebuild 413 BLAKE2B feba58c26e7ab783123f8cf37ab861cbb57de1ee61db31ab2e161dec38f7f62bc12dc3e65927013ad164684853c3ea66378bdaf85e254443bd49d353ff572e7a SHA512 f15c1f1f034df0ff8c52294adf0f6cac36dfd5be8a6b9e62aec3aaf16b5fce8dd782f3d71d4acea7ed09ac07351f17bbb9e078a5488411902d06e3e086eb7e20
+EBUILD pecl-raphf-2.0.1-r1.ebuild 399 BLAKE2B 6684bad12b6388c14e4130d1ca3113f47980ef6ddd4b3584143e8d59dff5a1b7738725f1110e78f8613ac85b59a8e83e1401fc7f8d84c9d1568c4eca00cc71cd SHA512 03ae042b060144e64385e215280a90a113b59543a99e33f15a19640dfb40650f5937fac43b3edc2877dee88f646b95cc22e976568f7932a68713f03c495c99d0
+EBUILD pecl-raphf-2.0.1-r2.ebuild 406 BLAKE2B fc9a6ba64ec47c2a6f17c6658702f60883e2815c7879979a0fdd9511d4f9d9d8d10b1eeeb282181673b4c7463b74a54b42fd7174b4e2afe892062335e4d62317 SHA512 804062d4034dbdfe5f3b86192ba83e4a65556b086b8c7854f1810ce4d6b0c36f7fb2a32b63e51a39f345f9a1bdddfcfedaa9a42bf976ee49c2f4a6cc092b03f8
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-raphf/pecl-raphf-2.0.1-r1.ebuild b/dev-php/pecl-raphf/pecl-raphf-2.0.1-r1.ebuild
index b40c6d7c4a5e..6d5801fa0023 100644
--- a/dev-php/pecl-raphf/pecl-raphf-2.0.1-r1.ebuild
+++ b/dev-php/pecl-raphf/pecl-raphf-2.0.1-r1.ebuild
@@ -9,7 +9,7 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_ECONF_ARGS=""
 PHP_INI_NAME="30-${PHP_EXT_NAME}"
 
-USE_PHP="php7-4 php8-0"
+USE_PHP="php8-0"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-raphf/pecl-raphf-2.0.1-r2.ebuild b/dev-php/pecl-raphf/pecl-raphf-2.0.1-r2.ebuild
index cbc099a5896d..1e0c6bfb8b03 100644
--- a/dev-php/pecl-raphf/pecl-raphf-2.0.1-r2.ebuild
+++ b/dev-php/pecl-raphf/pecl-raphf-2.0.1-r2.ebuild
@@ -9,7 +9,7 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_ECONF_ARGS=""
 PHP_INI_NAME="30-${PHP_EXT_NAME}"
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest
index 33da5f7445cc..2c83f7fb438a 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -1,5 +1,5 @@
 DIST redis-5.3.6.tgz 274235 BLAKE2B 8479b3060abb99f765b27fd8937cb4c7ef92c55c0581ae6a69dd06113367547d546a9f96a8418df928f258520cb0fed6f5d39f6d88972c74b8446134be08edc4 SHA512 e5047ba9974ff6065be0fe8614aea8bf7d7c77b3a4ca08b19d0bb53069dd164614ffd19bf09bda458511abddce438fd816c28a169536388c8c4cd923596aadf0
 DIST redis-5.3.7.tgz 275200 BLAKE2B 50cff3d36e189593a741ed3fe05c3558e6a0621e7ff906e4902ba39e3f7d3ae5b9bfa554480a131e32bcc0334bccbd3aa5507dc714b6d4b20ac808139c525a95 SHA512 b945d5aa86d3f58e75094369b0f324e987202f104aca7d7b46ba23cfaed54d186bb66931e200dd16d2dbeea11732dd0311da4e3d7485c3b725027f7924652832
-EBUILD pecl-redis-5.3.6.ebuild 1500 BLAKE2B 5af701a366b66f638126426a0427644e1447634a4d780e97a4da49fd81d64877eff47c549646819de849141adce1266c8fa1cc877ec16d576bd5a50981b5292a SHA512 ff2835af9ab04e3be3be13b55f5f0122dd3cd641365074af8228ff05c8a7c124b0129e6937319a4fa71f2a0a7807933affbdd65fde806cb2c75108c383e7c80b
-EBUILD pecl-redis-5.3.7-r1.ebuild 1537 BLAKE2B 1d6dab7a858fb50bcaef37399feba74490de73c613158bc52192864962c2806e4d860948f36be41f0de8f7323f212077017acd0686fb59d4fce9e99aab53b2de SHA512 59a32129ab6b63e9ee272e3dd13ee0087a70472fef673e1b6c9a2bdf1680b40b4e07a3b0d986b2971ad4b0195bac2349eb8d062ca92453a333f75821aeaeeb8b
+EBUILD pecl-redis-5.3.6.ebuild 1470 BLAKE2B 79bbd479077110c62c5256d4114ec44285e99fcde7e22294008ef4368c6562d846c8d614f1f8fd0e6a545bc7d29556a62822c96872345d97e420d5e57f8fc299 SHA512 c3e8bb1a1df9cec44a044588715fadc2028bc2f7cc049bc4bdbda290a3bb116d737bf4047348b21404b62b0a63dcbf0b10ee9121c1d8f3623112a8b2a511022d
+EBUILD pecl-redis-5.3.7-r1.ebuild 1507 BLAKE2B 000dbad244cccb87bc3d4ee2c9463a515877a08112676337c83d28851e736bad7b071478c870d1b261ea8eb1faf19d405f2b176208c88cdd99fcfd538d0a3347 SHA512 813f7b7ea8b5f0336125859e087a9f81702c0fe34a2bc4f2a67838367aaa835398a408917e736d1630c299d86b01f15da9027d2af4f623a827cdd05ea67c2e5d
 MISC metadata.xml 384 BLAKE2B 4a1a6b326526bb3f5b9d9d57158d6abbfe3c65b1cfc11980ce849d5f7278558ee0daf580aefc521939aae175cd8e2cb990e046fce8faf6774348b24fa6465ef8 SHA512 851e1fb9f6612105640028262a4821f0da5b1ee5949fdd99067e821ce1d22c41888ee53e102becc93c918a605c2b8dbb2d493cd7cad516530912fec652011364
diff --git a/dev-php/pecl-redis/pecl-redis-5.3.6.ebuild b/dev-php/pecl-redis/pecl-redis-5.3.6.ebuild
index d2e0f4804db5..744212808fbe 100644
--- a/dev-php/pecl-redis/pecl-redis-5.3.6.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-5.3.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PHP_EXT_NAME="redis"
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 PHP_EXT_NEEDED_USE="json(+)?,session(-)?"
 DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS )
 MY_P="${PN/pecl-/}-${PV/_rc/RC}"
@@ -20,7 +20,7 @@ KEYWORDS="amd64 ~arm"
 IUSE="igbinary +json lz4 +session zstd"
 
 DEPEND="
-	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] )
+	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php8-0(-)?,php_targets_php8-1(-)?] )
 	lz4? ( app-arch/lz4:= )
 	zstd? ( app-arch/zstd:= )
 "
diff --git a/dev-php/pecl-redis/pecl-redis-5.3.7-r1.ebuild b/dev-php/pecl-redis/pecl-redis-5.3.7-r1.ebuild
index 39d113032559..f9d87bdd2acd 100644
--- a/dev-php/pecl-redis/pecl-redis-5.3.7-r1.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-5.3.7-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PHP_EXT_NAME="redis"
-USE_PHP="php7-4 php8-0 php8-1 php8-2"
+USE_PHP="php8-0 php8-1 php8-2"
 PHP_EXT_NEEDED_USE="json(+)?,session(-)?"
 DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS )
 MY_P="${PN/pecl-/}-${PV/_rc/RC}"
@@ -20,7 +20,7 @@ KEYWORDS="amd64 ~arm ~arm64"
 IUSE="igbinary +json lz4 +session zstd"
 
 DEPEND="
-	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?,php_targets_php8-2(-)?] )
+	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php8-0(-)?,php_targets_php8-1(-)?,php_targets_php8-2(-)?] )
 	lz4? ( app-arch/lz4:= )
 	zstd? ( app-arch/zstd:= )
 "
diff --git a/dev-php/pecl-rrd/Manifest b/dev-php/pecl-rrd/Manifest
index 0941137f0397..245549d0cf57 100644
--- a/dev-php/pecl-rrd/Manifest
+++ b/dev-php/pecl-rrd/Manifest
@@ -2,6 +2,6 @@ AUX 2.0.1/0001-arginfo.patch 2714 BLAKE2B 23b597baafd80f10abd922d096b94968b54bb4
 AUX 2.0.1/0002-relax-float-test-result.patch 3214 BLAKE2B 28be00e2e4c85baf8f3da4da764d45e9f5f9a232c49e73c9d4f76a94c9eeb9b265ed56feffe3b19f7a5f314907139446e4b6ec837ceabb4f760c08fa0092202f SHA512 fd18c196df8a9fb36acf7f4f5cfbf048f829c00b08f2ad3c371252adbe9f148082026ce7c2e48126cb089e8820b77db8e19f86fe6e97836eac0eec4ca97a2871
 DIST rrd-2.0.1.tgz 18880 BLAKE2B c3fb65e95aece39690085830ec1c43ba173e173591215d6a66145ac71079f8d5ba5b097acd9018c86d2342550001334f8e1c98e22204d94a24aee5cc086295ca SHA512 b6f7173f54fcf49bf014cc6c78263c169cdf53dac66c12f5f88db7e01b49ea74da84a55f61deb25c866e6e2e74275ec48fc4a3d1b46719f66b5b7b7eb000b6b3
 DIST rrd-2.0.3.tgz 19178 BLAKE2B 473fe53e858665372133db9f13d9aeac330da2ca57a8fb59f0eb280f1bdd40d2f0b28179a9b150acdf15d7bbc6fb5416a82dcd670c67ad39050cbd1c5795b62e SHA512 28679ccead54806d1e92accc6f5ebab582a41db802f95797ddb43e3e15690889be3437f22e2a14939d217422ac2700ef90ae0a9b36244ddead3856343b3e09b4
-EBUILD pecl-rrd-2.0.1-r4.ebuild 546 BLAKE2B 3469b0b869dccefb2f3088dc77978076802652cb5b333f233cfac70e817294a35ebd75d8ea09d38acb9ab6de530bfc10c84b7e92c0d5b6b6679c01286f33542c SHA512 d95d0b44db290bd6c79704ec07a9968ef257ab4644ddac37455fc617e201b15c13400958fc22021fe218e9156bc7433127832d68cbe12bcdcfb2905ca40096d5
-EBUILD pecl-rrd-2.0.3.ebuild 589 BLAKE2B 5835d559263abe124b3ab47533d0e0554f0e5764c60bfb112b3c3c87747d79df697e589d1be2771a1deba89a40d4f94e47c8caa9c2e4e124ca0c1da041793936 SHA512 bfe8a5226d5448a20314e7430cf15c4ffe46cc815fd7e158f0b716e1e4159d4fb557d05717f641a5337e3b41a13483f858cedd15035a051263f5e381849a96ae
+EBUILD pecl-rrd-2.0.1-r4.ebuild 539 BLAKE2B 52caa9ed8c69d96a904753fb37399b0edf3357e6d44c5542e4cdec491acde567659d73717c49c75bf2da453dcaa22204265c04c17cb011cd6b00526ac80d6d69 SHA512 de38dd3de24d95d763d2a9dc03f563c71b07a1c9717b457fb3fb295e405bf02de9e46b2f68ea5dabd0963708bce03ea65cb4753965228e23cb21b94dbbe888c9
+EBUILD pecl-rrd-2.0.3.ebuild 582 BLAKE2B e66b755d5f3be4d67c547fb81d37882744e195ea90305d5781c2bc3c7f039156559d43ac1d3939f4207bb1ed65d62c3938e0f8f57accb5ec4287c9811c3da346 SHA512 3f071794555d1d1b4a4be9d6e91e77b5311412b5f18bab5c5fe1f71cdb96254b39f47acf7b1dd69fe0668878202b02c8d0a3d34bbe8b472362bd27144bd512d2
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r4.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r4.ebuild
index 563adc58f8c8..39bf35460c56 100644
--- a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r4.ebuild
+++ b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-USE_PHP="php7-4 php8-0"
+USE_PHP="php8-0"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild
index 7cdb21a8d0eb..b4d86011970e 100644
--- a/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild
+++ b/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 
-USE_PHP="php7-4 php8-0 php8-1 php8-2"
+USE_PHP="php8-0 php8-1 php8-2"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index 7dcf549c52c3..9d5f709ec14d 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1,5 +1,5 @@
 DIST ssh2-1.3.1.tgz 33838 BLAKE2B 05976ad143563fd9d51be3f8e23b5b22099e351d6f252b612aa1dcb56648dc337b623d2cddf7b9079f3e07c879ca69215a1987cd6f4326f97ba134e13c6d28e7 SHA512 c74d4f699853148b53cdca0eaf8837bfdbdd21d185761606acadf2442e84dbefdb00cde207e0ce4794ae1e4f8692a38ed903b6d11fdc57bca7b54a4250da9a76
-EBUILD pecl-ssh2-1.3.1-r1.ebuild 427 BLAKE2B bc43ad3bdf1adf43aedf90ce52f4c36372ba46936a21804064426b7aad9a1efba32c8e324097a598e755d613ea8964dbab63862ad5ad0a53be2daf071bf9d291 SHA512 c3a722d4fa903de4b983a5f40b11672ea830761edc7c0775b864ef9663266925fc501bb1c54f0760c399b6ebed9352911024d564e4d04b344172362ee8a495ac
-EBUILD pecl-ssh2-1.3.1.ebuild 438 BLAKE2B 014a461b27ae066e435d0482101480539652c4cd70d855fc3360a8f82fbbcc25574c17eb1d0147d78a5893c482a2c784f59880518bcbcfc01dfa51f5512b361e SHA512 b04b8ec84b48f4dea46f078d9d561a7560b0454a468e8ca6469559e8d68f61dc9840d9e6f3492f9a54e6ab22035a37cff2da9ebc8466b4f2c7e833b00441fcc6
-EBUILD pecl-ssh2-9999.ebuild 469 BLAKE2B c8fa0daa0b43411426d192d17f7ea2a6802801c60dbfe5709a8724805e6482d3155a9a7a0b7bb7657a107900e06be89fe2057517b3ddbe8e5e5375dbdf8ff186 SHA512 9d0b80a15ac6475d54bd58ce1e38590dd5e4507cf9cbf02065bd0a2afe8b8c90a3c3f8677f272745567e2b23374666354d31e2299ddda631d8331d30dd865a3e
+EBUILD pecl-ssh2-1.3.1-r1.ebuild 420 BLAKE2B 821a23b0da99a9e4c1e9a538acc5df0c6db112e8f9faf2228918621e46d1f43dd90d1ff55ce5837028b233eb1c21ad17401044410b5975d2a279d4522ff77ad2 SHA512 6407c43b9c9b67ff16327b93da89c3a0e306705ef3b927c01682d793ee7a4b4afda713b495d7d6c5ec5f4f02d273513fca75d24b0d455db591818657c733253e
+EBUILD pecl-ssh2-1.3.1.ebuild 406 BLAKE2B 53841ce9a26a4745e75cf3476723b4510cd692a0bbd6698fb92b98b41457378c13149deb0bc2120741abc674b8ec1e4d1dc9362679175d9b15ae5d90460584fe SHA512 d946e98eb185344814c21dee47ff32b0f79e8329a9290c5232bf563290ff3afb7580fc328fa8f3b7b5121608de3b3f9eaa6f12b2805d5ba0c763c878a05eab82
+EBUILD pecl-ssh2-9999.ebuild 462 BLAKE2B b58602c3becdeede30ff19cd7697dacb760e3d952e9f548830c73114bd38d19e277310699fa4b7c0fd5afddf98ff981d361c560e0de266707dc1e205ec259b89 SHA512 101ba4b002ca1a4bfbacb1ca44be02357b3ffd9e2d63f6b99be63e9e35ef366901002e79ea142abb0c3adfdbab421f097fafc08ac88cc10b5e0b5e389029d7cc
 MISC metadata.xml 322 BLAKE2B 0576bb512c57e5e2809e3ec24de126d1f42823c1780fedae5cf2998a8074f60a6ee0aae29d8086c01c490623065d0adfd0a18568637875ff46408127a38aec60 SHA512 26fea3796f479e95df152a2d305b5ee50c0e3c44d3d0923dd0451e643ba93788f7d0e31f1d576f3d3fd90880550be4bde81b17ccc13268afa41ba566e7dbf43d
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild
index ffd7c7eca7bc..26fa81cc22ee 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 PHP_EXT_NAME="ssh2"
 
-USE_PHP="php7-4 php8-0 php8-1 php8-2"
+USE_PHP="php8-0 php8-1 php8-2"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild
index 096be1929032..e78e7a80d05a 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild
@@ -5,12 +5,10 @@ EAPI="7"
 
 PHP_EXT_NAME="ssh2"
 
-USE_PHP="php7-4 php8-0"
+USE_PHP="php8-0"
 
 inherit php-ext-pecl-r3
 
-USE_PHP="php7-4 php8-0"
-
 DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="7"
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
index 8206375e6835..a4c8e36fc789 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 PHP_EXT_NAME="ssh2"
 
-USE_PHP="php7-4 php8-0 php8-1 php8-2"
+USE_PHP="php8-0 php8-1 php8-2"
 EGIT_REPO_URI="https://github.com/php/pecl-networking-ssh2.git"
 
 inherit php-ext-source-r3 git-r3
diff --git a/dev-php/pecl-stomp/Manifest b/dev-php/pecl-stomp/Manifest
index 685b01f431e3..cae711b1833e 100644
--- a/dev-php/pecl-stomp/Manifest
+++ b/dev-php/pecl-stomp/Manifest
@@ -1,3 +1,3 @@
 DIST stomp-2.0.3.tgz 23518 BLAKE2B f0253d0e6d1bb51d95007ce2580cb4e5a271547b73705d1ab5be36975cd58068e5fceea64b1451e438fb17601c1b1f513f287b189e3d2922747f735a48e582ef SHA512 e34a63d776cb79da7676d200e4aa2b4a9d4272014fff30eb4c07bc27417d8dc4e7738fb8d62e283cdaac0a411a7bd6e06ef5b06171caa629a404601d14da71d6
-EBUILD pecl-stomp-2.0.3.ebuild 623 BLAKE2B af0c407efc5023fd7b9f250d54be10dee71faf9bcd524c5b1b93d9936bb0966b1128757a05fe6db2dd0b9362026e4c6b8c03bb3f97656a34887440c2669eb545 SHA512 5e5d8d2b1c429e4494ef66ca8a6d8adce9079ca57e0bec3a0ff83e90adbe118ac96e62cdcb3a6eebabe8ef3f65497dca7e429fbb9c2c639877f08bb96325ca3e
+EBUILD pecl-stomp-2.0.3.ebuild 616 BLAKE2B c737e8b3fabc135fe44d472fe1a12c69753aa6d05d27095c0d31b17d646ad092be59724025de89b849601ad944aef0c3c92a69704f0d1d11fff164190c7dbe3a SHA512 2fb0e90ff6020031d7bd3f1c1d50872aa72f5f4490fc8d166c3bd54d9ff8914d5004472db7b2dbf9838c1aaf95c305d8ad0a2539851335a671a86e81a09bf6b2
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-stomp/pecl-stomp-2.0.3.ebuild b/dev-php/pecl-stomp/pecl-stomp-2.0.3.ebuild
index fc45df0a10a7..16445bac034e 100644
--- a/dev-php/pecl-stomp/pecl-stomp-2.0.3.ebuild
+++ b/dev-php/pecl-stomp/pecl-stomp-2.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_PHP="php7-4 php8-0 php8-1 php8-2"
+USE_PHP="php8-0 php8-1 php8-2"
 PHP_EXT_NAME="stomp"
 PHP_EXT_NEEDED_USE="ssl(-)?"
 DOCS=( CREDITS doc/classes.php doc/functions.php )
diff --git a/dev-php/pecl-taint/Manifest b/dev-php/pecl-taint/Manifest
deleted file mode 100644
index 4187978e9cef..000000000000
--- a/dev-php/pecl-taint/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST taint-2.1.0.tgz 18613 BLAKE2B a76299140dade9a9a2adf7f873cdbaf762abf9248fa7eb16ed502651ade0bcb3a8ca4fc52d495a809d9360e0650dd34ce57798e864e81587a65791f861dd051a SHA512 26374654b07f6c07de0993c91b331d4b35fa485b3d5d737f27daf401b4db0da3d10f59f7b38e523ab705cc76938c4bbf3aa862389122a9afbba008d912de1a6a
-EBUILD pecl-taint-2.1.0.ebuild 417 BLAKE2B 686e564e8b992e3420d8f355c5e9dbec38fc5336ce93f2548c8e5ee11db59bd623c60f6142d96d060f3c0559a3fa55a6df59bcb1f33d7984407e055016270e13 SHA512 2030ba2ce64d37167ba84286a3a4df4e25b6c5dd603bcba06775d911c72c64e5778cd132e2475c3d093e5b8be72d90f7449e88076fa261f2ff65553de6bc3f84
-MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-taint/metadata.xml b/dev-php/pecl-taint/metadata.xml
deleted file mode 100644
index 222c77f3742a..000000000000
--- a/dev-php/pecl-taint/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>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-php/pecl-taint/pecl-taint-2.1.0.ebuild b/dev-php/pecl-taint/pecl-taint-2.1.0.ebuild
deleted file mode 100644
index 5730e7cf3ebc..000000000000
--- a/dev-php/pecl-taint/pecl-taint-2.1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-USE_PHP="php7-4"
-inherit php-ext-pecl-r3
-
-DESCRIPTION="Extension used for detecting XSS code (tainted strings)"
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-pkg_postinst() {
-	elog 'To enable this extension, add'
-	elog '  taint.enable=1'
-	elog 'to /etc/php/<sapi>-<slot>/ext/taint.ini'
-}
diff --git a/dev-php/pecl-timezonedb/Manifest b/dev-php/pecl-timezonedb/Manifest
index bdcaf5f614af..214b59ba2e48 100644
--- a/dev-php/pecl-timezonedb/Manifest
+++ b/dev-php/pecl-timezonedb/Manifest
@@ -1,3 +1,3 @@
 DIST timezonedb-2021.5.tgz 631371 BLAKE2B fd9312a5a826a0f3ff469277151e68b2fd1dbaecdd345ebfe1c3cc8e847c0a925a8a22b4e7aa2eb9f18b9cd438cdab89ab3f889ad9cd384e13ec42700f6d17b7 SHA512 ac295df0dbc833e1b6d452df2fa0a316cc8df95abf6aaf809a87401256c891b9ba0e663dc300e5a0fdf1c0e3566b9eea580eff12ed4d2bcc4355b13eb5893d9e
-EBUILD pecl-timezonedb-2021.5.ebuild 443 BLAKE2B de4024f37000abc9beea5185ea348a3cd6471e3fcb95109d3d6870585a92ce8653c35dc36dc9ef2bd302a076882c9de81f2d8edff56e1755b15d9894f517e499 SHA512 c97cf8aa942406097d0435270d6ef9d1e50efe32bb46396d21c340b83f0f7640fdc633e7ec82e6241c7f46a61a2d8cb8da98a97188a8ba78afa2ac90e258ff59
+EBUILD pecl-timezonedb-2021.5.ebuild 436 BLAKE2B 6c444421a2cce17e67edfafbbc244b835a93160a538202a6e0df0ee28ccb93e33e98dfed78c39c6b10f727c6c230ca44bb55e87663c1d5083568ab88e07e44ca SHA512 90630d22908c3e28deeacc9823b497e38c6495139efb8baa1b46e3ac8f2150c37a08aca409c9e3ef4e1479ad3d5fc59214ee7a8caff26a6de354d93aff356b60
 MISC metadata.xml 636 BLAKE2B f684c89d246a7c39f73fb9751283ea88e4b592fe529bd5fdb999837a9dc9e97a74e99388ede65c3d6b6a2b237bc16bbf0342c4d62402da5d0a063a2129a15a15 SHA512 13c200867329ae46b6511726ab5846cafdda4d3a68cfd0da18d1e7aae64028e9ef68f2d587515bca027cd5cef96314dc84cf4f5f72f15933b8bb4732e01b228a
diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2021.5.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2021.5.ebuild
index b65eee39863a..3aeb79ad8564 100644
--- a/dev-php/pecl-timezonedb/pecl-timezonedb-2021.5.ebuild
+++ b/dev-php/pecl-timezonedb/pecl-timezonedb-2021.5.ebuild
@@ -7,7 +7,7 @@ PHP_EXT_NAME="timezonedb"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-translit/Manifest b/dev-php/pecl-translit/Manifest
index 60b6e96935f4..90321f4057f5 100644
--- a/dev-php/pecl-translit/Manifest
+++ b/dev-php/pecl-translit/Manifest
@@ -1,3 +1,3 @@
 DIST pecl-translit-0.7.1.tar.gz 227287 BLAKE2B 4d9c9a74ec775d720bf4f2742460e7c96f52bac7b0ddec71622818d5e257bf468092b067ce33b335eee78ded8f2e74f0378acb22a18ef7a30db57a78d9215939 SHA512 62a2a26dbc01bd802c16ab0346d8c2a1960c1066b221bc05d609ca49fef26e9ffbbee9b685fbd82ca9b02be954fbd7f5eb2d9de307c746a792b8785f44e64d46
-EBUILD pecl-translit-0.7.1.ebuild 653 BLAKE2B 7659eff79c5feea82e58758f7e2f0f6ab7b9ac4476968a3201a506408d413edeaece2ff41d0cf585c58c7fddea2082bb812d4eadd99261437d91b34e4087279e SHA512 c81a2bb46feab446f48656cd5dd12c36e4317d5bbcac127ec63559f30026e7c35dbd0b166f9acc72e721e2bf37c9c77c87e7574aeb96552633feb1057299e410
+EBUILD pecl-translit-0.7.1.ebuild 646 BLAKE2B 131156008d893b320234351fa24376fd578b5d8b03228ca60a57444288200d95a58d01fccb365fc54c8cab8f2fb476e4c426bd46ec950c94b6e25152ccd446d5 SHA512 1c82840b63fdb1709554d8971306b875644d970f279e2cf4f220bcca3f4be3fc602cf81315ed1e28832b26946c055f71fb6fb09c9b43fafa555cc7818a937bcb
 MISC metadata.xml 326 BLAKE2B 6499cb6ba931ab0f5717de688e20a55fda860a6d7c925238ae13f2c0b0cd18785e8f1b6a8ba3bae7a9612f9b8b3fd29f3b2f81ae405e840975bcebb7a51d4580 SHA512 ea6c4d3f6ad6c8239aa4454d4919d610260b029bc2cf8348e7f19c8d708fa08d641301e2e24b50faaa7b5615f17b27857102ab346966dc4f0efe43d8270b48af
diff --git a/dev-php/pecl-translit/pecl-translit-0.7.1.ebuild b/dev-php/pecl-translit/pecl-translit-0.7.1.ebuild
index 5aef258fa8cf..76a8da31dd59 100644
--- a/dev-php/pecl-translit/pecl-translit-0.7.1.ebuild
+++ b/dev-php/pecl-translit/pecl-translit-0.7.1.ebuild
@@ -7,7 +7,7 @@ PHP_EXT_NAME="translit"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 PHP_EXT_NAME="translit"
 
 inherit php-ext-source-r3
diff --git a/dev-php/pecl-uploadprogress/Manifest b/dev-php/pecl-uploadprogress/Manifest
index fb3fccf14183..c85b67cb2c2a 100644
--- a/dev-php/pecl-uploadprogress/Manifest
+++ b/dev-php/pecl-uploadprogress/Manifest
@@ -1,4 +1,4 @@
 AUX php-debug-testfix.patch 3125 BLAKE2B b7481ae979c468d0770d6ad2452cbac58b04a32845a0aa447eadf762f752cf6e363777760104d810a0ace60166f00ad003a23fa1363d0e1213c8cbada3288981 SHA512 de822c759a901c66ba9834090911703cf71623d5499723fc0ddc87e45176393ed94edc15b41029ce9d725320b8588646d877d060f8425cf1f77821b382a3ccf7
 DIST uploadprogress-2.0.2.tgz 19969 BLAKE2B 148cac83b00eb6b4f23861a04829280346957cdfc5bdbe94d687d0efb5da97b5f48162c59b07e0830a67350c7a2aa9a3085a4575f07b32016b01845301f04843 SHA512 b9ee5a09c3de78d58abd34da2d25d7b0cad38416309a9a69192f07e0c3fe2259de261bb3dee571e64e042753f861738ebcd67fa7fafeb595ec32ed3034c773cd
-EBUILD pecl-uploadprogress-2.0.2-r1.ebuild 838 BLAKE2B abdc8dab65d91dc6b83cea116e5f2e8e3b3953d5695301af28320ba395c50e4578531ae8cc6cf45ba74cbf3d02ba0f6f60343534bda8408a3ec4167e91128469 SHA512 2784fcbda726ddc5b8f68903d1c098e25b4557754e97f8954f5bb205426541d52463183a2b50e5cf9eacacec90a07004e669fd26505de54af886585d85eccffd
+EBUILD pecl-uploadprogress-2.0.2-r1.ebuild 721 BLAKE2B 8359f86698a681988799e73bf7abf68e2cf9e24e22c6cfbd07ca56601fe026ce8d382ed4b3e59010baca5b08f809084c1d96e45d84392b31040678a185486ece SHA512 12963c5353445564d2bca3ea852d8b568a4f05009c4882a3611169bee8c7af8cf3ff2412c40753a4dcd197ceb50b1015144feda622ea83e314c73969287c95b6
 MISC metadata.xml 711 BLAKE2B 6f64caf4b0734172e21382f36ea71f7e9f07e998eaad39045ef975dc16c75201508532056d15b3d1f87b241651a2d4d207e23f9c04494954f09a1c0e2d6536c2 SHA512 9edb41bdb677b1a9360676db7bb54dcf00860a1c71c9129fffe75944f6f7b02473911088bb759009d33f7aa72c388d9c73a0a6c1935ee0426aef706dbbe1818e
diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2-r1.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2-r1.ebuild
index 49f75395edd0..5557e747d344 100644
--- a/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2-r1.ebuild
+++ b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_PHP="php7-4 php8-0 php8-1 php8-2"
+USE_PHP="php8-0 php8-1 php8-2"
 PHP_EXT_SAPIS="apache2 fpm"
 
 inherit php-ext-pecl-r3
@@ -17,7 +17,6 @@ IUSE="examples"
 PATCHES=( "${FILESDIR}/php-debug-testfix.patch" )
 
 RDEPEND="
-	php_targets_php7-4? ( || ( dev-lang/php:7.4[apache2(-),fileinfo(-)] dev-lang/php:7.4[fileinfo(-),fpm(-)] ) )
 	php_targets_php8-0? ( || ( dev-lang/php:8.0[apache2(-),fileinfo(-)] dev-lang/php:8.0[fileinfo(-),fpm(-)] ) )
 	php_targets_php8-1? ( || ( dev-lang/php:8.1[apache2(-),fileinfo(-)] dev-lang/php:8.1[fileinfo(-),fpm(-)] ) )
 	php_targets_php8-2? ( || ( dev-lang/php:8.2[apache2(-),fileinfo(-)] dev-lang/php:8.2[fileinfo(-),fpm(-)] ) )
diff --git a/dev-php/pecl-uuid/Manifest b/dev-php/pecl-uuid/Manifest
index 6e937ed3524b..b15d57b337b9 100644
--- a/dev-php/pecl-uuid/Manifest
+++ b/dev-php/pecl-uuid/Manifest
@@ -1,3 +1,3 @@
 DIST uuid-1.2.0.tgz 16270 BLAKE2B a3746dce1c27973247fd84ccdf8d73809fae775fa0cf133c3bf09c862d93c6c3a53f2d093a1df3dd8bab90f4e58c326e6e7944bfdf436723c79ad5b634e46e18 SHA512 bd557823a8c2b78f74675a2554445eafc69193c6fe5af1f9435cdd90a8efdec0d3974ae8af759fe7d30b2f805876fc2ef55058dea245c9d89a792f634fdb0a10
-EBUILD pecl-uuid-1.2.0.ebuild 415 BLAKE2B 803ad0910ffa359488ecb83d5130b7bef6e1eb52e889b891bdbf79625291465b6815a689051c067b65409504ecebe45786c04539a6a9b10838b4e10f4d3f201e SHA512 5efde1456f6349cbbf1971ff14c9bcd519928245db5b06307d20e8eba5782318f65a1d1e47f2fccb409283170db9926ebe2cf86e8dc15e1e1b0b92b92ab25ca4
+EBUILD pecl-uuid-1.2.0.ebuild 408 BLAKE2B 58e5c20f37d510014b1b66ce7a5b73626d1da8628f7bb2e79ea42e5a22307b419f4caf9477e7b36a390fc21a15e2a02588a7398fe7f76183fe94d3280e35b2c7 SHA512 25275fdf5e9ab3b20ae6c3f803a0d5036fa40f8a0571b8c74929d2469a1f3b7ca3a1cfcddd8272bb72d49541956728fa122491e1bab5c410ca211797e188681f
 MISC metadata.xml 246 BLAKE2B b757b37f65a31ba151570156deb3f5eb41b48e8aac74482eef15d2ed6e226bc92d81273b09ab0e23c11318ca70a28d8171647efffab80822f855f85c60c6d5eb SHA512 712dba655975625f88dbe0545fbe94fecf6b4ac214031bb178aa33661e90c8c949e66e868b371832b88af741ae7b043c3c1fb246259366b2f38f66e69e543f05
diff --git a/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild b/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild
index d4c12dad5ad6..d928495b6ded 100644
--- a/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild
+++ b/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild
@@ -8,7 +8,7 @@ PHP_EXT_INIT="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( CREDITS )
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-xdiff/Manifest b/dev-php/pecl-xdiff/Manifest
index 067e6006d3f2..04a9c4fb3d24 100644
--- a/dev-php/pecl-xdiff/Manifest
+++ b/dev-php/pecl-xdiff/Manifest
@@ -1,5 +1,5 @@
 DIST xdiff-2.1.0.tgz 25150 BLAKE2B 3325cc5d3494ec0eb1e161b5321554b60aedaa90e1173a4d1e9b530f734ce80b39dc680fdc4bd5379094175a8719586e5900d5426f4df0ef78b5b40839515664 SHA512 6576f60d7e7a49bcfac3ba51c72ed0ed9ab1b7c1c9bb1e97923fc431cf033c907aa150ddecd452e4bc6c5338ed4110584464428fcd8c34a6c4c536412204a548
 DIST xdiff-2.1.1.tgz 25842 BLAKE2B 5699ceebc47ab05b24443bf5379ea485dbad459de933661ca1d8d77a3ca5aa31ffde8c79f165fcc3bdb52ed1c3800abafd824ea80bfd0c3cebf59e3b33cf0043 SHA512 80a845bd93d0083d95954be3b81a1b52a3f7d61ec10191af8fc9a46fea91559be97034aabbc51631ce0a9fc9a8ef894f3b4f347b5e917f1e15ffca2a3804c218
-EBUILD pecl-xdiff-2.1.0.ebuild 413 BLAKE2B 1884374cb863fede26cc85f07d05d767768890cb63850dbd443d92e487c27d867f21ec7d7171a82206f7f6a693b2d042aba8724d716ce9d967b29ac75566ff6d SHA512 944e5033ff1b472144f02fbc7707c99512dfa5c24d1a6065311519702b8ff9ce4a3302bd732c710f067cf61b0a63785cdc14aedeccd851d319f6217b50ee9f19
-EBUILD pecl-xdiff-2.1.1.ebuild 420 BLAKE2B 76b9e8a3de73e4f8e7482011d4acdbc5454a8d93e0c9870897ef3bb11e4ce336eb601c0a5201a761e50f88d25da72b0fd9cfdd8a19259f291ec493632d1c213e SHA512 a9a6aa63f05d02480e6f0800c60f68fb3956d168a602b955c013ce188273e6f1a2bd56f13965b645288d5c86df4bd1c43aa6920381367f70920ad784feadfde6
+EBUILD pecl-xdiff-2.1.0.ebuild 406 BLAKE2B 25a2b15e4d2dfe9c57e339eaa3303d401807c7fa1b8a354a7da7e8ca8d7df589a269bd4165c92e18e73245f361bd8c56f18887d57a5fada56c13a23425172dd0 SHA512 91da561a149816b57108b756565724cdca7ecdcbd2709a6e941ba2b54a776f1503a8f0974fb9f41a6a1eb7f4e49be30ca1ec8f9e387aed78726c16d4f7ed827f
+EBUILD pecl-xdiff-2.1.1.ebuild 413 BLAKE2B 5a81a38445ad993d393025b98629f168f1649e0ae30f507f9751e1f80561631c002397d46b2bb6d540e1447b5cd7b45acd38b021f6f447bb5f1762e496c5a970 SHA512 07e18019be7b89f3f1d92a93fb67fa1dbb5ca74aa983d6a8647068dcfb0592bdf92f34b2ff1ca609bc786257ac13b768b11df76b9bf4d0e5eb39e06c77e47f5f
 MISC metadata.xml 334 BLAKE2B 1ee64cfc85a8f5f434d752262416140a3ab219dd3e38654575ee43b80b45edba6d51b6a611d462dfe7327548523cbc75b62584fd3f344e82d95c27f06a04e6e9 SHA512 18e619cfc3f34a22e442ba7507e8fe0051e7b2fb0ff8480b26bbd2835cc262065ea98a263d40fbd77e1a044514cbd766111793549ad6b9df361d4b0c355d8b5b
diff --git a/dev-php/pecl-xdiff/pecl-xdiff-2.1.0.ebuild b/dev-php/pecl-xdiff/pecl-xdiff-2.1.0.ebuild
index 9d05cd85f871..48dfbe70e0de 100644
--- a/dev-php/pecl-xdiff/pecl-xdiff-2.1.0.ebuild
+++ b/dev-php/pecl-xdiff/pecl-xdiff-2.1.0.ebuild
@@ -7,7 +7,7 @@ PHP_EXT_NAME="xdiff"
 PHP_EXT_PECL_PKG="xdiff"
 DOCS=( README.API )
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-xdiff/pecl-xdiff-2.1.1.ebuild b/dev-php/pecl-xdiff/pecl-xdiff-2.1.1.ebuild
index 5232119de866..9171c7c53bf7 100644
--- a/dev-php/pecl-xdiff/pecl-xdiff-2.1.1.ebuild
+++ b/dev-php/pecl-xdiff/pecl-xdiff-2.1.1.ebuild
@@ -7,7 +7,7 @@ PHP_EXT_NAME="xdiff"
 PHP_EXT_PECL_PKG="xdiff"
 DOCS=( README.API )
 
-USE_PHP="php7-4 php8-0 php8-1 php8-2"
+USE_PHP="php8-0 php8-1 php8-2"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-yaml/Manifest b/dev-php/pecl-yaml/Manifest
index 5a2b23ae6890..5991db86a41f 100644
--- a/dev-php/pecl-yaml/Manifest
+++ b/dev-php/pecl-yaml/Manifest
@@ -1,3 +1,3 @@
 DIST yaml-2.2.2.tgz 41063 BLAKE2B 9fc85be5cb1eb86bc052b86d6292601babee0eb6fa790c0f5a77b307c2bd5a7a6ff66ea9efa21fa958a3c4f415f1850525454566b5a4303182d12a778fb2ed93 SHA512 4c1d3012623154b8d74908fb319a637d7bff178d02d0732d1a3d19d24df2c612d62948eb7dcd9ead9fd31f2da7af0cec54657b8cce128968a04079dd0002117d
-EBUILD pecl-yaml-2.2.2.ebuild 411 BLAKE2B 760299e11a4b2605a418a086bfa9ad3a57d407d2931287378314ca37ff6c16afda7cdee8bc1706229ffe01cc667d6bf078175c3bf4de6f4a46007663e26d1c16 SHA512 1549404ce75e26f078fe5a36013cb24e588a0aa0d279062eb53ba8ab19a050c46526acbea6381db0d19e0f77667e1b6bdb615043355707820ec98fa0c4cbd1ae
+EBUILD pecl-yaml-2.2.2.ebuild 404 BLAKE2B 38a65a5e9155ed0084cb2f36752d7f7da316909afce48994523cceae8ba50b924d540482cd52456a89e86bb878c4ad550251e0bf39c0b78f5541698900bba402 SHA512 b87e158437664a4da7d4bc53f76f02b36ec89aaf20117d9a1d36e7487923edf728c251dbc4035f4b09ca17c9a037b31e79f060acadca596614129e6bfda3ae96
 MISC metadata.xml 239 BLAKE2B c25c5a46bb59def6d564473a743d1c351a5fbeea2168a71478952bc219392c40f6e86a6e510589d9b70b834f58967a8d647f4cf2f1d4de1e37e2828f70035b44 SHA512 6f0cde14a96ea085b4d2e48538a956d62dbb4ee847096cebed5ad02e35f0f183a22aa19282ed4f59bf8f6d6ef935e6c7def3f7a5b4b24ee227601b6f8974e781
diff --git a/dev-php/pecl-yaml/pecl-yaml-2.2.2.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.2.2.ebuild
index 8bc40bd2fa2c..40810721042d 100644
--- a/dev-php/pecl-yaml/pecl-yaml-2.2.2.ebuild
+++ b/dev-php/pecl-yaml/pecl-yaml-2.2.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PHP_EXT_NAME="yaml"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
-USE_PHP="php7-4 php8-0 php8-1 php8-2"
+USE_PHP="php8-0 php8-1 php8-2"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-yaz/Manifest b/dev-php/pecl-yaz/Manifest
index c825cd496bbb..1bc0d49f4429 100644
--- a/dev-php/pecl-yaz/Manifest
+++ b/dev-php/pecl-yaz/Manifest
@@ -2,6 +2,6 @@ AUX 1.2.3/0001-arginfo_php8-support.patch 7166 BLAKE2B 42859817ae81ba437670c721e
 AUX 1.2.3/0002-arginfo-fixes.patch 1148 BLAKE2B 5910c1ccf81193cd4da155302c460b8a4859995c94bf2994631c288b60f4bc4681687a0426642b902c31e5ffd515c67346ad3fcd7e507fd45621a7f163a279d5 SHA512 5cb04810fc9dcf6cd6aa3b8f605dd8059c3e528b135c1433f2801c2737308341dc5f5475f5c14d91abe526d8fb86cbb13f62244ac26d223ad88aff2804e10d81
 DIST yaz-1.2.3.tgz 20059 BLAKE2B 3fbf6d57e8519f6d363dbf308cb6ba259098521ae352f8886e8e12ca2a0d8119eaa31fc30301aea6979b32c6c321c4de0ad63ebe72e8f52cbb630d7f136f3e60 SHA512 5e6ebccac05fa44b0758b6817530e8cb436e45ead659f6a5029383515213bcce8c8cc7ceb8ef5ff4ec2335ad5c3009c6ccf8786116b115c24a013329d107bd7a
 DIST yaz-1.2.4.tgz 20204 BLAKE2B f36a0db6b8c49a8a4235f49ef07e28196954e9e25bcbe1a2fe94d69d14224b777f692bdc135b17b4d12d1684bb2abd52fd7966a3d78460e563d8475e31cb0ce6 SHA512 c7e17681ec82805ba74d643b427d6fdb4c4542a7efcf690cf9e4ac8adf61b9a9bfe3268ed317dc5220a85f9962f86387c3054f50e98cd986b29f8fb3f5be6b1e
-EBUILD pecl-yaz-1.2.3-r1.ebuild 590 BLAKE2B f7ef9a71cb8d19f684ce47cd209a09924edeb547fe79b145521725c0badb0207c8e7183ea47df6c81b404b62866cc5b7a6a3cfc0b47299f2c8fa3626fdb5bf4c SHA512 1ebdaf64e38bc9be31fcce504cecdf3c6e855e88408b184f45ef2dee517bf638a8b9ad3bfbbe117c4656df0ca6147d6b853281923cdb5e576634bd9a777b0f28
-EBUILD pecl-yaz-1.2.4.ebuild 648 BLAKE2B c5d5dc50cd6ba59583a5e80b3a77833f07fbd2bccbab34aba296129dd0c36b68aee213f230c9cb5b08a84ec81b3c8a33136b3f5a65300b4cbdab33aaccc3ed97 SHA512 00bb24b85c2c875ac7e884162cae20d0adcb0a2e6d968fa63ed302350b01dc44b76843b995b540cb5fe05c615012829de012c5572a3bde54aaaf278d3086f770
+EBUILD pecl-yaz-1.2.3-r1.ebuild 583 BLAKE2B e1fb68172dd211abef47ae5ac2ac12ac7e10573931a8c828ddf5c5f239c8cb762a87252a75a8c4497091b6e83f6c238ae0dae1cd4d96226c9913a758bffa56b8 SHA512 50da7bc17d230138c9fa654751b4722df3048362510977bfd067f4036a6cbcb7fff34b9af85feee7307b72109402eae2da252eaf58ef124338d9cb4d61db00ef
+EBUILD pecl-yaz-1.2.4.ebuild 641 BLAKE2B a8734c7d1cf576f02b2bd83f9b3407901ce1d1909c4c073c8aa9bc86871ce6102b9e9928529fd31355fea242ed0b205ba884b16608626611f18e51e396662665 SHA512 9fcb996e448e4b8c0b39f99d623104fdbf7c86381544ad0da57fdcd11544b324299bbdfcdea214e5bfa9bf88afe464c0824554bada9b589cc8c956e932af6192
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild
index c1ef3bde4d69..7e4ac29a7338 100644
--- a/dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild
+++ b/dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild
@@ -8,7 +8,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( README )
 
-USE_PHP="php7-4 php8-0"
+USE_PHP="php8-0"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.4.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.4.ebuild
index 5cbe3b5cd734..2cac41a975c9 100644
--- a/dev-php/pecl-yaz/pecl-yaz-1.2.4.ebuild
+++ b/dev-php/pecl-yaz/pecl-yaz-1.2.4.ebuild
@@ -8,7 +8,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( README )
 
-USE_PHP="php7-4 php8-0 php8-1 php8-2"
+USE_PHP="php8-0 php8-1 php8-2"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-zmq/Manifest b/dev-php/pecl-zmq/Manifest
index dbd9d264d34d..cf6fcc671726 100644
--- a/dev-php/pecl-zmq/Manifest
+++ b/dev-php/pecl-zmq/Manifest
@@ -1,4 +1,4 @@
 DIST pecl-zmq-1.1.3_p20211103.tar.gz 104608 BLAKE2B 5217c77353cf36eb10fbb4825a77e16293770b58ee92aeec3487816c713982c67e1964e3da40b152952abe7a1e2be1dab3e67f53798849bfa1a52f3c47f2884e SHA512 762ecc78fda2e94d7bec57dc329741e0a4a6442e76a8a0bb367576b961e96482f43698e36adc7c8e6a585c914e696e6a17056a1ea680caa96f69faefc604d873
-EBUILD pecl-zmq-1.1.3_p20211103.ebuild 709 BLAKE2B 7d6c7d4c8ce0d775a160f8753d44e332228320e1281c90c3e12aed1e140654fab7da189ce21366ce76e9c0859eeef5cd673ea08c61cb1170ab6b96d052af2235 SHA512 ee1e88bae1ddd24ad224fe9d44bdeabbd1f6941767a45905276227cc01e3dfd41c8b905c7d94031c1cc995b51138e9fc95934652355ca22dbd90a9544b4e54f9
-EBUILD pecl-zmq-9999.ebuild 517 BLAKE2B 317c85e169fef0c90f35301e8520eec3a7809bb65a20490b78dded0ff27905fb1ebd1443ee51d53b3afe000f46af7417cac70114756c9ea3a8ddf52f17c79b1b SHA512 d7899617f8513b6510f1ecf3908f4d89194037393c17822987d11170f53b81d1aebf05ac2d74f09edf480da02b714d68e81728382a7ef987775b6d7284850ce4
+EBUILD pecl-zmq-1.1.3_p20211103.ebuild 702 BLAKE2B 3bec9a05e3d87bfd4351fed414b1b2f34e087aca6e671706cddcaa32dd6869fb482b8a7ccd3283da683c0d559bb156d69e207710eebb779a13439dbfab5faf3a SHA512 f01ab5a83e1e518fbfdc5c471a25603d39e80e4329cbbfec52b07491d767182e14b866c342633f945527f3e14b49be8300460946ce7fc076dd6914404cc85c39
+EBUILD pecl-zmq-9999.ebuild 510 BLAKE2B eac4c86bc7278ea5f28e3e6aa894150d942581b391c09928518dc09880f9bc55548d0683f4fb63f84526db0a986c0dd367f663522a8dffd1fc6fff3f3cedb551 SHA512 7198caf188b9f91fd9c2b94e04752d0180fccddb8339f9e9ca0dfc25b4ceff28675e5b1a9ca5b749773c521b81ad797d495bd6bdc1a9161097fe838f04019fc7
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-zmq/pecl-zmq-1.1.3_p20211103.ebuild b/dev-php/pecl-zmq/pecl-zmq-1.1.3_p20211103.ebuild
index 3263a4973133..da00ab3f0753 100644
--- a/dev-php/pecl-zmq/pecl-zmq-1.1.3_p20211103.ebuild
+++ b/dev-php/pecl-zmq/pecl-zmq-1.1.3_p20211103.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 inherit php-ext-pecl-r3
 
 if [[ ${PV} == "9999" ]]; then
diff --git a/dev-php/pecl-zmq/pecl-zmq-9999.ebuild b/dev-php/pecl-zmq/pecl-zmq-9999.ebuild
index d5bd392cbce7..4f64d3099527 100644
--- a/dev-php/pecl-zmq/pecl-zmq-9999.ebuild
+++ b/dev-php/pecl-zmq/pecl-zmq-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 inherit php-ext-pecl-r3
 
 if [[ ${PV} == "9999" ]]; then
diff --git a/dev-php/phpspec-prophecy/Manifest b/dev-php/phpspec-prophecy/Manifest
deleted file mode 100644
index 60b186477d8b..000000000000
--- a/dev-php/phpspec-prophecy/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX autoload-1.10.0.php 544 BLAKE2B 82d40ed95ab0a807cf26997d39aa2b5559a4f6eec3045027a04c173c0e56f0c4152c8ef64afe6898d648ad3b150a529eb8100fd2d3bcae63a3f98c2cde8800f9 SHA512 fb983523562eefffdd26c1789eb5be86ab2b47ef186adb0d469a44bd7fa958196afe8a000081103f01f1befabd7cc6829a535266e5a78d80087c915e8070c77b
-AUX autoload.php 544 BLAKE2B d6ec873ca93869028f105eb90480031805bf2a377ca73824ae363456388d0ecbebcc5a736ec0e9ba507f7bb00e2843aa6cb3a1cad15ea849d825080ff0c6cb09 SHA512 4c75d70b199ca708d6dbd8975df0fe1e73db9b91bbce1f4360dca7405e3bc782f10331e83399a09fe2ea7373064f70538ba0b7525be008614be75b52ee7267fb
-DIST phpspec-prophecy-1.14.0.tar.gz 40801 BLAKE2B 8968be07cbc02f76c515c8c6a27e69662e1aa697e5d502329a946a677903b59fc63347b2535b84ebf4e1d59cf6085fa10151ed9caea9f3b50c1897eaeb178636 SHA512 777137784a2235ae638d1b6b42bb67b2fa6eadb2c05e83097e90604aee5e0d7bc4100924fadf8f2e5ccbe09be6d4edf4fb63606f2be4a9c805dc4480d88747ef
-EBUILD phpspec-prophecy-1.14.0.ebuild 834 BLAKE2B 0758bd941f9c89db2215be2b1ac7fdbd1239db874359419f906a0a1340d8686fba06ab9d0b5c4698154291aa7c9d5d0c99d65e0951894ffb4cb28c58e05ba5e6 SHA512 f2b8d6938d002b46bf3545a383ae9809d73fd983b945fcd87945a129c1e8e37ca926476254626e1ced44fc77920843c33696e5ce1f70664c5e72ca6e39ab0ac8
-MISC metadata.xml 345 BLAKE2B 1a28da4b1310b57ee40a4bc2c5611fc435dd02f0e515e5aabcf44c8c195278f27a8be245acb1841242d215651225506a4a718846f514dd0d2dceebb835f0b435 SHA512 b23516a8ac80ab3f63b232b8defa85aee5585715bdf9a280d218758cb153fc274368bc4f3b1c47c55d481a2ec7a37897693670637078409dcac6014b223ff36b
diff --git a/dev-php/phpspec-prophecy/files/autoload-1.10.0.php b/dev-php/phpspec-prophecy/files/autoload-1.10.0.php
deleted file mode 100644
index fbc88617da61..000000000000
--- a/dev-php/phpspec-prophecy/files/autoload-1.10.0.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/* Autoloader for dev-php/phpspec-prophecy */
-
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-	require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-}
-
-Fedora\Autoloader\Autoload::addPsr4('Prophecy\\', __DIR__);
-
-\Fedora\Autoloader\Dependencies::required(array(
-  '/usr/share/php/phpDocumentor/ReflectionDocBlock/autoload.php',
-  '/usr/share/php/SebastianBergmann/Comparator/autoload.php',
-  '/usr/share/php/Doctrine/Instantiator/autoload.php',
-  '/usr/share/php/SebastianBergmann/RecursionContext/autoload.php',
-));
diff --git a/dev-php/phpspec-prophecy/files/autoload.php b/dev-php/phpspec-prophecy/files/autoload.php
deleted file mode 100644
index eb61ccb5eedb..000000000000
--- a/dev-php/phpspec-prophecy/files/autoload.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/* Autoloader for dev-php/phpspec-prophecy */
-
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-	require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-}
-
-Fedora\Autoloader\Autoload::addPsr0('Prophecy\\', __DIR__);
-
-\Fedora\Autoloader\Dependencies::required(array(
-  '/usr/share/php/phpDocumentor/ReflectionDocBlock/autoload.php',
-  '/usr/share/php/SebastianBergmann/Comparator/autoload.php',
-  '/usr/share/php/Doctrine/Instantiator/autoload.php',
-  '/usr/share/php/SebastianBergmann/RecursionContext/autoload.php',
-));
diff --git a/dev-php/phpspec-prophecy/metadata.xml b/dev-php/phpspec-prophecy/metadata.xml
deleted file mode 100644
index 9ff0adfe1748..000000000000
--- a/dev-php/phpspec-prophecy/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">phpspec/prophecy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.14.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.14.0.ebuild
deleted file mode 100644
index 6f43e7757c29..000000000000
--- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.14.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PN="prophecy"
-MY_VENDOR="phpspec"
-
-DESCRIPTION="Highly opinionated mocking framework"
-HOMEPAGE="https://github.com/phpspec/prophecy"
-SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/prophecy-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-	<dev-php/doctrine-instantiator-2
-	<dev-php/phpdocumentor-reflection-docblock-6
-	<dev-php/sebastian-comparator-4
-	<dev-php/sebastian-recursion-context-4
-	>=dev-lang/php-5.6:*"
-
-src_install() {
-	insinto /usr/share/php/${MY_VENDOR}/Prophecy
-	doins -r src/Prophecy/*
-	newins "${FILESDIR}/autoload-1.10.0.php" autoload.php
-}
diff --git a/dev-php/phpunit-mock-objects/Manifest b/dev-php/phpunit-mock-objects/Manifest
deleted file mode 100644
index 8fdb76c47367..000000000000
--- a/dev-php/phpunit-mock-objects/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX autoload.php 3973 BLAKE2B 0d76a132dd080b8f8fe839b1c3cb750372440ff903e464232bdcbaf2fc499c96a7579c63735631885b7e7422b3f6646179a0c4748d3885b81b53fc6652d1c164 SHA512 aee22419472bbca6c5b6a951a41c0a4098071679e5ddd40282a2d717a854189546ac8d2a8d2a9aad43e28b6ff831cedd6541c3b5e19d5599d62ffe2815204ea0
-DIST phpunit-mock-objects-3.4.3.tar.gz 37921 BLAKE2B 1d1cb1dc0bf024525f3d226d1fa67eb27a6de747ac90d58c54d145d284bb0edc06821f45b7b7bb8a3378bd68baa01c31e773da9ff522a410b3f5038746eadf67 SHA512 c9305796062a9ef412c194a82322c913b695c74fd9505580707381f9d9f96f6d69a16bde2c35226240e3c2bfaa6f0f9bf1c94c178b8a1f050b5afef7e53611de
-EBUILD phpunit-mock-objects-3.4.3-r1.ebuild 741 BLAKE2B 48f48f28d872223acddebe79c5f1d25fd653bed4f1f5fe746bd461a46ef60250c14461952c115b5f539935735c55937271268b9c0423b815d3c951d3c174e3a8 SHA512 299accf8bd6541c0afb0d89a4602b1e2a0894170f9b6ea9cb16338ac5df5bfdeda751c6aaed64c8a5d3ac570bcac6f68c3422a3b81143371aa96d39accab962e
-EBUILD phpunit-mock-objects-3.4.3.ebuild 743 BLAKE2B 7a17e4f97f1f4b6f38412b2b1b8f16726d19ba8c5a0865f2b44b51f7c75d79d883bd23a762f1d70dffcf63589b43ba0e72b1b38dfe551b2dae85fd5bf7833131 SHA512 6fd5a95ef93b094df720c288727ce63504cff8551e5af7de711373f7cc46c0d0844a9ef634612007e1b225ac6f06949b8f9c5c687c7bb71557a5bcdad11eb889
-MISC metadata.xml 367 BLAKE2B daffa63b3febac150582fe8dbdb7b15b876f0b9152955216dff66e2210c433a87b192effa26803620b379815448073fc2de6411f8b48e3e3fde93d52c2ac07e7 SHA512 c37c0fdc466216b4dbded6b04b11d169c50cc2419fc3c4d7a1b805122f025ad96892ecdc94e8c2bc0c22cbbd4ec211d167565d5ad8c2973b766ba57d29bcd9a4
diff --git a/dev-php/phpunit-mock-objects/files/autoload.php b/dev-php/phpunit-mock-objects/files/autoload.php
deleted file mode 100644
index 96bcae916553..000000000000
--- a/dev-php/phpunit-mock-objects/files/autoload.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/* Autoloader for dev-php/sebastian-diff */
-
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-	require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-}
-
-\Fedora\Autoloader\Autoload::addClassMap(
-	array(
-		'phpunit_framework_mockobject_badmethodcallexception' => '/Exception/BadMethodCallException.php',
-		'phpunit_framework_mockobject_builder_identity' => '/Builder/Identity.php',
-		'phpunit_framework_mockobject_builder_invocationmocker' => '/Builder/InvocationMocker.php',
-		'phpunit_framework_mockobject_builder_match' => '/Builder/Match.php',
-		'phpunit_framework_mockobject_builder_methodnamematch' => '/Builder/MethodNameMatch.php',
-		'phpunit_framework_mockobject_builder_namespace' => '/Builder/Namespace.php',
-		'phpunit_framework_mockobject_builder_parametersmatch' => '/Builder/ParametersMatch.php',
-		'phpunit_framework_mockobject_builder_stub' => '/Builder/Stub.php',
-		'phpunit_framework_mockobject_exception' => '/Exception/Exception.php',
-		'phpunit_framework_mockobject_generator' => '/Generator.php',
-		'phpunit_framework_mockobject_invocation' => '/Invocation.php',
-		'phpunit_framework_mockobject_invocationmocker' => '/InvocationMocker.php',
-		'phpunit_framework_mockobject_invocation_object' => '/Invocation/Object.php',
-		'phpunit_framework_mockobject_invocation_static' => '/Invocation/Static.php',
-		'phpunit_framework_mockobject_invokable' => '/Invokable.php',
-		'phpunit_framework_mockobject_matcher' => '/Matcher.php',
-		'phpunit_framework_mockobject_matcher_anyinvokedcount' => '/Matcher/AnyInvokedCount.php',
-		'phpunit_framework_mockobject_matcher_anyparameters' => '/Matcher/AnyParameters.php',
-		'phpunit_framework_mockobject_matcher_consecutiveparameters' => '/Matcher/ConsecutiveParameters.php',
-		'phpunit_framework_mockobject_matcher_invocation' => '/Matcher/Invocation.php',
-		'phpunit_framework_mockobject_matcher_invokedatindex' => '/Matcher/InvokedAtIndex.php',
-		'phpunit_framework_mockobject_matcher_invokedatleastcount' => '/Matcher/InvokedAtLeastCount.php',
-		'phpunit_framework_mockobject_matcher_invokedatleastonce' => '/Matcher/InvokedAtLeastOnce.php',
-		'phpunit_framework_mockobject_matcher_invokedatmostcount' => '/Matcher/InvokedAtMostCount.php',
-		'phpunit_framework_mockobject_matcher_invokedcount' => '/Matcher/InvokedCount.php',
-		'phpunit_framework_mockobject_matcher_invokedrecorder' => '/Matcher/InvokedRecorder.php',
-		'phpunit_framework_mockobject_matcher_methodname' => '/Matcher/MethodName.php',
-		'phpunit_framework_mockobject_matcher_parameters' => '/Matcher/Parameters.php',
-		'phpunit_framework_mockobject_matcher_statelessinvocation' => '/Matcher/StatelessInvocation.php',
-		'phpunit_framework_mockobject_mockbuilder' => '/MockBuilder.php',
-		'phpunit_framework_mockobject_mockobject' => '/MockObject.php',
-		'phpunit_framework_mockobject_runtimeexception' => '/Exception/RuntimeException.php',
-		'phpunit_framework_mockobject_stub' => '/Stub.php',
-		'phpunit_framework_mockobject_stub_consecutivecalls' => '/Stub/ConsecutiveCalls.php',
-		'phpunit_framework_mockobject_stub_exception' => '/Stub/Exception.php',
-		'phpunit_framework_mockobject_stub_matchercollection' => '/Stub/MatcherCollection.php',
-		'phpunit_framework_mockobject_stub_return' => '/Stub/Return.php',
-		'phpunit_framework_mockobject_stub_returnargument' => '/Stub/ReturnArgument.php',
-		'phpunit_framework_mockobject_stub_returncallback' => '/Stub/ReturnCallback.php',
-		'phpunit_framework_mockobject_stub_returnreference' => '/Stub/ReturnReference.php',
-		'phpunit_framework_mockobject_stub_returnself' => '/Stub/ReturnSelf.php',
-		'phpunit_framework_mockobject_stub_returnvaluemap' => '/Stub/ReturnValueMap.php',
-		'phpunit_framework_mockobject_verifiable' => '/Verifiable.php',
-	),
-	__DIR__
-);
-
-\Fedora\Autoloader\Dependencies::required(array(
-  '/usr/share/php/Doctrine/Instantiator/autoload.php',
-  '/usr/share/php/SebastianBergmann/Exporter/autoload.php',
-  '/usr/share/php/Text/Template/autoload.php',
-));
diff --git a/dev-php/phpunit-mock-objects/metadata.xml b/dev-php/phpunit-mock-objects/metadata.xml
deleted file mode 100644
index 8d4a253bfbb0..000000000000
--- a/dev-php/phpunit-mock-objects/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">sebastianbergmann/phpunit-mock-objects</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild b/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild
deleted file mode 100644
index 2fb8190b0ea1..000000000000
--- a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Mock Object library for PHPUnit"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="dev-php/fedora-autoloader
-	>=dev-php/Text_Template-1.2
-	<dev-php/Text_Template-2.0
-	<dev-php/doctrine-instantiator-2.0
-	<dev-php/sebastian-exporter-3.0
-	!<dev-php/phpunit-5.4.0
-	>=dev-lang/php-5.6:*"
-
-src_install() {
-	insinto /usr/share/php/PHPUnit/
-	doins -r src/*
-	insinto /usr/share/php/PHPUnit/Framework/MockObject
-	doins "${FILESDIR}/autoload.php"
-}
diff --git a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild b/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild
deleted file mode 100644
index e54d3abab3f1..000000000000
--- a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Mock Object library for PHPUnit"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="dev-php/fedora-autoloader
-	>=dev-php/Text_Template-1.2
-	!>=dev-php/Text_Template-2.0
-	<dev-php/doctrine-instantiator-2.0
-	<dev-php/sebastian-exporter-3.0
-	!<dev-php/phpunit-5.4.0
-	>=dev-lang/php-5.6:*"
-
-src_install() {
-	insinto /usr/share/php/PHPUnit/
-	doins -r src/*
-	insinto /usr/share/php/PHPUnit/Framework/MockObject
-	doins "${FILESDIR}/autoload.php"
-}
diff --git a/dev-php/phpunit/Manifest b/dev-php/phpunit/Manifest
deleted file mode 100644
index 2166816a6206..000000000000
--- a/dev-php/phpunit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST phpunit-8.5.11.tar.gz 159302 BLAKE2B fdf156842b3607f4cbd26194efd7eb7cb204fb1d1d078c0c6bd3bb68e520e5d748767f8aab64b7c9bf313161e3d84e08d415fbf0408c26541ec1f70cfe7af8bd SHA512 3e9db4a1d6c5bea3546b24bd837479a0114a9200f96034aabc96933dfb42c1237b03f7118f19eeb1216e32f2034c1ec8c632d20ecacbe70d3660fbbfd167ac79
-DIST phpunit-8.5.14.tar.gz 163158 BLAKE2B 8be0765b89cd7c7f91c7c8753eda9be46a38368c1b538b9e1a06b6f7e5b2cf2c37ef806338b7f4dd213962bfb8f7d749e1a97dd65d0e877fb2ffdeb747dcd344 SHA512 589cd74bf44c16ee0bb0b0e85f3468b0fdbd7e6ce968894954918094d49a0fed46570cac2fa2367f417715bf64f942f5742a292b09edd91317bbea06624ac313
-EBUILD phpunit-8.5.11.ebuild 3124 BLAKE2B dae0205a8a36f5895cf73b607b0dc206885b70126b4c78a4db83da64013f21fc0dc162ca120505129ada7cd2527bd7bc0eccd34188fe35f3937ecc2badececf2 SHA512 e8806ef9c92bcb3b9c2bfb2551864d6d2aeb92ca0b00389feb94375247fbd32d2154ba17c6d2f960421c1042dc236ae22b056f26991083c8902e1a97402c9d8f
-EBUILD phpunit-8.5.14.ebuild 3182 BLAKE2B 591c2d9834c2137747d7db2e97e3c164e54e201c1c21792eb63dcd5e0e6082cf86cd060ba517c568874acc8f078ce4e1747a939470b41dfa303c0a5de9f196a9 SHA512 9876c1a3acb42ab6b75e967cead5587e87ba7bdeb1ef5e0b4d8c003b6eae27838bcd449884bc6c40d9561a4e1b6107fbf04f035e962de608f389c5dc5c769741
-MISC metadata.xml 354 BLAKE2B 21e5101857c05c3a90ebe5ce30b8c3ddbcab297921102913d5b73e552887ce4d79f85c589d02d3b5492344543ed69670313349ebd37f4bb10dbf733e6cf54569 SHA512 210ec1fb2abfcefbad7a5065a53048bdb5ff663f58002e47b83327ec41ece2cd95540f512efd2ed03ce15009b46b7c91974c097c58a33aa63eeac715dd56ee6a
diff --git a/dev-php/phpunit/metadata.xml b/dev-php/phpunit/metadata.xml
deleted file mode 100644
index 18b58c21f5a5..000000000000
--- a/dev-php/phpunit/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">sebastianbergmann/phpunit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-php/phpunit/phpunit-8.5.11.ebuild b/dev-php/phpunit/phpunit-8.5.11.ebuild
deleted file mode 100644
index 5d87e3517972..000000000000
--- a/dev-php/phpunit/phpunit-8.5.11.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A PHP Unit Testing framework"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-
-BDEPEND="dev-php/theseer-Autoload"
-
-RDEPEND="dev-php/fedora-autoloader
-	>=dev-php/File_Iterator-2.0.2
-	>=dev-php/Text_Template-1.2.1
-	>=dev-php/PHP_CodeCoverage-7.0.12
-	>=dev-php/PHP_Timer-2.1.2
-	>=dev-php/doctrine-instantiator-1.3.1
-	>=dev-php/myclabs-deepcopy-1.10.0
-	>=dev-php/phar-io-manifest-1.0.3
-	>=dev-php/phar-io-version-2.0.1
-	>=dev-php/phpspec-prophecy-1.10.3
-	>=dev-php/sebastian-comparator-3.0.2
-	>=dev-php/sebastian-diff-3.0.2
-	>=dev-php/sebastian-environment-4.2.3
-	>=dev-php/sebastian-exporter-3.1.2
-	>=dev-php/sebastian-global-state-3.0.0
-	>=dev-php/sebastian-object-enumerator-3.0.3
-	>=dev-php/sebastian-resource-operations-2.0.1
-	>=dev-php/sebastian-type-1.1.3
-	>=dev-php/sebastian-version-2.0.1
-	|| (
-		dev-lang/php:7.4[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)]
-		dev-lang/php:7.3[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)]
-		dev-lang/php:7.2[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)]
-	)
-	!dev-php/phpunit-mock-objects
-"
-
-src_prepare() {
-	default
-
-	mkdir src/vendor || die
-
-	phpab \
-		--output   src/vendor/autoload.php \
-		--template fedora2 \
-		--basedir  src/vendor \
-		src || die
-
-	cat >> src/vendor/autoload.php <<EOF || die "failed to extend autoload.php"
-
-// Dependencies
-\Fedora\Autoloader\Dependencies::required([
-	__DIR__ . '/../../File/Iterator/autoload.php',
-	__DIR__ . '/../../Text/Template/autoload.php',
-	__DIR__ . '/../../PHP/CodeCoverage/autoload.php',
-	__DIR__ . '/../../PHP/Timer/autoload.php',
-	__DIR__ . '/../../phpspec/Prophecy/autoload.php',
-	__DIR__ . '/../../SebastianBergmann/Diff/autoload.php', // Before comparator which may load v2
-	__DIR__ . '/../../SebastianBergmann/Comparator/autoload.php',
-	__DIR__ . '/../../SebastianBergmann/Environment/autoload.php',
-	__DIR__ . '/../../SebastianBergmann/Exporter/autoload.php',
-	__DIR__ . '/../../SebastianBergmann/GlobalState/autoload.php',
-	__DIR__ . '/../../SebastianBergmann/ObjectEnumerator/autoload.php',
-	__DIR__ . '/../../SebastianBergmann/ResourceOperations/autoload.php',
-	__DIR__ . '/../../SebastianBergmann/Type/autoload.php',
-	__DIR__ . '/../../SebastianBergmann/Version/autoload.php',
-	__DIR__ . '/../../Doctrine/Instantiator/autoload.php',
-	__DIR__ . '/../../myclabs/DeepCopy/autoload.php',
-	__DIR__ . '/../../PharIo/Manifest/autoload.php',
-	__DIR__ . '/../../PharIo/Version/autoload.php',
-]);
-EOF
-}
-
-src_install() {
-	insinto /usr/share/php/PHPUnit
-	doins -r src/*
-
-	# referenced by PHPUnit/Util/Configuration.php
-	insinto /usr/share/php/
-	doins phpunit.xsd
-
-	exeinto /usr/share/php/PHPUnit
-	doexe phpunit
-	dosym ../share/php/PHPUnit/phpunit /usr/bin/phpunit
-}
-
-pkg_postinst() {
-	elog "${PN} can optionally use json, pdo-sqlite and pdo-mysql features."
-	elog "If you want those, emerge dev-lang/php with USE=\"json pdo sqlite mysql\"."
-}
diff --git a/dev-php/phpunit/phpunit-8.5.14.ebuild b/dev-php/phpunit/phpunit-8.5.14.ebuild
deleted file mode 100644
index 07f0cc3a2304..000000000000
--- a/dev-php/phpunit/phpunit-8.5.14.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A PHP Unit Testing framework"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-
-BDEPEND="dev-php/theseer-Autoload"
-
-RDEPEND="dev-php/fedora-autoloader
-	>=dev-php/File_Iterator-2.0.2
-	>=dev-php/Text_Template-1.2.1
-	>=dev-php/PHP_CodeCoverage-7.0.12
-	>=dev-php/PHP_Timer-2.1.2
-	>=dev-php/doctrine-instantiator-1.3.1
-	>=dev-php/myclabs-deepcopy-1.10.0
-	>=dev-php/phar-io-manifest-2.0.1
-	>=dev-php/phar-io-version-3.0.2
-	>=dev-php/phpspec-prophecy-1.10.3
-	>=dev-php/sebastian-comparator-3.0.2
-	>=dev-php/sebastian-diff-3.0.2
-	>=dev-php/sebastian-environment-4.2.3
-	>=dev-php/sebastian-exporter-3.1.2
-	>=dev-php/sebastian-global-state-3.0.0
-	>=dev-php/sebastian-object-enumerator-3.0.3
-	>=dev-php/sebastian-resource-operations-2.0.1
-	>=dev-php/sebastian-type-1.1.3
-	>=dev-php/sebastian-version-2.0.1
-	|| (
-		dev-lang/php:8.0[cli(-),unicode(-),xml(-),xmlwriter(-)]
-		dev-lang/php:7.4[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)]
-		dev-lang/php:7.3[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)]
-		dev-lang/php:7.2[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)]
-	)
-	!dev-php/phpunit-mock-objects
-"
-
-src_prepare() {
-	default
-
-	mkdir src/vendor || die
-
-	phpab \
-		--output   src/vendor/autoload.php \
-		--template fedora2 \
-		--basedir  src/vendor \
-		src || die
-
-	cat >> src/vendor/autoload.php <<EOF || die "failed to extend autoload.php"
-
-// Dependencies
-\Fedora\Autoloader\Dependencies::required([
-	__DIR__ . '/../../File/Iterator/autoload.php',
-	__DIR__ . '/../../Text/Template/autoload.php',
-	__DIR__ . '/../../PHP/CodeCoverage/autoload.php',
-	__DIR__ . '/../../PHP/Timer/autoload.php',
-	__DIR__ . '/../../phpspec/Prophecy/autoload.php',
-	__DIR__ . '/../../SebastianBergmann/Diff/autoload.php', // Before comparator which may load v2
-	__DIR__ . '/../../SebastianBergmann/Comparator/autoload.php',
-	__DIR__ . '/../../SebastianBergmann/Environment/autoload.php',
-	__DIR__ . '/../../SebastianBergmann/Exporter/autoload.php',
-	__DIR__ . '/../../SebastianBergmann/GlobalState/autoload.php',
-	__DIR__ . '/../../SebastianBergmann/ObjectEnumerator/autoload.php',
-	__DIR__ . '/../../SebastianBergmann/ResourceOperations/autoload.php',
-	__DIR__ . '/../../SebastianBergmann/Type/autoload.php',
-	__DIR__ . '/../../SebastianBergmann/Version/autoload.php',
-	__DIR__ . '/../../Doctrine/Instantiator/autoload.php',
-	__DIR__ . '/../../myclabs/DeepCopy/autoload.php',
-	__DIR__ . '/../../PharIo/Manifest/autoload.php',
-	__DIR__ . '/../../PharIo/Version/autoload.php',
-]);
-EOF
-}
-
-src_install() {
-	insinto /usr/share/php/PHPUnit
-	doins -r src/*
-
-	# referenced by PHPUnit/Util/Configuration.php
-	insinto /usr/share/php/
-	doins phpunit.xsd
-
-	exeinto /usr/share/php/PHPUnit
-	doexe phpunit
-	dosym ../share/php/PHPUnit/phpunit /usr/bin/phpunit
-}
-
-pkg_postinst() {
-	elog "${PN} can optionally use json, pdo-sqlite and pdo-mysql features."
-	elog "If you want those, emerge dev-lang/php with USE=\"json pdo sqlite mysql\"."
-}
diff --git a/dev-php/realpath_turbo/Manifest b/dev-php/realpath_turbo/Manifest
index ab293d36bf06..840cb515b9da 100644
--- a/dev-php/realpath_turbo/Manifest
+++ b/dev-php/realpath_turbo/Manifest
@@ -1,3 +1,3 @@
 DIST realpath_turbo-2.0.0.tar.bz2 9106 BLAKE2B 3275397ab72def1b120d2df1bfe6c233283754539b2ea7dfd558a0773d2f094f9f6b31850a516b883af470cd04d4ebb9d5a7d8492608169a797d1562c7236d11 SHA512 03a03d4a3a067ffac61222c4d71031ab9e289b745fd3b158b5b723f3abf1ad7bb1f691904e3f7b53a98c970f1b0f7c4fe558a4de696aac77d0f9a0f99159fb30
-EBUILD realpath_turbo-2.0.0.ebuild 615 BLAKE2B 35a53070abc947a61d75db41ee8c5a12273a2fe16654d135db481c800eecdc884c1b4ac91636934d8e7a724f3041077b77dc186bb93753f87a3815e042335dac SHA512 a427fa96a0d660edf88fe0f3fa39ea18014086656aeb650c2b22076b8bead6008c7107a909f02368ae5e4f2d02cab77cc8452860d3bc6216decfc5be10903a7e
+EBUILD realpath_turbo-2.0.0.ebuild 608 BLAKE2B 2fd37cf0a352deafe634863f2716731bd01841e3b438b2756cb911d5d33aa1d317b8122dfb6143b0a0bdab1c64f5eee6b2ac11b238f34a219588a292e0460bbf SHA512 f7d454e7be49b1ae1a61705186c5372183c209420a7ba6517fbe539046f46d9c22e374fe9b272c01889d0ef41e548851a84c167153947f651fb5e6af92dc5657
 MISC metadata.xml 342 BLAKE2B 24102d7673cef12c0c9c34d69206d321eabdeef1d798fa585f2f3e5159467a405442f7301fe6e50c214273269496d271239f3bf2b19ee99742c28f2f365b1799 SHA512 d4513cc6ccf087f24d0568059e8fcbb9ae05ab51e85040db6a1fcbacd66537191a24e1c80004da51407a10ef29eabce29f5348aceb5f921fc47952dcd53d6888
diff --git a/dev-php/realpath_turbo/realpath_turbo-2.0.0.ebuild b/dev-php/realpath_turbo/realpath_turbo-2.0.0.ebuild
index 8e01888cdfe4..d45d7601a231 100644
--- a/dev-php/realpath_turbo/realpath_turbo-2.0.0.ebuild
+++ b/dev-php/realpath_turbo/realpath_turbo-2.0.0.ebuild
@@ -7,7 +7,7 @@ PHP_EXT_NAME="realpath_turbo"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-source-r3
 
diff --git a/dev-php/scrypt/Manifest b/dev-php/scrypt/Manifest
index 180107d4ccc0..698a7316ca0d 100644
--- a/dev-php/scrypt/Manifest
+++ b/dev-php/scrypt/Manifest
@@ -1,4 +1,4 @@
 DIST scrypt-2.0.0.tgz 23229 BLAKE2B 71a40869004cbcb3fb6b303e1d59c0687b9817b89b38ebedc0001a732f4d4fba134ba124b09a6b4970da9892654631b41d0ce8e79d60eaccf788344972cb0760 SHA512 88b559f112f768eb1b61652ee5a6a75edbfd6133aca39c0d740dd083e3d2f718232a607a05a306cd40faeb4cab48f98de04f0799011d86543385583a99fb508f
-EBUILD scrypt-2.0.0.ebuild 356 BLAKE2B ba2696fc7c72b8a6be7e3607b4fb16daf2576004baad27cb5e7d8a5e9e2d8bdd32173ec2a100326c5a0a11b5aff9074042d21098b15916660e2f8c2ba09edadf SHA512 0dd51a87a7d1190e9b9f1f0890a526718e9122eb21b5e3d751fd578f533d4289e928a4f094851a61ddfe98de7d0b5a841cfdd6ca9a0ae84726c2db0c46fedbd5
+EBUILD scrypt-2.0.0.ebuild 349 BLAKE2B e94e6f9ec250827bc04e00b18b6a218de56bceee4d398298cb59d3f1c0b5f914782975133691d3303be8a8d08432c87dd93537ff64fb1f949931821535605bac SHA512 705a212786eef8fd9fbb78745eceeb13a88987e0af14f592739be2a465a7063379861e78f54c7273ababfa07e969fa584970b24896071176f3b76df6221c1475
 EBUILD scrypt-9999.ebuild 414 BLAKE2B 55fdaa9a3a2214ec81a6d662f3d3deb8d631d57c927e872d8192ab54e257bc64744f502c5a22049c1e57a0387c35e272af26fbd7cca10826be5e897c80a5989d SHA512 8b6d25876351f7b603acbe3496a3ccb33b0715a56d29d9ba02f90248fddb75cddef9f830910443a9de2c80bd7d5c90548704ecfc8c7b2dc2efeeb9ccce00a52a
 MISC metadata.xml 822 BLAKE2B 24967e03c8ab7834fd07cd06477f663df8f425097fe3adb0bd81636e142adbd180f318b4097e2920e016eaff95cf2b9654d2aae6c13c80f423eb58398b302b83 SHA512 e3a079ed9c395b9f613a0c03366a1a9be48be2cd45cb337a776ee83e0abf08b244977fb7c719ea878852200d18ffcb2afeaabdaf7a95aac28683a00430da7d1f
diff --git a/dev-php/scrypt/scrypt-2.0.0.ebuild b/dev-php/scrypt/scrypt-2.0.0.ebuild
index 3fc681c01f83..49ae1df6dc8a 100644
--- a/dev-php/scrypt/scrypt-2.0.0.ebuild
+++ b/dev-php/scrypt/scrypt-2.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PHP_EXT_ECONF_ARGS="--enable-scrypt"
-USE_PHP="php7-4 php8-0 php8-1 php8-2"
+USE_PHP="php8-0 php8-1 php8-2"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/sebastian-comparator/Manifest b/dev-php/sebastian-comparator/Manifest
deleted file mode 100644
index 60a5f7b1a82f..000000000000
--- a/dev-php/sebastian-comparator/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX autoload.php 1601 BLAKE2B f3f668b40b4d8a3259e11fc0fbe3a810157c2bcf40c3d8372dcebf2bdcec7fa999654d88db19fd50169563d34e3b4754101010bb80cef39ed71c0747d3d3c9b6 SHA512 477a0610c65ad7f6fa07532c97f62ec6968fe88810782fd37024767d89dc1e8e59de1e1cbfbf8fdf8d6a363d0e202ae659c6fffda8cd8cf7916b2ed089aa3457
-DIST sebastian-comparator-1.2.4.tar.gz 13402 BLAKE2B 5fc664e42408a188ed8601f2413f0b6517e5fd9b26f85be3177f09d6aaf4fda8eaa2e9e643e08914fb18aca0c795989d1e341d28476e3857c7d991bd2c06d51c SHA512 b7ca4bbdd91c9d59f83c4ccbd63d7755205f6686de7d7e41808faba404df8f58173a0699a0e4d1fbc09914c2fcf841ddc4df41a86aa5cd0fdffa3be4d438a8aa
-DIST sebastian-comparator-3.0.2.tar.gz 16305 BLAKE2B 3cc8551fad28542823fba182abf6e9f33bafa0fea004ceee7d2b192f250678ec7f2014b7e9ae16eee1ec84ff37e656f5612a0d45d3bc10c5959831d39d851fee SHA512 05d5cdb5ce6346325c3f7c6f7b6669de7d599e0b65a95505a85aca887df5498d5baa22f22e9065bf185ac50df1abc969bf86263d31a3923034607938a5eace58
-EBUILD sebastian-comparator-1.2.4.ebuild 681 BLAKE2B 46a10b2c9c09f727210587fb649e56c517b094e8056818b22c54235fb7a7d6b417bb158b9dc3c31fce22e7dab26d6734b7c9fd814f4a8d258aeed8dba1fd1445 SHA512 c736c946ca19ccc2052f050a91351edfa7e1b33bd3fa519d1741b6b902d35bf854007b8f30955d3fde45316b6d36ec9f85e94d1e89526826dfde01c1047fc0e4
-EBUILD sebastian-comparator-3.0.2.ebuild 745 BLAKE2B df2cb1f7b806baf82112e0a3dca50785a934b10bbd654f3f6637f27b8dda24da98c4c5d96596a3c255835ec89331158e1f7dba9faac4ccd81099953ef33f0325 SHA512 ec611830d1622cc0597b6df947f8cb18071d86570d134b894f399228314ba6b2b8529f081392971cf6be1cd8332c8277d2511c764100a20f7471a7ad6ef992f2
-MISC metadata.xml 357 BLAKE2B 84f6229f9d78fd220dc87f7a6bc761e4654b697a317c9e27bf20a6ddf7df6b61a9ff994b02c4209cf1bc7ea60d146bd8e34d4714debac6e9b0d2f5aef3bb6989 SHA512 060ce0953d464175c75b284a05058874dafa3c6295cf93a2a28935da6e499de56ff5cb5dbb6ee4bb5c5cc2a66a3d3a9cf878d7fd835e756eeb5c8b21e717dee6
diff --git a/dev-php/sebastian-comparator/files/autoload.php b/dev-php/sebastian-comparator/files/autoload.php
deleted file mode 100644
index 696ae0327d79..000000000000
--- a/dev-php/sebastian-comparator/files/autoload.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/* Autoloader for dev-php/sebastian-comparator */
-
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-	require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-}
-
-\Fedora\Autoloader\Autoload::addClassMap(
-	array(
-		'sebastianbergmann\comparator\arraycomparator' => '/ArrayComparator.php',
-		'sebastianbergmann\comparator\comparator' => '/Comparator.php',
-		'sebastianbergmann\comparator\comparisonfailure' => '/ComparisonFailure.php',
-		'sebastianbergmann\comparator\domnodecomparator' => '/DOMNodeComparator.php',
-		'sebastianbergmann\comparator\datetimecomparator' => '/DateTimeComparator.php',
-		'sebastianbergmann\comparator\doublecomparator' => '/DoubleComparator.php',
-		'sebastianbergmann\comparator\exceptioncomparator' => '/ExceptionComparator.php',
-		'sebastianbergmann\comparator\factory' => '/Factory.php',
-		'sebastianbergmann\comparator\mockobjectcomparator' => '/MockObjectComparator.php',
-		'sebastianbergmann\comparator\numericcomparator' => '/NumericComparator.php',
-		'sebastianbergmann\comparator\objectcomparator' => '/ObjectComparator.php',
-		'sebastianbergmann\comparator\resourcecomparator' => '/ResourceComparator.php',
-		'sebastianbergmann\comparator\scalarcomparator' => '/ScalarComparator.php',
-		'sebastianbergmann\comparator\splobjectstoragecomparator' => '/SplObjectStorageComparator.php',
-		'sebastianbergmann\comparator\typecomparator' => '/TypeComparator.php',
-	),
-	__DIR__
-);
-
-\Fedora\Autoloader\Dependencies::required(array(
-  '/usr/share/php/SebastianBergmann/Diff/autoload.php',
-  '/usr/share/php/SebastianBergmann/Exporter/autoload.php',
-));
diff --git a/dev-php/sebastian-comparator/metadata.xml b/dev-php/sebastian-comparator/metadata.xml
deleted file mode 100644
index 66ce5497903c..000000000000
--- a/dev-php/sebastian-comparator/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">sebastianbergmann/comparator</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild b/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild
deleted file mode 100644
index 87983369a3c1..000000000000
--- a/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/sebastian-//}"
-
-DESCRIPTION="Compare PHP values for equality"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-	<dev-php/sebastian-diff-2.0
-	<dev-php/sebastian-exporter-3.0
-	>=dev-lang/php-5.6:*
-"
-src_install() {
-	insinto /usr/share/php/SebastianBergmann/Comparator
-	doins -r src/*
-	doins "${FILESDIR}/autoload.php"
-}
diff --git a/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild b/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild
deleted file mode 100644
index 1967df759685..000000000000
--- a/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/sebastian-//}"
-
-DESCRIPTION="Compare PHP values for equality"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-	>=dev-php/sebastian-diff-3.0
-	<dev-php/sebastian-diff-4.0
-	>=dev-php/sebastian-exporter-3.1
-	<dev-php/sebastian-exporter-4.0
-	>=dev-lang/php-7.1:*
-"
-src_install() {
-	insinto /usr/share/php/SebastianBergmann/Comparator
-	doins -r src/*
-	doins "${FILESDIR}/autoload.php"
-}
diff --git a/dev-php/sebastian-exporter/Manifest b/dev-php/sebastian-exporter/Manifest
deleted file mode 100644
index 024b9ee651d0..000000000000
--- a/dev-php/sebastian-exporter/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX autoload.php 429 BLAKE2B 7fb7aabe5cee47b74491d50a2a01f60ee45f5d0698f5bd5c908ec1796bbd31cb003de188c61dd4492a5e1556b47e3ab8ef77019ce4dc9cfb90a2e3af96527694 SHA512 06f8a87461a518009d2dd4298637ede677d6304b36d25d94c75472420cf2e4a8fa6aef23b5e21f98ee4ad03b2886fc946c5b0213944947290a3dd9c5308f8509
-DIST sebastian-exporter-2.0.0.tar.gz 7473 BLAKE2B c8f39c9fb19d146959e184ca1356a2f802bb29d31792575fe624072fcc7fc44f5d5d619dbc9dafc9114c46e91ba64338af6902abc2fecc96cfbd0b28294a97cc SHA512 0d418973a6e272e327c16f2393bde09424f8dea6991a804259ac57261efddeb99e33a904bbf2ede99b07def897c0baa12ad9fc04c8c33af684f1fd19d976948a
-DIST sebastian-exporter-3.1.2.tar.gz 9996 BLAKE2B 214acefe5679a45d5e67ce635790a12002aca0e380a087e96358200001400458ce907bb4f424ee3683b2fe17fb4bfbb674ebe0afbdcd51b24c654de2b4075736 SHA512 bc6cb070c8c7cd5262262337950ffc70081137c4513c427cc94ac491e2ebe0e91ca4caf7858eb7957f9abe5b4b2b2d6237020a0a6df556439191724f3cda1db8
-EBUILD sebastian-exporter-2.0.0.ebuild 665 BLAKE2B f7d755d21dfff3a5da126c36d1677e5e7cd1085dc22f6ff0dd00168f6088a84d40217e0d0d3ca75501fad18a3517b069059ebf0b5398f0d703970c754bbc5255 SHA512 cc3cfa93a635da141a211614171dab797cc52eeae3545e2a46d119cc1be75f27b210df196b75ab962a366f2982a3e0fa329fc5c985ee5e8659fdca0afed54cb5
-EBUILD sebastian-exporter-3.1.2.ebuild 663 BLAKE2B 68d83020f9712eaecf652633f6ee174c9f04dd353593642f5e6c8432177f499f6aedd39dbb592ab0f659564391f449f316e779bd3d5483d1d9d47b8ca620be73 SHA512 1be2702ef1196a6017bc8e0941fd88b89d056b5306f48c085d787d638b54a31978560bcaafb0d02294b9c787169b414efde52ae55810bde19af9637d3d3ab7fc
-MISC metadata.xml 355 BLAKE2B 6bc46d0667f05f3a6ba0694c08c8e33230d078ff2680b8c7d549fd7812b4f83bf66eb5ac158f85e83f33ba3c97d84fb68f13686a55a41e6206b68e5ceb6522bb SHA512 3d0c024e6adda7e09d1392526fcf3f3ae28a4a8ae9195b63f7a4e07ce36082df9f8c2744b95c628e0fce341cc3e80cecb85fcee1d8604d350d28fd5663326ea8
diff --git a/dev-php/sebastian-exporter/files/autoload.php b/dev-php/sebastian-exporter/files/autoload.php
deleted file mode 100644
index 7803f5f61891..000000000000
--- a/dev-php/sebastian-exporter/files/autoload.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/* Autoloader for dev-php/sebastian-exporter */
-
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-	require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-}
-
-\Fedora\Autoloader\Autoload::addClassMap(
-	array(
-		'sebastianbergmann\exporter\exporter' => '/Exporter.php',
-	),
-	__DIR__
-);
-
-\Fedora\Autoloader\Dependencies::required(array(
-  '/usr/share/php/SebastianBergmann/RecursionContext/autoload.php',
-));
diff --git a/dev-php/sebastian-exporter/metadata.xml b/dev-php/sebastian-exporter/metadata.xml
deleted file mode 100644
index ced75d6e7f76..000000000000
--- a/dev-php/sebastian-exporter/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">sebastianbergmann/exporter</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild b/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild
deleted file mode 100644
index c009cfcb320a..000000000000
--- a/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/sebastian-//}"
-
-DESCRIPTION="Export PHP variables for visualization"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-	=dev-php/sebastian-recursion-context-2*
-	>=dev-lang/php-5.6:*"
-
-src_install() {
-	insinto /usr/share/php/SebastianBergmann/Exporter
-	doins -r src/*
-	doins "${FILESDIR}/autoload.php"
-}
diff --git a/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild b/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild
deleted file mode 100644
index 7de2b3bc07d0..000000000000
--- a/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/sebastian-//}"
-
-DESCRIPTION="Export PHP variables for visualization"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-	=dev-php/sebastian-recursion-context-3*
-	=dev-lang/php-7*:*"
-
-src_install() {
-	insinto /usr/share/php/SebastianBergmann/Exporter
-	doins -r src/*
-	doins "${FILESDIR}/autoload.php"
-}
diff --git a/dev-php/sebastian-global-state/Manifest b/dev-php/sebastian-global-state/Manifest
deleted file mode 100644
index 7db6d3d90fa1..000000000000
--- a/dev-php/sebastian-global-state/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX autoload-3.0.0.php 843 BLAKE2B 0a040782b66fb717f3de580e455ce2d186dd30ffa9b57f56a80e6d179636ef3612b49f546769937870e56ba3460d15542943bc0370a17c445ce7eb6c7d1d944a SHA512 bf474bcb0a0e43184c9e6cf4508b8ddbcf30adf6fa2568057828fde1af0f8ed9301b171ee1fc1db1a4a4bb4c78e473c23d637abcff9cf9298445210fcf5bbc63
-AUX autoload.php 657 BLAKE2B 239a7bcc4ac117a513f807d8c3266c4951e4b3bf86a6c2625c2ab480905a99b5e9175238b8d8bec080228f7f7c734eefe5325fc147dfadb73a988aaa7ac3fcf1 SHA512 26f6a18f580a3080c80ef6abe8598fa589ade4343152fffcf3e967a208ec1e28b3231f241402cb6f8e22b8f6c1d248f0d999186846d5ced069a624571133f7f5
-DIST sebastian-global-state-1.1.1.tar.gz 7659 BLAKE2B 9793e68f226901cb2d67e3d4ac03cc41323485a1b7d819dfe0a4cd9c00b19eb79ebf539a8705545a4c132ef8a2a286edc804016cb76400256008ecd298f2f3c5 SHA512 dec6387183ea6cf869b1302e641a9d85b6dd69ebf299354825ab2f8a06a82609f8e3a2bdeea6924b5520f813af7493fc8e957c3f9876dcaa302066770997186c
-DIST sebastian-global-state-3.0.0.tar.gz 10550 BLAKE2B 58ad62cce7f94805add12105b3000c54e73624c780fa12970e779538f3ff06f145001c6d19e98e817982b092be992b4e1e55638f727fb3e7bad9d12c242546a5 SHA512 2a081fbf7b26afab0eeaf1933887dea12973c6cde1fe7115fe560d56e81ab69dceb7b3431818c51641778f6526abb0055e2a27420e53b2fe90e3f95ee57b01d0
-EBUILD sebastian-global-state-1.1.1.ebuild 617 BLAKE2B 8e35757bf526a669ef11bc65d6f37188f075238828980b227e502b7d27054c908aeb0b2fad9476f73eaa057fc203d175491444094a2c75d244a07ff1b531ee6b SHA512 31c674dd5317b14dce21371a46b5b226d9d3d2646ddf903fca06a8cea111da0d7d7841ca183d10611743ee017ab805e1d53049acbc204bca5dcdb7ffd26db323
-EBUILD sebastian-global-state-3.0.0.ebuild 764 BLAKE2B dc0d62e8f2a4f505a6ab6d2cbaafaedb90b0b3c040deabfe03b4f3505abc5a335be1a2c8971e20bde43e1c1256045e7d6d78361de1f2ddd14c72d1dece48fc30 SHA512 38fb47b90a0b8318ae0738b347274f6722964921f06cfc687126ad8003d6988cd336b65b928e7e80ba8ed547ec5177a73bea62d7aaf97c95936c159f6300703f
-MISC metadata.xml 359 BLAKE2B 929e3fb85a02ff3ea974d74e471d3dd529d81cc7fca6da76f0dc95c09c0ab5a3be76a46217c473b2a32c8c8e014415845ad757413c3b7e15fd551c0fc687d594 SHA512 53a2e3429b2fdef6f9c1f564f3de0a4cc09c4fd0533fa116c25c38ce7d1a7ad6a17f33bc64f211bbf7bd6f4e7c6617ad183b692e5aad3d72a0d0aa978bccaa3c
diff --git a/dev-php/sebastian-global-state/files/autoload-3.0.0.php b/dev-php/sebastian-global-state/files/autoload-3.0.0.php
deleted file mode 100644
index 01a691b3140d..000000000000
--- a/dev-php/sebastian-global-state/files/autoload-3.0.0.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/* Autoloader for dev-php/sebastian-global-state */
-
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-	require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-}
-
-\Fedora\Autoloader\Autoload::addClassMap(
-	[
-		'sebastianbergmann\globalstate\blacklist' => '/Blacklist.php',
-		'sebastianbergmann\globalstate\codeexporter' => '/CodeExporter.php',
-		'sebastianbergmann\globalstate\exception' => '/exceptions/Exception.php',
-		'sebastianbergmann\globalstate\restorer' => '/Restorer.php',
-		'sebastianbergmann\globalstate\runtimeexception' => '/exceptions/RuntimeException.php',
-		'sebastianbergmann\globalstate\snapshot' => '/Snapshot.php',
-	],
-	__DIR__
-);
-
-// Required dependencies.
-\Fedora\Autoloader\Dependencies::required([
-  __DIR__."/../ObjectReflector/autoload.php",
-  __DIR__."/../RecursionContext/autoload.php",
-]);
-
diff --git a/dev-php/sebastian-global-state/files/autoload.php b/dev-php/sebastian-global-state/files/autoload.php
deleted file mode 100644
index e7c855e9b3f3..000000000000
--- a/dev-php/sebastian-global-state/files/autoload.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/* Autoloader for dev-php/sebastian-global-state */
-
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-	require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-}
-
-\Fedora\Autoloader\Autoload::addClassMap(
-	array(
-		'sebastianbergmann\globalstate\blacklist' => '/Blacklist.php',
-		'sebastianbergmann\globalstate\codeexporter' => '/CodeExporter.php',
-		'sebastianbergmann\globalstate\exception' => '/Exception.php',
-		'sebastianbergmann\globalstate\restorer' => '/Restorer.php',
-		'sebastianbergmann\globalstate\runtimeexception' => '/RuntimeException.php',
-		'sebastianbergmann\globalstate\snapshot' => '/Snapshot.php',
-	),
-	__DIR__
-);
diff --git a/dev-php/sebastian-global-state/metadata.xml b/dev-php/sebastian-global-state/metadata.xml
deleted file mode 100644
index 3a7b23c158e8..000000000000
--- a/dev-php/sebastian-global-state/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">sebastianbergmann/global-state</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild b/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild
deleted file mode 100644
index 256ac1e6d492..000000000000
--- a/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/sebastian-//}"
-
-DESCRIPTION="Snapshotting of global state"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-	>=dev-lang/php-5.6:*"
-
-src_install() {
-	insinto /usr/share/php/SebastianBergmann/GlobalState
-	doins -r src/*
-	doins "${FILESDIR}/autoload.php"
-}
diff --git a/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild b/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild
deleted file mode 100644
index 707301722613..000000000000
--- a/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/sebastian-//}"
-
-DESCRIPTION="Snapshotting of global state"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-	>=dev-lang/php-7.2:*
-	>=dev-php/sebastian-object-reflector-1.1.1
-	<dev-php/sebastian-object-reflector-2.0
-	=dev-php/sebastian-recursion-context-3*
-"
-
-src_install() {
-	insinto /usr/share/php/SebastianBergmann/GlobalState
-	doins -r src/*
-	newins "${FILESDIR}/autoload-3.0.0.php" autoload.php
-}
diff --git a/dev-php/sebastian-object-enumerator/Manifest b/dev-php/sebastian-object-enumerator/Manifest
deleted file mode 100644
index 4711213521ed..000000000000
--- a/dev-php/sebastian-object-enumerator/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX autoload-3.0.3.php 635 BLAKE2B 089dea0d15cef507d15d966e64eceba547bf8825c1d72a572962155133da10bea6eb8ae80f848fb0b56354b8b44f4a2f16ea5806e4c0307a8fdf79e215941e77 SHA512 6765523012c04d7be4af3579a02db9b3b867f94cbc35198a099cd8b2fa5c03b100be61d11bee3fbc8992c8ce36c699bdb3be1d4400ccd1128ba6426b65f0c263
-AUX autoload.php 620 BLAKE2B 0f78748010526a3f72d61ef23121a573fba13b7c945e66056888e833673dba8dbe691087910a8d6e72c9a3a4febe6c3f6897bcdb1b8cb846dd832bc30dc864a5 SHA512 6b7ea509b19366d7de9a5e7c45e5f11f56824d19b6af08af8523d1a02bdb690b6f5639b0a324966bf14a9ef06c0ed5c224c52e9d5bc529095f1125507bd94aa9
-DIST sebastian-object-enumerator-2.0.1.tar.gz 4861 BLAKE2B cc68da9e38e756e478eedab588c023ebbf15d28d6f9e5399f178c581765aa02324ffe6f0bdf5e561f61791f449d8763e6cfdb572c779adaa9c7dedcc8b0f15a8 SHA512 087ef23c079be2ef56948c734cbdefbf4d8cad36c6c26aae5e38401ec3f306d91067aea28a2226811d1ed90611c7c8070a4f5c3733a24eb56f6a177eb332a9b3
-DIST sebastian-object-enumerator-3.0.3.tar.gz 4989 BLAKE2B 8d2314daf82280dc746cdc91c3c927d012440ef162a59918e038a15775f0113cf7bc0ae0eafb83d6d6992cdb2680bdd92935789584305906747fd71f13fcad5a SHA512 9bbff5081e1627d7ab98e01830cf6245f15b3ca96a56f6074e090f10862d19d0849251d69bf1117d3634b7e0ef86e266b2e9d4062e75eff9c9bc5f994dfe9a2d
-EBUILD sebastian-object-enumerator-2.0.1.ebuild 716 BLAKE2B 7789f4498282ff900bf102c41573ff917b4b39213cd02d1ea98e421befc7f3ba515827e5c7f8f7040ce775615918d4d3feee3cd206c0cd4c0573fbfa0215fff0 SHA512 70300787755c1ebc577fe27ac833a7ae8433ab5132723d0d7df843a938dbddfc0ee6549c43525ab59d3c7b75f7c6ed8b1f96bc115ee4dad7e1facce3b09c00f1
-EBUILD sebastian-object-enumerator-3.0.3.ebuild 818 BLAKE2B 8ee64d5dbd92a4707cdca5e6e8abfbe4660dd8697bfddec2bf039c77b87b66235591e12479982c47e3fd19e5254aa205edd59a1e9dd350c2a785fd2c91f75ca9 SHA512 84aa4646558a1402b6d8607bc4c7d775ef7a3f1218c7f02763942a31c31f66d12002015dfeee1e6a20f6422f2d80d234d3d1af52aa22d949b751624c7ee4b13f
-MISC metadata.xml 364 BLAKE2B 45b7368ce224d4c1e3edf7ebd4f3e7743713d695ff326fd1bdca8c66c7856d96e534bbb92ab7f4b48bc921cfb8d16171802fb0aef550e9e23b7ec18571138d56 SHA512 1f72f5d6749392ecea5535faa4c981844f9da06b51a3349969081cca5ccf48b5d4252b20cb579398a67a587e38ec838f04f3f58539fec1d0de5d71ad895fa84b
diff --git a/dev-php/sebastian-object-enumerator/files/autoload-3.0.3.php b/dev-php/sebastian-object-enumerator/files/autoload-3.0.3.php
deleted file mode 100644
index 07afae81e5d4..000000000000
--- a/dev-php/sebastian-object-enumerator/files/autoload-3.0.3.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/* Autoloader for dev-php/sebastian-object-enumerator */
-
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-	require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-}
-
-\Fedora\Autoloader\Autoload::addClassMap(
-	[
-		'sebastianbergmann\objectenumerator\enumerator' => '/Enumerator.php',
-		'sebastianbergmann\objectenumerator\exception' => '/Exception.php',
-		'sebastianbergmann\objectenumerator\invalidargumentexception' => '/InvalidArgumentException.php',
-	],
-	__DIR__
-);
-
-\Fedora\Autoloader\Dependencies::required([
-  __DIR__.'/../ObjectReflector/autoload.php',
-  __DIR__.'/../RecursionContext/autoload.php',
-]);
diff --git a/dev-php/sebastian-object-enumerator/files/autoload.php b/dev-php/sebastian-object-enumerator/files/autoload.php
deleted file mode 100644
index cac71a54f125..000000000000
--- a/dev-php/sebastian-object-enumerator/files/autoload.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/* Autoloader for dev-php/sebastian-object-enumerator */
-
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-	require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-}
-
-\Fedora\Autoloader\Autoload::addClassMap(
-	array(
-		'sebastianbergmann\objectenumerator\enumerator' => '/Enumerator.php',
-		'sebastianbergmann\objectenumerator\exception' => '/Exception.php',
-		'sebastianbergmann\objectenumerator\invalidargumentexception' => '/InvalidArgumentException.php',
-	),
-	__DIR__
-);
-
-\Fedora\Autoloader\Dependencies::required(array(
-  '/usr/share/php/SebastianBergmann/RecursionContext/autoload.php',
-));
diff --git a/dev-php/sebastian-object-enumerator/metadata.xml b/dev-php/sebastian-object-enumerator/metadata.xml
deleted file mode 100644
index cd07b250d72c..000000000000
--- a/dev-php/sebastian-object-enumerator/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">sebastianbergmann/object-enumerator</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild
deleted file mode 100644
index 99e54f1f8bae..000000000000
--- a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/sebastian-//}"
-
-DESCRIPTION="Traverses array structures and object graphs to enumerate all referenced objects"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-	<dev-php/sebastian-recursion-context-3.0
-	>=dev-lang/php-5.6:*"
-
-src_install() {
-	insinto /usr/share/php/SebastianBergmann/ObjectEnumerator
-	doins -r src/*
-	doins "${FILESDIR}/autoload.php"
-}
diff --git a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild
deleted file mode 100644
index 90dcda08ea79..000000000000
--- a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/sebastian-//}"
-
-DESCRIPTION="Traverses array structures and object graphs to enumerate all referenced objects"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-	<dev-php/sebastian-object-reflector-2.0
-	>=dev-php/sebastian-recursion-context-3.0
-	<dev-php/sebastian-recursion-context-4.0
-	=dev-lang/php-7*:*"
-
-src_install() {
-	insinto /usr/share/php/SebastianBergmann/ObjectEnumerator
-	doins -r src/*
-	newins "${FILESDIR}/autoload-3.0.3.php" autoload.php
-}
diff --git a/dev-php/sebastian-object-reflector/Manifest b/dev-php/sebastian-object-reflector/Manifest
deleted file mode 100644
index e08ec34d8f18..000000000000
--- a/dev-php/sebastian-object-reflector/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX autoload.php 495 BLAKE2B 1ddad60e63bd386b4c0c50592134ee2f06622ae13e99d97d79009f42431078481a3732c7bbfc4385a75d25f4172553aebf0c6bb5c09b6e4134c62cf3c2960da0 SHA512 727da79b8fba9c3a8d2b781ac7e0185b6d219732c28fe942ebaec79251c2e40580841a559d4aaefcf5b8692e09308284a95670ea0e4fb99e167d3263e2b2b429
-DIST sebastian-object-reflector-1.1.1.tar.gz 4755 BLAKE2B c549186722bde6625d44478dc90023511cd4e2fb9fe206b08881746e4443275b20eaad86a13bc202b3f464cad7239aac28da9962db7a97b9c789534424cb3ead SHA512 42dc43d1a606b1aedf2cc40443139d115fc38a50a2e51d2b4d72ecededf39bf5cecbed6d1bb002dbb6f7bd3c7da50d9436f7489f9078d52d61af7777f31f5e57
-DIST sebastian-object-reflector-1.1.2.tar.gz 4814 BLAKE2B 0692da7e50e6ff262395ece9bae1e02138bb3d86bd8b992b32d1eff9e3eabf5a1b3246e9e117314eaf49fdc5ed12b599bfb6fdab7de45506b392bf1d7dd94879 SHA512 2cfbc24d2f2105000ba039226e6dc399b847d60ca84f6643755c8cfa2d5efe3259da2e7762670ab5d330fe8075eca3124dbfe0a4780dc873e39e8c1420267c4b
-DIST sebastian-object-reflector-2.0.4.tar.gz 3366 BLAKE2B 9ceb1666e2e1e3679b66473b48a9c0a79fb905a7f0b2dbc5ba36766c1a15ba9ea5678da7a15664ef63a1a7fb1add80535da4ff065a356d085d966704e5647e3f SHA512 e7f9932a7a7c123008490a07bd7fb0a06acd6f0c39d1efd8de677a7ab9af3d98d72d8cf6c3a06ca15f869069a6709f1f70437cefc9c171b4f13436f68ab7112f
-EBUILD sebastian-object-reflector-1.1.1.ebuild 717 BLAKE2B 48a067ca4518e7950796ca7c0be679d9d816a1ddb5961c2e96532d7f6b022301faf0142f66a1fa1d82f78d292aa8736879d0fa42acdf08a9bf8fc29748071bd0 SHA512 e36cec264ed026051a6a5091607f18f4b279af7da73f75ceb40ef2e101becffc42a7664f46c817aeda40587c84f35819574f6f8ce3cb968bb468f1d78a0c78cf
-EBUILD sebastian-object-reflector-1.1.2.ebuild 820 BLAKE2B deb09d89a06b213b09c4b0605f86f05be8187fe94163774bcdaf80317b00a50ae14afa29989708556c7c3facdf79c16d92b3aced4da5bdf4af66c1598b14dc7e SHA512 5afa1597ce718e9af74f1978b1a2553de37352e2507ecc72ac4d6bb03c16b08374076875cad7e89b01fdcde17968c2ff3988dd3bfd30c8f14f8705b0af66a672
-EBUILD sebastian-object-reflector-2.0.4.ebuild 814 BLAKE2B ea6930ff418c5138be58cfddeb41a6ca0909879dd0e4344cc3907fbde25c7de303a0e2297f1c3887ead1d65c0e3134a890202bf15450fe227e925639965890d1 SHA512 559b529e9548b4a7ef7015832569eae6008375ba8ca4772a85d48a5987cb98666c632f4d156568565d7f908971dbb124f8cfd18c1e2e88df02c1b5f912a2f188
-MISC metadata.xml 354 BLAKE2B 5c8277e7a7ad7dacd263368cee683687b6f3c02c5ca49776d41466e178854e43a071195eea89888790e3011eade29a6019e6254d246fd04fcc02b625b02c7f4f SHA512 02fed9ec530c21fa123b3ceb4486b250a0f97489e33746696eb722e26b08a5c1f9198bd80d0b1c1c7c3db447c0083c5c96257a8924335096e968be70a6d963cc
diff --git a/dev-php/sebastian-object-reflector/files/autoload.php b/dev-php/sebastian-object-reflector/files/autoload.php
deleted file mode 100644
index 5190fda9b96c..000000000000
--- a/dev-php/sebastian-object-reflector/files/autoload.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/* Autoloader for dev-php/sebastian-version */
-
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-    require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-}
-
-\Fedora\Autoloader\Autoload::addClassMap(
-    [
-	'sebastianbergmann\objectreflector\exception' => '/Exception.php',
-	'sebastianbergmann\objectreflector\invalidargumentexception' => '/InvalidArgumentException.php',
-	'sebastianbergmann\objectreflector\objectreflector' => '/ObjectReflector.php',
-  ],
-  __DIR__
-);
diff --git a/dev-php/sebastian-object-reflector/metadata.xml b/dev-php/sebastian-object-reflector/metadata.xml
deleted file mode 100644
index ec74c535c743..000000000000
--- a/dev-php/sebastian-object-reflector/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">sebastianbergmann/version</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild b/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild
deleted file mode 100644
index fc8ff64226f6..000000000000
--- a/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="object-reflector"
-
-DESCRIPTION="Allows reflection of object attributes, including inherited and non-public ones"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-	=dev-lang/php-7*"
-
-src_install() {
-	insinto /usr/share/php/SebastianBergmann/ObjectReflector
-	doins src/ObjectReflector.php src/{,InvalidArgument}Exception.php
-	doins "${FILESDIR}/autoload.php"
-}
diff --git a/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.2.ebuild b/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.2.ebuild
deleted file mode 100644
index 4373ddb60bb0..000000000000
--- a/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/sebastian-/}"
-
-DESCRIPTION="Allows reflection of object attributes, including inherited and non-public ones"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-BDEPEND="dev-php/theseer-Autoload"
-
-RDEPEND="dev-php/fedora-autoloader
-	>=dev-lang/php-7.1:*"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	phpab \
-		--output src/autoload.php \
-		--template fedora2 \
-		--basedir src \
-		src \
-		|| die
-}
-
-src_install() {
-	insinto /usr/share/php/SebastianBergmann/ObjectReflector
-	doins -r src/.
-
-	einstalldocs
-}
diff --git a/dev-php/sebastian-object-reflector/sebastian-object-reflector-2.0.4.ebuild b/dev-php/sebastian-object-reflector/sebastian-object-reflector-2.0.4.ebuild
deleted file mode 100644
index 4e42c8e4c710..000000000000
--- a/dev-php/sebastian-object-reflector/sebastian-object-reflector-2.0.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/sebastian-/}"
-
-DESCRIPTION="Allows reflection of object attributes, including inherited and non-public ones"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-BDEPEND="dev-php/theseer-Autoload"
-
-RDEPEND="dev-php/fedora-autoloader
-	>=dev-lang/php-7.3:*"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	phpab \
-		--output src/autoload.php \
-		--template fedora2 \
-		--basedir src \
-		src \
-		|| die
-}
-
-src_install() {
-	insinto /usr/share/php/SebastianBergmann/ObjectReflector
-	doins -r src/.
-
-	einstalldocs
-}
diff --git a/dev-php/sebastian-recursion-context/Manifest b/dev-php/sebastian-recursion-context/Manifest
deleted file mode 100644
index 1f81077e5ccc..000000000000
--- a/dev-php/sebastian-recursion-context/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX autoload.php 492 BLAKE2B 141d4ab79acd2614a81a85411eb7514489e0e34256c50d9bae5b82106e24d84d03b465dce5a29e254ec2b7989d24f5fb3adb457e71e5026cf7445801a36f1d92 SHA512 6850fe9b76c5055d42cb8fd21496082b626c113fccbaa9048c7fc07c4853c610f91f83665df441964175265ab2df7244e7ae67c7ed5664ed2850886b973fcf97
-DIST sebastian-recursion-context-2.0.0.tar.gz 4526 BLAKE2B 54ecdfc255c3bdbedc2a909f5b569c62b19e2e66fc5ea4ae7be8401516c142b43e611d5e8f1c056be329983f21e1a8b85e7fb2ff1ddb92a2f6aad4d4191418a6 SHA512 9d25d148decc81f5a21d7a4e1f966563bf6ec765fcc1b1ce779668b74dfa39959db07cf296e9cffcbcb3943c8911709bb73f22c5bfcc81c5d2fcbb51967cf75e
-DIST sebastian-recursion-context-3.0.0.tar.gz 4414 BLAKE2B 04a0aca4b6012013306c813109c0ed6f60d2f4f1381ba6506398388b5065d69375191290d33cdc4b82359dc30b1fd98ef61005a657fa8db302472597950255b5 SHA512 0fce5709cb22818de6bbfda1ba2a99fea511d5b36bcbe7955661d756a6f82ba84cbf8fb4eb421d6b51ae9e36a8edac56c5bafbccf8b665a0296883ea0dbb3b91
-EBUILD sebastian-recursion-context-2.0.0.ebuild 627 BLAKE2B 8aa67f9beca4a2fe2f7f61dc680d0950f0dfa8d0c75f21f99f3bbfcc9c2e94c050b5fcd81c3a91783cd4445afbfdf4f8dfa47f19b9e406237ea4b8d4ee28f5ce SHA512 b7c36a9f0051065edede6a9b8fa75e3582309db0335b86b53a642ea55111aa0dc914509225519b490ec16083666940d9916164d6693f37c424cc1f3e0b6023df
-EBUILD sebastian-recursion-context-3.0.0.ebuild 625 BLAKE2B 1e15db0269cd1f1632eedb38d57554c479ad529593eec800df12f145919d7351ae4e341afa795754ea58815fecaecbde5c3af9b688f7713619db13e983f90ac7 SHA512 bf77b6a08f8300871b8199d17b48138519a5b63ece57c809b359ef892ba919b13b67aa49a0315613f57d9114f14f3cb18da055421b7c1c15f0482a56e0f18a59
-MISC metadata.xml 364 BLAKE2B c897c7e30c0af3738e12c289f555a0057ed3b2e58e03b94c4ceca333811591eb8574852aafc97718ab020a49ff7300fa98827f8e4c1bf2e12288c2ff0aa19ed1 SHA512 3e3b39d9ba414a284ad1f3b9214ce159f2799a3789a45c0a0a268326a9361239b968bcc29dbb385058672e0968e174b4ab746aa30aefd122212256a3b3f05614
diff --git a/dev-php/sebastian-recursion-context/files/autoload.php b/dev-php/sebastian-recursion-context/files/autoload.php
deleted file mode 100644
index 5f7e83143612..000000000000
--- a/dev-php/sebastian-recursion-context/files/autoload.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/* Autoloader for dev-php/sebastian-recursion-context */
-
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-	require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-}
-
-\Fedora\Autoloader\Autoload::addClassMap(
-	array(
-		'sebastianbergmann\recursioncontext\context' => '/Context.php',
-		'sebastianbergmann\recursioncontext\exception' => '/Exception.php',
-		'sebastianbergmann\recursioncontext\invalidargumentexception' => '/InvalidArgumentException.php',
-	),
-	__DIR__
-);
diff --git a/dev-php/sebastian-recursion-context/metadata.xml b/dev-php/sebastian-recursion-context/metadata.xml
deleted file mode 100644
index 539eefc99110..000000000000
--- a/dev-php/sebastian-recursion-context/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">sebastianbergmann/recursion-context</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild b/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild
deleted file mode 100644
index 7aeb39d9e647..000000000000
--- a/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/sebastian-//}"
-
-DESCRIPTION="Recursively process PHP variables"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-	>=dev-lang/php-5.6:*"
-
-src_install() {
-	insinto /usr/share/php/SebastianBergmann/RecursionContext
-	doins -r src/*
-	doins "${FILESDIR}/autoload.php"
-}
diff --git a/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild b/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild
deleted file mode 100644
index fc0a0fd747d0..000000000000
--- a/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/sebastian-//}"
-
-DESCRIPTION="Recursively process PHP variables"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-	=dev-lang/php-7*:*"
-
-src_install() {
-	insinto /usr/share/php/SebastianBergmann/RecursionContext
-	doins -r src/*
-	doins "${FILESDIR}/autoload.php"
-}
diff --git a/dev-php/snuffleupagus/Manifest b/dev-php/snuffleupagus/Manifest
index 07fb23de5132..c2cf211ae8e0 100644
--- a/dev-php/snuffleupagus/Manifest
+++ b/dev-php/snuffleupagus/Manifest
@@ -1,3 +1,3 @@
 DIST snuffleupagus-0.8.3.tar.gz 11987086 BLAKE2B 989dbb57a8375cb394dfb41f07de5c048b66936a8e5b3dd14fb3609149dd371203f7a30d1fbcfe8ef6faa2ba5864c68b209b1b209541c348c0277c8bd12b568a SHA512 426ab7509e31f712dbef1505bf60f00d3a31481de1fbb0b438e45fb45a50fbdc16204d6af18490c5522a41e62d83107f280a20ac2ffc2795da68407b0dac81d6
-EBUILD snuffleupagus-0.8.3.ebuild 2357 BLAKE2B 66931d7852d9116ae64468395d73996054d2dc84de7aa8c251f699d9b01fd9f954bb456d2a673e17e6046d2d3062fba3f5dc4b3bf25e8b35050e3a4e8bd9cf31 SHA512 4ea9ca2b66325e4388259faece2d57b5e28cf744ff7abd0460bceb85a5191992ad41ae0829af8b21f7bd6484757788e7bacbefed81cd1789b5fa689cd3a7b764
+EBUILD snuffleupagus-0.8.3.ebuild 2350 BLAKE2B 28be1f5588118094db5a6cf41f5e9c0e9074910de6ecb1c6761f40d8871d795149674ab05ad1c9c0dcffc45bbb91c18795efe2cea9bdc7506fc171035684f02d SHA512 c911bdf271eb3832743fbe4fadb6be1a003f19e87bedc756a88942cae7da8967e36b448f811dd00449407a1239b8ecbcf3ae212746feceacdf4150ea6f028e7b
 MISC metadata.xml 336 BLAKE2B 6684e51a28675df71f8171c0bb5b7469a47fbd334920dfa846e0e45d6b6d8c1b92aaeb469e6d371537a9521d5e0dda4dd0d1a9e349a999d3a4c0fca4b1e81fe5 SHA512 775fcf5192683d3a69a426ffa9b3e9f0ef5ae34ac69fc19258995db89a18fad9ae1d87358260d234af6fa45054f68980296434874cc125aa8f5ccf37fbe2a983
diff --git a/dev-php/snuffleupagus/snuffleupagus-0.8.3.ebuild b/dev-php/snuffleupagus/snuffleupagus-0.8.3.ebuild
index 00e1998355c4..ec4d6e1da428 100644
--- a/dev-php/snuffleupagus/snuffleupagus-0.8.3.ebuild
+++ b/dev-php/snuffleupagus/snuffleupagus-0.8.3.ebuild
@@ -9,7 +9,7 @@ PHP_EXT_ECONF_ARGS=( --enable-${PN} )
 PHP_EXT_S="${S}/src"
 PHP_EXT_NEEDED_USE="session(+)"
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-source-r3
 
diff --git a/dev-php/swoole-async/Manifest b/dev-php/swoole-async/Manifest
deleted file mode 100644
index 9d94d3c67075..000000000000
--- a/dev-php/swoole-async/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST swoole-async-4.4.16.tar.gz 419094 BLAKE2B 7b93a0d2eb8a9597a68871783c60746c832b2eb1dce89a0f82ca6df2ee20151f910ad4f8ebb6a453bea3b7c2cc274266614f147b34c21a089ff9cc4ca0f73d1c SHA512 cf4bfc3c86740e343774b2cddc0ef2386f522e7929c160bc10d47ebe0b8f8d63dbcc82e70b7f3f30e7f7c102ebd42b02cddf4c3e1a0289f0e45147ddbd9aa546
-EBUILD swoole-async-4.4.16-r1.ebuild 1126 BLAKE2B ef3a48440d629a0ef2e76ab452672d2508f3eb0d462e82ffabbf15e483014f2d2bd90e01d262db21a97241610bf2d4455640cbcb75b6ebec89f98e5ab512f9de SHA512 7765a963b84930c07c67ed6042f410f5badcf2524dc014754089a4904f7779fb2fde7a4a820a1339103585cfd62315316ce34c88e7cc8c8b06449760ad39fd72
-MISC metadata.xml 248 BLAKE2B 23d890183d0685ae23ea7d370f1ba3fdc379ffdf11239eb61bcda5104dda906654f7dc238ecb01d345cbf790df9fb41ff32b4bef16ed2c26f468aee8f2c6b7b5 SHA512 f75afe21947c53da964b12c9917864186a17dab1c34e68f28cf50549c52c24477bcf57c569d0ff5a7558cd1fc10afd52677da658e6c903ff95d83de7b807936b
diff --git a/dev-php/swoole-async/metadata.xml b/dev-php/swoole-async/metadata.xml
deleted file mode 100644
index fc23648923fd..000000000000
--- a/dev-php/swoole-async/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>php-bugs@gentoo.org</email>
-		<name>PHP Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-php/swoole-async/swoole-async-4.4.16-r1.ebuild b/dev-php/swoole-async/swoole-async-4.4.16-r1.ebuild
deleted file mode 100644
index 7e3dc9689a29..000000000000
--- a/dev-php/swoole-async/swoole-async-4.4.16-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="swoole_async"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_SAPIS="cli"
-DOCS=( README.md )
-
-USE_PHP="php7-4"
-
-inherit php-ext-pecl-r3
-
-SRC_URI="https://github.com/swoole/ext-async/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/ext-async-${PV}"
-PHP_EXT_S="${S}"
-
-HOMEPAGE="https://www.swoole.co.uk"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="An extension of Swoole, including the async callback style API"
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests will require pre-configured endpoint
-RESTRICT="test"
-
-# This will only compile with the same version of dev-php/swoole
-DEPEND="~dev-php/swoole-${PV}[php_targets_php7-4(-)?]"
-
-RDEPEND="${DEPEND}"
-
-IUSE="debug"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-swoole_async
-		$(use_enable debug)
-	)
-
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		[[ -f tests/template.phpt ]] && rm tests/template.phpt
-		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
-	done
-}
diff --git a/dev-php/swoole/Manifest b/dev-php/swoole/Manifest
index f45c777b09d3..3c15c3f3a4ce 100644
--- a/dev-php/swoole/Manifest
+++ b/dev-php/swoole/Manifest
@@ -1,4 +1,4 @@
 AUX swoole-4.8.7-gcc13.patch 551 BLAKE2B 16fa5f7cc95c15f4eb1560c94f2a35b1745dadc1c9c32d2ea388f18731d95ecf72c6aea5a2284e0143d6f1ddd0ad5b932d2cebc80ff60b025c55de20572bb149 SHA512 8b2bcaa1a2398e5a7347da203cbbd4ec1e449742c014cc881c689dff70d19c0793e4d0d5a93607a71cb68b023f27fe61a0a3cf9f5f84f955db0e04feb3f75e95
 DIST swoole-4.8.7.tgz 1851160 BLAKE2B 3e5c9d664f1897b7bd490a1e9dbc4c3c03117a18ae58586efe534c617578a7af5be779e6ca44a5bf2f782abc2eb57bc21e3dc4e3445c3299918bc189547dc75c SHA512 36f36aface71435233aaa8c81e023b813c6175d3ed00a9de20acb690b58b464d99670c3b96f247ab1147f95e099d44785d60d5f1e36f519ccfeb09b3bddba264
-EBUILD swoole-4.8.7.ebuild 1697 BLAKE2B 9161e59b30be630631925dc3ca9e59b5a075f64bcfd0ea6463e459de90f430130e256dfcd0daa41b535ddba6eb7b5e4c6c297ed5e8762103f593a85f3a4f9d7e SHA512 d7dbdbac2bd2c6b3f56ad83afb2e65e1eebcbe3eb5d7cc01234908c57aeac7c1f9acdd56d4c46d3f8296adcfef97920baf40de224c68e6b226d906d76ffddd49
+EBUILD swoole-4.8.7.ebuild 1630 BLAKE2B d9530d5ed6fbffbc29f38c7dfacd9ae8db4b9a7b52d2756a0567ba516b3f94dff58b9ffbae4ace2e9f16790511b5ecd246905d054181fc89ec0cc77a4a05df10 SHA512 5782456af586c7c34c08c0fc2c426c2bc8b1d05034f781c9299102f963e3dac0f05e10fcc9a3d3b803ef2d8ac0ca3ac76e74cfa9bb7978f3075fefa9f78f8bd1
 MISC metadata.xml 425 BLAKE2B e22c1dc7ced96324ae0be299115d702664cb05e990c299b25dd8d558c7ab8e2ceb93a7bb5ebe5fbcb6c8a29e971208024ac5e4c6f78708c7f255d7e99a01ae19 SHA512 02c341989d04d303904279e74aa2692c61b7e92402cd825ea68bbd67212e213d589bd67412da5314972b6e9f299b6e7eed0e6c7739c165a7718342cb1a60a0d6
diff --git a/dev-php/swoole/swoole-4.8.7.ebuild b/dev-php/swoole/swoole-4.8.7.ebuild
index 59684d9f8333..021ddffd27f3 100644
--- a/dev-php/swoole/swoole-4.8.7.ebuild
+++ b/dev-php/swoole/swoole-4.8.7.ebuild
@@ -10,7 +10,7 @@ PHP_EXT_SAPIS="cli"
 PHP_EXT_NEEDED_USE="cli,sockets?"
 DOCS=( README.md )
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
@@ -31,7 +31,6 @@ DEPEND="
 		dev-libs/openssl:0=
 	)
 	mysql? (
-		php_targets_php7-4? ( dev-lang/php:7.4[mysql,mysqli(+)] )
 		php_targets_php8-0? ( dev-lang/php:8.0[mysql,mysqli(+)] )
 		php_targets_php8-1? ( dev-lang/php:8.1[mysql,mysqli(+)] )
 	)
diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest
index afe065ec187f..5de6af1227a5 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -2,7 +2,7 @@ AUX 3.0-xdebug.ini 1207 BLAKE2B 5ebcd3d89e1f49ea67c517d9fe6f552b82341e47cc1d46f0
 DIST xdebug-3.1.1.tar.gz 468120 BLAKE2B 038774612158c2c9b406e29dd70e2a3e182ce121bc92036eeb3362be0ba513a223cb2da41bdfe914d6861ae9d94ff33c5301cc23725ee771f47876c8095ae0b8 SHA512 b91bca3bac184723b3f6dc0c5db012f2ec0895ed55cd4ff83f73d35462b9cea654476c848f7d61559a4bd8661ce335fc71a45a7cab1165f4197d265e31eccc71
 DIST xdebug-3.1.3.tar.gz 470305 BLAKE2B abc799f966c20ba868d57e707ebc35e1f2d4ef5567bcd373ae5ae2ada58fbd4a4a807cfdf520cb883f08bc5296f219d190865462eab7d11ff2cb8c12a33b671b SHA512 cd2e85ce37f5122bcaa8300061be3b244bf9a58060e4e7286b3b52e9ab592f9a8ad43b62d53f13c7be878bb8662ff7aba187b73040bea79a3244df3d6b59e27b
 DIST xdebug-3.1.5.tar.gz 434440 BLAKE2B e9a94ff8d774ed55c848a6e3933064ab6ea91db6b70f9aaed206296152ec2bc7e15b6330ea166bf9bc5fa26ff0c2a0bf8accd281ad833318b9b718d6f7d671a4 SHA512 6949d98cdf67c5931f1abfac1a2a8ea95123431dc57325fe5005c445f4f87fd461ce4eadde41f45d2e3fd4d63c0e4ae952954eae4f86d78c498f95ce43b49e81
-EBUILD xdebug-3.1.1.ebuild 1505 BLAKE2B 09a7a3f833c9b2133eb68d2bbefbb6d5179b7c803c31dfe833eff35be9ec0d8554311619776e37b3ed1355edb65c02a8f547422144a98ee459245ebdd9565434 SHA512 dc092f4c554aebd1e132e6e863f38bee8c391621af6c4908bd158e8395b8feef5a5e8a8cd067643f3b3f85abe1e30274482e8ec71d7a95b995ee507a4f17e032
-EBUILD xdebug-3.1.3.ebuild 1507 BLAKE2B 0ff5baf2a8fa16a979a83c5901e39cd4308df0361db297a31c75fccfdb05208ce1cebce2548264a320052bc49c432c84ae4b4c9cbe1785fb1c5290eea1206989 SHA512 acd019dbe0ff4e462317791bc5493d4a479a9c59183c674042cb5bd30ddd1318f696e3b8390fb43a44b63b8fb13eb17387e5ed4f63c395d2a389a9395c75df41
-EBUILD xdebug-3.1.5.ebuild 1537 BLAKE2B da9dae4e79dd125480a5a0b6fa2d1d4bbc4970a8a3581e76e3b5a0d11a2df8eeef991c05f6d5d7afe7f9b1ab0f6f2ccd081465a2b40a6fcd57c5d4a483bae0ce SHA512 7b4fdf05a95acb384ad60a024fd74ba622d216254caa0697f28397ecae004a671dfa465728f3f63af52190e995f21a032f9975b00ecaae5c9b8788b113784286
+EBUILD xdebug-3.1.1.ebuild 1498 BLAKE2B c0710aa85ae2e0f5243dd86a68eaa6f3866e0d64c3558d90702fc839ceb91b35fd588b9f7971cbeb5942c92481f9e27bab7e020bc6be020e46a88285db9ca640 SHA512 3a48015d8ccc34c5886472399f246e7693a58a64469517344ea34818536cbe41cccd03144f2ae159e336c369db7e730479a2d7d5b6ed1266aa77803daf23c770
+EBUILD xdebug-3.1.3.ebuild 1500 BLAKE2B b344207a0d9fd9902c96612ba14f0e5867ba607fb5eb045e85cbbf4211c466d50075bb39016fc662341aec4251fa89d8fe87a432fe742bfa2f53cad646a4ce76 SHA512 eaf3124c3d5bf14f01ce25da9d0f3c197db2d3fa553999bff5801a6601c6bb87b7719cdf6230d25bbf9c6e34361ab03032b3c531ae6fabbae19629b8664590aa
+EBUILD xdebug-3.1.5.ebuild 1530 BLAKE2B 07138e7081abb014eb78722052f13e1663f2221fa99a86118b75b0a785206441402b3bb39305737a8003bc8673a6672f80a30296853be41527e9fc59626e956d SHA512 e841cfc6de9dd12809d074abda0d4d2035461a222e850f70c8d6b7135567b79f4a5160f1a40e12605760adc6bfcb950725ca5bbc7e2bfc4c94ed64e31844e745
 MISC metadata.xml 318 BLAKE2B 3b475c99c023007f79d0a677e7ed0b977622befdb5b70003253548b748ec16e796bfacd7585b14ad97693002a61ed4136668723a05ef59901d04300fab13a04c SHA512 a00cf5299b46138af793fe348350bb9a19d5c1710fe531cac7fbc8f0d8b9a3147df7374e7bc0f1d1122d3b5e992c482e921c2482b5fde0d7642b542b65428cbb
diff --git a/dev-php/xdebug/xdebug-3.1.1.ebuild b/dev-php/xdebug/xdebug-3.1.1.ebuild
index 74307ff3b3de..25092707830a 100644
--- a/dev-php/xdebug/xdebug-3.1.1.ebuild
+++ b/dev-php/xdebug/xdebug-3.1.1.ebuild
@@ -7,7 +7,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="yes"
 PHP_EXT_INIFILE="3.0-xdebug.ini"
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 PHP_EXT_NEEDED_USE="-threads(-)"
 
 MY_PV="${PV/_/}"
diff --git a/dev-php/xdebug/xdebug-3.1.3.ebuild b/dev-php/xdebug/xdebug-3.1.3.ebuild
index 120e481aec0f..8393dcb5b637 100644
--- a/dev-php/xdebug/xdebug-3.1.3.ebuild
+++ b/dev-php/xdebug/xdebug-3.1.3.ebuild
@@ -7,7 +7,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="yes"
 PHP_EXT_INIFILE="3.0-xdebug.ini"
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 PHP_EXT_NEEDED_USE="-threads(-)"
 
 MY_PV="${PV/_/}"
diff --git a/dev-php/xdebug/xdebug-3.1.5.ebuild b/dev-php/xdebug/xdebug-3.1.5.ebuild
index a97b4d0aaaec..abb4cc5fb250 100644
--- a/dev-php/xdebug/xdebug-3.1.5.ebuild
+++ b/dev-php/xdebug/xdebug-3.1.5.ebuild
@@ -7,7 +7,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="yes"
 PHP_EXT_INIFILE="3.0-xdebug.ini"
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 PHP_EXT_NEEDED_USE="-threads(-)"
 
 MY_PV="${PV/_/}"
diff --git a/dev-php/xhprof/Manifest b/dev-php/xhprof/Manifest
index c308f69c9ef9..293dd4260233 100644
--- a/dev-php/xhprof/Manifest
+++ b/dev-php/xhprof/Manifest
@@ -1,3 +1,3 @@
 DIST xhprof-2.3.5.tgz 842658 BLAKE2B 4392b521e8b4c10dc745bbd670c351231680e753251b1d1e3c7048e17fa5a88a6c79da39f3c50b8642ca0c1a5b9658e4dafe6ed4af3dc97c71265f021438fda9 SHA512 50ae6fb8d63ac8354b7887daecd1882f33e616cd1ef165b54d51f26fa93d2827f621e89d0d583979c453af5d66a83ddcbf0eb2d462df74ebb422294e601268f4
-EBUILD xhprof-2.3.5.ebuild 376 BLAKE2B ec6f0e8106c7cfcaf5bc450a03510549b95d06c13334796392373a48d936b5d7c8fcaee698492cd0c3e95260d35168384711d6587e1344b70fe549433c5d15bb SHA512 b5c8daa2f962106fd0c4ffc8a0b97ea8d06c5efc23db1c80e46309f90cbced554318212e8678a0392095712e812d19f6e49a4a365ecd97d499c667959c87c5da
+EBUILD xhprof-2.3.5.ebuild 369 BLAKE2B 740552d3992cdf2955382905c3fd1930b243ad192c5d18a669aa5779c98f662133beeaecaa7c1994a23c6aed95f73f001e6961fadf894f6b50c0ad5e82162091 SHA512 a2712ba83f1e11e2d07d3656ff261a4b35644737ff4d3fd6459bec81e6cde99d1cf59d5d1cbed358790469a9f9c63768bda3da6a1d870b50ff74df4d90175a8e
 MISC metadata.xml 320 BLAKE2B fcc5d80e127f6834fe5d8e9b15648e129c894914079784416d269553112e790d1b0f4d25f9c3d5a46b55ca569a35c122d84189d4f5fe4f9ff2e500fb37c53104 SHA512 975a3563e5575c13fefa0e01ec3dd44f7135195c66ba157c7766069cd21de332ee361db730032d2c88be60ea00bb4b52dba1ba1c95a24e6de8126ab320f77c14
diff --git a/dev-php/xhprof/xhprof-2.3.5.ebuild b/dev-php/xhprof/xhprof-2.3.5.ebuild
index e1655ad5829f..eb86358926b8 100644
--- a/dev-php/xhprof/xhprof-2.3.5.ebuild
+++ b/dev-php/xhprof/xhprof-2.3.5.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 PHP_EXT_S="${S}/extension"
 PHP_EXT_ECONF_ARGS=""
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 8dc9051f4346..293c875fa689 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt6-WebEngine/Manifest b/dev-python/PyQt6-WebEngine/Manifest
index ea8ef8520b55..63e3788cda9b 100644
--- a/dev-python/PyQt6-WebEngine/Manifest
+++ b/dev-python/PyQt6-WebEngine/Manifest
@@ -1,3 +1,3 @@
 DIST PyQt6_WebEngine-6.5.0.tar.gz 31349 BLAKE2B 80ab4ad292107e5ca57c5b27f2af3747f9c28ebf2c1afe0f32fe1fbd6897dd701d7f46bda8f08c5f0048d4efef4c3c0087854acbc58a319163e328f74177b05c SHA512 bafa26cc800ec031fe9bb1e309832df79b41c5f43a6cdc8ecc2bc4b09c59b60975a67ede6190726db887689305e7a6012f705eb9b83c3e0c82a23f3f1c3880ff
-EBUILD PyQt6-WebEngine-6.5.0.ebuild 1901 BLAKE2B 94d1c54d3fdea16fc23afbd6434759b3efe38e2d69cb75785d6457d4c17789aeb4cfa56c9f7e664e3327e993c50270497b079fc2b1d67bbc23513bfdec9e2af3 SHA512 94f239cc71cac9599053d32b4fe50c844589a0fb4f20381d441bd74f97e80493e4173e1467a2dd3f28137d0d4e2e4d23f4428e6523ba90b084a034ef1fbd049b
+EBUILD PyQt6-WebEngine-6.5.0.ebuild 1900 BLAKE2B be25e2a2ee937e8717f94454d37f055fd1bf316a9466760f24ed07d6e1c43699a26afd63b483a4220808bbcd7c7fed2b65397dbc4933744a8a9e9420a2321acb SHA512 6445b9247f03dcd19506f2e21d650aa972b82662f7e791c4da7693c26ea4da6c3f05ca480aca4bb4b3e51118d38af1bc7074cec177869759d12cf71adf2705ee
 MISC metadata.xml 574 BLAKE2B 1cc3bbf5d25e8aac390530005c225bfc618fbb1bdef3a3d075f445eee2cf68d86feb6ac8841d7e0efd1679b19fc14b33b33accdd7e4932e742f46907a8f98601 SHA512 1af94b1a66be1dd38feb818ba973852912bacacc715e0bd893f8b3de56d17f8902b7486cc487137defad749773a6f728c470cbb9c62d15f91a63d80b16296604
diff --git a/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild b/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild
index 7b79fa8835d8..8cf1955de931 100644
--- a/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild
+++ b/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="debug quick +widgets"
 
 # can use parts of the Qt private api and "sometimes" needs rebuilds wrt :=
diff --git a/dev-python/PyQt6-sip/Manifest b/dev-python/PyQt6-sip/Manifest
index 4caaaad69a49..1fe2947a26b9 100644
--- a/dev-python/PyQt6-sip/Manifest
+++ b/dev-python/PyQt6-sip/Manifest
@@ -1,3 +1,3 @@
 DIST PyQt6_sip-13.5.2.tar.gz 111381 BLAKE2B 38d38ed72877525ce2464d4f7bdd53b5c383dea89bd940a7f4db4bde54ebefab5b6f82449a9b915b0d64ae6763bf14d784f3a75e465e76ba44cdda22f1aa14a7 SHA512 b3616b2ab91d1e437dc13b56f7e8cb9edf0cdf5d9d76b5681398cb9d5d793fd09d323a8603969e879f990b81f9743527995c10e70ba5af33b5bb62e3a7967767
-EBUILD PyQt6-sip-13.5.2.ebuild 425 BLAKE2B aae93302707b9513d029ffcb74ea5c25d7f597b782863ab832f428c1c09eadf246eeb92d0dda74d04f3e78bc23854cd1507ea1393bdd7bb289558307b4c83092 SHA512 0f512506a22a1af3ea2ad51e39b16ac7568d0d013f2ce279e98d2f435ef029196fc94b4b1836f1606d85260f1dd853f0491e4b4579482740de52fd0a222ed98d
+EBUILD PyQt6-sip-13.5.2.ebuild 424 BLAKE2B b67748d36216bd04bb9ff90ec0f5f5acf0094f68a6cbdb09a8a76b6e3590ff0544235b3b8111b52e8893b12fe6fa0c22f9145838186adcd5e01fc364904b3f54 SHA512 119e45e6e84daf9164369d88f85f2a66431faec45e7debf53b3c3199efb64daa3f0872e09b52c8bf165b2f7288e90546d6b245cec33955ac0bc70a0689832e1f
 MISC metadata.xml 399 BLAKE2B d762950e9c399c7cd0db4c7e521745824cea16fa2575878b8d20a932914037eabce35cc988532b3711d4447a132fdb4a61383017e3b3f7e89f09db74efb05244 SHA512 7c8fa564a8b30bb8207dd4eb70caaa1da4db60a1bc24dced4df22b371f441daabc484c57dcda87fb89bacbeb706414938750553c59b11da8d392d61531d92a41
diff --git a/dev-python/PyQt6-sip/PyQt6-sip-13.5.2.ebuild b/dev-python/PyQt6-sip/PyQt6-sip-13.5.2.ebuild
index c7f0d5a6d814..2d6a3537221b 100644
--- a/dev-python/PyQt6-sip/PyQt6-sip-13.5.2.ebuild
+++ b/dev-python/PyQt6-sip/PyQt6-sip-13.5.2.ebuild
@@ -15,4 +15,4 @@ HOMEPAGE="https://www.riverbankcomputing.com/software/sip/"
 
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-python/PyQt6/Manifest b/dev-python/PyQt6/Manifest
index 0fc12b5d85d4..86dbe4a97594 100644
--- a/dev-python/PyQt6/Manifest
+++ b/dev-python/PyQt6/Manifest
@@ -1,3 +1,3 @@
 DIST PyQt6-6.5.2.tar.gz 1037215 BLAKE2B dae331dc27975f3ad4fca10cedf093fecabf819d1fd97b873f9a793ce12168af9a72e2b119a4fc3ecf263e1ba42103f48d5198554248743a6289efc8aa3b7d70 SHA512 11da50ff8b914794e8044e136a3c8a79d16aa63ab33045f2807985c2fe2235c1a7682f7e955c9e8852093c34a671ec09d84afaa9d3d59945461797e81911721f
-EBUILD PyQt6-6.5.2.ebuild 5375 BLAKE2B 4fba0f8b473ad9ef5c6764402a6dc597ba1e75e540028d55082b333646599bb4a67f1c203bb7e8dca020990e3c0043d24f8f7d408e2f20b82b73dd3f31f288dc SHA512 397cf49d07f1d9c1baace1466eeb803556354abc3906866133f3c63168d035d1bbe3e60d3c6c46756d94b3b57fd5987c8643a09e1fd9edfbfd72072aa88775d6
+EBUILD PyQt6-6.5.2.ebuild 5374 BLAKE2B 24673d1881e7997e83da686d7899b2329c54b7dc0b6d5ee87ea91b8c7f92cbf1640a70dbf778b8d04e0784b46e90a420fa80ac28f7af2330d9dc13f96fdf4d2d SHA512 6cc575947d9dd747847738d6e4492b487e5e87e12f4b0817020e76dd9c51d7e6427701ad316f981bde40c45adf15ca135f302079a0a81f81cb267e328efd4784
 MISC metadata.xml 2277 BLAKE2B 22ee4e39000e75990db2f605303b3a4b8be0032cd82cbeaef4a0cf3730b7fbdc4dc45be9530373471c953e9fd767a54bfde705d67153dc24e70609bb830f37f1 SHA512 09e0c1fb5cae914501c2b8626ca89c7b03bb30d3efee1afe47fb3e938a3d4c1952dc21ad2ca3c6d95efd55fb918e60a21b3bf1b66e7737ae403e8e08d1f53e41
diff --git a/dev-python/PyQt6/PyQt6-6.5.2.ebuild b/dev-python/PyQt6/PyQt6-6.5.2.ebuild
index 311aa076e528..709ab50fa52c 100644
--- a/dev-python/PyQt6/PyQt6-6.5.2.ebuild
+++ b/dev-python/PyQt6/PyQt6-6.5.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 # defaults match what is provided with qtbase by default (except testlib),
 # reduces the need to set flags but does increase build time a fair amount
 IUSE="
diff --git a/dev-python/ansible-runner/Manifest b/dev-python/ansible-runner/Manifest
deleted file mode 100644
index b0b895791605..000000000000
--- a/dev-python/ansible-runner/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ansible-runner-2.2.1.tar.gz 172121 BLAKE2B b4bb0917570b2b7ba4a7f44bf0276713eb3842ec8a9db62ec5bec8f90e91603b69cf2651f16dd150c8267b3ff25529d4c1bbcd628a26564b74362325b9c75ba8 SHA512 e9ba5c7afd3d8542af37bd9ef3ba7a417bd7ebb430b2dca6f2bb6289633dc89a14e7beb39236f75b75b802c6fc07501c6e6fa06102c69037e34568c396d6642d
-EBUILD ansible-runner-2.2.1.ebuild 885 BLAKE2B 7508d5363e079b60c7a58e3b943e6ce01876aeba76e85d680ffdecb0200364dc352ec9744da57acebf375f229b918792118ec0944bc46ead72b51184077d0f88 SHA512 b1403bd9579fa532643af035a593527f474de1344fff53eb5f31728fe059b99afee97d860c153612084b8515448063609c72f841b0a026a9fc038514c6909dcd
-MISC metadata.xml 919 BLAKE2B 4f08236cc9aa2a45279ec971c60e5d4f0a8f3695bc5cf4fac42d704682026b30b2ab0a6b0b408e313b3614da94de873256d146c4602598a762c59072f3c44d27 SHA512 f632561c44dfff6767bad8a8273776efe86b45feb7900ea07be4413f8779bec5c9ea1950a2ca1ebdaf7d17230f6839aafbd3c5fcc54cd6df3085b7e392605a6b
diff --git a/dev-python/ansible-runner/ansible-runner-2.2.1.ebuild b/dev-python/ansible-runner/ansible-runner-2.2.1.ebuild
deleted file mode 100644
index bb7b0431f6d4..000000000000
--- a/dev-python/ansible-runner/ansible-runner-2.2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A tool and python library that helps when interfacing with Ansible"
-HOMEPAGE="https://github.com/ansible/ansible-runner"
-# TODO: fix broken tests
-RESTRICT+=" test"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/python-daemon[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e '/cov/d' -i pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/ansible-runner/metadata.xml b/dev-python/ansible-runner/metadata.xml
deleted file mode 100644
index 19979f1c1c52..000000000000
--- a/dev-python/ansible-runner/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-		<name>Zac Medico</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">ansible-runner</remote-id>
-		<remote-id type="github">ansible/ansible-runner</remote-id>
-		<bugs-to>https://github.com/ansible/ansible-runner/issues</bugs-to>
-	</upstream>
-	<longdescription lang="en">
-		A tool and python library that helps when interfacing with Ansible
-		directly or as part of another system whether that be through a
-		container image interface, as a standalone tool, or as a Python module
-		that can be imported. The goal is to provide a stable and consistent
-		interface abstraction to Ansible.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index f9bed4a4dbac..fee1c074ec59 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -10,6 +10,7 @@ DIST boto3-1.28.44.gh.tar.gz 698689 BLAKE2B 9c23bd7aa680f59ad686ad5ec46dd751d22b
 DIST boto3-1.28.45.gh.tar.gz 699111 BLAKE2B 6873e83e58d4a778b5296c7def5ed5060f5d1d18c1b123e1662be8688a683aac8fe8f10821a59ac0cfb6192e925c15fe8aafc46b6bd1ddc261142024427d9b7a SHA512 8d8f6b9735995ee3ff5f47ddd79d19ec490da116454f7adbf65a22dd592b82727e7528236d4bca577ebe7857a2f9e14ac34357988fb958696b81e54162d8b081
 DIST boto3-1.28.46.gh.tar.gz 699277 BLAKE2B 7bc3a739cbb40b56c7b993132571add6d77f6a1941b00a1ae35cfa62a836a7b21dfe572d6ccccaf674b20abfe4895d53d3247c4fa52410fed276ace282a05fd1 SHA512 8a6a1b8325da12e75563cd8fc7973f79d1c2a2e418c8a5401064525381f06800c8a4e282253af3330e301a56fa74290743ea5f0a516bb4f017d8f23c9ed7e43c
 DIST boto3-1.28.47.gh.tar.gz 699978 BLAKE2B 056a6c4ac0d94dd147cf1a0e438f9947b2a0bf9f608b5317fe71f58192003cd6de819acc090067cc86124be6ead967bf8cc15ac9061008a15e57cb4259145bb8 SHA512 e0ad5c30677a6c04206a1845ac1cb19a91789885de7ca2cfbac70743e54f8d3254471672c560dc0b97f3d46b6366455521cb78d1c300428ff01f2fdfa1da7ff6
+DIST boto3-1.28.48.gh.tar.gz 700213 BLAKE2B 3ddb02067fee032d3d5e493849936b854130def109f46806fe826845da1daa681920448d96658910ec3064d576de1fe6055d514345cbe88d548278c16c2a28a9 SHA512 b561b0631af566a82495d97ba9c4dc58183361868042b70c353004c58c3cfc38c3496eb5a4d387e5272b76f479a7f101676fc3a9b6306d203e5122bde0091e98
 EBUILD boto3-1.28.30.ebuild 1508 BLAKE2B d38a9300c2cfd40239efbe4b7bad251a3fa5e723b438fbfafbaea76fbfb252832aba45f875aa0afb984a9ae2f4e8a4e64499d9ddff4ea1e3d1ddb0ea3fac5f65 SHA512 9c1ce9d3f807344d2040fa6200070589fbbc6f0ac0eea1146255c18412faa70a90632836ad2f0450c902ef57bd274ed537ec1633438c91b27fc76af981c7b895
 EBUILD boto3-1.28.35.ebuild 1532 BLAKE2B d9c16eb4938ac7488765eca7dc3d5d55402c5aeed4b4e380c9d0433a4e18a94cd11938b43fbe3584b95bc36fec90557a1cfb6017a41fa70807bc06b941e3eca6 SHA512 2d6bd178dd4b7b9b30ed092f69ffdf01e4450eae8e5ee86bd5dcced4370f6f49a440067ae598e126d7ca0f50f9c1212e734ccbd5073fb4fcdef8850327b57763
 EBUILD boto3-1.28.38.ebuild 1532 BLAKE2B d9c16eb4938ac7488765eca7dc3d5d55402c5aeed4b4e380c9d0433a4e18a94cd11938b43fbe3584b95bc36fec90557a1cfb6017a41fa70807bc06b941e3eca6 SHA512 2d6bd178dd4b7b9b30ed092f69ffdf01e4450eae8e5ee86bd5dcced4370f6f49a440067ae598e126d7ca0f50f9c1212e734ccbd5073fb4fcdef8850327b57763
@@ -22,5 +23,6 @@ EBUILD boto3-1.28.44.ebuild 1588 BLAKE2B 7868e2dbbe0ec485326e70c75cd785d0d369de8
 EBUILD boto3-1.28.45.ebuild 1588 BLAKE2B 7868e2dbbe0ec485326e70c75cd785d0d369de83650d28b6501faaa4d21a8c1952c68c1e06659d1c4f70baf420b70edfb714e82d60dc9dfac2f494cc42066317 SHA512 a16a292694a5fd614ab03939fa6131614b287c8e475a83f40f463f0051f6404aa85413713038de60089b6489fc5fa9688bedd1d66ce578ed3fb0cd1b3c237d72
 EBUILD boto3-1.28.46.ebuild 1588 BLAKE2B 7868e2dbbe0ec485326e70c75cd785d0d369de83650d28b6501faaa4d21a8c1952c68c1e06659d1c4f70baf420b70edfb714e82d60dc9dfac2f494cc42066317 SHA512 a16a292694a5fd614ab03939fa6131614b287c8e475a83f40f463f0051f6404aa85413713038de60089b6489fc5fa9688bedd1d66ce578ed3fb0cd1b3c237d72
 EBUILD boto3-1.28.47.ebuild 1588 BLAKE2B 7868e2dbbe0ec485326e70c75cd785d0d369de83650d28b6501faaa4d21a8c1952c68c1e06659d1c4f70baf420b70edfb714e82d60dc9dfac2f494cc42066317 SHA512 a16a292694a5fd614ab03939fa6131614b287c8e475a83f40f463f0051f6404aa85413713038de60089b6489fc5fa9688bedd1d66ce578ed3fb0cd1b3c237d72
+EBUILD boto3-1.28.48.ebuild 1588 BLAKE2B 7868e2dbbe0ec485326e70c75cd785d0d369de83650d28b6501faaa4d21a8c1952c68c1e06659d1c4f70baf420b70edfb714e82d60dc9dfac2f494cc42066317 SHA512 a16a292694a5fd614ab03939fa6131614b287c8e475a83f40f463f0051f6404aa85413713038de60089b6489fc5fa9688bedd1d66ce578ed3fb0cd1b3c237d72
 EBUILD boto3-9999.ebuild 1532 BLAKE2B d9c16eb4938ac7488765eca7dc3d5d55402c5aeed4b4e380c9d0433a4e18a94cd11938b43fbe3584b95bc36fec90557a1cfb6017a41fa70807bc06b941e3eca6 SHA512 2d6bd178dd4b7b9b30ed092f69ffdf01e4450eae8e5ee86bd5dcced4370f6f49a440067ae598e126d7ca0f50f9c1212e734ccbd5073fb4fcdef8850327b57763
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.28.48.ebuild b/dev-python/boto3/boto3-1.28.48.ebuild
new file mode 100644
index 000000000000..90e1b0ce7382
--- /dev/null
+++ b/dev-python/boto3/boto3-1.28.48.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+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_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() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit} \
+		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 0721633736f0..9b608ad80dfd 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -10,6 +10,7 @@ DIST botocore-1.31.44.gh.tar.gz 11937780 BLAKE2B 38660a6025cef328a4df7e3f0170a79
 DIST botocore-1.31.45.gh.tar.gz 11938951 BLAKE2B 842d76cfea05de7515d6dfe8c977c8981924e400ebf518d5ed139c2c12b517b7136811a50e4bf768fb45d2d18e782e82d9482566d9e90a06cf0e76485fa931a3 SHA512 8ad8de83dbe5aa1b90da0627b25022e80df9b4d759050c5baf72b1cc8f29a8df260017e943c7f4b9b9b5b4b112c4acb15a8998531a48777de926dee54af82424
 DIST botocore-1.31.46.gh.tar.gz 11938173 BLAKE2B 99c9b49b8403d005f0153f1bf89f6da8708b9c39c7ac4d8b00bae181ae1663cda95470ff804e38b582f4a07047a21167475aa75247b4003e8bbca887dadde944 SHA512 51a7d1df2c7c2e7098dbca05e602af0975988fe8ee4c608235608b27a338e016b16b1cf6605a74ebe52e77b335333d06a3c9b4338c2843dca19dec1c64c1407e
 DIST botocore-1.31.47.gh.tar.gz 11942023 BLAKE2B 94bdc5b5ca5e5749d40996c7396f1bd4236eeeefeee98b3fef6b452cb0d4c5886b0028f165175a70d7794328113f13ab7449c71b8c375a995f0d1d4b629c807a SHA512 788af17274fca19028eaa61ebc72f17cb40b95d1b354ee88fe063ece5eeff3b3f6f3aacea462c4dd065bcd8f3ddd577d6180c8d3f5d0c8c589dd8d31d60aba94
+DIST botocore-1.31.48.gh.tar.gz 11946450 BLAKE2B 5393125dcc346182ea81ebebeb181cc7aad8e64e4ca5d93e23e9fe98d12dd2d175b8ff659864574d6dea15e5248dbbaf7a247f8261e74a9cea48a73e3e6b87f4 SHA512 51e13e1bd2962e4ed1c2dff97e9ead583e78bc3cb43cecc92b79299b3da9f449d244d0218e94506ae2c59ba4be49db21c03af6f6fc1451340f4d7fb2d6c082f3
 EBUILD botocore-1.31.30.ebuild 1827 BLAKE2B 52ad52588a26e5f1af6dc5f75059fc5d4821e7b7cbb583b07713f3f6af6d6076593df2f22c957ea39813f70b9c0b00eab67b9a9dc174baafa3594326debc3540 SHA512 e4e23357c944e848d0d638977e7053de952e90c6b8d74ca16a25b0ff37a70b0f5bcb6e60022dfdee7c81d8d792d0a28c6acc6f37eac69c2274e36f9a7c808750
 EBUILD botocore-1.31.35.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
 EBUILD botocore-1.31.38.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
@@ -22,5 +23,6 @@ EBUILD botocore-1.31.44.ebuild 1599 BLAKE2B 8325845842cef976827216365bd3f88b7865
 EBUILD botocore-1.31.45.ebuild 1599 BLAKE2B 8325845842cef976827216365bd3f88b7865bb4ce82764b121a42bb99d98952042223281fa66e6e31ec83e39c4fc585672fbab6426a7df79aa945df720d42a1b SHA512 ade15b4567ae00f08a0f5895d967ad3f37af15c24b3169e9319fd7d3c3a3316f34d989b225a928c8c72c2656e4c8f79d61e8b7ddd17e179adf7ff67bcbac6efb
 EBUILD botocore-1.31.46.ebuild 1599 BLAKE2B 8325845842cef976827216365bd3f88b7865bb4ce82764b121a42bb99d98952042223281fa66e6e31ec83e39c4fc585672fbab6426a7df79aa945df720d42a1b SHA512 ade15b4567ae00f08a0f5895d967ad3f37af15c24b3169e9319fd7d3c3a3316f34d989b225a928c8c72c2656e4c8f79d61e8b7ddd17e179adf7ff67bcbac6efb
 EBUILD botocore-1.31.47.ebuild 1599 BLAKE2B 8325845842cef976827216365bd3f88b7865bb4ce82764b121a42bb99d98952042223281fa66e6e31ec83e39c4fc585672fbab6426a7df79aa945df720d42a1b SHA512 ade15b4567ae00f08a0f5895d967ad3f37af15c24b3169e9319fd7d3c3a3316f34d989b225a928c8c72c2656e4c8f79d61e8b7ddd17e179adf7ff67bcbac6efb
+EBUILD botocore-1.31.48.ebuild 1599 BLAKE2B 8325845842cef976827216365bd3f88b7865bb4ce82764b121a42bb99d98952042223281fa66e6e31ec83e39c4fc585672fbab6426a7df79aa945df720d42a1b SHA512 ade15b4567ae00f08a0f5895d967ad3f37af15c24b3169e9319fd7d3c3a3316f34d989b225a928c8c72c2656e4c8f79d61e8b7ddd17e179adf7ff67bcbac6efb
 EBUILD botocore-9999.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.31.48.ebuild b/dev-python/botocore/botocore-1.31.48.ebuild
new file mode 100644
index 000000000000..7cacb5c3f634
--- /dev/null
+++ b/dev-python/botocore/botocore-1.31.48.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+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="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.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_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
+	)
+
+	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest
deleted file mode 100644
index 6dbc625488d3..000000000000
--- a/dev-python/cx_Freeze/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX cx_Freeze-6.8.2-buildsystem.patch 534 BLAKE2B 2ac116374717090f7316b434fd36f77b6693f92b8e236d71663a297f6d6d8629ab9c247b35dc80b3b455d643a25a4aec97c586a6c4580947e8edaa529721aed8 SHA512 accef4bdb6b7a986998cf13b356faa4825e19542e38623570c7f6fb1cdc60f6aca41ee03e84dd543a352bfd77eba227be29cacee60117aad54cd802b4309d169
-DIST cx_Freeze-6.14.5.gh.tar.gz 1648095 BLAKE2B 81707d17c2118a8db4d768b2fbe83278c6b01509a5a1d3e7f3a41efaa29607fc4b254e9d545a4697b77d4932100f344a8013ac59084bb74d97d1b12cb927ec6e SHA512 52233a138da3250e97668a5c225e78b864bebaa43ea2b30de01af2de7739f48a25030e10d36ccec609240822de308ad030eaa26c2ede8b29318d2b30647cf1c8
-DIST cx_Freeze-6.15.1.gh.tar.gz 1651345 BLAKE2B 9c0c29f19e09184ad7b0a6954649c30fa1c941ff822b1c5ec745b1a6c7dd58fc77b06c070641a9200fc4910bdfc49937841ba2b547b16ec48f9fd30dfee6cd03 SHA512 d6540736d437242fd89fc34f0ff81691eebb455c0ddca8b90ee6ec436105d908e9fed580a08e23999f70b5e3aa2f2e66ee35eec092eecab0501e9b3117af23b3
-DIST cx_Freeze-6.15.2.gh.tar.gz 1655639 BLAKE2B 303b3d541cae2e0ef98ea0c57a693092c177cb9e308ae44ee0a9972a9a4b34298ddd0deb86d49d9a0ce9f1f1ea480edd45aa4e63eeca1ce86a1b348c10b7caee SHA512 2f6dc0bed9981190411b1ac12c6a5a8c7907cf059d50e01bc1958308b8f905d818aff12262712ecc7ee931a0976fae0fbef7dd35433158122386d7b6a9a3b3eb
-EBUILD cx_Freeze-6.14.5.ebuild 1264 BLAKE2B 196cb52494bd805aecac5ae9a7c83d606c2ed52b2676672790355209764bbfd2735dae81eed11797eb0a9ddce40256f6f9bcf81f45dd011d1e8a917d8cc1ae47 SHA512 aabbff39c52aa43032afb2c64b69dbffbb63a14b2c7558e1290fbc64fb757889345e51045b5f4bb1dafe9b2f2aea4db793f2c5e00f6ef311c818a687275ccfd7
-EBUILD cx_Freeze-6.15.1.ebuild 1312 BLAKE2B 4032f5fad919217cfe4b48f30f58fd4c0b55cdeffb13686d78a4b8c745009ceb118ec70f9cc3b6763afa6cf1de3f797b87d7c91bcdbb99a61bbf474f6444d459 SHA512 5903db435f1a43626283ca6bdccf6f6cbf50f3a8c5341265c326a2fea13931bdd2b04e7b2ddd700701e170dd508244061611fccf2badfb4a45ceb9f2e56e4032
-EBUILD cx_Freeze-6.15.2.ebuild 1473 BLAKE2B ce063c80fa0978d0dae3676b6b3551e81335498a7aeac4f9842988c57ea99dc8585f5427ddacdd17c331db716cc135e006daab0562c4c5391ddf938bf65f7695 SHA512 6798debe037d68acd8f02af7115fe222114143bcf93def0de611caa36bff67c3a1f0f809ec178896542141fdd3e0f789d343af52a1c65045914f60a0d1d535f3
-MISC metadata.xml 377 BLAKE2B 86f050a41d2f189365feead986749e6173cb4e7b7bec9bbc16cf12bff93dcfb900b1023878dfaa3962673e949802562354f11469dc7db29821c5175db359bacc SHA512 eb2c5a7911f2760a224eeb3ce665406d4ef0f04502c3b077e9e59ec814bfc4e5dffdf41cca12b160d4c50c53434da2bf4385863318034262a4c5a11d9ef620a2
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.14.5.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.14.5.ebuild
deleted file mode 100644
index 339d480083ce..000000000000
--- a/dev-python/cx_Freeze/cx_Freeze-6.14.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Create standalone executables from Python scripts"
-HOMEPAGE="
-	https://cx-freeze.readthedocs.io/
-	https://github.com/marcelotduarte/cx_Freeze/
-	https://pypi.org/project/cx-Freeze/
-"
-SRC_URI="
-	https://github.com/marcelotduarte/cx_Freeze/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="PYTHON"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/importlib-metadata[${PYTHON_USEDEP}]
-	dev-util/patchelf
-	virtual/libcrypt:=
-"
-BDEPEND="
-	test? (
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pydantic[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# bug #491602
-	"${FILESDIR}/${PN}-6.8.2-buildsystem.patch"
-)
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# new setuptools?
-	tests/test_command_bdist_rpm.py::test_bdist_rpm
-)
-EPYTEST_IGNORE=(
-	# windows-specific test
-	tests/test_winversioninfo.py
-)
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.15.1.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.15.1.ebuild
deleted file mode 100644
index add25e3339af..000000000000
--- a/dev-python/cx_Freeze/cx_Freeze-6.15.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Create standalone executables from Python scripts"
-HOMEPAGE="
-	https://cx-freeze.readthedocs.io/
-	https://github.com/marcelotduarte/cx_Freeze/
-	https://pypi.org/project/cx-Freeze/
-"
-SRC_URI="
-	https://github.com/marcelotduarte/cx_Freeze/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="PYTHON"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	dev-util/patchelf
-	virtual/libcrypt:=
-"
-BDEPEND="
-	test? (
-		app-arch/rpm
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pydantic[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# bug #491602
-	"${FILESDIR}/${PN}-6.8.2-buildsystem.patch"
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove pythonic dep on patchelf exec
-	sed -i -e '/patchelf/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# rpm test expects .pyc
-	local -x PYTHONDONTWRITEBYTECODE=
-	rm -rf cx_Freeze || die
-	epytest
-}
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.15.2.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.15.2.ebuild
deleted file mode 100644
index 9063990d7b26..000000000000
--- a/dev-python/cx_Freeze/cx_Freeze-6.15.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Create standalone executables from Python scripts"
-HOMEPAGE="
-	https://cx-freeze.readthedocs.io/
-	https://github.com/marcelotduarte/cx_Freeze/
-	https://pypi.org/project/cx-Freeze/
-"
-SRC_URI="
-	https://github.com/marcelotduarte/cx_Freeze/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="PYTHON"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-util/patchelf
-	virtual/libcrypt:=
-"
-BDEPEND="
-	test? (
-		app-arch/rpm
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pydantic[${PYTHON_USEDEP}]
-		dev-python/pytest-datafiles[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# bug #491602
-	"${FILESDIR}/${PN}-6.8.2-buildsystem.patch"
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove pythonic dep on patchelf exec
-	sed -i -e '/patchelf/d' pyproject.toml || die
-	# remove repeatedly outdated upper bound on setuptools
-	sed -i -e '/setuptools/s:,<[0-9.]*::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# rpm test expects .pyc
-	local -x PYTHONDONTWRITEBYTECODE=
-	rm -rf cx_Freeze || die
-	epytest
-}
diff --git a/dev-python/cx_Freeze/files/cx_Freeze-6.8.2-buildsystem.patch b/dev-python/cx_Freeze/files/cx_Freeze-6.8.2-buildsystem.patch
deleted file mode 100644
index 760ac42fb942..000000000000
--- a/dev-python/cx_Freeze/files/cx_Freeze-6.8.2-buildsystem.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 3149360..e06a1d3 100755
---- a/setup.py
-+++ b/setup.py
-@@ -99,8 +99,6 @@ class build_ext(setuptools.command.build_ext.build_ext):
-                 # macOS on Github Actions
-                 extra_args.append("-Wl,-export_dynamic")
-             else:
--                if not self.debug:
--                    extra_args.append("-s")
-                 extra_args.append("-Wl,-rpath,$ORIGIN/lib")
-                 extra_args.append("-Wl,-rpath,$ORIGIN/../lib")
-         self.compiler.link_executable(
diff --git a/dev-python/cx_Freeze/metadata.xml b/dev-python/cx_Freeze/metadata.xml
deleted file mode 100644
index c16a84646bd9..000000000000
--- a/dev-python/cx_Freeze/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">marcelotduarte/cx_Freeze</remote-id>
-		<remote-id type="pypi">cx-Freeze</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/frozenlist/Manifest b/dev-python/frozenlist/Manifest
index a678b60422bc..e29b1b6dd08e 100644
--- a/dev-python/frozenlist/Manifest
+++ b/dev-python/frozenlist/Manifest
@@ -1,5 +1,5 @@
 DIST frozenlist-1.3.3.gh.tar.gz 27742 BLAKE2B cf0dcd2ed0e22cb7fa3d57a73177e53cace8e6301c462ab56544678f1f78f113ac3ad9ffb68dafb3ae957a1e52e2069dcec76b5adc27284587d614bbb6a8c139 SHA512 8f416996c18d352912e88dad6b503cb1e5ce566d69e97aad8d7eedc6415316e8c9e63eb2c341c5d2409ebf90fd58153ce642d5d88f277435bc6e5a4f1ce8b949
 DIST frozenlist-1.4.0.gh.tar.gz 29063 BLAKE2B ec33639c22448da84fda9eaa83a78737f20579061e0ae05699a361ac9a8646df0ebf5c31df69cd7c4ee1c1c7fc0e28d0f6050a1879c3d28bf83e2caf442eb2a3 SHA512 937f7684df3879596903b5ce2d9a38590383a7c319e3079bbd8fdcbea169c692d9feabac0a7e0646d334ec517a86f7d943e0b0107fd925203de1cc8029b252ba
 EBUILD frozenlist-1.3.3.ebuild 968 BLAKE2B ee09f69900d9fdaa304292d773222b2b0233c7230ccab7d0d37424ada2acc4ce50e56bc522a3ff51a08153a25efdd888f9f6e93d55017abffc91ddb9d0f9a601 SHA512 643832cb425d3b90b8d14b27c26cb5c60e80abdb30722b64273851ff4e03efdb89671bfc7ac037677ef5242cc1b42644a552ca6d8fadb6803f961297b09ad7ab
-EBUILD frozenlist-1.4.0.ebuild 1217 BLAKE2B 4d3ed05e2215de47b11892659735a924eaa4700ce48a5f9bbfd983f8a1cb0bed9c3dfb6696d4306d2e9a56190bfecbe96f208b487c714fa07177a06c909a1bd6 SHA512 41345d9c3c6e3021bf118f860dffaa5eaa8c24c1e858dbd409fe8746b5652460b19ec71bbfc479a90f12253b14d0d54f3ce6aea16f40791b4e28c3b3f2822092
+EBUILD frozenlist-1.4.0.ebuild 1216 BLAKE2B 13fef2819f4eac31532e56c45d5e53727f6147bcef32aaefd2df11ce7966ce432ab6a7b601cc7b68697ae5cc4207402e533e503b93bbad4b1947b556e6ad0100 SHA512 4dd5ccc90e339f948b6c70948fde06a0efb8bb8b0e4a4d3737897e9da39a6a1be2f99dc1dec523e92b6379f0da9654daf92ddf684ae66549f118046f97dc9de3
 MISC metadata.xml 495 BLAKE2B 98916d3eb7834f06b99201a1339f8a432c2ce12aeb4038bba22ea218d73244151463d4671cdd18350c14ed8e466a93b31620f6f57fc306dcfeff9c812f8b71ec SHA512 0d0d154af4e43a5fde5fac025948a6c25e2b0efa2350b50e2a7cc826c576ced6c4746ba0a17d9d1cf0a304828d850acdef96e56381fae9728ef37fefc12b4ec5
diff --git a/dev-python/frozenlist/frozenlist-1.4.0.ebuild b/dev-python/frozenlist/frozenlist-1.4.0.ebuild
index 6476cee628ae..0958c3e69d41 100644
--- a/dev-python/frozenlist/frozenlist-1.4.0.ebuild
+++ b/dev-python/frozenlist/frozenlist-1.4.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 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"
 IUSE="+native-extensions"
 
 BDEPEND="
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index bbf19663ee73..e0763b8d7459 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -2,8 +2,10 @@ DIST jupyterlab-3.6.3.tar.gz 16847186 BLAKE2B 6916722469ab100a1a240b8a565c9800f3
 DIST jupyterlab-4.0.3.tar.gz 18222352 BLAKE2B 7dee4109e94173d35794c2b3a05de5cbab145fc031b22628ca4b5c1d97497658807b0a9b713d58a7aae3a38a64a37e04e535988d727cab6ba3c3aebe2ff6c0a2 SHA512 cb7694c1398cbf1b061d385518d08d5ff4411bc7f53828d99edd3cf8420d39c09d99e1ee061d60a86d83e640c37777bfd4f98ce71276366f291f784f23740d4d
 DIST jupyterlab-4.0.4.tar.gz 18223782 BLAKE2B 8f2b157d27c68fba62fcfdeeb055b0c9b646987d2f31447b87720110ec2331ddad90c0288ad7554faa26674bf810d92d99f1924e2d34f81d2303a4ab6b213cd9 SHA512 23479cee2405ddc42a11c477cb93fad6cb5481a70766d48c1f7f1e498481c36a0dca47c5523ff3fc97aacfd86a37debd53cc3570e3e0916cc0a6cb526d99a574
 DIST jupyterlab-4.0.5.tar.gz 18235811 BLAKE2B c1847bc3b9cb420d987c1ffd6d00951946c7312dbc94f49e3a4fadc85f4059c6d76294e78be4a629a4d2565bac5b569d957521aa26b4bd2365528cae7548b074 SHA512 befb13b653037511651387e339b8e41c17989c146080ad41c68b60f415a4c3c539d666719ba3256b341998fa13fe414c28c78159429d26f7000d0e01bba41ecc
+DIST jupyterlab-4.0.6.tar.gz 18236816 BLAKE2B e39e7cb6fbdecfee0b5e592091f989fe94907369d057457130f8bc2f391ca4c83cc09542bc9da766413821eb4c4e9eaaca3adfeccf26b0b2f61ab5e65dac9e45 SHA512 fc4acde65f2bb24adbf95e5cde17e0225390a0c8aca10e04b7c9cf5b2bcebe529608b53ce259f081508b86216b94c71fb260c857b9fe3a2bef16cb4e7af3dcda
 EBUILD jupyterlab-3.6.3.ebuild 2744 BLAKE2B 9cfdab0afb8feff32c1eb0d4f1e641860ff59e72080448805cfc11cfe3a565a7c8fc18b4013f5b78ff83304b21df03ad939d81eac8d9afbbf2bd59ab75f778b2 SHA512 a5ff778dee692241083a51d970ce5025db0976b6abc4c14e15fe39b48427a5a27aee5f91bc6989b3a109ae11590d89e66f15b3dd573cc79caf90118d022ec71c
 EBUILD jupyterlab-4.0.3.ebuild 2571 BLAKE2B 4afda064ba9209bb9aad9fb11467d46a5b0740c8f2dbb05edd6d74274fb2ce65651a35713f24115a58bb24327705f486f61d85a2168a61d8414699d479582ce2 SHA512 2cb0315f4f5069465d3b7bec38121b85de8c8eaa7cb3aac47e028aae6b885262d4fd72f00869a5fd1db07381036dd929609b8b98661d007184e16cd69fc025fd
 EBUILD jupyterlab-4.0.4.ebuild 2595 BLAKE2B 10fd556791199de87445fad9ae5464a163e985b4a9a01e90416af5a0b7339f040ed72a3eb24f2784d8e96ddf97cf4bc56f026677de0efd901551adfdd59558f2 SHA512 acee9c5419ec876057bd4c39bbb02b9450bbf60a2620fcd31d40fe728beff2ed5b64fb1bc85a6c9c52c3b40bebcb258645ebc1a5fd11ae32096706cd264d729e
 EBUILD jupyterlab-4.0.5.ebuild 2609 BLAKE2B a982cb28bc732374978536544bbf96d7dffe77c6bde34de40c4a78ab95720a83414e6f6b8443ddcd0151801709b5bacff8f32c68a4a4ef5c9ad66fb5ca93de76 SHA512 f66532ec44d14062b56911de35b3ca168f88debd3c0ed424d955a81052b05a676aabb626786ded8667427d307863766d4fb912e2db7d858f59bd8dc69cef8433
+EBUILD jupyterlab-4.0.6.ebuild 2609 BLAKE2B a982cb28bc732374978536544bbf96d7dffe77c6bde34de40c4a78ab95720a83414e6f6b8443ddcd0151801709b5bacff8f32c68a4a4ef5c9ad66fb5ca93de76 SHA512 f66532ec44d14062b56911de35b3ca168f88debd3c0ed424d955a81052b05a676aabb626786ded8667427d307863766d4fb912e2db7d858f59bd8dc69cef8433
 MISC metadata.xml 412 BLAKE2B f0b40e19f8ba9dc116f0e4a882cabab6376f22d1eaeb3eac58ecff465ee2aff3564ddbf55e4ffb8971807a39945109a164037a954419671a274d3ac558b102ea SHA512 b6149a03585ca04bc3bf6f3ea6055e8e1fcb620a771359d150df7c22ee16bf09f57c8037df2161021fac0c194be0ac5ec79a31f0511d785e0c5b1ca96d817e42
diff --git a/dev-python/jupyterlab/jupyterlab-4.0.6.ebuild b/dev-python/jupyterlab/jupyterlab-4.0.6.ebuild
new file mode 100644
index 000000000000..a329291d6048
--- /dev/null
+++ b/dev-python/jupyterlab/jupyterlab-4.0.6.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_PEP517=hatchling
+
+inherit distutils-r1 pypi xdg
+
+DESCRIPTION="JupyterLab computational environment"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyterlab/jupyterlab/
+	https://pypi.org/project/jupyterlab/
+"
+
+LICENSE="BSD MIT GPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/async-lru[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	dev-python/jupyter-core[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-lsp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
+	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab-server-2.19[${PYTHON_USEDEP}]
+	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
+	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	net-libs/nodejs
+"
+
+BDEPEND="
+	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		>=dev-python/pytest-jupyter-0.5.3[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-cache[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# These tests call npm and want internet
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
+	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
+	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
+)
+
+EPYTEST_IGNORE=(
+	jupyterlab/tests/test_announcements.py
+)
+
+distutils_enable_tests pytest
+# TODO: package sphinx_copybutton
+#distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme dev-python/myst-parser
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index bd5fbaa9de65..d0581999e5f8 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,3 +1,5 @@
 DIST python-keystoneclient-5.1.0.tar.gz 325232 BLAKE2B 18d901b0d249574224dc2e398266a3fca60baff12b076c3dae8a73da1698c8ae13d0f6cf6ab8b1f1a8a3ed657e1ce1fec71f50d49b04769c3c65379ae3d1ea09 SHA512 6589109b7c79f40af75ee8bfd438dc16ed8a097ba51a95ffbcb4f84377d7681f5f26568e99c5fea0c34710fb4f33f3e47355f5ec9bc4e5e1f8bf1740188d7ae6
+DIST python-keystoneclient-5.2.0.tar.gz 324652 BLAKE2B 2279e4d094faefc17b70211dc65083a4b726dd178d655d2efb55c9ae6f4d0837051d563e96b7ecca553c2f855de7affc20e11dcff615fdb2fb755fdd6e508f3c SHA512 2cb7137d88b090e3054448b3134084964597b77f013e75b3665bf80438b6f900630407b8dbd992ae39a877b2546bb61e6ffa665690cc7ed79aa453ee459c909e
 EBUILD python-keystoneclient-5.1.0.ebuild 1709 BLAKE2B c9f65312ab0b7fa337af22cae76e454ad3f4f103cf1f36477a14f8f5c8d247529b355a3108b8ff6ba14cc3816136cb4db838aab773cc594e3f4ea2a676e249d9 SHA512 09ab33e54e5e7225c0bdda8c82f484836588ab8f71d8ab3540e1782b2ea564305023dcb487a2ec372620f9211e15d345b9f6618041a2e861bba12c46d74329ab
+EBUILD python-keystoneclient-5.2.0.ebuild 1712 BLAKE2B 6adc6327a9d286ccca55a63e839ee045db9def9dc336670cd04afd2443449acae608303797eefb89f0b728a2eb1c618fe15979abca1053a893fe23bc93f28f01 SHA512 6a0f22f3e7daeae24f418f20882b06828fb7a5db666e36f623275d3eeed344a9e0409c8386723adf6aab311405640ab567c8524d805be2dcc57f059a4bfed68c
 MISC metadata.xml 667 BLAKE2B 47026519bc6a282a39e2503fc0fe2ebb54902ddf8cefac20f36e13c5dbe6589bd245588e461ff958d8b6e16c58e4d07f0937484da0fe438e4ac5367c9957efdd SHA512 df9d8fc8aebd726b4dbc63548a573352206dc92cf2db1520e558ce8bf1635ecab36589e7fae0bd38e34a62b16369ae890855b0f0390a0182e20a28ca8b48a635
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-5.2.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-5.2.0.ebuild
new file mode 100644
index 000000000000..3c048d57e4f5
--- /dev/null
+++ b/dev-python/python-keystoneclient/python-keystoneclient-5.2.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1,
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Client Library for OpenStack Identity"
+HOMEPAGE="
+	https://opendev.org/openstack/python-keystoneclient/
+	https://github.com/openstack/python-keystoneclient/
+	https://pypi.org/project/python-keystoneclient/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth1-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/os-client-config-1.28.0
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest keystoneclient/tests/unit
+}
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index c0e6e3f6e5ee..1fc72204dfab 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -4,10 +4,12 @@ DIST stripe-6.1.0.tar.gz 263336 BLAKE2B 176903f3b6f4eabdcb3181272c96a66432f6569f
 DIST stripe-6.2.0.tar.gz 264754 BLAKE2B be5d34887537154df852fd328e81949a0eb858e02236ecf5bcd33a43c0d1c7f1f71cbe67c89e4cb177e50fadd047a0a0c6945702993712f9212b46ea154a067a SHA512 e18fff6735f6c03d64a427232d3a67fff653d570a0413e03a3cb9c2e8dedeee88640197f8f8ad93cea76ace2c9fdee81b79d54cf48cf92a5f2a79b2e33160a7a
 DIST stripe-6.3.0.tar.gz 276422 BLAKE2B 2fa438593bdec94f5c8306ee180921c2920e8995036d3ec53794dcba89f4f97c257bfe13561d1fd993c49247d0423ca4d7f4e994c1b4b8386ebaddf47f9063de SHA512 900a85bd8a44404dcc8ed4e057db64087b7a6f05d8e01183c22fc5dd7da815298e23b386d2d41dee6ea3925e92653858cc945e163757870fe04c543def017424
 DIST stripe-6.4.0.tar.gz 278866 BLAKE2B 62b8ae5202e7c4b866eddc7de7654fe94ae10187ef060b543c7c461cb273575e1b0bc499c27128dfdf18482e48a18f4a1b8eebd261e3c8bf1e520635efb34a25 SHA512 29f5efd6ea94b73db3fab85a40e2d033b571410c657d0e7af6d1c4d24c4c703eb196806ea58d6563fc5ee4fc2fa3e7fa7b77a0fcb6377ea71d4a7aed0b8e081f
+DIST stripe-6.5.0.tar.gz 290534 BLAKE2B 40672358ae9b962f14cb3dad669e7857bf52981b1801325f92193b2cd42e42a7ad14dcd25272ec36589c103c28b10c8eaae0fe6175eb10b00a6a0f278dee5312 SHA512 920bb7e0a0e1cbd4b5e085928f28c12ab793bfc1e1aa29aa58f4cbf11f1bfdfeadac84d2be1fc9e14e70ce9a2f9e4900112cf982b6bab220e1cc09569d7db2f4
 EBUILD stripe-5.5.0.ebuild 1855 BLAKE2B 32f5243b637b1bd18920e2bd38dbc6c1250bf63c683015987cb99492802d2e9102bbf1fd95d71c5df0ef0fbf2f9169d114a4c71bb86a3a0e3984482c0db9c1bb SHA512 1f90a1cf06d7870bd503ba11ae61917c5bd2dd4c1d4d0bc251a8af91913eaacc616b518cb4c8706849cfc33a1944655fd6e50300fbd9601fa525a42ec87bedcd
 EBUILD stripe-6.0.0.ebuild 1857 BLAKE2B c3bbd829c22415c9643c2498654d7e475be1195425e72ac747af8dbabde710b9907d3990ed21415a9fe3a21b8a831953d2075798e791b109f1676b0dcdc9a4d7 SHA512 97c6a3d644f054866a2740a7aefa484415bf63b5ea67b618ca2204722208bacc1850d0c310a47dfa035d107b6c65d82e8bec7a83572e79cd38f4fa2d7fe7a002
 EBUILD stripe-6.1.0.ebuild 1913 BLAKE2B 21b072f49bc4daac0e92b297f7088d4282897d94489f1c96dc2a1f63c003c6492dd452543f6e62df3084a94728e2c96eb458140f72a606f8cae4f1d3fdde5e2b SHA512 d29de2e0f9ba27196220b300cfb9f93306630a07328ca45593c3159eac49edcc7b6f792eb3d9590a41da02042de67e67cf505793912863c64b9accb499a86f02
 EBUILD stripe-6.2.0.ebuild 1913 BLAKE2B 21b072f49bc4daac0e92b297f7088d4282897d94489f1c96dc2a1f63c003c6492dd452543f6e62df3084a94728e2c96eb458140f72a606f8cae4f1d3fdde5e2b SHA512 d29de2e0f9ba27196220b300cfb9f93306630a07328ca45593c3159eac49edcc7b6f792eb3d9590a41da02042de67e67cf505793912863c64b9accb499a86f02
 EBUILD stripe-6.3.0.ebuild 1913 BLAKE2B d617f476411f190acbfe7a6012bfbd446edb5aa198955c4241d0f91ece685ef7d4aa8ff79f722f806c66641186b3fd4fd77f891c909d066a595054f3218a5117 SHA512 f507e275ff4e7b647e46d64193aab2b6aebacaea2f49be99f21c2b610b3fc113bdcc0ab5d6f3e02f19fee91279d06a8d63f2a9b10105ffbb564bca5af90d4eea
 EBUILD stripe-6.4.0.ebuild 1913 BLAKE2B b6227332646d7fbca3705898345caeb7c73dc80d03aba4a1b18610d4ef7badc65f2d8692716f619a1e3ffea0bb3587d4fda7336160e39d54cbf254f0a53e8e9e SHA512 707a91ff3ba44a9c72873ed331227cf881114a343b923f9c030840502e614bcd53bbb64937c376813ec0be603ba8c6ca55ff4dc1181b4a96c7d23739644cdd65
+EBUILD stripe-6.5.0.ebuild 1913 BLAKE2B 753b4000d61d14cf30351a941ab4e50fa7c5dffabf9de669e7f41626ff0dcbcb2fe79ab8c4ca9559bf2b6bcab23b34c022cb2b7580b85a02d02faf32fdaac6f9 SHA512 3a49f5049167286f94804f4747cc8c0199f475f9af50ce8a779962d23aa5a85ea93c013410299a04d1acd199b6a53daa5a59d500f7470e5c75e2b83e37a051c7
 MISC metadata.xml 372 BLAKE2B e6a38fdec6fc016068e7a0522ba15e83bf358ba1475e54a9630b1e86c75bc14b790c59716317bd81438a1c770e4d31afbe04400ddcd5dd272715c251fd6cb1a2 SHA512 2d9672b242f2d38654f7906097e597dfbdf75afa3583ea331f61772db95d19a802e83ed523c67a6cf3da18411036055c0996fd04d99199618d5205be8a61bd77
diff --git a/dev-python/stripe/stripe-6.5.0.ebuild b/dev-python/stripe/stripe-6.5.0.ebuild
new file mode 100644
index 000000000000..07022a54f45e
--- /dev/null
+++ b/dev-python/stripe/stripe-6.5.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Stripe python bindings"
+HOMEPAGE="
+	https://github.com/stripe/stripe-python/
+	https://pypi.org/project/stripe/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
+"
+# please bump dev-util/stripe-mock dep to the latest version on every bump
+BDEPEND="
+	test? (
+		>=dev-util/stripe-mock-0.175.0
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		net-misc/curl
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
+
+python_test() {
+	epytest tests
+}
+
+src_test() {
+	local stripe_mock_port=12111
+	local stripe_mock_max_port=12121
+	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
+	# Try to start stripe-mock until we find a free port
+	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
+		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
+		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
+		local stripe_mock_pid=${!}
+		sleep 2
+		# Did stripe-mock start?
+		curl --fail -u "sk_test_123:" \
+			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
+		eend ${?} "Port ${stripe_mock_port} unavailable"
+		if [[ ${?} -eq 0 ]]; then
+			einfo "stripe-mock running on port ${stripe_mock_port}"
+			break
+		fi
+		(( stripe_mock_port++ ))
+	done
+	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
+		eerror "Unable to start stripe-mock for tests"
+		die "Please see the logfile located at: ${stripe_mock_logfile}"
+	fi
+
+	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
+	distutils-r1_src_test
+
+	# Tear down stripe-mock
+	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
+}
diff --git a/dev-python/tikzplotlib/Manifest b/dev-python/tikzplotlib/Manifest
deleted file mode 100644
index a89a6a5e2e10..000000000000
--- a/dev-python/tikzplotlib/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX tikzplotlib-0.10.1-matplotlib-3.6.0.patch 1622 BLAKE2B bd7d5fc97835f89782bbf1dc4071dffdc6f633f5852a8ab6ed26f6e6b8ccdca1600259630e749278d4252d6c9fbe595147dde500d411d0d76976d039e13fcb65 SHA512 5405986792fc808561379aad09eb7d9241e456d5e2bd3dedf682035069eb290d57df42429f5330465c0ecebf1591a840ae7759ceb5ec21f3562be404d5e9218b
-DIST tikzplotlib-0.10.1.gh.tar.gz 98265 BLAKE2B 7664e702afb38580af78f2b0887000215a5a0c2ef57e4f9ca5d1100bcba257365b89aee805e800e3a9b5a992487c1ee9733088dadc53941405c0055336478130 SHA512 13a750d9929db1d4ce4608a296523be55878c702846b0b339c6c002cbdf4e8f7b1ffea84db612d8932a379fafce9b4fe6ab6ce4325bf780f211cc0b885a15818
-EBUILD tikzplotlib-0.10.1-r1.ebuild 1189 BLAKE2B 35ea9a5aa827d4a18e32734b2344a738be4181fb4f149cdae8510d2c1329cf4b7e22c801ff242ab0468a6dada462da27b55160b743d59921e32d7fc73f1bb75d SHA512 7b32901f7838d091088079eaffd304f19880a4a500a8473762b3087b1ba5b56c4c5aeb3059ea3606a2e7a705a06742c96fe3a1698308197e297f4639ad5f0e04
-MISC metadata.xml 854 BLAKE2B d3cd2be01b5f729857c8957a875caa3f42574634daa75dd9249fdc4497d63bb9b0a7501ed06429b4a3d3a0813406a88403c70819581be92948aa52f95a148352 SHA512 609fa041d9a99edd80118743464f39ee4ea00c3de665e6c4ce72b1748f83f9e0828439af61b2d090207e04776a312e65c653036c5309e53cd7823ca581116c07
diff --git a/dev-python/tikzplotlib/files/tikzplotlib-0.10.1-matplotlib-3.6.0.patch b/dev-python/tikzplotlib/files/tikzplotlib-0.10.1-matplotlib-3.6.0.patch
deleted file mode 100644
index 2c3a0e506cc6..000000000000
--- a/dev-python/tikzplotlib/files/tikzplotlib-0.10.1-matplotlib-3.6.0.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://github.com/texworld/tikzplotlib/issues/567
-https://github.com/texworld/tikzplotlib/pull/558
-
-From f9988eb6aa7cc7d55c0bb528c53e7a8408308939 Mon Sep 17 00:00:00 2001
-From: Paul Kim <44695374+thekpaul@users.noreply.github.com>
-Date: Mon, 3 Oct 2022 01:15:21 +0900
-Subject: [PATCH 1/2] Legend Compatibility Issue in texworld#557
-
-.
-
-.
---- a/src/tikzplotlib/_legend.py
-+++ b/src/tikzplotlib/_legend.py
-@@ -78,7 +78,7 @@ def draw_legend(data, obj):
-     if alignment:
-         data["current axes"].axis_options.append(f"legend cell align={{{alignment}}}")
- 
--    if obj._ncol != 1:
-+    if obj._ncols != 1:
-         data["current axes"].axis_options.append(f"legend columns={obj._ncol}")
- 
-     # Write styles to data
-
-From 61f7ea2fb2633f1c0de48f8da1f90a5f9ba078c1 Mon Sep 17 00:00:00 2001
-From: Paul Kim <44695374+thekpaul@users.noreply.github.com>
-Date: Wed, 5 Oct 2022 11:30:48 +0900
-Subject: [PATCH 2/2] Backwards Compat for `ncol`
-
-Co-authored-by: st-- <st--@users.noreply.github.com>
---- a/src/tikzplotlib/_legend.py
-+++ b/src/tikzplotlib/_legend.py
-@@ -78,8 +78,13 @@ def draw_legend(data, obj):
-     if alignment:
-         data["current axes"].axis_options.append(f"legend cell align={{{alignment}}}")
- 
--    if obj._ncols != 1:
--        data["current axes"].axis_options.append(f"legend columns={obj._ncol}")
-+    try:
-+        ncols = obj._ncols
-+    except AttributeError:
-+        # backwards-compatibility with matplotlib < 3.6.0
-+        ncols = obj._ncol
-+    if ncols != 1:
-+        data["current axes"].axis_options.append(f"legend columns={ncols}")
- 
-     # Write styles to data
-     if legend_style:
-
diff --git a/dev-python/tikzplotlib/metadata.xml b/dev-python/tikzplotlib/metadata.xml
deleted file mode 100644
index c432fbaf0427..000000000000
--- a/dev-python/tikzplotlib/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription>tikzplotlib is a Python tool for converting matplotlib figures into PGFPlots (TikZ) figures like for native inclusion into LaTeX documents. The output of tikzplotlib is in PGFPlots, a LaTeX library that sits on top of TikZ and describes graphs in terms of axes, data etc. Consequently, the output of tikzplotlib retains more information, can be more easily understood, and is more easily editable than raw TikZ output.</longdescription>
-	<upstream>
-		<remote-id type="github">texworld/tikzplotlib</remote-id>
-		<remote-id type="pypi">tikzplotlib</remote-id>
-	</upstream>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.10.1-r1.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.10.1-r1.ebuild
deleted file mode 100644
index 7b21d67ed209..000000000000
--- a/dev-python/tikzplotlib/tikzplotlib-0.10.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
-HOMEPAGE="
-	https://github.com/texworld/tikzplotlib/
-	https://pypi.org/project/tikzplotlib/
-"
-SRC_URI="https://github.com/texworld/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# https://github.com/texworld/tikzplotlib/issues/567 for mpl-3.6.0 dep
-RDEPEND="
-	app-text/texlive[extra]
-	<dev-python/matplotlib-3.6.0[latex,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/webcolors[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pytest-codeblocks[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.10.1-matplotlib-3.6.0.patch
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/mock
-
-src_test() {
-	local -x MPLBACKEND=Agg
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	epytest || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/vncdotool/Manifest b/dev-python/vncdotool/Manifest
deleted file mode 100644
index 741d98b39438..000000000000
--- a/dev-python/vncdotool/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST vncdotool-0.13.0.tar.gz 72780 BLAKE2B 6a27565c5410148f569bd5a8e212327d734f9fd044549683bafcbbaed0df56e0a4853b4750eadc74e2186463313cd510c5290a8c4de69eba5ecbc42ea5d94c32 SHA512 65e275c53dbc805114801b149bff86743cdcb2b8d69b038425fd7dd6f911b113e332246178080c71314d58624137152205057c00b451a3ec6b46541f1b294b98
-DIST vncdotool-1.0.0.tar.gz 62580 BLAKE2B d09b26e81496055f17e96fa5b60ea006ddd210fa8b0044785c107582af18a61fb5beec83f577222b32cc8f446694235cd3ab468cfa917ec3ef4b00b6fbc1a8bc SHA512 45fba9ba3549ad575923bcfb3ab62c53b3c2d85882c87ca2b656795314b9c32aa989a1fdae280f904cb4d79f509622810ffd4d1e2977beac917f0289d6ff24a4
-EBUILD vncdotool-0.13.0-r1.ebuild 1162 BLAKE2B 7d3759ab64735784f1046af0d53f4b4aca7e3975011e3fdc2d0ac25d3bdf27a067d785a103f10e7bbbc53267e7e587c507e97b90adbc7fe9a4c404a8f9de60b5 SHA512 245833b28e23d83e9c0fc9a627c12d6278df6d5bddf37ed78f5a829dbdd9103fa673fcb651f3629f11799492dc5668c018d5990c4352d3ac5351cedbeedfc004
-EBUILD vncdotool-1.0.0-r1.ebuild 1169 BLAKE2B f41eab36927e551c9b2945811286085f4e9f3c66e08cb540ecbd5c23552dc4b5eb400208cab07cb7579dcd4c663e2808b6727c0816cd82bafef555f8a8e95dad SHA512 c76c99c79c25c1f670892cd10fc7d44f4e2278271487da63542364429e36979b0aea74e639ac09358f7d12b43c7571a4e67998e9d9c3ca692a61dbe1ce52db11
-MISC metadata.xml 320 BLAKE2B 0b405f90f51c6ae099c590ba1ece92ec3ba2a3f505ee1febeca2eeb7c660f5bbf0951dce22fe318eef1e0bd693c26ba1d4c2b12c12c4497efeec59510d1c32da SHA512 35eeadb7cf094a4ecccf3eeb485fb04369f2fe739b1fa028379fde8deee48ad373729a77eee16699c61728b41b79a00cb50870c186afc148baab44d114442404
diff --git a/dev-python/vncdotool/metadata.xml b/dev-python/vncdotool/metadata.xml
deleted file mode 100644
index ec8cefeff626..000000000000
--- a/dev-python/vncdotool/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">vncdotool</remote-id>
-		<remote-id type="github">sibson/vncdotool</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/vncdotool/vncdotool-0.13.0-r1.ebuild b/dev-python/vncdotool/vncdotool-0.13.0-r1.ebuild
deleted file mode 100644
index 047806e5bb04..000000000000
--- a/dev-python/vncdotool/vncdotool-0.13.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Command line VNC client"
-HOMEPAGE="https://github.com/sibson/vncdotool"
-SRC_URI="https://github.com/sibson/vncdotool/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-# A lot of errors such as the following appear
-# pexpect.exceptions.ExceptionPexpect: The command was not found or was not executable: vncev.
-# to install those, a manual compile and install of examples from net-libs/libvncserver is needed
-RESTRICT="test"
-
-BDEPEND="test? (
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	dev-python/ptyprocess[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	dev-python/tox[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-)"
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/twisted[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
diff --git a/dev-python/vncdotool/vncdotool-1.0.0-r1.ebuild b/dev-python/vncdotool/vncdotool-1.0.0-r1.ebuild
deleted file mode 100644
index 442bf83a24ba..000000000000
--- a/dev-python/vncdotool/vncdotool-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Command line VNC client"
-HOMEPAGE="https://github.com/sibson/vncdotool"
-SRC_URI="https://github.com/sibson/vncdotool/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-# A lot of errors such as the following appear
-# pexpect.exceptions.ExceptionPexpect: The command was not found or was not executable: vncev.
-# to install those, a manual compile and install of examples from net-libs/libvncserver is needed
-RESTRICT="test"
-
-BDEPEND="test? (
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	dev-python/ptyprocess[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	dev-python/tox[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-)"
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/twisted[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 2b0b516e8d76..835684134d67 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index e7840bd6780e..381ef2d8071c 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -151,5 +151,5 @@ DIST 6.5.2-0-202307080352qtwebview-examples-6.5.2.7z 47258 BLAKE2B fd303abf3d097
 DIST 6.5.2-0-202307080352qtwidgets-documentation.tar.xz 23043964 BLAKE2B c8b0ab6283d5f8f78cb2572091182c62665fa994352afa025613f1af230eb4b134dc76ee63a194f79043524592cac42f6ff69cf5d05650f1a024ca91c6208c1b SHA512 e11adf4b33cb6238fe55c7894a997602a34957410e0425f153295c57438cf8f93b9be3a7a4e9b3b77c50e7e530941a59245b8b687dd676eb6720bca9577a5e62
 DIST 6.5.2-0-202307080352qtxml-documentation.tar.xz 257520 BLAKE2B 0d75f414b32368d46d918e93ea10adc523cdcb70be80f796e70a9c15b881946dd5818031e2205e9c6bb1887828bf84ee05226910c74aad0181ab3e086120f48e SHA512 61ad421343b37083f04047dd0e7e68c3332eca8d3730e387818716ccc8973f95c119cf0bfd51bf53254c9b9ccde0f61c6c30af39b0965d56a88503d153bbaeb9
 EBUILD qt-docs-5.15.2_p202011130614.ebuild 3196 BLAKE2B a1fcea250c2fb373126fe9b6190ba48a4a5097a62c873c3661df35022bf0c0b4fef9813cd3fc6d3bf068f3c6fb74eb2612d9a7cf583e73d84dd5795855566a7e SHA512 47652f0db86fbfe08f31053af456b756a53090b53a2bfc3c7828b5791dfa21eb02962f3d802cbee87c7b12471f1543164891631c49954b255d6a97009b037325
-EBUILD qt-docs-6.5.2_p202307080352.ebuild 5035 BLAKE2B 339c6f7ee0e02db8cca02263566bd396e6f984b5df0efc4d637cbaa3502092f7a3d8a3fd03141eed2601b5956fc791a16f919e52b8d73803e392cb923d37cf6f SHA512 252b535718a697a76ba9a2e69beb1525b577fa408a92c38d7dc9f756ed278450a86f9b2071e238b51cbe5513b9fb5e82fd5a9839a3ab6c3eecfe9485a16dd346
+EBUILD qt-docs-6.5.2_p202307080352.ebuild 5034 BLAKE2B ee11fe4ce9b2cff7d2443f1b4907b26c31d2b0ef948d287b07a33cdc6102e6ea5be2506c47b125a4ccf3cd343228a8c1cf0604e2526e0d7c1ac4b68818fd3407 SHA512 2cef50b834cc38a9939dd2db2e98862be2a1b4fd7909cc604c2f2006455565b78237984ecd40086bf0a161df733d85b9e81bb22beefc9368ceb98d5be44d1e42
 MISC metadata.xml 5116 BLAKE2B 5efae3f5542b01326cf11a9bfbbdab10e648652b26c77786289e4d843d69812f8e9b39d14c502cbdf21dfc68fb92c5cee5bae44848f3226fdd15d6a7b9875e82 SHA512 d8bb4bb98f4d30c61b3b1eec02c254fe032aec94c3a46b28b0505622dd5e8a172eb66cd2b4c9fc125e3a66d25c20bf6def6bd1c70d4b05b0481b34ab3c469583
diff --git a/dev-qt/qt-docs/qt-docs-6.5.2_p202307080352.ebuild b/dev-qt/qt-docs/qt-docs-6.5.2_p202307080352.ebuild
index 98ace3ec6876..dfdc6d93de58 100644
--- a/dev-qt/qt-docs/qt-docs-6.5.2_p202307080352.ebuild
+++ b/dev-qt/qt-docs/qt-docs-6.5.2_p202307080352.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://doc.qt.io/"
 
 LICENSE="FDL-1.3"
 SLOT="6"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+examples +html +qch"
 REQUIRED_USE="|| ( examples html qch )"
 
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index c368d3393ef9..c7cb5b93efa9 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,7 +1,7 @@
 DIST qt3d-everywhere-opensource-src-5.15.10.tar.xz 118262456 BLAKE2B eff3ffd0b305e005019ae59c7214f2df12509ce3fe6cde38dc315b8a3062364c714e5b7e3d33fbaa2c7a71ae19077149bbd7e13d49757044c497337ff2c16035 SHA512 6c3d94b02188493567921552e104f407fd92bf2b95acd6c933a9dd214ba7ebc0c1983ffcaefeae63d60131d02651df1da834522628711d36514dc697e7bb885f
 DIST qt3d-everywhere-src-6.5.2.tar.xz 161691776 BLAKE2B 0bae744dda45b5af9a0c2dca98d43a2f0376cca018671cd91ffa6add8e7045c2fbcdb08f5a9966e93c70e1976f6e2b1a3670b1de6362fbe4eb7bb7c03d53a22e SHA512 f7bcc09b5c6c01e58b68cb7af67cef5f0477ec3cdcd924fd365b7411b2e5d89c307f29d099289055fb1b04b8237cc87dc071734433fa4d0bbb21eec698ed731a
 EBUILD qt3d-5.15.10.ebuild 948 BLAKE2B aefde923b2946495d82760f4a446bb53d21bde558cd2ae500afeb92b7435aa24ebcdb0fdadb4e54bf198e679bdc72bf5303417c77c9bbec99c68eea1d387b56b SHA512 3750f03d8d4937fdc1407325016835ba8885679e8cc3100b537102091fcd6c59cd0db120f7b4db8199c8ce00ad65107634539f41d11d9edc25be9728be2111be
-EBUILD qt3d-6.5.2-r1.ebuild 759 BLAKE2B 6846482699a24cfb1573b27e66c861ea007ff39a24c05ce5edc68f2cd9bb46d4ed4365aadc33e0f057d093300592939f0b2db68d4e71b94a38597da7844a2ce3 SHA512 a01f9df9563743b7216c034edd8087c10bc178a62b538d532cb53ffe94649b1daac7cfc51376c14f970cfb0c978cc69c03316cf06f4711ac2253fc65478c18b2
+EBUILD qt3d-6.5.2-r1.ebuild 758 BLAKE2B fc8a6912f25792e29391f207df24cf2306f16706e694b57ce2881bfa631ae563cb9a05da0770b47b019934b0ba89341dc9008047bcf7a4c766293a832ad0e81d SHA512 c0fea1c344f49c381a6cba8ef311f57f69f56e56003b248e29bcf5fb7b41de6cb576c79f4f3e546b301a375557b0814757f56f8e79bdb9de1b74126dd373d17e
 EBUILD qt3d-6.5.9999.ebuild 759 BLAKE2B 6846482699a24cfb1573b27e66c861ea007ff39a24c05ce5edc68f2cd9bb46d4ed4365aadc33e0f057d093300592939f0b2db68d4e71b94a38597da7844a2ce3 SHA512 a01f9df9563743b7216c034edd8087c10bc178a62b538d532cb53ffe94649b1daac7cfc51376c14f970cfb0c978cc69c03316cf06f4711ac2253fc65478c18b2
 EBUILD qt3d-6.6.9999.ebuild 759 BLAKE2B 6846482699a24cfb1573b27e66c861ea007ff39a24c05ce5edc68f2cd9bb46d4ed4365aadc33e0f057d093300592939f0b2db68d4e71b94a38597da7844a2ce3 SHA512 a01f9df9563743b7216c034edd8087c10bc178a62b538d532cb53ffe94649b1daac7cfc51376c14f970cfb0c978cc69c03316cf06f4711ac2253fc65478c18b2
 EBUILD qt3d-6.9999.ebuild 759 BLAKE2B 6846482699a24cfb1573b27e66c861ea007ff39a24c05ce5edc68f2cd9bb46d4ed4365aadc33e0f057d093300592939f0b2db68d4e71b94a38597da7844a2ce3 SHA512 a01f9df9563743b7216c034edd8087c10bc178a62b538d532cb53ffe94649b1daac7cfc51376c14f970cfb0c978cc69c03316cf06f4711ac2253fc65478c18b2
diff --git a/dev-qt/qt3d/qt3d-6.5.2-r1.ebuild b/dev-qt/qt3d/qt3d-6.5.2-r1.ebuild
index fac726abc29b..8674faa12455 100644
--- a/dev-qt/qt3d/qt3d-6.5.2-r1.ebuild
+++ b/dev-qt/qt3d/qt3d-6.5.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="3D rendering module for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 elif [[ ${QT6_BUILD_TYPE} == live ]]; then
 	EGIT_SUBMODULES=() # skip qtquick3d-assimp
 fi
diff --git a/dev-qt/qt5compat/Manifest b/dev-qt/qt5compat/Manifest
index 7f3594b3b46d..7eecd524584e 100644
--- a/dev-qt/qt5compat/Manifest
+++ b/dev-qt/qt5compat/Manifest
@@ -1,5 +1,5 @@
 DIST qt5compat-everywhere-src-6.5.2.tar.xz 14638008 BLAKE2B ab16da4c4cdbbfde615e083ebce57352bbee6e37ddd6a9a764a9f93824edb0a230324c989808c859b8142f16cec2f57cfffe33fe20fd1d7b72ec8a1967c87e99 SHA512 c646231f4bece460bfa6b654cba63a91c938c98b4fca8198e63a3fc15a2c7424ef43a765f612d6555b341a8b46f89293d4567257e489569e4669d9beaee6ed66
-EBUILD qt5compat-6.5.2-r1.ebuild 652 BLAKE2B 26cc49e8f9d8a3eb8969c2d6718a96d401758bf51e992a3dcc1ff5be75093943451bb3341410710b419d0f7845bcccd67ced953b42898bcb457092d1e1cc84b4 SHA512 1855245e6b098ec3b38297a8d0ccc415bb5b7e531d20526e7d3e72146333e4615992ab4fda80d36856dac0f85a16dc700e5e95a775b092779a9d436e8d1f3050
+EBUILD qt5compat-6.5.2-r1.ebuild 651 BLAKE2B a0471558e3e523460d70304ff87368ccc0f00d3b49ca30a953a4010c503da95e08574856b4c949b78adf7e1f979fcc161e85549953c9596567e42dd186bfbde2 SHA512 520d249ea504d0f36d582dedad0dbad9e48c1c70aa3cce285803e7d2c9a760ea35c39e7d6e284ce360bb5e37de10a66a79fd5183015a6097844b7fe37400bc32
 EBUILD qt5compat-6.5.9999.ebuild 652 BLAKE2B 26cc49e8f9d8a3eb8969c2d6718a96d401758bf51e992a3dcc1ff5be75093943451bb3341410710b419d0f7845bcccd67ced953b42898bcb457092d1e1cc84b4 SHA512 1855245e6b098ec3b38297a8d0ccc415bb5b7e531d20526e7d3e72146333e4615992ab4fda80d36856dac0f85a16dc700e5e95a775b092779a9d436e8d1f3050
 EBUILD qt5compat-6.6.9999.ebuild 652 BLAKE2B 26cc49e8f9d8a3eb8969c2d6718a96d401758bf51e992a3dcc1ff5be75093943451bb3341410710b419d0f7845bcccd67ced953b42898bcb457092d1e1cc84b4 SHA512 1855245e6b098ec3b38297a8d0ccc415bb5b7e531d20526e7d3e72146333e4615992ab4fda80d36856dac0f85a16dc700e5e95a775b092779a9d436e8d1f3050
 EBUILD qt5compat-6.9999.ebuild 652 BLAKE2B 26cc49e8f9d8a3eb8969c2d6718a96d401758bf51e992a3dcc1ff5be75093943451bb3341410710b419d0f7845bcccd67ced953b42898bcb457092d1e1cc84b4 SHA512 1855245e6b098ec3b38297a8d0ccc415bb5b7e531d20526e7d3e72146333e4615992ab4fda80d36856dac0f85a16dc700e5e95a775b092779a9d436e8d1f3050
diff --git a/dev-qt/qt5compat/qt5compat-6.5.2-r1.ebuild b/dev-qt/qt5compat/qt5compat-6.5.2-r1.ebuild
index f7beee148ed0..aa715cf61b5f 100644
--- a/dev-qt/qt5compat/qt5compat-6.5.2-r1.ebuild
+++ b/dev-qt/qt5compat/qt5compat-6.5.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt module containing the unsupported Qt 5 APIs"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 IUSE="icu qml"
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 8773ec82ecd3..47e5634cc3d3 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -2,7 +2,7 @@ AUX qtbase-6.5.2-CVE-2023-38197.patch 14691 BLAKE2B 68de2edb047871de9608a0a57077
 AUX qtbase-6.5.2-no-symlink-check.patch 152 BLAKE2B 676ff8577f678fe3ed1e34e3fc8f7a9b16145259b2e23c432d4cb08465cb5d3a6685e557c9da862f3abb0d51459c7dc055155d804c3daef768bf0e9bdcc3b162 SHA512 6a82cb63812c7fa6d04e9ba9d017ce23ff1d620ec6ebcd575719678138d74e1298e3962d48e211ee72c9a533f03cb7a0fa47b428592a1402ec7ad1d1c487a4b4
 AUX qtbase-6.5.2-tests-gcc13.patch 1491 BLAKE2B 72417e910bb35df59c10d18e093bf4d17952d0a39ead552a342020004bbf7c9e0f903140c014509ab806915ff380ad3732e3cd119b9b1ce3bec550b9c247a077 SHA512 10e05e135e4997cc71c0d2f1a0b40131babe88801d87bb11f69aa1ae93cdcdef9e1e510dbfe337b5bd101e4831a401a63a5e49d84f9f865d6db986e3e60277ba
 DIST qtbase-everywhere-src-6.5.2.tar.xz 48410716 BLAKE2B 578c69ede6f45a8b21cba0a24674d5d8801722503d13ab9578b06b2446ce15e6a84bcdbd0c5d2c9aa868ec70862f0845406c959ed79b695f82bb398ecf299c63 SHA512 8d97029aae5b73a3e03624c9a8495dbf2fe54a4f5e992071c06f3d93935e64c80f2121b33eeb60a92d96ceb288cb25d74906a5bf47b45bb018d859d4a2d13f20
-EBUILD qtbase-6.5.2-r2.ebuild 9045 BLAKE2B 2b60af58b51b185cff174c4fb16e244fa33fdb730de8c538059a07a642baee1b8960942545a36429b3bd197a5c5e87d9b3c73ad37339da680d633804b9ba3885 SHA512 f474b8034abd3f05b153ed33d6323c74b440fe7359f6496fd71d58104a5a246922155b5fa34291b5965554d78376020459462b7c4d032241636af3a0ec30ed3b
+EBUILD qtbase-6.5.2-r2.ebuild 9044 BLAKE2B 8ebf9cd55b84d6d59c6deb989a742ac39f557c17cb676b0b5ddea6e0b7b6cef516ec5eb4f6d2399aa0bda2a2c4a2ec0a0dc2a465d00225d742fdf710c7aa14c8 SHA512 18162638b26cf002569d54c6db62871c14fe8788f42e508037afe3c7541a972b5cf48d698561c3ca010cdcd8fbf7b1456381e042e50029366cefaec1c8bf878b
 EBUILD qtbase-6.5.9999.ebuild 8949 BLAKE2B 432fbee8f09610215ba7bed1a873e783a6bc3d779477f85879133dbb6ccd17fd8a18516fdf58ff535e8983cdec6e06059b12f2fc54f03534b69b66f31f5280f9 SHA512 d01e74f5ed99b2f4a3b22ca273a728ef36211f39db7fe848055af03208041be2c2d3a2c8d34cecd7305c2d661f902f5a3e5af437901e711a50882b24bdd13e52
 EBUILD qtbase-6.6.9999.ebuild 8926 BLAKE2B 4bcae64b2b1786ed9e4052c8fbe7d794fe6105a6cc51940c5407b84e3861590494a9105442df3b1a9b45b2af8393d40adc4089b2a540fc25c2f684122712b0f9 SHA512 bd1e95cb56327bd0923a2234908c69af3cc4a78a30b79a8ca367335c3c73919ff5ede83b5deff19a43dfcb5d5c0703a9dab21986be41b1b8c05f5b76cbd9f3c0
 EBUILD qtbase-6.9999.ebuild 9040 BLAKE2B 84fffb276ffbb63a9da01502f67fc5994ee3c7ca95b26d3042d3157c90f11ba757b429fca2f4b9421d66d1eb87b646176b36ed4dcf848677074f9b78dacd2825 SHA512 082d25df8e5833316e3baa4faa85190a0e3b7d7d8008dd0326e9f444760641f25a453e23284f99345dc255de8a5faf9a4486506c74340bf36fe0f080d5489f96
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index f0eca7d2ab6c..fe37d3d61bf9 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 declare -A QT6_IUSE=(
diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index a4e1b0f804db..ff5afe300f05 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,7 +1,7 @@
 DIST qtcharts-everywhere-opensource-src-5.15.10.tar.xz 4254496 BLAKE2B 9a163371a6360fb39f57d08e282f4bca79c4839ebbb105ebb37f32797d72faac73cdf832eb64cb4d76196447f5feb3089287e98f6979e0bd6b2fba5f7e0d28a7 SHA512 15c76bc6b987b2d89473972df9cd4826913bb0dd2dffdb06fc6dfdbdd1a5676508584d5f0982b06ab513e46cee12871f3eb0ed00f94fccf23ef807079be96961
 DIST qtcharts-everywhere-src-6.5.2.tar.xz 4667940 BLAKE2B 36a24659e09e8f6d19c14683e86781ceb04efa80c9dc44e666202507b5d1a0586c1265ed6d5deecbdd18b4d7c0f0d539d9e829f90419ddb05a323ce389bb455c SHA512 913362f21668a81b82eff5125991b0b53ff9eeaf93dc6bf17539d4cffdc60e639a4e3490edec793d02ff942174ea3036854cdc8801382f4b8af341f8cbc3a1f1
 EBUILD qtcharts-5.15.10.ebuild 572 BLAKE2B 8b157c6f720fd9befa6b1cd25fbe018b72936c88b3b47b3744e9080bb48c78f46538df11f52498237b01967fc7c26ffaf172f24a7a1ca1e8107269aa61951bd3 SHA512 42a14766f3898d45ce51b03680f7751dad7c0cf250e7b7de7af3ab012f5168bf2aa1969d701243af5038049042e4d57d7eb66b79899048c917b4358ab9ceb4d2
-EBUILD qtcharts-6.5.2-r1.ebuild 529 BLAKE2B 3262b212cf9caf4059720a7f7c884759dceb4a4936869d7be9b38357f6b2be7e5d22775159bab9f8a48042875585b52e71d2f68f7076a4a3c4f5b81ae5711894 SHA512 50a76440d405d2a2a4916558b53c4ba19c0a7e509cb4c36f12941a420382e17d2dd10eb05bd0e662eca869490880fabde6369ad64546a5b5896a8b0d8378935d
+EBUILD qtcharts-6.5.2-r1.ebuild 528 BLAKE2B 241a569f2977e6b91eb365cc7e517f8c13056a6eca89150a5054fbd6187f152f14596cb4a0420a8e5e1f1e5797a2239b0568212c1e6fa10847a89cd4a2b7f1a9 SHA512 ca65539a48eefb57737ed7097243c587e51faef9d20aba7776e1a282d5de8b4e4f5caae48eb1c4d5eb0947bfbc3cc5c62e674f7bd6f7090bb57da00fa1430853
 EBUILD qtcharts-6.5.9999.ebuild 529 BLAKE2B 3262b212cf9caf4059720a7f7c884759dceb4a4936869d7be9b38357f6b2be7e5d22775159bab9f8a48042875585b52e71d2f68f7076a4a3c4f5b81ae5711894 SHA512 50a76440d405d2a2a4916558b53c4ba19c0a7e509cb4c36f12941a420382e17d2dd10eb05bd0e662eca869490880fabde6369ad64546a5b5896a8b0d8378935d
 EBUILD qtcharts-6.6.9999.ebuild 529 BLAKE2B 3262b212cf9caf4059720a7f7c884759dceb4a4936869d7be9b38357f6b2be7e5d22775159bab9f8a48042875585b52e71d2f68f7076a4a3c4f5b81ae5711894 SHA512 50a76440d405d2a2a4916558b53c4ba19c0a7e509cb4c36f12941a420382e17d2dd10eb05bd0e662eca869490880fabde6369ad64546a5b5896a8b0d8378935d
 EBUILD qtcharts-6.9999.ebuild 529 BLAKE2B 3262b212cf9caf4059720a7f7c884759dceb4a4936869d7be9b38357f6b2be7e5d22775159bab9f8a48042875585b52e71d2f68f7076a4a3c4f5b81ae5711894 SHA512 50a76440d405d2a2a4916558b53c4ba19c0a7e509cb4c36f12941a420382e17d2dd10eb05bd0e662eca869490880fabde6369ad64546a5b5896a8b0d8378935d
diff --git a/dev-qt/qtcharts/qtcharts-6.5.2-r1.ebuild b/dev-qt/qtcharts/qtcharts-6.5.2-r1.ebuild
index cbd5653b3a93..81b6b9beb3c8 100644
--- a/dev-qt/qtcharts/qtcharts-6.5.2-r1.ebuild
+++ b/dev-qt/qtcharts/qtcharts-6.5.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Chart component library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 IUSE="gles2-only qml"
diff --git a/dev-qt/qtconnectivity/Manifest b/dev-qt/qtconnectivity/Manifest
index cc3f7af6f430..690fe309798d 100644
--- a/dev-qt/qtconnectivity/Manifest
+++ b/dev-qt/qtconnectivity/Manifest
@@ -1,5 +1,5 @@
 DIST qtconnectivity-everywhere-src-6.5.2.tar.xz 985972 BLAKE2B e7f3d8ad3580336d7eaff50e8ac2af3b291462544ebc5ca3d049d045a8388668d5e54a075375aaa9c99b3232ec07063dc4b7288bdc9fee83843fe57909e5e35b SHA512 76d9569ecfbbb4355587779a9aa0abf20f7d08484a2634e6c3b49a71b057451c54fd5fd344b4c376206384e5f1e9264a6bbbcd85ee44f15637c116f411d4aa30
-EBUILD qtconnectivity-6.5.2.ebuild 1647 BLAKE2B d890151be30c6195e874e420a27ae3bc096d8818f09bf838881690a931001c83731a3c2545c955580fd0bcfda56b4c4e8b61784d99df724a669d6036d87d1fc5 SHA512 55b2000fff9cb30feb13e230fc1e0678c61e66fe020870f64f0c86fee9c45b34591240db264c108991bc5793d2216cd629769b6c040b481b115f0871d923bf98
+EBUILD qtconnectivity-6.5.2.ebuild 1646 BLAKE2B 4884f8d88098f69792dd281fa3dd664b8845eae85bfbb67112fbc7034c5e8758c109422cbbf45acca552197893fb8dbda7e265150e57c03cd311bec377b9efb3 SHA512 02eaaa1eddce7eca4fbde9634423b18f85a928f330a17e117732355a0bf207f8b468ad22f6ca649ef399f05b5f3b477e34b247e0d93a27b86e953c0c3fc8e076
 EBUILD qtconnectivity-6.5.9999.ebuild 1647 BLAKE2B d890151be30c6195e874e420a27ae3bc096d8818f09bf838881690a931001c83731a3c2545c955580fd0bcfda56b4c4e8b61784d99df724a669d6036d87d1fc5 SHA512 55b2000fff9cb30feb13e230fc1e0678c61e66fe020870f64f0c86fee9c45b34591240db264c108991bc5793d2216cd629769b6c040b481b115f0871d923bf98
 EBUILD qtconnectivity-6.6.9999.ebuild 1647 BLAKE2B d890151be30c6195e874e420a27ae3bc096d8818f09bf838881690a931001c83731a3c2545c955580fd0bcfda56b4c4e8b61784d99df724a669d6036d87d1fc5 SHA512 55b2000fff9cb30feb13e230fc1e0678c61e66fe020870f64f0c86fee9c45b34591240db264c108991bc5793d2216cd629769b6c040b481b115f0871d923bf98
 EBUILD qtconnectivity-6.9999.ebuild 1647 BLAKE2B d890151be30c6195e874e420a27ae3bc096d8818f09bf838881690a931001c83731a3c2545c955580fd0bcfda56b4c4e8b61784d99df724a669d6036d87d1fc5 SHA512 55b2000fff9cb30feb13e230fc1e0678c61e66fe020870f64f0c86fee9c45b34591240db264c108991bc5793d2216cd629769b6c040b481b115f0871d923bf98
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.5.2.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.5.2.ebuild
index 47506d7b4b09..2d6e976614b6 100644
--- a/dev-qt/qtconnectivity/qtconnectivity-6.5.2.ebuild
+++ b/dev-qt/qtconnectivity/qtconnectivity-6.5.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 IUSE="+bluetooth nfc smartcard"
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index b1a93fabe407..1ef9decf90f2 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -3,7 +3,7 @@ DIST qtdeclarative-5.15.10-gentoo-kde-3.tar.xz 26396 BLAKE2B 07ad0b115316e8eeaa1
 DIST qtdeclarative-everywhere-opensource-src-5.15.10.tar.xz 21596352 BLAKE2B 4259b55b1406694cf10d5ff1c4bc2501b47a7a7ea4a09eeb77c08fa1417d5f8d028df1a0753af0d1ef52d7aa1331343c56b6c72adf462a6d1a1d5097c288ad8f SHA512 378fc41a31edb52d85fd5e37fe6c086e35b5d5d759ceacc49cf7981a8a38d25ae5f2ca27d99547bd1db381f32128e7947800e2a01a857177707cc2a9980373a8
 DIST qtdeclarative-everywhere-src-6.5.2.tar.xz 35552840 BLAKE2B 048da9ab9433034ede21b51458cd3c7bd09d5364c8e2e65a02905bdc107d456ba0cbf2f9ea459324462c455fb33ef5f9b7bbbbe79e669100c82274476c10b34c SHA512 e6fd9dddbab72ee2e323d8ae0f4ac438b935477ad50b3e069a307993e94b289648d29ee265ac535e1396e4c1ba4bdf7e16b0cdf89a17df8d0a43bbe94f7316ef
 EBUILD qtdeclarative-5.15.10-r2.ebuild 1537 BLAKE2B ea417da488314eed547e9637796d153a358c8cec1645242338f6fa67605b45a886b9f91de62db4483f1a69b704ce852879948c097c66cdeb4f6e777a81c264f6 SHA512 a34ae5b04825f751715975dc927824b6ba4726564647e50d84f27bc1dc1d8c8a6dde27b02e568b01ee21f6a8476ac27d9db9b72fd3b3a4175be7043e89d7435c
-EBUILD qtdeclarative-6.5.2-r1.ebuild 718 BLAKE2B 528000a8f7e267c34f1077e3910e74f61f83bb13d5a53a8cb4d21b499307722a98b839e27c908d3acf6b329e26f900fd1d481524afbcd66cebef696a91a99efd SHA512 96c4befb851b638b94f2b7727d38645dc2b17e192ea273ed4129f73a4f040e00f976001bb4f57a86e3fc1b5cd6c02f13734051e61e99e04d1f717ab3b32c0306
+EBUILD qtdeclarative-6.5.2-r1.ebuild 717 BLAKE2B dcb093715efa69c52016178259c5ec0d908b47f5005a7a79d13531c3eafd688f7645980b00069a1cee2371230bf0482c26f097a4ae75305fac3002528753c113 SHA512 397ada54ee33c2c3a4245d394ae919fc95c22afb814320a65604aebfb936136e03716268a9c7da19a3fe7d0e8c66e81a7f2ba72ba3802b244dd9188b68d77f8d
 EBUILD qtdeclarative-6.5.9999.ebuild 701 BLAKE2B 4430d15f8361f70d6207f04903285e05b634ea2fa1e25a0431514a4e941cf4c4726417462d6716dc59a86d34c02584535ce528ac7fd6510a66a126f18cf39cd3 SHA512 96f79b461851f32831a1e9f4dfb1fc02f08041b8b64cb2259015fa0e2be48622e506a0f918737ecee0490bd6ab7e2f159ad51d518cd454ce149c8c26aeb57124
 EBUILD qtdeclarative-6.6.9999.ebuild 701 BLAKE2B 4430d15f8361f70d6207f04903285e05b634ea2fa1e25a0431514a4e941cf4c4726417462d6716dc59a86d34c02584535ce528ac7fd6510a66a126f18cf39cd3 SHA512 96f79b461851f32831a1e9f4dfb1fc02f08041b8b64cb2259015fa0e2be48622e506a0f918737ecee0490bd6ab7e2f159ad51d518cd454ce149c8c26aeb57124
 EBUILD qtdeclarative-6.9999.ebuild 701 BLAKE2B 4430d15f8361f70d6207f04903285e05b634ea2fa1e25a0431514a4e941cf4c4726417462d6716dc59a86d34c02584535ce528ac7fd6510a66a126f18cf39cd3 SHA512 96f79b461851f32831a1e9f4dfb1fc02f08041b8b64cb2259015fa0e2be48622e506a0f918737ecee0490bd6ab7e2f159ad51d518cd454ce149c8c26aeb57124
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.5.2-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.5.2-r1.ebuild
index eb266e39c599..ad50dee9925f 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.5.2-r1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.5.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt Declarative (Quick 2)"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 IUSE="opengl +sql vulkan +widgets"
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 6030e46c0ae2..a06ebeb8a5c3 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -2,7 +2,7 @@ DIST qtimageformats-5.15.10-gentoo-kde-1.tar.xz 6944 BLAKE2B a9e43d63cc2db043723
 DIST qtimageformats-everywhere-opensource-src-5.15.10.tar.xz 1845088 BLAKE2B ff704a5ea07173f2e6e9fe72f4e9ab11093a6cd80bedc56efeddc68ff4a53ac46bcd6d6871697f5dcaab537a6b3238aa5a61120090670a4ef529bc5173a44b81 SHA512 7373884e5f01da0aae6f7d4575ca953de3be6cd41d3d19aa29bb2a2e5998486407525f23122e8b13c26143e64aa95d4756c5381643e93f930472c9890e6561de
 DIST qtimageformats-everywhere-src-6.5.2.tar.xz 1966744 BLAKE2B 953b0ff7a9f79860c60651645441ebd853b355140a30b34fc0c8dec2d50e532733f3cce11de8315e756abea9f45d8b595aaa6b3a5e1a8cf751ee202f45fe5d67 SHA512 c7262b773642f216b5f6ca3496cce294f1acf7bbf55aa61db1b60ad24ec0c332b83aa9b43e8baa5ce33a54826364385b4de00426e5556fe821c3b5e770d53819
 EBUILD qtimageformats-5.15.10.ebuild 705 BLAKE2B 4222a57660cc0730f376db02db94e3d82d36cf06566add5caf1ef5569ac92a023273e1374ee901e0010d1b8dde5ef1670400ac6d18cdcc2f9aaf71d60e277a1d SHA512 c735cb6de2811e5c2c8a7f8c97e6430263779025d7d5809ba665dc25fa66297c9cbca07aea2483e170d266876aa023a95ce045cb02b83f1c04ba47f5d7434e63
-EBUILD qtimageformats-6.5.2.ebuild 635 BLAKE2B df95273018d1db06a2b72408fe4d411d0885fad219b8f995a4d7ad2e5e5289eb5a3962d7bed9ce770707552c015cdfa1d1d433527035cb6557660673a9e486fd SHA512 5e4b301d055ccf0966359f5c4d69eacd964ef22463ca4e9b1b1bc7d75295ae136a851f0b6897f288448f94900b1adb776e5c4a8879d103ee0982866559239a5a
+EBUILD qtimageformats-6.5.2.ebuild 634 BLAKE2B de7dcb555d1982648cababb31159ec2c5efbba24dfb0b325c30f3b41ee376c62bb02719a5413418ce17efe0d0749068077d822fa53d332e6f54c33397a8d6652 SHA512 ee0fb4ce0254f30a60b657685378253ce96681d243def953feb8d44f75895a1be351016efce6033f62d857a42e669f144eea0e2a4216c18060e7272e918c82a1
 EBUILD qtimageformats-6.5.9999.ebuild 635 BLAKE2B df95273018d1db06a2b72408fe4d411d0885fad219b8f995a4d7ad2e5e5289eb5a3962d7bed9ce770707552c015cdfa1d1d433527035cb6557660673a9e486fd SHA512 5e4b301d055ccf0966359f5c4d69eacd964ef22463ca4e9b1b1bc7d75295ae136a851f0b6897f288448f94900b1adb776e5c4a8879d103ee0982866559239a5a
 EBUILD qtimageformats-6.6.9999.ebuild 635 BLAKE2B df95273018d1db06a2b72408fe4d411d0885fad219b8f995a4d7ad2e5e5289eb5a3962d7bed9ce770707552c015cdfa1d1d433527035cb6557660673a9e486fd SHA512 5e4b301d055ccf0966359f5c4d69eacd964ef22463ca4e9b1b1bc7d75295ae136a851f0b6897f288448f94900b1adb776e5c4a8879d103ee0982866559239a5a
 EBUILD qtimageformats-6.9999.ebuild 635 BLAKE2B df95273018d1db06a2b72408fe4d411d0885fad219b8f995a4d7ad2e5e5289eb5a3962d7bed9ce770707552c015cdfa1d1d433527035cb6557660673a9e486fd SHA512 5e4b301d055ccf0966359f5c4d69eacd964ef22463ca4e9b1b1bc7d75295ae136a851f0b6897f288448f94900b1adb776e5c4a8879d103ee0982866559239a5a
diff --git a/dev-qt/qtimageformats/qtimageformats-6.5.2.ebuild b/dev-qt/qtimageformats/qtimageformats-6.5.2.ebuild
index 044867e78e37..309485931210 100644
--- a/dev-qt/qtimageformats/qtimageformats-6.5.2.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-6.5.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 IUSE="mng"
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index b99b10863357..a79dd82f2034 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -4,7 +4,7 @@ DIST qtlocation-everywhere-opensource-src-5.15.10.tar.xz 6552240 BLAKE2B 1e44bda
 DIST qtlocation-everywhere-src-6.5.2.tar.xz 3032488 BLAKE2B c8cd34980b0f78326fb70bf76a04094cf3e27afbd6aed6d982ce30abfa9dc4250d164dbe11c1027bedcdeee3b7c907c3716e88f16eeae173b846ccdf2c38d458 SHA512 b1e5c1813deb8a4eb9f8548afa935f1a2145ed3168f0276493ea501057fd4f70b8980ae387248a59e50f0e450ae245a04cd8636fb61d37af9c3634ff1cdd24f3
 DIST qtlocation-mapboxgl-5.15.10-5a07e196.tar.gz 3726230 BLAKE2B 9dbe08088a55bc1da4952a628af987b3b056615e883983d3a5e2eb392ce4aff16bfd753f84bbad07f9a415fbd275ec9933a64b6bcfd27ea6d8adced6d2adcac7 SHA512 ec3de81f643388690eda45d073a9c6f908d8efeff30cd062d9afcd1f94c6b45b301327747928d45b4047ce04b7df5b0afaf9e8942e22660711a5ac49787829eb
 EBUILD qtlocation-5.15.10.ebuild 1544 BLAKE2B 2943df2242ee45db0180334464d327614bcfb6ad93cd8117e4f6c81c3ef2384199dc547743f5784a0b88e976ea5296a833fbad986eb30eb947d6004283b69dd3 SHA512 453d7c2b6ab694e98c1ec9d08af70994910e8537f75d02aca8117b9887b3e7d98ac27f391b76327668a57d5a0186ebffb4b13f727d87feaaac4f0a0e1d5a2acd
-EBUILD qtlocation-6.5.2-r1.ebuild 1468 BLAKE2B ed0d13151b41de0a0f86fca85dabf14b4893a939d4e6cde9ce4de4c844aef9e54e4ff2119566d48d2ce2ca1a307b6171592a658f7446ecd23d5de12aefe721c2 SHA512 e5a83f5e17b9db8ebc5dd92ab2024be8b96f0d2edc6994c58c9d260fc0c59dafb9852db3c402e6b47022587d2807c39292d84ec2b58bdda4fca8577f948ac74b
+EBUILD qtlocation-6.5.2-r1.ebuild 1467 BLAKE2B 2b6d68428c3bc6b5a41edac4ad8a7fbee6008c4554e5158a3810481d41054ee879b9be2299e8a7d266dc8c693c5a6099cd0a9d9741cd7398e8b9b13815ff2e96 SHA512 a106ed0557a55741d9ed52a090510fd14bdd9822ac8b9a5befa07ff4c181ed29bd85eed03465229649b138d3656a0962e753cf2ff33b547ae75415706e42adb5
 EBUILD qtlocation-6.5.9999.ebuild 1411 BLAKE2B 843b87346b18a733fe8835e57990aef80aa48b762f7a1c0bad5ce65aad08932bdd8d92f8833953fcb2526342fea2403ed46a0fdaa52951083b5bf38cdf56cf79 SHA512 8a388a2303a712230d293ece7b6d23d7b0b31aa3776b28011327bc3400d80edfe88f66af4acb3c1079adc1e040778c5e5c8bb4c797e03f2461e9c4cbf9467947
 EBUILD qtlocation-6.6.9999.ebuild 1411 BLAKE2B 843b87346b18a733fe8835e57990aef80aa48b762f7a1c0bad5ce65aad08932bdd8d92f8833953fcb2526342fea2403ed46a0fdaa52951083b5bf38cdf56cf79 SHA512 8a388a2303a712230d293ece7b6d23d7b0b31aa3776b28011327bc3400d80edfe88f66af4acb3c1079adc1e040778c5e5c8bb4c797e03f2461e9c4cbf9467947
 EBUILD qtlocation-6.9999.ebuild 1411 BLAKE2B 843b87346b18a733fe8835e57990aef80aa48b762f7a1c0bad5ce65aad08932bdd8d92f8833953fcb2526342fea2403ed46a0fdaa52951083b5bf38cdf56cf79 SHA512 8a388a2303a712230d293ece7b6d23d7b0b31aa3776b28011327bc3400d80edfe88f66af4acb3c1079adc1e040778c5e5c8bb4c797e03f2461e9c4cbf9467947
diff --git a/dev-qt/qtlocation/qtlocation-6.5.2-r1.ebuild b/dev-qt/qtlocation/qtlocation-6.5.2-r1.ebuild
index 227c0e646e5b..5bde326e020e 100644
--- a/dev-qt/qtlocation/qtlocation-6.5.2-r1.ebuild
+++ b/dev-qt/qtlocation/qtlocation-6.5.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 519dfd9240b9..dcee58d249ff 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -2,7 +2,7 @@ DIST qtmultimedia-5.15.10-gentoo-kde-1.tar.xz 2420 BLAKE2B 9062d863dc7e47a5690c7
 DIST qtmultimedia-everywhere-opensource-src-5.15.10.tar.xz 3832156 BLAKE2B 88c01c685294085fdde9f00e2e2ea0952311cef910ee037bd6ee204cf7e00bc25a6aeecbdd70e4822bfe4de40cb6b991a8f4a72bfd74872110d43154aefce0b3 SHA512 a322dba0daced00cf0a7fcd21b7f55c281dec107b7976792406ecc7658c94ea1a40c81c7cbdc0987f1be32cafd2458993c92db87fcbfdc7ba1243d2e0047896e
 DIST qtmultimedia-everywhere-src-6.5.2.tar.xz 6415576 BLAKE2B c0032c405315e6884de6bb851de3aed0b60827a932c15b1022dca70ebfaa5dffb258b2b22f9ab40f57586490db6ec50ea862152fca8429e600f9c6bffe2f42a2 SHA512 e12a2406e78eda8f3f4674b8fe01b06bc2c7b8fcbe5342e25e28340e13c0ab0db44a78c91a8a1f268664e5bb11c3bc7116248700f0c67faa618e058af0dfb1e0
 EBUILD qtmultimedia-5.15.10.ebuild 1511 BLAKE2B f773c6effa7a370b2e48a3af434486ab29251e2f50d71a56862ffa35e2eeaf13f63314980464bd59489ae862122435ffa453e8c29b0010b51c970dfd97ad3d8a SHA512 f9a8ba144b8ec74364cb9b5dc0dad015c01c9e24f2217d01a331c7456bf8cc4128d91f4c3e5c81ff07003760126499c2edfafc127ca2ec1f0ce590934f240a21
-EBUILD qtmultimedia-6.5.2-r1.ebuild 1949 BLAKE2B b9dd4a9d8bf7916e2a31e658ca5d1231342df6d2ac70925a0511f528eef3aad030000ae3eb09c3e440c06aa9cc39ed71ad18655a6ea078431171049bb6fc3cc7 SHA512 dd805568e002ebb3d46222e255a4fa22b09658e6121e09b2b95f48db62ad0b3eedfe9eb2ec9a7af4058595a51909750d46acbcf54e05011e491278bc5545cecb
+EBUILD qtmultimedia-6.5.2-r1.ebuild 1948 BLAKE2B 887245aee45ef57f78913ad44827dfa4a10537f8d7abed05baa36d6ee71679740701bb7d9e807d52672725d62b190b8b0080762160f3ce04d23200dc582fa389 SHA512 8a435cbfc16814967b0db03ff6a43d8a6877967a5060de37806ee317a5370ff3c94500be2261a4c2f70ca5f0b5c083acf55c3ab96995613f21342a9437ae5411
 EBUILD qtmultimedia-6.5.9999.ebuild 1922 BLAKE2B 5251ca3cac32001e6e1b3f9763c99bcdebf905fa464f37afbd8d761d4baa8144a0eab1301bfe48e57c3c06b07b61fed83804f5ec97e2dde6fdfa5d9f7db7dc13 SHA512 f23d513fe31efd997b0bb7cf1f251bbbc2cb733c43e5d5f788f2fdd91e65097564cac694a25adb73947df17c56009405cb842347e8926221516f181ac466e071
 EBUILD qtmultimedia-6.6.9999.ebuild 1922 BLAKE2B 5251ca3cac32001e6e1b3f9763c99bcdebf905fa464f37afbd8d761d4baa8144a0eab1301bfe48e57c3c06b07b61fed83804f5ec97e2dde6fdfa5d9f7db7dc13 SHA512 f23d513fe31efd997b0bb7cf1f251bbbc2cb733c43e5d5f788f2fdd91e65097564cac694a25adb73947df17c56009405cb842347e8926221516f181ac466e071
 EBUILD qtmultimedia-6.9999.ebuild 1922 BLAKE2B 5251ca3cac32001e6e1b3f9763c99bcdebf905fa464f37afbd8d761d4baa8144a0eab1301bfe48e57c3c06b07b61fed83804f5ec97e2dde6fdfa5d9f7db7dc13 SHA512 f23d513fe31efd997b0bb7cf1f251bbbc2cb733c43e5d5f788f2fdd91e65097564cac694a25adb73947df17c56009405cb842347e8926221516f181ac466e071
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.5.2-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.5.2-r1.ebuild
index 8e203f8eaec1..79804f6301a8 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.5.2-r1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.5.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 IUSE="+X alsa +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan"
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index 97af0920ac93..a29f41566a76 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,7 +1,7 @@
 DIST qtnetworkauth-everywhere-opensource-src-5.15.10.tar.xz 144780 BLAKE2B 81a26919bef970538dbaa4f8bb219b694e190cae2cb2e156fdd0af3997fd5b86facb0d4841a92161703c78deb675f76a8950889c9a2c08156f2ce34b4ec88bef SHA512 bfdda139223d183767e50fb95309dee7cd85c42fa09a00246a38987bf1570d84a137fb3fc71119416cc45126f21f6964f430b031e5acd4447caf30d0aac3bc2a
 DIST qtnetworkauth-everywhere-src-6.5.2.tar.xz 150416 BLAKE2B 68ed2266051fb3caa0ddb59c1d1591e35b39aea1432da488f563ede86b9e2ecaa1d556b42c9b828910bb30eca5e413f5aa0a81f2196f02456aea303ebe55b084 SHA512 f9374c2729f584532e90114a3bf8939eb27e90e31a2c76c414e8e5fb23a1feac96b23ec31ebfc59122f7d8431ef2ab285a8e840ffba143752e586a0a527d3436
 EBUILD qtnetworkauth-5.15.10.ebuild 402 BLAKE2B f6aada3fab2a9a22353930bcc8c96fd46806ccc46792a9bf770a812245a9b246722101f40c0ac9a8b3fe115a94f38c4d32e988cd23f0f28133ea08e858b95414 SHA512 63a5ddf86500089e2f7fa44ebb585a11bf257222a9a9b96fa8985b5acb56301a8680f04ec0ee4cee0bd9dcd3761031da704f71bd18dfe7c88aeb9fcc308d222b
-EBUILD qtnetworkauth-6.5.2-r1.ebuild 328 BLAKE2B de758ef39149207fd3eee8a0d4a9c9987ecba375fec97d2ab73da285b8eb7051186d3886a74cbd7eb07cfa654e7a9ec4d45170136cf8d9e3aa0ace7a3e0bb3c1 SHA512 5bd7f25402133d0555646cb01b035515d7387827d7ff7140666a1f980f00309bca8ea4fe91fdf57924c0303702e06b9e3885a24aa77a16a4e9434b8807de6c73
+EBUILD qtnetworkauth-6.5.2-r1.ebuild 327 BLAKE2B 74b0dc43c757762f0ef8ee7020fa21ff9570e796716ee50ed8fa4054b2999f30de67242733da9e66a1e205968278891a8023ca8fa91caa39b6f59272a9e93715 SHA512 8fa9b61a184d6e30d1522809210c91f67464f5ebf649a1a4e65e5190aa3c79f437c720014975361941b02def6a89e283ba2973b8f81f27f5863c21239d58d29e
 EBUILD qtnetworkauth-6.5.9999.ebuild 328 BLAKE2B de758ef39149207fd3eee8a0d4a9c9987ecba375fec97d2ab73da285b8eb7051186d3886a74cbd7eb07cfa654e7a9ec4d45170136cf8d9e3aa0ace7a3e0bb3c1 SHA512 5bd7f25402133d0555646cb01b035515d7387827d7ff7140666a1f980f00309bca8ea4fe91fdf57924c0303702e06b9e3885a24aa77a16a4e9434b8807de6c73
 EBUILD qtnetworkauth-6.6.9999.ebuild 328 BLAKE2B de758ef39149207fd3eee8a0d4a9c9987ecba375fec97d2ab73da285b8eb7051186d3886a74cbd7eb07cfa654e7a9ec4d45170136cf8d9e3aa0ace7a3e0bb3c1 SHA512 5bd7f25402133d0555646cb01b035515d7387827d7ff7140666a1f980f00309bca8ea4fe91fdf57924c0303702e06b9e3885a24aa77a16a4e9434b8807de6c73
 EBUILD qtnetworkauth-6.9999.ebuild 328 BLAKE2B de758ef39149207fd3eee8a0d4a9c9987ecba375fec97d2ab73da285b8eb7051186d3886a74cbd7eb07cfa654e7a9ec4d45170136cf8d9e3aa0ace7a3e0bb3c1 SHA512 5bd7f25402133d0555646cb01b035515d7387827d7ff7140666a1f980f00309bca8ea4fe91fdf57924c0303702e06b9e3885a24aa77a16a4e9434b8807de6c73
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.5.2-r1.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.5.2-r1.ebuild
index c0c8c0b51bf7..2ff63a90b3a6 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-6.5.2-r1.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.5.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Network authorization library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 RDEPEND="~dev-qt/qtbase-${PV}:6[network]"
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index 7b7b1310faad..7aee42e7dff1 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,7 +1,7 @@
 DIST qtlocation-everywhere-opensource-src-5.15.10.tar.xz 6552240 BLAKE2B 1e44bdafcde01294424cef1963924b85fc4f3cc8ab19b1ae37d79d10cb0bbb1a482f592725fa28e0f039fc84cb2167df4d15e23e4060bd7c49df013c54322665 SHA512 e4fb56ddd2dc50024f02de84323c3299788eb6632672e1bc52ef1399ccf9d0af34b0104548cb108fb372870057426b0cdd52052ad91ba45fc7f8098a675f29a4
 DIST qtpositioning-everywhere-src-6.5.2.tar.xz 1456284 BLAKE2B 15ec5202f72ccec5b5cd5e887eacd34718e47e150fd290e8ef3e03e6566b647ca4e2995c87bc54fad598b0225a390eaa93fe7685419006ff39db93fd3803488d SHA512 8319e999de227d6ee999a4e7f84e3a12e2a8b070375fd7b86cef7a7962cce1d4d45f17a846df779561e1cedde80a80240bd2a03259c8a2ed5ebda6e209bdd991
 EBUILD qtpositioning-5.15.10.ebuild 877 BLAKE2B 901e07cc2a16f98840d7361b5db7611406a275116728fe65f28012e03b90f9b797291508623e8ab5a28a10c88d2f8e917145e149ed494355706e12f9b44260d7 SHA512 79aee05d67010aecd2a0d4c802a39bea7f4d63a1a2009ade3df0343e8081c568a374728c818539a23f37e17acd98f47de1cdf825263fb25fcb5bf0988dc13db6
-EBUILD qtpositioning-6.5.2-r2.ebuild 1444 BLAKE2B ffe8580c4387d0f830c53171bdd6699cf539302d54dd6e3138dba12f00452ab8a89e87af9ec179bfbc7387e36a57f016ca1900d190bca3dbac40572cfacf2df0 SHA512 1e144814c599b533513050c3add315a8ce5ed96accbe3f5e495a9e5582d3230bfbf9e14230c2c44e92c64232fcde8e72458bc93140256aa03b5886c3486c8d03
+EBUILD qtpositioning-6.5.2-r2.ebuild 1443 BLAKE2B 62b10c1e624ed7a187c8a9a7ad6d5e3ecddfc01620bddb94c4c49c23d2f4a34b639ea1a17faf00441f8381b2c7603bc789cc9fd0d044439e2b9ace5b490d04dd SHA512 a5265fc8d25aa798912328689ac6d57a77ac7efacfd913902e29c845c1b83e2f1fe576bd91b1e21222cd92758ca90fdcde093d17be794e9e765f2c33963f94f3
 EBUILD qtpositioning-6.5.9999.ebuild 1444 BLAKE2B ffe8580c4387d0f830c53171bdd6699cf539302d54dd6e3138dba12f00452ab8a89e87af9ec179bfbc7387e36a57f016ca1900d190bca3dbac40572cfacf2df0 SHA512 1e144814c599b533513050c3add315a8ce5ed96accbe3f5e495a9e5582d3230bfbf9e14230c2c44e92c64232fcde8e72458bc93140256aa03b5886c3486c8d03
 EBUILD qtpositioning-6.6.9999.ebuild 1444 BLAKE2B ffe8580c4387d0f830c53171bdd6699cf539302d54dd6e3138dba12f00452ab8a89e87af9ec179bfbc7387e36a57f016ca1900d190bca3dbac40572cfacf2df0 SHA512 1e144814c599b533513050c3add315a8ce5ed96accbe3f5e495a9e5582d3230bfbf9e14230c2c44e92c64232fcde8e72458bc93140256aa03b5886c3486c8d03
 EBUILD qtpositioning-6.9999.ebuild 1444 BLAKE2B ffe8580c4387d0f830c53171bdd6699cf539302d54dd6e3138dba12f00452ab8a89e87af9ec179bfbc7387e36a57f016ca1900d190bca3dbac40572cfacf2df0 SHA512 1e144814c599b533513050c3add315a8ce5ed96accbe3f5e495a9e5582d3230bfbf9e14230c2c44e92c64232fcde8e72458bc93140256aa03b5886c3486c8d03
diff --git a/dev-qt/qtpositioning/qtpositioning-6.5.2-r2.ebuild b/dev-qt/qtpositioning/qtpositioning-6.5.2-r2.ebuild
index 5bc8b82de998..db86f6d88a9d 100644
--- a/dev-qt/qtpositioning/qtpositioning-6.5.2-r2.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-6.5.2-r2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Physical position determination library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 IUSE="geoclue nmea +qml"
diff --git a/dev-qt/qtquick3d/Manifest b/dev-qt/qtquick3d/Manifest
index 3fea73b4879c..7e7c48650993 100644
--- a/dev-qt/qtquick3d/Manifest
+++ b/dev-qt/qtquick3d/Manifest
@@ -1,5 +1,5 @@
 DIST qtquick3d-everywhere-src-6.5.2.tar.xz 59171420 BLAKE2B 91012368061acf6c4057362a380fea2e3fdc46cf63644a667d7b05450fbbeb8c8dae3765c5617fec8c8a1fd3f880fad21c8e6524c3240f040c9dfdbb80869423 SHA512 2a26f4fa4e4d88b4205813a8bba1c83811354e5ad5e7aa832fd46c5956b46d15e690c359d83f85018c1430e15edd151207411a50227855de4fc8451db710ace2
-EBUILD qtquick3d-6.5.2-r1.ebuild 880 BLAKE2B 3dac83e3bbdc4e50e0420647c0601c6b3b773b4420dd7b6196e8a09b2c396b57895c2a3e33d0b6e2d85c173044f036b826089d8c374f0aa59365d3d19aefe17d SHA512 08e5304cb219e26d6c4280ad2517a13bb0feb8c761be0de44c3b857f0f5bdbaba172bf5e3ded9499546606a8b298d62d6a83022a864038646f40c9d0407248cb
+EBUILD qtquick3d-6.5.2-r1.ebuild 879 BLAKE2B f388786f20d5fa10ed30215ec991dfc9bf76c30ee0eca70c453af2abf103b51f9806088002882844f6983213d9fde5563e5effa8016c61f047a5c8398b14690b SHA512 ab6bf4fbadf0a1d5cf266c5326b4d9b8e1548242c2ee1596940c0a7f4e563c86c0415dd8cf7c16a97177002850968edce8b5b432eec8cd9b09d193bfa663a3d3
 EBUILD qtquick3d-6.5.9999.ebuild 880 BLAKE2B 3dac83e3bbdc4e50e0420647c0601c6b3b773b4420dd7b6196e8a09b2c396b57895c2a3e33d0b6e2d85c173044f036b826089d8c374f0aa59365d3d19aefe17d SHA512 08e5304cb219e26d6c4280ad2517a13bb0feb8c761be0de44c3b857f0f5bdbaba172bf5e3ded9499546606a8b298d62d6a83022a864038646f40c9d0407248cb
 EBUILD qtquick3d-6.6.9999.ebuild 880 BLAKE2B 3dac83e3bbdc4e50e0420647c0601c6b3b773b4420dd7b6196e8a09b2c396b57895c2a3e33d0b6e2d85c173044f036b826089d8c374f0aa59365d3d19aefe17d SHA512 08e5304cb219e26d6c4280ad2517a13bb0feb8c761be0de44c3b857f0f5bdbaba172bf5e3ded9499546606a8b298d62d6a83022a864038646f40c9d0407248cb
 EBUILD qtquick3d-6.9999.ebuild 880 BLAKE2B 3dac83e3bbdc4e50e0420647c0601c6b3b773b4420dd7b6196e8a09b2c396b57895c2a3e33d0b6e2d85c173044f036b826089d8c374f0aa59365d3d19aefe17d SHA512 08e5304cb219e26d6c4280ad2517a13bb0feb8c761be0de44c3b857f0f5bdbaba172bf5e3ded9499546606a8b298d62d6a83022a864038646f40c9d0407248cb
diff --git a/dev-qt/qtquick3d/qtquick3d-6.5.2-r1.ebuild b/dev-qt/qtquick3d/qtquick3d-6.5.2-r1.ebuild
index fb83b01939ee..3510013ca1b2 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.5.2-r1.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.5.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 elif [[ ${QT6_BUILD_TYPE} == live ]]; then
 	EGIT_SUBMODULES=() # skip qtquick3d-assimp
 fi
diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest
index 7e939d0329bf..4e9250bba0c2 100644
--- a/dev-qt/qtquicktimeline/Manifest
+++ b/dev-qt/qtquicktimeline/Manifest
@@ -1,7 +1,7 @@
 DIST qtquicktimeline-everywhere-opensource-src-5.15.10.tar.xz 105584 BLAKE2B a99e6b3813527ec0f7a835167ae356c555d2e18cc67cf40853264df8e6443543755e82177c8033aaa8ef7a0645a9263fd4b97dc2084b5470b51fd889c1c70e93 SHA512 702f3f260e52659cf58a093e6019e26402db867bd65052c2b01c9ee1a995e8eeb0ad1f1dcaa64a9db4ca56f81ffd2d177319a7a4f379ca0f3bb7f27295f08541
 DIST qtquicktimeline-everywhere-src-6.5.2.tar.xz 113208 BLAKE2B bdf2537cfa13415e570d66a0b0f96c0852e62c8e2cd746c8ea7618e0eddb89b79dc8b75964460d806ea869b6c4dc1eced7cafa8c63dc2afcce231884cd601045 SHA512 4447973fba264b4a412f7a29b5d32c6ad1c62a5dc72ced8a8f88d565655fec3bab3e5047d0f7323f5415f2c7e5782bf533a67a778f1daa55cda588ccabe0054c
 EBUILD qtquicktimeline-5.15.10.ebuild 366 BLAKE2B b96a5118b144bdd8ecb543224e233d45a30a529a20d9795e1f2c1fe96ec4cbc52a921bf4d294e04cb51f07f866b5f62fcaf5ffb21f8984c387d5971ea78aa128 SHA512 933d5f932a33831742e2fe6001f9db49ab0dbb0cce45d8d42efca9036aa533ef55501b132e61daf03a19be8153defb7bc21e180efabbd9a98a6aa2224239b825
-EBUILD qtquicktimeline-6.5.2.ebuild 352 BLAKE2B 7430d0ca1c9a88311fdfcea591396edc773ddfbdfae0b70bb076d688a166d1d503d7f49314a3c0fef65ae4897a744e8276d6de74f0bab7332e298b7b032fb4fd SHA512 338728e8809cccf99921dfced0f5bc5b18e8cd0b31259a2e65cbef923858ea242296ed95ea62def15f1d6ca593d90744496affab03f816b1febcd6799b171f09
+EBUILD qtquicktimeline-6.5.2.ebuild 351 BLAKE2B b75c9f6759e138c0face6a8813102336333941312502132a5a8f8e18796419b7e3bd3b2d39cb3143185dfe834532a2b11322e43982dcedf04e8bdeb4d953b16b SHA512 28a7ed469747a1e12ae90a710f72429f9b62224870c84c3f91181ebfa3e550d54a678b2d15cd2841a05569ab05a5aad7e89a5bcb3a6ac4400de2c8e3b333cc6d
 EBUILD qtquicktimeline-6.5.9999.ebuild 352 BLAKE2B 7430d0ca1c9a88311fdfcea591396edc773ddfbdfae0b70bb076d688a166d1d503d7f49314a3c0fef65ae4897a744e8276d6de74f0bab7332e298b7b032fb4fd SHA512 338728e8809cccf99921dfced0f5bc5b18e8cd0b31259a2e65cbef923858ea242296ed95ea62def15f1d6ca593d90744496affab03f816b1febcd6799b171f09
 EBUILD qtquicktimeline-6.6.9999.ebuild 352 BLAKE2B 7430d0ca1c9a88311fdfcea591396edc773ddfbdfae0b70bb076d688a166d1d503d7f49314a3c0fef65ae4897a744e8276d6de74f0bab7332e298b7b032fb4fd SHA512 338728e8809cccf99921dfced0f5bc5b18e8cd0b31259a2e65cbef923858ea242296ed95ea62def15f1d6ca593d90744496affab03f816b1febcd6799b171f09
 EBUILD qtquicktimeline-6.9999.ebuild 352 BLAKE2B 7430d0ca1c9a88311fdfcea591396edc773ddfbdfae0b70bb076d688a166d1d503d7f49314a3c0fef65ae4897a744e8276d6de74f0bab7332e298b7b032fb4fd SHA512 338728e8809cccf99921dfced0f5bc5b18e8cd0b31259a2e65cbef923858ea242296ed95ea62def15f1d6ca593d90744496affab03f816b1febcd6799b171f09
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.5.2.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.5.2.ebuild
index 48f8a5bde6c4..02e283a7726d 100644
--- a/dev-qt/qtquicktimeline/qtquicktimeline-6.5.2.ebuild
+++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.5.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt module for keyframe-based timeline construction"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index 090bb15c91b8..848b7d1a49fd 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,7 +1,7 @@
 DIST qtscxml-everywhere-opensource-src-5.15.10.tar.xz 437404 BLAKE2B e36e866e4c02722f88499cc92bf27d2401f2b89d19fed83915803f6c8a367007fc386df250d11ecd92e5c80713924dd9992608769dbb0a42071f0d928317d935 SHA512 93e2df05da176802a0439ba752f52d1c84d291a2addf9492aaab2099f06efb32d896edd0660711bb2e0b67f7a9ea2c4d31b4ec3366f6230140d3de0056478923
 DIST qtscxml-everywhere-src-6.5.2.tar.xz 1163208 BLAKE2B 9e149a82f8f00a7f0c78beb393a87de2dd7b0c61f0168b7f2bb717591d2923b91ef2ebbea211cfe7c724e97a32f74a41537763c828e1e1a3fa16a017b1c73ffa SHA512 fafea704d5e592a31c11f0039336de587353a57d5a69b07d0346fd2906488810d0ed1fc9267a0bf06aeae7f93ae19e150c5734bc969c1e0c7bc4e6215744ac3a
 EBUILD qtscxml-5.15.10.ebuild 398 BLAKE2B 27b0f98657fad702cb2b14ad1c69bc80b9c42e5680ed3ba2db0e79bb9884c0f7e4960c3c4bea26a6e5577476030b52c172f327cb6b6ecd9ec72ec6b5d306725d SHA512 62f3dd6a55d8f8dc8af4d1e0f7ded88f8efd3fe1ada7a7f585bdd488c3599f160a9efbc52a014cb5016e11a13856dfabbc236cb4257bae8bbb18137bc02e22ce
-EBUILD qtscxml-6.5.2-r1.ebuild 677 BLAKE2B 5b4a53a211c467cc30ca0220a4e949e6b869e71ce8351839f77b0846d6d001bbe780b225f19d9c93ac8bdda1a3ff4993d9c8f70e65aead9464d524d47508a33a SHA512 0c8cf8f2e6019062ac0e153ced62bfa7026b00d0aa4d021fff939bd2791a7fc4d57db22c83fa145dccaa7b09ea9303868c73cdfda8e163126a9bf1da154fc87f
+EBUILD qtscxml-6.5.2-r1.ebuild 676 BLAKE2B cb170b72a5ed14fa577d6e2d9098f300bf1bd50e8cb1de6b24d1dcf2ab6ad81968f5fd298825955d5cd72189ba8f5a4fcc436a77009a0ae386a3544695ebe766 SHA512 ed18488c4a6b8b0992e4741ff7d3fea10bae3d0cc58dc89858bdb237e1e5b04090bbbfb430b4893c668d4f27568de1220e3ba8a18f6557036a1e3290f065dbf8
 EBUILD qtscxml-6.5.9999.ebuild 677 BLAKE2B 5b4a53a211c467cc30ca0220a4e949e6b869e71ce8351839f77b0846d6d001bbe780b225f19d9c93ac8bdda1a3ff4993d9c8f70e65aead9464d524d47508a33a SHA512 0c8cf8f2e6019062ac0e153ced62bfa7026b00d0aa4d021fff939bd2791a7fc4d57db22c83fa145dccaa7b09ea9303868c73cdfda8e163126a9bf1da154fc87f
 EBUILD qtscxml-6.6.9999.ebuild 677 BLAKE2B 5b4a53a211c467cc30ca0220a4e949e6b869e71ce8351839f77b0846d6d001bbe780b225f19d9c93ac8bdda1a3ff4993d9c8f70e65aead9464d524d47508a33a SHA512 0c8cf8f2e6019062ac0e153ced62bfa7026b00d0aa4d021fff939bd2791a7fc4d57db22c83fa145dccaa7b09ea9303868c73cdfda8e163126a9bf1da154fc87f
 EBUILD qtscxml-6.9999.ebuild 677 BLAKE2B 5b4a53a211c467cc30ca0220a4e949e6b869e71ce8351839f77b0846d6d001bbe780b225f19d9c93ac8bdda1a3ff4993d9c8f70e65aead9464d524d47508a33a SHA512 0c8cf8f2e6019062ac0e153ced62bfa7026b00d0aa4d021fff939bd2791a7fc4d57db22c83fa145dccaa7b09ea9303868c73cdfda8e163126a9bf1da154fc87f
diff --git a/dev-qt/qtscxml/qtscxml-6.5.2-r1.ebuild b/dev-qt/qtscxml/qtscxml-6.5.2-r1.ebuild
index 3baf824212bc..71db5ea6bf57 100644
--- a/dev-qt/qtscxml/qtscxml-6.5.2-r1.ebuild
+++ b/dev-qt/qtscxml/qtscxml-6.5.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="State Chart XML (SCXML) support library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index cf38503d54bc..0563ea12e3d2 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,7 +1,7 @@
 DIST qtsensors-everywhere-opensource-src-5.15.10.tar.xz 2059812 BLAKE2B 80fb3587ebd50ac28ed3d15f1e6888f10d250253be0a7e176d37ae355f124d98ae8eeff63cfd4ff0c1785c994a48a043f83102689f3a5e644806dd90ded0ded5 SHA512 9950b0f8b90727a051299c5b7e7852819c165bcdb1cbe2f8bd7386768175c387ab838918e7d6f1dcf2a7d6d32bb1559dfda225c57e8b9b5b4ffeac5f3db432ac
 DIST qtsensors-everywhere-src-6.5.2.tar.xz 1484712 BLAKE2B e285a4bf219f7b1b807cc07fa14bcb3129e21bdc10fbbb7cc1d7ec26a0327ea2293d90138251007f9ff657f1708076242d85684dc1f7bd4eff19ace81baf5166 SHA512 5014ba0bb2ebecd23b26c7eabe5aa1dde2a18f31e1448f2e86411593772cb1fda74520460d7be97c4f612ff6d25d1135fb551d2407660754611a83e8b35aaa7b
 EBUILD qtsensors-5.15.10.ebuild 566 BLAKE2B e798853d8e80272c044a99cec1afc8bb006ce73552d642d7b9852a55b3e018875fdf8bcdcef2a001ecbfbafd0cc2e36350d41bf93bce93e35b7a5e081a607ed8 SHA512 1927fa1e7693842aa7c08e604bc3033bdfabf28411ca6d748ac8a26f432187f14b8c10dc9a5a51b631b71d7f81048c893d700110fcb2888da02268b4529e7e4c
-EBUILD qtsensors-6.5.2.ebuild 486 BLAKE2B f872e54edd0ecca634a19cf769637758862e03c674a86e51b5289beef86759c0a0271a0a9844f5d4e3b969b4f80211a46843616c94aa106a074f2da4e5716a59 SHA512 3f2c1ab5ea5ee184c9b41f5c8062e3215cc69454a4c33c531b1edc9e2907262e322c4237307775097c2bd542a7d3959d7cea4fb845c452314ab8c412366e344d
+EBUILD qtsensors-6.5.2.ebuild 485 BLAKE2B 720b99ab4fe61f454ade69f8d05d10f2b77f65cd73a2560f3247ba4547660aeab2c80122fffcd83a5b937114198588001d9970541f7b67e3480b452c569e79a3 SHA512 a3e3453939fc164ada08b845410fe1252196c4c48235f1338ccaca45de9abd3f2c5495d278cbca7a31b28016619ae73178734b39165e6783b0b75b50ca3e2b4b
 EBUILD qtsensors-6.5.9999.ebuild 486 BLAKE2B f872e54edd0ecca634a19cf769637758862e03c674a86e51b5289beef86759c0a0271a0a9844f5d4e3b969b4f80211a46843616c94aa106a074f2da4e5716a59 SHA512 3f2c1ab5ea5ee184c9b41f5c8062e3215cc69454a4c33c531b1edc9e2907262e322c4237307775097c2bd542a7d3959d7cea4fb845c452314ab8c412366e344d
 EBUILD qtsensors-6.6.9999.ebuild 486 BLAKE2B f872e54edd0ecca634a19cf769637758862e03c674a86e51b5289beef86759c0a0271a0a9844f5d4e3b969b4f80211a46843616c94aa106a074f2da4e5716a59 SHA512 3f2c1ab5ea5ee184c9b41f5c8062e3215cc69454a4c33c531b1edc9e2907262e322c4237307775097c2bd542a7d3959d7cea4fb845c452314ab8c412366e344d
 EBUILD qtsensors-6.9999.ebuild 486 BLAKE2B f872e54edd0ecca634a19cf769637758862e03c674a86e51b5289beef86759c0a0271a0a9844f5d4e3b969b4f80211a46843616c94aa106a074f2da4e5716a59 SHA512 3f2c1ab5ea5ee184c9b41f5c8062e3215cc69454a4c33c531b1edc9e2907262e322c4237307775097c2bd542a7d3959d7cea4fb845c452314ab8c412366e344d
diff --git a/dev-qt/qtsensors/qtsensors-6.5.2.ebuild b/dev-qt/qtsensors/qtsensors-6.5.2.ebuild
index b70b8eb46e14..9df0aa9b2543 100644
--- a/dev-qt/qtsensors/qtsensors-6.5.2.ebuild
+++ b/dev-qt/qtsensors/qtsensors-6.5.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Hardware sensor access library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index 3e4685da8d27..aa7e6a1bf5b0 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,7 +1,7 @@
 DIST qtserialport-everywhere-opensource-src-5.15.10.tar.xz 324256 BLAKE2B 7d5492648854877b42a4a058ee2e1205f67d2ad949041d62f800f0fde701e02b7651efa16dcfa43d0396675009ebdc9362fd74eccec06f079847b7ffff0efd24 SHA512 59face48cce750fb02c112dbef9c997a5b61d84cf8085a0f8c59c3bb5c93d7110de9c9830f26f3ed61fffb2c23eb8a42d5683211abaa6e5147cf87643469a45e
 DIST qtserialport-everywhere-src-6.5.2.tar.xz 279364 BLAKE2B 7f1efb56f4e8f61e97faf62f4edeee8a638180245d0ccf6e85e6a41ac78906dafe4470a7884680b84838a8f409dbf27230659777922ce4250feda7c83b4b8e3b SHA512 9c26fe572272c1dfc7ce795451f2e4a5976a55e13ac8c91ab2dd2f8d07f77f0a18de80dc7b77c31e7233dba962ea2f88495286263fe59ec7f5ac62802f96b2f7
 EBUILD qtserialport-5.15.10.ebuild 565 BLAKE2B 380cc83e92be8bd256a5e652a5018380da908a30a20a8676c3701caea63dba343b99edd1f67458ebb5556ca49cac3f0b766b0237c66b01e7b8087246ecda4bdd SHA512 acfee3720971a49241a821201849b840e1d019ed768e58da252a5e519bd142d9166e4551330ed8d21184a1b899d8175dbe1bf251f4a938d13d971514ca4063df
-EBUILD qtserialport-6.5.2.ebuild 343 BLAKE2B 760748f060f1a7d4e8f556274ecfd88b5f8b40ecb2e9c3f800d2fd73d05553972f99fc940b2bc50d39847cb90023164187c17447ba16ad55ebfc94ed7c92f0d1 SHA512 5a1b62c2d23da41ca03d91d530c9f0bd807362b825b9dd08b85fc0e93cae85aaf60e4ea0435fe14284c8819c3cfce3873baa12fcff8969fd2d3f75e018753c55
+EBUILD qtserialport-6.5.2.ebuild 342 BLAKE2B 2a90e5514d6e601199f5c7a381a6fe3e223bab57221ac4c97161b4cc11efa89c31fa7b790eecd0f0c994dd54d4bb32ff32c633596835be21a389a6539746a48b SHA512 e3f50280ae117e7fff0eb7bf581235502274b7b8fac8785ae0722974affb7d3eeac74213dfbd7a4ebc939d6874ad2c07546f6178c9443eda22965921feb6e984
 EBUILD qtserialport-6.5.9999.ebuild 343 BLAKE2B 760748f060f1a7d4e8f556274ecfd88b5f8b40ecb2e9c3f800d2fd73d05553972f99fc940b2bc50d39847cb90023164187c17447ba16ad55ebfc94ed7c92f0d1 SHA512 5a1b62c2d23da41ca03d91d530c9f0bd807362b825b9dd08b85fc0e93cae85aaf60e4ea0435fe14284c8819c3cfce3873baa12fcff8969fd2d3f75e018753c55
 EBUILD qtserialport-6.6.9999.ebuild 343 BLAKE2B 760748f060f1a7d4e8f556274ecfd88b5f8b40ecb2e9c3f800d2fd73d05553972f99fc940b2bc50d39847cb90023164187c17447ba16ad55ebfc94ed7c92f0d1 SHA512 5a1b62c2d23da41ca03d91d530c9f0bd807362b825b9dd08b85fc0e93cae85aaf60e4ea0435fe14284c8819c3cfce3873baa12fcff8969fd2d3f75e018753c55
 EBUILD qtserialport-6.9999.ebuild 343 BLAKE2B 760748f060f1a7d4e8f556274ecfd88b5f8b40ecb2e9c3f800d2fd73d05553972f99fc940b2bc50d39847cb90023164187c17447ba16ad55ebfc94ed7c92f0d1 SHA512 5a1b62c2d23da41ca03d91d530c9f0bd807362b825b9dd08b85fc0e93cae85aaf60e4ea0435fe14284c8819c3cfce3873baa12fcff8969fd2d3f75e018753c55
diff --git a/dev-qt/qtserialport/qtserialport-6.5.2.ebuild b/dev-qt/qtserialport/qtserialport-6.5.2.ebuild
index e88655bfbcdc..4b10fb24beaf 100644
--- a/dev-qt/qtserialport/qtserialport-6.5.2.ebuild
+++ b/dev-qt/qtserialport/qtserialport-6.5.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Serial port abstraction library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtshadertools/Manifest b/dev-qt/qtshadertools/Manifest
index 5caf46401914..dbb54edf02af 100644
--- a/dev-qt/qtshadertools/Manifest
+++ b/dev-qt/qtshadertools/Manifest
@@ -1,5 +1,5 @@
 DIST qtshadertools-everywhere-src-6.5.2.tar.xz 1061812 BLAKE2B 33b997f121ae408f9cbbba53c08d015f55709b3558e8ef1f0ec41c2313f1d4e51051c4bd540e25b1fa91c1bd9d7dbba381e363ee6fae1df6d728ad95727dc829 SHA512 95a697de1e0b415b700edc86c452847f37478951c547fad42c8373c592a1f474b824df7c2d1ae3b26fb9401df3c523431633e0293f5e472732964cb527def6be
-EBUILD qtshadertools-6.5.2.ebuild 333 BLAKE2B b9aab8dd741788daf5d7775dd273a93be96372f5894f7810c77c6a2b5c78d183653e2f32391a5b392bf1552c68f36c58972765ec900461f36d7cb73f3e3b99b6 SHA512 8e0d6afc5dd6ee0842cc7e7983d3f8779bb1c4e2a2f246bb1b55b0066850e292870165fec84f664ec85feffe13736ce0970691c0ff86190f5907b41ab67d8338
+EBUILD qtshadertools-6.5.2.ebuild 332 BLAKE2B 3c2aad3995eb8018badc0e504d698c428a61b15d7845741abae781d8f2a87e97cbef0865898c4c1c1189e670a1d23bdf8511d2e2c63edf18cf81b4fafc3bedfe SHA512 96c2710fc657c7db3ac2098cc1dd9450b34a0d88763854f7615570ea396445ed7ed9bc9a81cea17d895b5e86a5fbc55c1eea035dfeefa10bf81d1dbf5b28feac
 EBUILD qtshadertools-6.5.9999.ebuild 316 BLAKE2B af77183f14888dcd6060254987f681ad19285921233b4bc983f332a5b1ea3d002b69ae725c177c62eaf646a8d05180cab07786ac618ab9b839d3ea1ed8e39894 SHA512 c6763f935d73641aaa5ba093a63f664df57458c3650a0de501341b1ed313f814a0632dbfc2602b588e063bb60fee9dcc65545f22043234126ceb0c0ef742ee0c
 EBUILD qtshadertools-6.6.9999.ebuild 316 BLAKE2B af77183f14888dcd6060254987f681ad19285921233b4bc983f332a5b1ea3d002b69ae725c177c62eaf646a8d05180cab07786ac618ab9b839d3ea1ed8e39894 SHA512 c6763f935d73641aaa5ba093a63f664df57458c3650a0de501341b1ed313f814a0632dbfc2602b588e063bb60fee9dcc65545f22043234126ceb0c0ef742ee0c
 EBUILD qtshadertools-6.9999.ebuild 316 BLAKE2B af77183f14888dcd6060254987f681ad19285921233b4bc983f332a5b1ea3d002b69ae725c177c62eaf646a8d05180cab07786ac618ab9b839d3ea1ed8e39894 SHA512 c6763f935d73641aaa5ba093a63f664df57458c3650a0de501341b1ed313f814a0632dbfc2602b588e063bb60fee9dcc65545f22043234126ceb0c0ef742ee0c
diff --git a/dev-qt/qtshadertools/qtshadertools-6.5.2.ebuild b/dev-qt/qtshadertools/qtshadertools-6.5.2.ebuild
index 174c66ce198a..03c1664487ae 100644
--- a/dev-qt/qtshadertools/qtshadertools-6.5.2.ebuild
+++ b/dev-qt/qtshadertools/qtshadertools-6.5.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt APIs and Tools for Graphics Pipelines"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index 78051f5e4a30..5b6c781b6974 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -2,7 +2,7 @@ DIST qtspeech-5.15.10-gentoo-kde-1.tar.xz 1044 BLAKE2B e555c475fa1824ffbe34c5a0e
 DIST qtspeech-everywhere-opensource-src-5.15.10.tar.xz 104944 BLAKE2B 7e664719d352cd29cb289f8b8f59d4595ffe343dca028a69030032030eb02c601b29492cea885bcab940264624b39042773bc70884512726abcd89dc27065b64 SHA512 b938c8baba11aa9a40a2ec5492df32c511164686aa2649d78023beccc8b23f1e0a77193672f7bc7d7f72aeb7b59fe30972683f5a4e22e1e39da9744ecd40201d
 DIST qtspeech-everywhere-src-6.5.2.tar.xz 249568 BLAKE2B af86153ea1cf0f248ab80aa828a0457e23e1f97cc5ae91bf60fa426a43a44247230b643ae48e6ae839668ea9a66edc94e0358502abcab03788cd7d1368403592 SHA512 bc6ca225f9eadc838e63bb3b011f604c1ae18eee76445c2c0d22152e473b9316b6903e349aee2555c5a110ef65fbd25ca9065b22ae4cef6e5290daa665c78434
 EBUILD qtspeech-5.15.10.ebuild 730 BLAKE2B 9ca79158cacdb395d0e845f8504a1846889bae0eb116af6255016b2b88f6ab30b5d511575e13561c3cc3941dc9bc3e8832472d90d1ac0471af2cc55bf64d5dde SHA512 4222158b97630d34ede62e8d0116834442fe72509ed0763fec33ce0306ba1689afec8e57ce732e140410e31a42bf6403c8ec6fc2dd3aefb8895058d8d3c44323
-EBUILD qtspeech-6.5.2.ebuild 1299 BLAKE2B a3288360a7d306c2d055992075a2c48b02bbdb3b9d1b4e8a2228a51cd15558d8175577a4e6a42dcedf17f6cfce796dafd99a29945f91d82b7b554e5a45d02342 SHA512 44284d73c69a3fbd3b1988173250c25368ae8853b52fc2651e3b2987afac68fd64c9095defcf57f5bf46057b429d163487919da2c13f6fe600424c4255b4a86a
+EBUILD qtspeech-6.5.2.ebuild 1298 BLAKE2B 405cc6ed13dee0710c7a950bc6ddeeaf68bc3669ed9c43011f2f7480bbe869a91850a6a4cd461df0a6f9a1fddf4de573fa6e8b62caee250b794ebb7e7efa985a SHA512 5ffeca57decb87bacda23b64dab8fd19a551cc07b0fd207a166cd764ed76eddfae907e064c6843c0dc54663ceb06b67dc246504e8fdf8cb8974ab659908fb4c1
 EBUILD qtspeech-6.5.9999.ebuild 1299 BLAKE2B a3288360a7d306c2d055992075a2c48b02bbdb3b9d1b4e8a2228a51cd15558d8175577a4e6a42dcedf17f6cfce796dafd99a29945f91d82b7b554e5a45d02342 SHA512 44284d73c69a3fbd3b1988173250c25368ae8853b52fc2651e3b2987afac68fd64c9095defcf57f5bf46057b429d163487919da2c13f6fe600424c4255b4a86a
 EBUILD qtspeech-6.6.9999.ebuild 1347 BLAKE2B c8f1d966827c793ee541907ea5d47211b8535b3ffd2345c30275f5c85b249c962d27768ae3ded6e9bf143be00a6a8de4472bc1fbe8dcc9fa0a20370f63ad338b SHA512 7524e9adc9cad5f411d6ef6087d271ca9ab57f2d1eeafcf3dec49921449f523ed7d2f1afa6875af7b15480d4d1b4771af1185fb334bda63e8caa8bd76671b035
 EBUILD qtspeech-6.9999.ebuild 1347 BLAKE2B c8f1d966827c793ee541907ea5d47211b8535b3ffd2345c30275f5c85b249c962d27768ae3ded6e9bf143be00a6a8de4472bc1fbe8dcc9fa0a20370f63ad338b SHA512 7524e9adc9cad5f411d6ef6087d271ca9ab57f2d1eeafcf3dec49921449f523ed7d2f1afa6875af7b15480d4d1b4771af1185fb334bda63e8caa8bd76671b035
diff --git a/dev-qt/qtspeech/qtspeech-6.5.2.ebuild b/dev-qt/qtspeech/qtspeech-6.5.2.ebuild
index 94803ab4eff3..78bb4e99d6eb 100644
--- a/dev-qt/qtspeech/qtspeech-6.5.2.ebuild
+++ b/dev-qt/qtspeech/qtspeech-6.5.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Text-to-speech library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 IUSE="flite +speechd"
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index dd79cf107397..dca68b9407ad 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -2,7 +2,7 @@ DIST qtsvg-5.15.10-gentoo-kde-1.tar.xz 5012 BLAKE2B 2eaab709cf165108b6f18ffd88ee
 DIST qtsvg-everywhere-opensource-src-5.15.10.tar.xz 1889960 BLAKE2B 14ee7bbf0914e47d8fc39790ce597fca0085e6018d33878752e707a9ece567bb139bc2f1e689840d6641aa6db958240a4f97fab69e7200385ddb2ee53abc5f04 SHA512 6de19c1dd6584f95bc3abbd391495bbdc13f15cc677a0c9e7afa2a0beffef8f8128eab5ccda741ed95af4553203b9daf1fc0327197912945e7211aeace33c6e7
 DIST qtsvg-everywhere-src-6.5.2.tar.xz 1727648 BLAKE2B 65dc5184e89110d3543386526e2625431f162f0da2834e42f0c5f9d3b6e33e74315dfa5f0365d33d0ea1af824d4dbca6a4f4b9bcb8a32d13fcee4b5e82ce426e SHA512 34f572eceb27021d2b55d67ed2de84f9d41c0cb2463c5c8e9c9e270b52782d32f707b83fdc95c67f306bb82a3ea44a5d48921e6bc979197ce6bc94eaf89ccb20
 EBUILD qtsvg-5.15.10.ebuild 496 BLAKE2B a9a417892487c84120f966f2bd06d84f7348e069ec3917aca6c88c33345109bf127802e01fae1da95a5945fc7e44db8f3a2f3b7f6b699fcfbcc3367b082f2563 SHA512 b94101d98d128f952a0bdc6b14e04c76e492d6925e06d6c0d97d077f908196d944169a196a28e4aac384c261c93a6b5fa2dd94646c4186b392fd1ec57f885e15
-EBUILD qtsvg-6.5.2.ebuild 344 BLAKE2B 3ee43ffd7160dd57f6799740fbb025516febcf1977d14c89fdba9f74aee784d0ce9b48f4215cdf307b42b15c48425d592beff37a03e30e86fdcb13768a0a3213 SHA512 05697ba3b4c95469017b81dbfd018a0ad35e913d791c9f5dafc87340b7215cda8e86884381aef1c237bfa2d7859b32277d460435277e16990eb4c80fb4505871
+EBUILD qtsvg-6.5.2.ebuild 343 BLAKE2B c926a49a98f2d4b414ef5a32fe24022078c11b607fe16f220273ff61db1628d4e7ff372e088df69053238d79937b5f04b1f6919e490a18057b6155e03f12e9a8 SHA512 7c2acebee6c2fa9e66ab4b92c09086eec72df5a184999154a511ff80fdeacd0d934159b00ef8917fc7bcd193147db5de168a41f1cb7f6851980fa2c60a7e0344
 EBUILD qtsvg-6.5.9999.ebuild 344 BLAKE2B 3ee43ffd7160dd57f6799740fbb025516febcf1977d14c89fdba9f74aee784d0ce9b48f4215cdf307b42b15c48425d592beff37a03e30e86fdcb13768a0a3213 SHA512 05697ba3b4c95469017b81dbfd018a0ad35e913d791c9f5dafc87340b7215cda8e86884381aef1c237bfa2d7859b32277d460435277e16990eb4c80fb4505871
 EBUILD qtsvg-6.6.9999.ebuild 344 BLAKE2B 3ee43ffd7160dd57f6799740fbb025516febcf1977d14c89fdba9f74aee784d0ce9b48f4215cdf307b42b15c48425d592beff37a03e30e86fdcb13768a0a3213 SHA512 05697ba3b4c95469017b81dbfd018a0ad35e913d791c9f5dafc87340b7215cda8e86884381aef1c237bfa2d7859b32277d460435277e16990eb4c80fb4505871
 EBUILD qtsvg-6.9999.ebuild 344 BLAKE2B 3ee43ffd7160dd57f6799740fbb025516febcf1977d14c89fdba9f74aee784d0ce9b48f4215cdf307b42b15c48425d592beff37a03e30e86fdcb13768a0a3213 SHA512 05697ba3b4c95469017b81dbfd018a0ad35e913d791c9f5dafc87340b7215cda8e86884381aef1c237bfa2d7859b32277d460435277e16990eb4c80fb4505871
diff --git a/dev-qt/qtsvg/qtsvg-6.5.2.ebuild b/dev-qt/qtsvg/qtsvg-6.5.2.ebuild
index e1b14151f896..47ed19374618 100644
--- a/dev-qt/qtsvg/qtsvg-6.5.2.ebuild
+++ b/dev-qt/qtsvg/qtsvg-6.5.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="SVG rendering library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index c3189bdae52e..c5674760015a 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-everywhere-src-6.5.2.tar.xz 8591336 BLAKE2B 37adbaec83938d4dae096b1ab4e49d1693ab2a926b3b61f5b40f45c8f89ba71ae847abf6eab4db26206dfc9896e5a880de489cfe17c942e66383dcf9b6fc7397 SHA512 d5b858b5307b2abfda2786331034a2957afbaba6299955bc3a2489f15bc8c2613b613b0f6f1fdf2aabfa9929a44eeeae3faeb26e0ab176d347e8ddd47f0e8011
-EBUILD qttools-6.5.2-r1.ebuild 2301 BLAKE2B 3f48fd4c9e7347d81b5111407e7658892041a6223a30671deb015ba69d8c3063ad91d7d205d8e6cade0b5b45069ce9232a394f0434bcfe331013ef83f27a6503 SHA512 b91f1afccf27246c02eb73cf708f415445fd901430d333334e01aeb0fd37c63d29df6557d9c5e31ba7482cb54676d24fed9a692a0dfcd466e44dc678e327fe95
+EBUILD qttools-6.5.2-r1.ebuild 2300 BLAKE2B 2522af46846418a0081c18f755c8d95001575ccc59ad7307261606cc9f8f8c552d83e3985fd52211311028f63555b7faaea69a34735c347d64e61b97c588a545 SHA512 6cd5ac2eeb825b6777ced294535d7428740b1a260da0e8b890e405b04221118f7386a8b83c9533234c304be020737c62a9c7eb195816cad43dfe5987cbf76b19
 EBUILD qttools-6.5.9999.ebuild 2284 BLAKE2B b33b383177131409da792ab93f263764862203e579b6208b97b3c0e58907ecf2a369e48355f524bf3640fc1db09a137ddac3cbb62379b29cf72411fa050e9783 SHA512 fda4172784d089eb1bfaeb9fcb2e25e1bb2617c9b430630fb71d6414e41158c6a575f2426a8b2e294cb5f141e2b337ab9e80c9859da1abfeeca6974642b9c7bc
 EBUILD qttools-6.6.9999.ebuild 2305 BLAKE2B 08686030aee50f3b01069b139fa9ebe4c99c21eb8ddeb76576ad15c651e9ab765a327449aa8bb69e69efc5dc423fcb5a4355d9aa0870279f9af07d22addf54b7 SHA512 cec8a1e9be36ae6a31c93cdeb751be9490696fdb1f0a1f25fa7e73fbeaa70940867109ac48636dbc02494eefac1ada0c8c2da6fee18594d42042684917747a3d
 EBUILD qttools-6.9999.ebuild 2305 BLAKE2B 08686030aee50f3b01069b139fa9ebe4c99c21eb8ddeb76576ad15c651e9ab765a327449aa8bb69e69efc5dc423fcb5a4355d9aa0870279f9af07d22addf54b7 SHA512 cec8a1e9be36ae6a31c93cdeb751be9490696fdb1f0a1f25fa7e73fbeaa70940867109ac48636dbc02494eefac1ada0c8c2da6fee18594d42042684917747a3d
diff --git a/dev-qt/qttools/qttools-6.5.2-r1.ebuild b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
index 9120759d00ad..7b0d625a130c 100644
--- a/dev-qt/qttools/qttools-6.5.2-r1.ebuild
+++ b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit llvm optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 IUSE="
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index d5ea788d25e9..3f3a38727776 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,7 +1,7 @@
 DIST qttranslations-everywhere-opensource-src-5.15.10.tar.xz 1635736 BLAKE2B c21f5fed04502622377bc1eaa11dab2d4e693ca7a882ced21920926fac74fc75b92d16a26c35133f1437cef51d1effbcaa292ef2a768e085f54b10774d47f8fd SHA512 94f22857cf9f14f13f774ee5632bfd0fc367ca5fb745cbfb3997fee8651961d9547f0a629afc54c35b2e4493244da9b94214777e20340c2b203c538bc1c84a22
 DIST qttranslations-everywhere-src-6.5.2.tar.xz 1468624 BLAKE2B 4201ecaf6fedb920ff49fafed7579af2a676a9f34e33bda886f3898a111c49a716cf4c161a51724298f4b477320610ffdc03b00555b5d7e4486d729afcd4b162 SHA512 2930153207a6ba7bb6720171f2be1c845e84edef87abd5ec6a4464c4386fb58fbdd59740c210727eb6b058ceffcaaf0aaea99e968215b68b121eb35d6e4f05c2
 EBUILD qttranslations-5.15.10.ebuild 379 BLAKE2B f7a1f63d58d4a09bdf92cf91f2ec0c546a8626cddc7bcc9d55c70eab8db038d3ae6912e0909f660099af7d4998e99353d0eda9d98da253f7021b8008c1d30b41 SHA512 bf741516c6b8ad79fac401a29befc1004926ce203460b0c5f261744c70db5bcc0047b9af8f36153668b1680fefcbd80f50840623d5379be43ce059e1373c4506
-EBUILD qttranslations-6.5.2.ebuild 347 BLAKE2B 9c1202755938b419e2da4122db1f72db89a0bc33e0cab8b11a6e90744cec7f931e758d3b66842700cb8ee0eb42a3eefefa6642da509f5c504ee4a1c3bbd51da7 SHA512 47915df9e5c7087c827030b9bf2c628620b6d865aeb1c2d1fe35303b7abd6479dbe33c655a7359a2514bff89a566d1b6a10a1bf0077346b85b5ce498cd172988
+EBUILD qttranslations-6.5.2.ebuild 346 BLAKE2B 6ce3245e15ebb8ea0d6cf27d658c277e3738ceee79537390f4443ed7354bdfc68550c0bb41923fcd3507be0f4fc7f6eca5f3055d120e7dfcfebf597155b8abd6 SHA512 1374e29d9351327759bd68f064d9fceffcd46e49a7896aef8f036bd99c9524a75ff99eb40da4a12173f552213b2bdc8b4db9bcbb225d53ce05816f1e6f6a34e4
 EBUILD qttranslations-6.5.9999.ebuild 330 BLAKE2B abc4eeef9e79487bd946e40db1c094b8556161d4422914f1ef2ca777944c554462525cae5b122411f432816da4196d22637c2af4daa521bf73b3ab40efa73c8e SHA512 377621adf3eb0c8dc733dae23910550eb78699dbb2913863b829ee5bace6971c6f1559b4c6c0f203eb73bca4d44567040546d5d64c98c104258de222aa4e77c8
 EBUILD qttranslations-6.6.9999.ebuild 330 BLAKE2B abc4eeef9e79487bd946e40db1c094b8556161d4422914f1ef2ca777944c554462525cae5b122411f432816da4196d22637c2af4daa521bf73b3ab40efa73c8e SHA512 377621adf3eb0c8dc733dae23910550eb78699dbb2913863b829ee5bace6971c6f1559b4c6c0f203eb73bca4d44567040546d5d64c98c104258de222aa4e77c8
 EBUILD qttranslations-6.9999.ebuild 330 BLAKE2B abc4eeef9e79487bd946e40db1c094b8556161d4422914f1ef2ca777944c554462525cae5b122411f432816da4196d22637c2af4daa521bf73b3ab40efa73c8e SHA512 377621adf3eb0c8dc733dae23910550eb78699dbb2913863b829ee5bace6971c6f1559b4c6c0f203eb73bca4d44567040546d5d64c98c104258de222aa4e77c8
diff --git a/dev-qt/qttranslations/qttranslations-6.5.2.ebuild b/dev-qt/qttranslations/qttranslations-6.5.2.ebuild
index d481584b1cc7..c23a37475691 100644
--- a/dev-qt/qttranslations/qttranslations-6.5.2.ebuild
+++ b/dev-qt/qttranslations/qttranslations-6.5.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Translation files for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 DEPEND="~dev-qt/qtbase-${PV}:6"
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index dc7079c5228a..150afc913be3 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,7 +1,7 @@
 DIST qtvirtualkeyboard-everywhere-opensource-src-5.15.10.tar.xz 10958048 BLAKE2B 738a31b2c9e9f8ccaf34a794da92a659c570db614a6473a96e17eb42de31395602283a600e04d871603bad99be80474895364d3689f25cbae561ea9772a97140 SHA512 6d539af5e5a336f2bf4ac1e6006268e50b426f6bb174019f742847da86f8cd5c8eb2c5f353255b5d1bba9c9c7a7b035bcb12e0063be5b31e45741ea9bd478582
 DIST qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz 3735288 BLAKE2B 3c088e7b435754ed344136e4646b53ca0793824f7711829858853e3cd49bed7fb47af9caeda4d92dea46130af64eac60084256297fb3647f45127647601c20cc SHA512 acb1f5de2f0d7f985f14d8f77a37698b7ecc7db15a9911148a5f3dafa26db68f2712f9d0f2c9babec9c20b672e350e0431faed2959d2b6eb43113304ab049470
 EBUILD qtvirtualkeyboard-5.15.10.ebuild 1215 BLAKE2B 5efc9c8205dd9bb16aeee41108fabdb91b0c279e1dd4a6438f59db0396ceee80b567cf2d26eaba12f2ecbf4d864073aa2e2541e21296d6137587a530e93c014f SHA512 dc3502caa1b1a6170ea77f54d44133794ebd226b46ff0eca1735eece767c5b4f291084114c556eb8064fb040f1abe77fecfba70ad9e9526de09dee5c4de1a36e
-EBUILD qtvirtualkeyboard-6.5.2.ebuild 1062 BLAKE2B 284f0d9c7b7533bf9ebecdebb5728fb6ebc6079306400be76198939e2cd40688018db8eef60035d582201bef6ef4fb17022df017c49d8803e4f82a50c687a3d7 SHA512 97b2732a7eac5db17b415170ef77c0d8380c569e1ab9a6c492e33b24cf0e4560d810cae0f1b2d8b9ae4e79c6e76f73e39263e0e4fce3325f4aec4054c5267d78
+EBUILD qtvirtualkeyboard-6.5.2.ebuild 1061 BLAKE2B 1f04f239dc138f8c665e71cea0f75c8c8c7628d5da4f041b685fb32134741572f30583706cfa9dcc6a5d8c1228cfc46f5189f12422e82cb08f63390af42b979e SHA512 9b7f3019b6d768d36fd16b1e5b02ac4d6e33be7d984bea56f7c67ea45b7185464fa3452f3c673c5c684b42e43d214916f5cb038dc634c862de5d42c14a1877be
 EBUILD qtvirtualkeyboard-6.5.9999.ebuild 1062 BLAKE2B 284f0d9c7b7533bf9ebecdebb5728fb6ebc6079306400be76198939e2cd40688018db8eef60035d582201bef6ef4fb17022df017c49d8803e4f82a50c687a3d7 SHA512 97b2732a7eac5db17b415170ef77c0d8380c569e1ab9a6c492e33b24cf0e4560d810cae0f1b2d8b9ae4e79c6e76f73e39263e0e4fce3325f4aec4054c5267d78
 EBUILD qtvirtualkeyboard-6.6.9999.ebuild 1062 BLAKE2B 284f0d9c7b7533bf9ebecdebb5728fb6ebc6079306400be76198939e2cd40688018db8eef60035d582201bef6ef4fb17022df017c49d8803e4f82a50c687a3d7 SHA512 97b2732a7eac5db17b415170ef77c0d8380c569e1ab9a6c492e33b24cf0e4560d810cae0f1b2d8b9ae4e79c6e76f73e39263e0e4fce3325f4aec4054c5267d78
 EBUILD qtvirtualkeyboard-6.9999.ebuild 1062 BLAKE2B 284f0d9c7b7533bf9ebecdebb5728fb6ebc6079306400be76198939e2cd40688018db8eef60035d582201bef6ef4fb17022df017c49d8803e4f82a50c687a3d7 SHA512 97b2732a7eac5db17b415170ef77c0d8380c569e1ab9a6c492e33b24cf0e4560d810cae0f1b2d8b9ae4e79c6e76f73e39263e0e4fce3325f4aec4054c5267d78
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.5.2.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.5.2.ebuild
index a040a8b2bcce..e56b46f38623 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.5.2.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.5.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 IUSE="+spell"
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 68f469e032ff..198e8ebd6c12 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -5,7 +5,7 @@ DIST qtwayland-5.15.10-gentoo-kde-2.tar.xz 43076 BLAKE2B 735ac875c0957de47f90d08
 DIST qtwayland-everywhere-opensource-src-5.15.10.tar.xz 568552 BLAKE2B c5cd4ed5ff78befb5bb49f9eb809562c418b2469aa0fa23728a1de46d57f42788bba3f87a54c8dda2ee0900c76b84213d1111fd86159dc5e6707f7b67ed386de SHA512 214b1fec7dfd815d148a7485f7811e623b06d172e58e4ee3167264a4e4b8f4aeec11474e574f91652a0bd3a48476a6747cad468f1e5035c49a55a96fc1400899
 DIST qtwayland-everywhere-src-6.5.2.tar.xz 1059356 BLAKE2B 4708b78ff5c8e413edaa4d4400317f58dd068273a5eef7caf1500abf8afbe4e9ac405b6854691ef93265a7eeb0cfb7406024826a0b7c7ba3f8149218af67fd48 SHA512 520d109402f1d629481029a3b1eaab740e66135db4069c34651172bb2ad821b22de60e9956a96331d2f32a4522fc52c6a4ba99b474092d755760cad08c776477
 EBUILD qtwayland-5.15.10-r4.ebuild 1353 BLAKE2B 3cab556185c182f4cd8ed280737e1434c51ec1c52719688a2ca5372d81baa5edca8675b22a7c0f9601f7dacec65f54e7e361fd851a2f226dcefaac38180bd9b5 SHA512 0ac3e896cc8c6c717e44dc3119b1c5cf3cc4cc6d22538f837699528c61e29e11a3969538b0518d21c7d7b1362ac81910e9508197076481a51b4bece379f7dca2
-EBUILD qtwayland-6.5.2-r3.ebuild 1025 BLAKE2B 6bd629f6b5a04d34615489934d1013d0be49c5c59d720ab8d3712a1d34adf01695301eff88256496760f34ae2cb22ef76e1ea695894d73ba50df6dd3c1d76b74 SHA512 c1f1ce94de2650218ffa30a93af3c04a77e8cae8ed172e469fa3608c146212105bdf7f7e327b2cff371e920e9a5e0bad8940461d96110815671a0e605ca11e5c
+EBUILD qtwayland-6.5.2-r3.ebuild 1024 BLAKE2B 051c5c5e6e979b7b8d385bcf0653bbc7366dc45a3f78cf934b29343a40145a91f193c2325f97eae633516c5ec8d7bcffa4f422d8a8d557a28d29eb76e0d36034 SHA512 318426aa080d2f5d43f58836b50995f83a51df4735b85dbe02f5c9fd4413424bfb2a7dec54f79958527d5e83963d6f502404625d9d91f83cf76b8a979af64f78
 EBUILD qtwayland-6.5.9999.ebuild 943 BLAKE2B 1527a7fe4f074ab0d22e1144aa46ccb2356d040777c8d43fb38400c05fd5c4c5b48f90ca06bcd78171ae23cb9bfe65e2764a4c1c32fddc6fcebbba318d0cb83d SHA512 b678155903b89df2e6171ea1a38ae2aca9260f99779935b7af89cca59a14445fbcec71cf49671f3aaf467ab069fbac1c61df4fbb19766229d281786905a5f0d6
 EBUILD qtwayland-6.6.9999.ebuild 943 BLAKE2B 1527a7fe4f074ab0d22e1144aa46ccb2356d040777c8d43fb38400c05fd5c4c5b48f90ca06bcd78171ae23cb9bfe65e2764a4c1c32fddc6fcebbba318d0cb83d SHA512 b678155903b89df2e6171ea1a38ae2aca9260f99779935b7af89cca59a14445fbcec71cf49671f3aaf467ab069fbac1c61df4fbb19766229d281786905a5f0d6
 EBUILD qtwayland-6.9999.ebuild 943 BLAKE2B 1527a7fe4f074ab0d22e1144aa46ccb2356d040777c8d43fb38400c05fd5c4c5b48f90ca06bcd78171ae23cb9bfe65e2764a4c1c32fddc6fcebbba318d0cb83d SHA512 b678155903b89df2e6171ea1a38ae2aca9260f99779935b7af89cca59a14445fbcec71cf49671f3aaf467ab069fbac1c61df4fbb19766229d281786905a5f0d6
diff --git a/dev-qt/qtwayland/qtwayland-6.5.2-r3.ebuild b/dev-qt/qtwayland/qtwayland-6.5.2-r3.ebuild
index cbda1d2edbac..11f662fc4e82 100644
--- a/dev-qt/qtwayland/qtwayland-6.5.2-r3.ebuild
+++ b/dev-qt/qtwayland/qtwayland-6.5.2-r3.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Wayland platform plugin for Qt"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 IUSE="compositor qml vulkan"
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index 57705c740b95..d6b9197d0666 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -2,7 +2,7 @@ DIST qtwebchannel-5.15.10-gentoo-kde-1.tar.xz 5808 BLAKE2B 4aa01535519811778a3b7
 DIST qtwebchannel-everywhere-opensource-src-5.15.10.tar.xz 211876 BLAKE2B fcc3a198a90826b2d16d3a9ed950b4e00d9a7645231c26af79f3271ad3dacb981f1c057ec95b9c3c71f2baf05e0b71a4fc4d5121cc3fc8ebe101cf21fc404d11 SHA512 ed8349820c623dd7abcd34244a2f05426667d6997a8952567c3cbe785bb2ea92f03dd931bb53f77b34faff16d04dd7d39e4165c75d7a9ebb4ae225d7582355bc
 DIST qtwebchannel-everywhere-src-6.5.2.tar.xz 213940 BLAKE2B c5b97c63c91ef282e37d51b0c9957c5603c05b5336537b1bf57da0c3d60d55eab6516a00db30248fe63a7407bf1713c23baad0bfb4089c76ed1105b3bcdbc120 SHA512 405595dfdfed48aafe42969881994472cb08dc4105a63ccf8c5ca059c0c243b654c38356059ea26cda9165a50b306c92d296dd3eca430b29615ec0ac68431c09
 EBUILD qtwebchannel-5.15.10.ebuild 599 BLAKE2B c61043201e33bea4827e7726a31ef0f631bba2799aaf76f9aa849d58f2b958e9053a6d73438906c92ef5ff160cf69cf568692ba566fa55d513154c7fbb385a31 SHA512 62b65e38d50d9d337a4e6979ff758211350f720c4b7072d02213133a88e017f8996f69aabd0a22a495c0c86b5e6c19a4117f771ce1f58877413fcd57613e4dc8
-EBUILD qtwebchannel-6.5.2-r2.ebuild 513 BLAKE2B ff74e6564675937e05159bfd59a2dc064474d98961219ec103ed706f858fa86b980a9b694092c43f62fed187c9f96cd7ff8c79a04c673fa19bc76ca3184e8005 SHA512 5fd93c342b755b32af156dca4ee75974756bed43b6437e7a7fb13ec54cbcb72dd8478a64b17d00f7862952ccb25b23a4ce8bbd9c59234485285abc485dcf4bc5
+EBUILD qtwebchannel-6.5.2-r2.ebuild 512 BLAKE2B f48123782ea025cd92f772ddc2cd090089835c01249a919376a9d882ca276d32a1284b4c5a73d93e15d8bc978248a098d89b5f0a8ae2386f49297bd4894710cd SHA512 96c4169c3f37ca28235d47976eb06a69022dc5a4ed36629835cc0c5458e9328d334efe3172823d5ffc6493c37266cdf83b7dac522cf386d84af839f411b565cb
 EBUILD qtwebchannel-6.5.9999.ebuild 513 BLAKE2B ff74e6564675937e05159bfd59a2dc064474d98961219ec103ed706f858fa86b980a9b694092c43f62fed187c9f96cd7ff8c79a04c673fa19bc76ca3184e8005 SHA512 5fd93c342b755b32af156dca4ee75974756bed43b6437e7a7fb13ec54cbcb72dd8478a64b17d00f7862952ccb25b23a4ce8bbd9c59234485285abc485dcf4bc5
 EBUILD qtwebchannel-6.6.9999.ebuild 513 BLAKE2B ff74e6564675937e05159bfd59a2dc064474d98961219ec103ed706f858fa86b980a9b694092c43f62fed187c9f96cd7ff8c79a04c673fa19bc76ca3184e8005 SHA512 5fd93c342b755b32af156dca4ee75974756bed43b6437e7a7fb13ec54cbcb72dd8478a64b17d00f7862952ccb25b23a4ce8bbd9c59234485285abc485dcf4bc5
 EBUILD qtwebchannel-6.9999.ebuild 513 BLAKE2B ff74e6564675937e05159bfd59a2dc064474d98961219ec103ed706f858fa86b980a9b694092c43f62fed187c9f96cd7ff8c79a04c673fa19bc76ca3184e8005 SHA512 5fd93c342b755b32af156dca4ee75974756bed43b6437e7a7fb13ec54cbcb72dd8478a64b17d00f7862952ccb25b23a4ce8bbd9c59234485285abc485dcf4bc5
diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.5.2-r2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.5.2-r2.ebuild
index 7160bd0b64a1..0d3afd47bd87 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-6.5.2-r2.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-6.5.2-r2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt WebChannel"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index cae04c6b10a8..b3d42bd6f278 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -13,7 +13,7 @@ DIST qtwebengine-6.6-patchset-1.tar.xz 9648 BLAKE2B c1bb02662ed5952e22ac3c3ee68f
 DIST qtwebengine-everywhere-src-6.5.2.tar.xz 412356700 BLAKE2B a48a513cffbf140aab08d748bc7826e841b7e1a87d113abbd0d8e7df5b9eb1ff2a44b89ae341c161eae26fd004699a1392f811252eb25aa13e0ce8e08f6be0a1 SHA512 f5791002495ebfa9912477f39a96d28bd4f4329f636f6b2055f1b811503b3c394c3ddd7baed5643f78f1905b1e8f860b4202b5d8e4afe5791e5450b9f46eac12
 EBUILD qtwebengine-5.15.10_p20230623.ebuild 8524 BLAKE2B cce6249550a5574ab7763c042117186201da9c006982eb99efc1da72d1d339e90f9c6e9a60371a25d314f3372234e9d976d2cd292d0abcc08a4442a699a95495 SHA512 95138584a3644d86b9835288446dd2d01997379f894a38f101bbf899e853235600c9c80b571ed8380a15d179cb72fb0b68324e83b1b230847325ff476fa992e3
 EBUILD qtwebengine-5.15.10_p20230815.ebuild 8258 BLAKE2B 766d6ad760f73e66d9a7f0ee52c3916e14b7f640e26784abf0866b039aecbf809c9e21a00b13d030311fa1ab91360aacd837e1257474800732a5598c3910c646 SHA512 c2d9534d452db6f53238faa05f6b454c4daeb6fcf683997d5095f4a9b777248e8d7f67ba4203a4b26457782817b887ca0cce36fb8d14f887e1b9772e78173140
-EBUILD qtwebengine-6.5.2-r1.ebuild 8083 BLAKE2B 3c16c2ee3141c8fe6be62f1bd25923dc851430d30b4ce0760e1b4fd0a857cd498f1aab4c1e04293af6d6eea48f5c7fa88e18ef8d9e7fb153de6cfff16f5c013a SHA512 c9e2ca65cf4961ae4e9cb9cba649705a28b5d705fbce46cfa2aa07232e1a5948857db03964be85f0fe3c2cccb85980c5642a22d222dd9b69f5cb614e9c12dd3d
+EBUILD qtwebengine-6.5.2-r1.ebuild 8082 BLAKE2B 1a92a1e0f76fdb8e166b6fb2def7143b598808df1204332888e9eeacc90eb9ee36a0cd86baf4a50776c8e409115ec26b3ce2d85603dce41d42ef80741fe10fae SHA512 fde0aa1dcdc52866c10f97417463a1eebf006d9d1735db669c350cfc2ba5c80b1177e49e8e1a96f216441591393265db8a149de808d8383fe19ae7af5e554333
 EBUILD qtwebengine-6.5.9999.ebuild 8120 BLAKE2B 0399b10325436c6ac9580b7fd289a07f36d88d9b465c6832c7600d9000f9e21caf9da11e3bae39a9251fe02ccec23d796b0ca174d1070cc3458e3f6d31fde12c SHA512 e661f0d4ef4ad258b826fcca095f2ad8eedd9afb2877a1cdcf4bd78df47380935ade33fb7c870c52cdef7b9409de032fbe11c64b30b86bed6249dab3b9aaea26
 EBUILD qtwebengine-6.6.9999.ebuild 8362 BLAKE2B f99e9911134964eb7c6594ae2ac49c7c457abf06a44366a8f845048be7d7c69795c5eedd3580a2de74d5a02b8d40f2479b3bc73a222a58eecf838e1aae5764fc SHA512 3565e114f3c3da1756ce074f5a6c0906addf2d809f0e27bbdbe76ad5a722e17157b48f0ddc30079215d50e9634bc687e1caca9703d5c282fab206bb643be5780
 EBUILD qtwebengine-6.9999.ebuild 8362 BLAKE2B f99e9911134964eb7c6594ae2ac49c7c457abf06a44366a8f845048be7d7c69795c5eedd3580a2de74d5a02b8d40f2479b3bc73a222a58eecf838e1aae5764fc SHA512 3565e114f3c3da1756ce074f5a6c0906addf2d809f0e27bbdbe76ad5a722e17157b48f0ddc30079215d50e9634bc687e1caca9703d5c282fab206bb643be5780
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
index 4f2f7fbf799d..879eb11787e6 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI+="
 "
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 IUSE="
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 05efd7f37b3f..fcd849119d5f 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -2,7 +2,7 @@ DIST qtwebsockets-5.15.10-gentoo-kde-1.tar.xz 1516 BLAKE2B e58309d058b7ba0233f77
 DIST qtwebsockets-everywhere-opensource-src-5.15.10.tar.xz 261792 BLAKE2B 67461c8d87dfff155817489a30e1f0a100851523ead230600c3f6487d0006db78c5506af68d4b576dc89f445d52d97acbd8f83d179f2ecbf3b3bdde25c11d996 SHA512 b9a2593169f0ff8e3e77c178de689dacfed564b2100ae67194f3636bf6d2300be3531a01b7158b06657f4a2d2a32453a98b96c6ab13fb9d8094e7ceeb5fdcbe3
 DIST qtwebsockets-everywhere-src-6.5.2.tar.xz 459540 BLAKE2B 486fcfe061fe27c512714e3c54c6cb382806b8fcff17bd6e88228f57972b107a654a64956989072cbb235ae5420ddda2ccbe5498334b43e336672a8a16482cd0 SHA512 0ede50ef09ec92cc9ff73ac8287d93c82eddaaefb8df05687f24fa1b9fcafe0e34cdef324ad81c89353ea9e21509243efce63bb42b640050309c61d100d354a7
 EBUILD qtwebsockets-5.15.10.ebuild 578 BLAKE2B c89a75bff2dc425ed95717e37c667136a5082535d19fd58b341e7da4b210224bf9142da7abbf24130abc4c4e36ee4e5f59eb32505c0be39cf22c8bbdaedd8261 SHA512 b5baa375f6484fd77203b7402fa3e1555a214e6cca44405b44eadf0e201e546026af97675dd01daf8513ddc6a575a4f30a4ed1ba23985cd200058e631d593369
-EBUILD qtwebsockets-6.5.2-r1.ebuild 510 BLAKE2B 261216a8b95c730a81fa6714c13c556919232bc0365b128e9e77966452cff63f6585afdfdb4e330235355040b3762346f946b44b7d673cc8e58691082ee8d284 SHA512 4963afed478b0bb00fd7488529fcb35c2ce6e3f5891c3089e8eb9708b76206c1b959ed5b6367e7489aaa229e24752b5d1b12a4b6fac3ccdbd9a579a0f33459a0
+EBUILD qtwebsockets-6.5.2-r1.ebuild 509 BLAKE2B 44720f4bc6aad3a96b4bcb315df610b428d27f88d8f32ab7856c8de28006208faccf626b431b55747b5f5b1f1b6877b7b71160b62ea4b4a29312f9379e6785ef SHA512 d0cdabc89557f5027ef63061c982523946aacd21f6537e4610fffae70d3749f19fcc3e5370d546ec15f547ae3f96ed84a0004852fd568ecb1470d09a5fe7ffec
 EBUILD qtwebsockets-6.5.9999.ebuild 510 BLAKE2B 261216a8b95c730a81fa6714c13c556919232bc0365b128e9e77966452cff63f6585afdfdb4e330235355040b3762346f946b44b7d673cc8e58691082ee8d284 SHA512 4963afed478b0bb00fd7488529fcb35c2ce6e3f5891c3089e8eb9708b76206c1b959ed5b6367e7489aaa229e24752b5d1b12a4b6fac3ccdbd9a579a0f33459a0
 EBUILD qtwebsockets-6.6.9999.ebuild 510 BLAKE2B 261216a8b95c730a81fa6714c13c556919232bc0365b128e9e77966452cff63f6585afdfdb4e330235355040b3762346f946b44b7d673cc8e58691082ee8d284 SHA512 4963afed478b0bb00fd7488529fcb35c2ce6e3f5891c3089e8eb9708b76206c1b959ed5b6367e7489aaa229e24752b5d1b12a4b6fac3ccdbd9a579a0f33459a0
 EBUILD qtwebsockets-6.9999.ebuild 510 BLAKE2B 261216a8b95c730a81fa6714c13c556919232bc0365b128e9e77966452cff63f6585afdfdb4e330235355040b3762346f946b44b7d673cc8e58691082ee8d284 SHA512 4963afed478b0bb00fd7488529fcb35c2ce6e3f5891c3089e8eb9708b76206c1b959ed5b6367e7489aaa229e24752b5d1b12a4b6fac3ccdbd9a579a0f33459a0
diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.5.2-r1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.5.2-r1.ebuild
index bbcaeda665e8..60d75487bb62 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-6.5.2-r1.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-6.5.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 IUSE="qml"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 76e3e1cf6493..ade01146098b 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/acts_as_list/Manifest b/dev-ruby/acts_as_list/Manifest
index dabed41aef7c..a7dc2601627d 100644
--- a/dev-ruby/acts_as_list/Manifest
+++ b/dev-ruby/acts_as_list/Manifest
@@ -1,5 +1,5 @@
 DIST acts_as_list-1.0.4.gem 40448 BLAKE2B ac0d9e29006c052b1f421fc734d19390942fcb1eb68d33ed67944bf9bcf1dc8b73c813a2ee8ae6b358f74e019bf36d200e6fe44e01391dff68041d5263b907b1 SHA512 45cc3a2ddc3bdf245819bfe62c39cea5e9b96bf63b3e817adae2acadcf7b51f47379ae9bf1c2c1cfd6a1dc70d7279f44e0a932c838fa93fa4a0c3b9dcbcd46ea
 DIST acts_as_list-1.1.0.gem 41984 BLAKE2B abeb0325795276294451b4cb86e20dab6871003c72679ce28f9326cd844234ad56457a03d9b9ecd81b8c143deeefc25dd15df88a38ebdd1324a953b2399465e7 SHA512 bdcaf07bc4ad3854d68c8d95e666e86c2500474ffa212c315b6b4abd321341ac782c0e301f2c859c12b80ecfdd1cc743ccf8a7bdbdb36e30fafcd98d4928a00a
 EBUILD acts_as_list-1.0.4.ebuild 905 BLAKE2B 87aaed0b79f37ca049380f15e133c811741efb65d51a16512a8ff71043139b6ba69b1276ee4d895bafe6f8bf8b902eaf5501791a3f5e58638590e80cf82e5be7 SHA512 bf0af82c1ca30cfe0e473a68e92ab9056ed21a1833fc9adee8a912a97340ace545ec2a147fc54cd2fe6963617608406e0cffae4c2e47156d0b91fa8c2da605e0
-EBUILD acts_as_list-1.1.0.ebuild 904 BLAKE2B 20e22824ff06f1a3f9ca37ab8330c31dcd62a1eaa1bdc4a870cdc6bef68b84e0160f1a82cc580c54cf792bc0132a7c41d10ebdf063257e2114f7707cfc38a073 SHA512 a3f18da56beff465dbb3970e7c59d1a113a8c88ffcd965c0a73710ca87fd7fe5ae9e8de6e7a68f1855ee98c4533cbf3c5a77db6775867667fe0dfe13960530fa
+EBUILD acts_as_list-1.1.0.ebuild 904 BLAKE2B 78a9fd1533080ecdeffa18579fbf9e7ba3ccff01ea7277a3f23fe24c7b64b7159830e8d1b10865e769f67eaac95d1de9efd833fa9e648f9afc9486f62b2848ed SHA512 492761a0a0204a1406c7005c8fadf10bbb36fc0fe159b4f4e91bebb0eda16f5d17c701fc2e35441c92a8da745682b3ae4408d377e535a298ef0208389e1db6f9
 MISC metadata.xml 347 BLAKE2B 2d2ba105cf2f5b444977deadbfe99bc236c4a5a2ee227ebc72215161b9cd9dc0decb036f71205ced7560adffcb55c7bba220163d4a24b6113f8e54241615d7d3 SHA512 64a245beb42b2c7e87ba21faa689a45ea32b2222f675b0b3e72cf666bec981a74d62e60cd1090a304309bbc6d516cc4170b70dd71137bf0fa4b0e59211d60665
diff --git a/dev-ruby/acts_as_list/acts_as_list-1.1.0.ebuild b/dev-ruby/acts_as_list/acts_as_list-1.1.0.ebuild
index aecf7c5a7880..1ea325ddf3e6 100644
--- a/dev-ruby/acts_as_list/acts_as_list-1.1.0.ebuild
+++ b/dev-ruby/acts_as_list/acts_as_list-1.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 inherit ruby-fakegem
 
diff --git a/dev-ruby/excon/Manifest b/dev-ruby/excon/Manifest
index 2ed4d1a71f78..46bc1f29ac51 100644
--- a/dev-ruby/excon/Manifest
+++ b/dev-ruby/excon/Manifest
@@ -1,9 +1,11 @@
 DIST excon-0.100.0.tar.gz 225605 BLAKE2B 4097fb64e79ef8fe89d2e93f7c44e3f71634f2c434eabd78c1518c35e06b68bde1c5254ee5f61fdf4c55d03f261ec83a5be738440b13f036d65b69051b57e6d2 SHA512 0f4758ed66b9915967b145532e648d716370c92ea3fb1ef6650079911901d53900bc03c18b90c7d3bd033e89e2d9bf1043edaacb86c5269f48303fff0b8de453
 DIST excon-0.102.0.tar.gz 225048 BLAKE2B 6260b39f169766b1ada7197a0f291df6dec8c65281680ef83048ecaffc5d28c4fe5ce76a739ad511f53715deabd0d582fce9087933165dd1afa9962c1db34091 SHA512 65b03011670899a1e13f45f0cd0ee066bdb37d1e75bb534e714b646f7591433a7b2ea2039879b00c35511c651926d808cef6cae043cc04c819f4f28cd2b18758
+DIST excon-0.103.0.tar.gz 228734 BLAKE2B 1188411785e0101903eb7e2bb5ccb3db9259890a0957f06fed9297240858c91dca2cd16bfedecbe5867b816937812ecced8f577ea70b752ede295ce381a8071d SHA512 a605dd8c0bc55cbdab2b852e9c5792dca74908fbf5f05f512b07f1e08f0d7932ae0dbbbebf8d6685d1bbdfeaa91615f6e6eacb12722df653b8d9fc7a688a2731
 DIST excon-0.93.1.tar.gz 222206 BLAKE2B d32302aa69a54ffb332cbcf2fed8cda2e7e01461deb1f7477554c1fab1bd56b865b15aa6a44002772486c0c3a88729f2414a9cd6be057f07a6bd38e2fe7965d9 SHA512 bf7eb0532b44722c84f08c994a9cd9f473a3df23dcd9df87ecf34dc5ea10329391658fcb772103dde61e1f46ad33cfe98c773a5d2ee767c21f6bc11bc0d4bc46
 DIST excon-0.95.0.tar.gz 223110 BLAKE2B 1d0706cf999ba6affb7aa9e7ed7160c90667d1bc27d121e4b40818288c445e893e9b438322a99174f2e86d6059b3e9b6bb7e8eec6c3c0ad211aea9862f297a0e SHA512 e1a269c8969f553b63a57642128b36ed82f9326de33b5f386f4ed0da60c1c28fe01b762e8607e6904fcc5445d9ec8d2bdc9985c58f8d07076693384fa435ad31
 EBUILD excon-0.100.0.ebuild 1447 BLAKE2B fb5f8ca0c44b8072520570e7edb585302d017b2d8b508bc2b068fc35c34e84ed2b048ef29a4d824f0b6c370eafabb64ff707c22389a2349b9274d9e07415ed2a SHA512 188cc5ed8b575ad83432673327d4c4756fe73f9690e1515d4f4c2a6c9a8fcd3c386628635737e2332fc775fa550be904d4f74acca80551c2e784ecc08cf60138
 EBUILD excon-0.102.0.ebuild 1440 BLAKE2B 06eb737e4449b43f2657d2549f6fd77629037cb0c07b2d3fb7380eec0a7efebe959f0b30c2b3dde2f03b23f2c72261805b366bda24944a17e37c8a88fa9f6330 SHA512 d828acd5cf21f5f0a84dd6116c5faa358807dccbafc380c15cbbd9c436fbc4594b66bbeb56224f948785688ab8bd39bb092a4dee837ddaf6849a2a07e394f97a
+EBUILD excon-0.103.0.ebuild 1551 BLAKE2B 603bc210178d61922dd2e4c884a693aaba1eee550032c79edc8e071e37741b3dae33be4e596dff4b1347bf1c547367c240d4c8d8edb6ccfdcf7fe01f471d882c SHA512 eb8ba7e3b09812b4996b816b0ec9bb5246d29d2c9a6ee2ef1e72281a7c9835ec7d52451b2a5eccf227c395cd675bb0ab486c2b351dd331b0c1bb2bef15b2cbe4
 EBUILD excon-0.93.1.ebuild 1172 BLAKE2B f8b2827a64b74c14c82dc0f5cf452934602447eaf2182b8b7a645c95c2b9b867fefd6c53a650c735dba5d2c704034faddcf7cc6e0e6a0fa78f9b0082e15219e1 SHA512 8e0ab41f166f3ca62f529a0c8566aaedabf1dcfb81ecdd99f2133b9eb35b34e9d31543afc74e2feb8610e12dd173a3019e40d289be8ebadc04ce3b08ea64100d
 EBUILD excon-0.95.0.ebuild 1173 BLAKE2B 70cbf8cf8065f918918a71383fca9c7587c5c0f71f6227273bbe2aa81b181357101fdd075eaf7e090112358ab9d4e0c71596ef4b4262c193577673424aa09e77 SHA512 7a64b892d9641bdbab4e5903fed47b1c554afc78d34f32cf9b557d43ec364d11ae6eb139898dfdaac8701b4d350f7ab3caa3e9baa2bfdac52f61eeda18addc28
 MISC metadata.xml 449 BLAKE2B a51e81b7b137d4140aaf665fe3f799af701ae62dc5d319c96a1bc995f26cd6f79d59122409af1f2a37970106a49ba9e5ae7a48e37766c5f450c102c5ee62747a SHA512 f8cf7e241dfce9528214e00dbe8026b2b6c211f8278cb7b30a093a09926e37ecdaeb2d7e30e6f5b8e63f278c3d4900d0c62e84c17a89ffa0e21ba5c18458dda2
diff --git a/dev-ruby/excon/excon-0.103.0.ebuild b/dev-ruby/excon/excon-0.103.0.ebuild
new file mode 100644
index 000000000000..8b6240e05f1d
--- /dev/null
+++ b/dev-ruby/excon/excon-0.103.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="changelog.txt README.md"
+RUBY_FAKEGEM_GEMSPEC="excon.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="EXtended http(s) CONnections"
+HOMEPAGE="https://github.com/excon/excon"
+SRC_URI="https://github.com/excon/excon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+ruby_add_bdepend "
+	dev-ruby/rake
+	test? (
+		dev-ruby/activesupport
+		>=dev-ruby/json-1.8.5
+		dev-ruby/open4
+		>=dev-ruby/rack-2.2.7-r1:2.2
+		dev-ruby/rdoc
+		dev-ruby/sinatra
+		dev-ruby/webrick
+	)
+"
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files --/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# test that need network
+	rm -f spec/excon/test/server_spec.rb || die
+
+	# test that wrongly assumes 127.0.0.1 won't run a DNS server
+	rm -f spec/requests/dns_timeout_spec.rb || die
+
+	# tests that depend on eventmachine which is broken and no longer maintained
+	rm -f tests/{bad,error,pipeline,response,request}_tests.rb \
+		tests/{batch-requests,complete_responses}.rb \
+		tests/middlewares/{decompress,mock}_tests.rb  || die
+	rm -f spec/requests/eof_requests_spec.rb spec/excon/error_spec.rb || die
+
+	# Use a rackup version compatible with sinatra
+	sed -i -e '/launch_process/ s/"rackup"/"rackup-2"/' tests/test_helper.rb || die
+	sed -i -e '/open_process/ s/rackup/rackup-2/' lib/excon/test/plugin/server/webrick.rb || die
+}
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index 038fcf328677..85757098c4e9 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -1,11 +1,13 @@
 AUX mocha-1.16.0-ruby32.patch 1889 BLAKE2B ac383ca88d04a78751109cb03a3ab83692cac13b5636974678b0b1bf42ce2fd2f71b8f8c6b1c3c7dde7ca38574120ec2cd68c8ff442dd908b680eb7da5a39e23 SHA512 5abbe4e7dd65201663e6a055936827a60b01213e968be18ac7f960cda66ff88c43a09993375003802dec721808989cc6c35cfbcd73be031de45c6c2cd9410e46
 DIST mocha-0.14.0.gem 82944 BLAKE2B 50a066e2f5007df08a7f76785fd4c2b12327b4969c11324a0574c707bea3219d51edb9ab40635378c16b46ad826ec7eff42434a27cd61113a6f40251fa2e6930 SHA512 918e45f2ee761c7dc399c7958e4d406f9e186c90f479fd01a421aa542944b47e9b2c5e938f4fc5292a7da345726447b2d47dc5f417e114201f8a4d9893c4d461
 DIST mocha-1.16.0.tar.gz 246370 BLAKE2B c2891021c33e4038ff965a470eda3be7eac2765f7c038fef33f38cd07b8501fdb88a1dcd8d291eabb124fb0fff50c40651bf29ac4a28012b57c7a02d2ff46b63 SHA512 b7d8825771f84245e7383e4081dcb42734b9716e7bef3c1b5d49ac28850590b4beabf8d0370992e100b6340ff3cfb3113610e303de74bc33c059bd9b9910cb8e
+DIST mocha-1.16.1.tar.gz 247461 BLAKE2B d4bce5f945018e527f6b19c6328d3687912a3ac9638b6d7b7bd5cd5bf1cca20fd34ae8261a56525dc11610711e590f6ae915a0a5a0555ec47e30e8e3cbbda63f SHA512 b65cf98ab39334ad86a6f375b648fc906d083e803afa5bd2a62aaed87ac625fcf94ed9b16b21dc1563ff67675e00bf008d43234bde0343604f6fce2841d8b2bb
 DIST mocha-2.0.2.tar.gz 245650 BLAKE2B 3bf56cacc99b5eeb17977cd1052c635df74aec10f20a76d843d703e68520ef434bc9111b739591dfa15b21ecdbdfb5b55037e9509683624349be83613528787f SHA512 93579390f4feaf034cd6e8905654fe8cc5c8a1f28f3d27488deeb84250114a5e04c4e7aa544f18f33b2c3887668d5fddb3a3f9bda5548d577be1522da2e09760
 DIST mocha-2.0.4.tar.gz 243542 BLAKE2B 4a9bb3f1493225f7eed7080661a168a90c56e4f737a8bc15402bf0a08ae7cc14e8e5cff9a090b6413633c37169e7ff9f45aedc3c5fd929ab32d359ad58d404f7 SHA512 4a72cd18e70608265bc20761848657b900a6d60c888ec4027e3b9f1884efa41d0d0591c4f3e26edd96a806ecdfc3b921d5871465a799a5ea5905627b7093f5b1
 DIST mocha-2.1.0.tar.gz 243730 BLAKE2B a99cb5b6d968e0612cfc4f2d766029d2f700c92b3e1f16f33341b8c5652db823d52fc34070acd0711ea94077eeed32d13e605982b93baa56e7d11dae7fcfe55f SHA512 8044065ebb2225f7aab117353b0a49c854768fd55f7165ccb5916027f6f8fc843665572ed786e41d5ec6affedf397f4de20fa31a9f9c1582a17a67555662a65e
 EBUILD mocha-0.14.0-r1.ebuild 933 BLAKE2B 28076a15be9a921a81ee23d19096967bb86f21865886e8052e6edd8dbe94e038e9199c37137548d3749fa11205ab6ee6f87e17a10c1cd1f5a00d2e20ef2c9f4b SHA512 9648c9e78b6f9b52d90aa7cb2bfdcf823bd24ecc9e1a63e176eeb18e19f59b2be163cd19599352274c6b09f6be49f29284c5d493dc1a1e0f7ff922219b8f5a43
 EBUILD mocha-1.16.0.ebuild 1059 BLAKE2B 4a5b9815abd9ae4c88053b05f6a8855fb3ef1f96180f70c490020e6292004376ffd5a69ec5dee45a12ac4389d052d862d8fcfd9b844be86dcfe6cf4a04148019 SHA512 f0dac0499979c406be52ae294968dc160f06c4708224bf376a2e5e6d3e099ee38057caa3d30bcd7a4f8764cd11834dee4c65fdffd38984e3968fcc8b96935c00
+EBUILD mocha-1.16.1.ebuild 1052 BLAKE2B bde2633f9184fa12c1dec7c518c8ef23c8680d9d0ad3dc76b512d0b14154e9c1b11d98751ddb18c62a62998199554897089c77f14c9d4b186600edd4d9f12db4 SHA512 220b0d302b4e5b6b55e8890273436640f134d4f5ea82e4caa0f9104fbce2851c91b8d97515769c0a93576980ef0712ca18c33e1d681a2893482404c347dc511d
 EBUILD mocha-2.0.2.ebuild 1076 BLAKE2B 929b09a37927bcbca0bff449cfcd81a8d431736c87d09afd1aea76eb2368234bdef79fc55d9af4a502246da4196b4998f77c37a24fb2397f5f16d2ddd310ba62 SHA512 223addcd1f6cac1e4fca4b2c16c75515e4a54a60afac375dafd38363290813c7105060ec13cf92399ad5e6cddb1b3082f2fb0ef0746db4275be6d20f7dbfe337
 EBUILD mocha-2.0.4.ebuild 1005 BLAKE2B 246b96ce74599dff847325974c7972c317facd679a66f99b770dde81495bcd2697ac87693bef95602a9a31f487a14ebe489bfe8f0327d70ebe8ba62a74d2d321 SHA512 fcae9a329a08462d960ee8b21c80f23ad3280acaeef97207e627c46fdcfb8ccc25decb998f28a1c14cb0206b5de7a92ec30ccda2827993cd628f450b92ec4372
 EBUILD mocha-2.1.0.ebuild 1012 BLAKE2B 1236c88f968dc3397a3d8470c7395a1bfbfcaceab9e1a393ec099a845597821b1463292186014b8243ba38ef5efa3ae8bf53c282deb14e806d3a75446f8f6ec6 SHA512 188da0d4430600aedac7feac4dfcd81f474e49cffaac19563662404203ce69db0a0326b03333ff58570cb33882f2408268c1473c85a8a5e935f351cff7990e47
diff --git a/dev-ruby/mocha/mocha-1.16.1.ebuild b/dev-ruby/mocha/mocha-1.16.1.ebuild
new file mode 100644
index 000000000000..01b505b918e2
--- /dev/null
+++ b/dev-ruby/mocha/mocha-1.16.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_TEST="test:units test:acceptance"
+
+RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
+
+RUBY_FAKEGEM_GEMSPEC="mocha.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
+HOMEPAGE="https://mocha.jamesmead.org/"
+SRC_URI="https://github.com/freerange/mocha/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
+
+PATCHES=(
+	"${FILESDIR}"/mocha-1.16.0-ruby32.patch
+)
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
+
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	export MOCHA_NO_DOCS=true
+	each_fakegem_test
+}
diff --git a/dev-ruby/sanitize/Manifest b/dev-ruby/sanitize/Manifest
index bc1ae50f8f07..2de6496f71c7 100644
--- a/dev-ruby/sanitize/Manifest
+++ b/dev-ruby/sanitize/Manifest
@@ -1,5 +1,7 @@
 DIST sanitize-6.0.1.tar.gz 1352433 BLAKE2B 91614d3a5fe4f3d3741a8cc8d88a98281a43424132e82932600f4140ab857a0a3492d49ed92205a7e9a05f9eb0b350c30b3b0342790baab0b5f37ab6b83357a2 SHA512 2b43b11e211ddc10c1362bb5c78abd2c8844f3daf6dbb44ddd0731af596a44f7d5883e4f45e3d29c9b8f545794b8a1f98301565818982dadd8c86ece7fd9b2a1
 DIST sanitize-6.0.2.tar.gz 1352670 BLAKE2B b9d2066f4f7ec168f6265953a855e9e5cccf5d045b294178656649e1f38b2b39a4bd605ebd802a430c85eb6eaf5166baf0821d0d5a99229415338726fb7dc393 SHA512 e4cd6b2058d937db1e37bc5f09e471c96bb4eaac4a67ecf634150b5aac1c87f02e627c8a60cac482f0bebef460ec3ef01d02b45b9524025269a7dbc51d20ca8e
+DIST sanitize-6.1.0.tar.gz 1352762 BLAKE2B 7bd05780437387767dc6b2779458e6422483168ec8d5ea11ddb582c1a6375d7d2f0b686e64d769124be79a285774fbc175079024474a9ccee69e3a750f30ae7d SHA512 506df1324bb767aa7409c2bc8a0a309ad5d174d313940ced37b61b0a63ec756ecf91dd4c1ba43ab2d6386f51ad2970fb0dbd8b9b919822a5d12ddce4fe0eedc7
 EBUILD sanitize-6.0.1.ebuild 762 BLAKE2B 8dd6159223e6942409b1c361a0386646bac66892550616beda33a067d5c07d7cad3ce19d66b8a94f1f2da8ab2f0d666aaebd0d04250003b201c0f8dc5dae34d7 SHA512 988023d10ccf24a175a59d355aafca7094b64b24853b6949fb033ec5d113551fba94d6bd17260bf626f1b3a57d907a4fabc90a4dc854e39e59fd386408e16524
 EBUILD sanitize-6.0.2.ebuild 755 BLAKE2B b143655251d14cb4b78f530e02de7877bc99c7834a09ec465fcf42d642353d2a58bdd6b90f2ab2fa986e38876a6bfb90dcd6cc9ff5e9d811add5ad26bc1bf6e2 SHA512 d6c4607ec8c74e3f340b0ebb3924e2bd2a19e2f7ea3ef917b23aa8f5b3c44150379c1e1bb53d6b65627bc1232d247bf7b9b3a42c5ccb8b27357a931d24f45473
+EBUILD sanitize-6.1.0.ebuild 748 BLAKE2B 6878bb39a102f7d27f10d8301cd17080437fdf3763d12ba1aa9983c351d58977b243d11b70677e52a8d36ccba1e6f1922bc41d5566c64000e71f3d3714b822ad SHA512 47b198a76258bab7ce42ba93ee025605190741b4a95d7c244448c0d6c10f45d563e30f1c99d94c3dd9a6f9e51e85e129d0c191269aa2587d3a1b4e20b0c1f25c
 MISC metadata.xml 342 BLAKE2B 56d8c8d3467a7284a795dbe938e591403576e6e3d4fe675471e2b24b6c2f8520bec8cdea8d7e3182fe6fe8187a6dfb2889befbf5272f76b8f87acc4942a36e9d SHA512 e4257fbb18383d391d7962b3869db25b6875721cad7100dd42f7e10ac72254720c67e1028c13e4fe7517fda833677c1a542e12ff81ba0632b878b851a974c00c
diff --git a/dev-ruby/sanitize/sanitize-6.1.0.ebuild b/dev-ruby/sanitize/sanitize-6.1.0.ebuild
new file mode 100644
index 000000000000..a53d20a45b0d
--- /dev/null
+++ b/dev-ruby/sanitize/sanitize-6.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Sanitize is a whitelist-based HTML sanitizer"
+HOMEPAGE="https://github.com/rgrove/sanitize"
+SRC_URI="https://github.com/rgrove/sanitize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/crass-1.0.2 =dev-ruby/crass-1.0*
+	>=dev-ruby/nokogiri-1.12.0
+"
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test_sanitize.rb || die
+}
diff --git a/dev-ruby/serialport/Manifest b/dev-ruby/serialport/Manifest
index 7067f813deda..56afacc65939 100644
--- a/dev-ruby/serialport/Manifest
+++ b/dev-ruby/serialport/Manifest
@@ -1,5 +1,5 @@
 AUX serialport-1.3.2-clang16-build-fix.patch 428 BLAKE2B 6dea3ea254b19cfb8b4b7ee0844b648d9dd9bb12e4bb508bfcbe62c5cadcc2041b4caac590ee5d08c7cfb1874e32dc21de7a9fd7c4c669095cb0051ef37dc4be SHA512 6ae14305ffd30d4024e21e9d5fd8d049c5dead1b0b01a366435322698d4fba0acbb3305a371259619aba95559c208f4c707b7b38dca69a9ae9e594205b1ed202
 DIST serialport-1.3.2.gem 25088 BLAKE2B 035e7bdb8ef321fb67ec63283c0e4c8fbf8f909ea3495994716b95cc55f212561a09a87352aed67290d96b54bb26b7802e5ed37c27e67291d768d7eb6d30850e SHA512 ff78fa04183108c2e9c5eb4f0caa9f8072a693a2a120ca084476b4125ca32ec67a6fb268bedda3ca142a9a397dbc585dffaab88f339fccc12e5ad03a09d4c28c
-EBUILD serialport-1.3.2-r1.ebuild 804 BLAKE2B fa5f8025aa58eeaf9572b1fe71ee54827aad78798352275b53c7b990455941bd742507b0af4c772119fe28bc83a3de7e813fd41d74fd461c1b644985c11ce985 SHA512 c6da590ec87a9c1130b934486b64f7f19acd195d607a1a07def005f06ed2f325b2e477f6dc422beb8478d54f235fa4a0952eb68920a0ed26aade0ddbf71441b0
+EBUILD serialport-1.3.2-r1.ebuild 802 BLAKE2B d3322aab3a21159ef644a5ef6165efe1abbd75acbc3ce673473fa79e787a12c05eb035a96ed2474c1b2ea82f8d666088c6046fc617f7e8970105caca1ddae8fb SHA512 9eca08e76426a422306c26b0c288b09ccf7519cc10d9baa7baabff337ecb33e885d0c624d6933b754779c2336fa34c7256b99378840365d11614ebd71074aa04
 EBUILD serialport-1.3.2.ebuild 752 BLAKE2B 5e06e384ded36fc82eaa78f6f7ef85fcabbaae4f2cf84cb70b622d2fd72d1273d71c86ce162f81cc5efc16ac8b2af2c98397bd2edf02a4214910a720b3dd6377 SHA512 26a43470edc3083e8bf40bfa79c0af2988565702e1f6a6dbdaaa91d4f20fa196ba6be61f6ea8d9bb44293098ba0e88525bb93024d05768c710e141c3f49fc2ca
 MISC metadata.xml 349 BLAKE2B c7564017cb010dfb71882f21a24d3f5842450cf5ae0d937745c2139913ac5ea2909b99989bfa92eed299ccb0b8adc82d5ad270081887e50f7bf11296097c0ff8 SHA512 4bd626072beef251443974e36503ccd25e1e5d4fb46f779ce2d8d4d0112daf22e545778c8a5b6684740ff7c07f00d3fc90cadce85b22f446b66ab2595abbf4db
diff --git a/dev-ruby/serialport/serialport-1.3.2-r1.ebuild b/dev-ruby/serialport/serialport-1.3.2-r1.ebuild
index 2825b5e4e88f..2926a1035eeb 100644
--- a/dev-ruby/serialport/serialport-1.3.2-r1.ebuild
+++ b/dev-ruby/serialport/serialport-1.3.2-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/hparra/ruby-serialport/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 PATCHES=(
diff --git a/dev-ruby/tilt/Manifest b/dev-ruby/tilt/Manifest
index 673fceaa8884..528b43c32529 100644
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -1,7 +1,9 @@
 DIST tilt-2.0.11.tar.gz 53041 BLAKE2B 2509cc3efe5e6302c8943c00108eeda6ee4b23a18952ad23049e11ea28b397b80a21d34c4d241119f45cedf2a978a2673d857a6cc32d7e26a2016caa510458f9 SHA512 e28e31ab92aa42eada34e0f6c05dab6a54945d07b649588356b1635ba8a36700f6e537e8702613883693501442d21690d8b3690b06f7b9f331192134511b78b7
 DIST tilt-2.1.0.tar.gz 54542 BLAKE2B b2d7729654efb51d9f61afe75476d6620edd7c104c045dc68c6a5e983cea8dec612d2e5013c51ee7736c87d770acdf8e6f186ff156d177f3281e0fb58d0e8422 SHA512 a450bdc51d782169cda2c43b550fad1425d4ee1a8f3c2da0bb1112051eb9ccfd95e903984ed6d3c76b0f322a243021587c6614f6452c385450ff1a985cfbcaa5
 DIST tilt-2.2.0.tar.gz 57826 BLAKE2B 10729ac9cb2e2d0b2292a6fdacc0d705179d719d7f4bbdb11075e0eeaeb82933daec22063d3448ea2ada6e50f37b2b66303854707f50162efd11a6151ded45df SHA512 135a32402512fda71952dc2534b02a291d749dbdcb9e17f52c7fa6ecfe3bd7e894f28f3d3d4a595daa63ffbe90cca106347aa916541292558a26d8122fcd7c90
+DIST tilt-2.3.0.tar.gz 57454 BLAKE2B 2c3c934e73c015be850951c67731b2f1640fb340ab1807c72c654363c2ab3aca939b8452327cd54e2c1964add81176cec0dfd2639901284476f0dd13d42a2ccf SHA512 3438c196c2e0936f2c3551fe3786d71b1336118352b97c95d3504b900082ce4248bbaf715f3f812eb7fe6e959767c75e316bf6cd5b659c216bbfd630dbf678bc
 EBUILD tilt-2.0.11.ebuild 1326 BLAKE2B cfcca1b12c5a716d9db6fac9ab530299486de446e5da1691a11b1bd4ccc2df79202be529f788134944be2945c87b2f426d1305a0f14e066b09a7d2d8d1e2430d SHA512 60f2b95a57305756de8b3a8b973195a7ef881f0a70840350b95eb6081091d2478d8814c60e6f1b77c3b12c11b141971e491408139a83a3bc933b8252380369b0
 EBUILD tilt-2.1.0.ebuild 1330 BLAKE2B a362dc305af6e323cfe43cc3021f5ea992c440d066e95560cfac0eb99f797d423d6a9ac9d981074fabb4b7d2be3c80044223040e6fdac03c2bea23cd84760346 SHA512 e3e8627b4910ba462ba03f25685877d31755424a3fd75f961136ab2b36c18e8fa4b28dbccd40b467883a548e2bf2c53b2c998bb2b08bfad4f2e921cb602fa37e
 EBUILD tilt-2.2.0.ebuild 1360 BLAKE2B c28af8d597b610ac374e0ff3cd5acbd92b9f67efc542d7414eaaa71a4cef28a923aa0418f18681b8852314aedb3449f11b74416fa4da22aaf2740a9aee798326 SHA512 de195a4172a82eba07b009a206eab72b9167c046099f4dc89951e0995625f592a9b6ee69f2fcbef8dccac89b46a408206005a949b7a6e5e8a05d282456750bdb
+EBUILD tilt-2.3.0.ebuild 1359 BLAKE2B 6420eb1d31669c27fe993be065263781e56334b013b71e07bd2b0b5f1ca95a4f95296fe71c2a8c3f8b8af03fe8539c2aeed85a830d75326afa702d38de3fa7ff SHA512 d13023784a72f04233535a319b90e0b097f7bbe839bfa9ad901151e2cda4adb49ebb386cf445de565c40fe76b40111254eebb92357b2ab8020891c0d2869805d
 MISC metadata.xml 340 BLAKE2B 5414049365511f348e3da85bf3f207b791dc4269331e6a650f90398b6afe2502e2e62624ec9597a2d55dca4a7e4a99e209837c44bac7a901ec42139518f41647 SHA512 4be8002eca7cc4c0204311dd7dd187caeee3f40db9b00d108fb18e97009f8cec10d298a958bf83d24177297cebd78789cdd546a0c5e9c7288aa697dee1facf71
diff --git a/dev-ruby/tilt/tilt-2.3.0.ebuild b/dev-ruby/tilt/tilt-2.3.0.ebuild
new file mode 100644
index 000000000000..2c9d6bfc3006
--- /dev/null
+++ b/dev-ruby/tilt/tilt-2.3.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/TEMPLATES.md"
+
+RUBY_FAKEGEM_GEMSPEC="tilt.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Thin interface over template engines to make their usage as generic as possible"
+HOMEPAGE="https://github.com/jeremyevans/tilt"
+SRC_URI="https://github.com/jeremyevans/tilt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# Block on some of the potential test dependencies. These dependencies
+# are optional for the test suite, and we don't want to depend on all of
+# them to facilitate keywording and stabling.
+ruby_add_bdepend "test? (
+	dev-ruby/erubi
+	dev-ruby/nokogiri
+)"
+
+all_ruby_prepare() {
+	sed -e '/bundler/I s:^:#:' -i Rakefile test/test_helper.rb || die
+	sed -e '7irequire "uri"' -i test/test_helper.rb || die
+
+	# Avoid tests with minor syntax differences since this happens all
+	# the time when details in the dependencies change.
+	rm -f test/tilt_sasstemplate_test.rb || die
+
+	# Skip tests for unpackaged asciidoctor converter
+	sed -i -e '/docbook 4.5/askip' test/tilt_asciidoctor_test.rb || die
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 66ed90aeba03..33286fde49e1 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index 6c018991d858..cf768ddf5540 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -3,7 +3,9 @@ AUX bear-3.0.21-libfmt-10.0.0.patch 936 BLAKE2B 1ac889c2bfa057cc6b25fa473a88b05a
 DIST bear-3.0.20.tar.gz 125393 BLAKE2B 826a774beeb0596038f69b345a3659fe58f897bdb1a63f5faeac1d4242ae3cf4bf346ab82d2f87934d0786e5c0d4e835837b838a62f5a92c28ffe5e6a3d6a900 SHA512 4cf0e648b73fd4c0ac109c4a853e203efccb34ac7373d6c2f3ee3d5089853b791008990df768871dfd1268324bcce97c44657b4c3a2d1383134cba3eaec40bdd
 DIST bear-3.0.21.tar.gz 125827 BLAKE2B f7dcd383f27c370edb2fa0225e8337b2abe086df25a0272f61051600c017527b4079750328cb811b6967ad6fab51647909333eb1d084e24060fe56ca1036e40d SHA512 9fe43a52fb30b7b413244576c6ea0d493bb720e54d0b6263280224efef4b0432dee46697df160ba7e76bc1a5c8735fe814e0eb686ed797658b563bcb8c5bb7e5
 DIST bear-3.1.2.tar.gz 127197 BLAKE2B b9ef373aab194f0e7330c5f457b88e3c11bb3b202940eff65ecbae79b123254df9629c06f4781570b19675834be80fba041b070820663a6b9a747fc6d269be25 SHA512 02701e8a53b9d776ca838248f5b5d149d7ded6e024ce65bd1ca3b440ab1bf95691dc3d36bb28f043ce24bc1da6e666fb022ff92fa9df7c3142451742de16ca3e
+DIST bear-3.1.3.tar.gz 127766 BLAKE2B 8fdb5b9bf8e1e026df2296b0d45f23ce1a9157dda28b2656d36c0799e2f02965711ecdf09780d075e18965afc6a771dbf26501e9e1e3b26f4784d4191e168748 SHA512 34039b51a7cd636bdb7fb716f69d6c70de3e7bfc5e2c83a3040942010fb7effe49b0afa0d29be182eb550d57b024fbe5bea779a7fda5f86201865bf491ba1672
 EBUILD bear-3.0.20-r1.ebuild 2130 BLAKE2B 032ab0d9e944f03b29a31756b7b482a7b29c27e85767e25a6d32c94b0e5c98252d7d847df991989346625d90e92179a8307eba883758776c4653d1c99081302a SHA512 6b97b0d7e42951d9e78f0ba6940500b2d397f8326e1453041e088bada11e57c62828d5a02f5ea16f023ae0fe4d8651d1a0c62439392ea5cb39cb54691b454de7
 EBUILD bear-3.0.21.ebuild 2269 BLAKE2B c90eeb683137b82948a2fa44a0131188dcf3c94d46b25eac9b5e7a0dc63d1d834bd7b816b15d0dbe24a23161c86ce9de93dc8235b1c2a35bb2ffb6e36a4fbb4b SHA512 a9d88ebf9da3caf67f5800ab7c4ebfc775e47a6237c5b12ea07615ae9dcddf1593525b830bc1a346b93abf79347a212d88605010ed0d60e113a5349bfaf540eb
 EBUILD bear-3.1.2.ebuild 2220 BLAKE2B b875eecaf7a24e34dc87c902245d7441c5dc3246dd2be472fd24ff26a97faa579e2c4cafeb123fa72f3fc3e9624f7648b29b962cd8a11026c24e368c53979db5 SHA512 3d0ee1c27cd77d814588e05da5d11be266f5b2745afdd313360eb1e2efa3a61d80e459cac5625413739ca2331f4a3486a80aff64608ca3832d0d73bdc05156a9
+EBUILD bear-3.1.3.ebuild 2161 BLAKE2B f7ba0db9ec50827b09a8556c01faf67317e8df5c9109a054db979360357dd76471592ae22892df57e58981e92069870d26b903be57de8fb12e62695bbfbe6c3e SHA512 13305c6157d52338b01349d4617c78a5e51114df19645df45e551b7d21ee8c7611cf7a1d943abf502b008eee57eac29a903a59b146755a79548f21c851e49b9c
 MISC metadata.xml 915 BLAKE2B 74d981eed24b95353d225061c11b11e3f7aedddd6fb3b79a96bc98f2d348d64ea4598337f5b946d94ac64278eaa9bce5a3ade0f9564d9e3f3b4031574569f20c SHA512 010b17d6da15e7b5a4079864c7c2f3f11c8531faddee1ab226c1d6c3f646079c52ef4495e4685bae6eeec8702801ddbd41c4bd2e1aaa82400c1265e2ecad1957
diff --git a/dev-util/bear/bear-3.1.3.ebuild b/dev-util/bear/bear-3.1.3.ebuild
new file mode 100644
index 000000000000..d07cd15e5151
--- /dev/null
+++ b/dev-util/bear/bear-3.1.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake python-any-r1
+
+DESCRIPTION="Build EAR generates a compilation database for clang tooling"
+HOMEPAGE="https://github.com/rizsotto/Bear"
+SRC_URI="https://github.com/rizsotto/Bear/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-cpp/nlohmann_json-3.11.2:=
+	>=dev-db/sqlite-3.14:=
+	>=dev-libs/libfmt-9.1.0:=
+	dev-libs/protobuf:=
+	>=dev-libs/spdlog-1.11.0:=
+	>=net-libs/grpc-1.49.2:=
+"
+
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-cpp/gtest-1.13
+	)
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		sys-devel/libtool
+		$(python_gen_any_dep '
+			dev-python/lit[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	# Turn off testing before installation
+	sed -i 's/TEST_BEFORE_INSTALL/TEST_EXCLUDE_FROM_MAIN/g' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_UNIT_TESTS="$(usex test)"
+		-DENABLE_FUNC_TESTS="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if has sandbox ${FEATURES}; then
+		ewarn "\'FEATURES=sandbox\' detected"
+		ewarn "Bear overrides LD_PRELOAD and conflicts with gentoo sandbox"
+		ewarn "Skipping tests"
+	elif
+		has usersandbox ${FEATURES}; then
+		ewarn "\'FEATURES=usersandbox\' detected"
+		ewarn "Skipping tests"
+	elif
+		has network-sandbox ${FEATURES}; then
+		ewarn "\'FEATURES=network-sandbox\' detected"
+		ewarn "Skipping tests"
+	elif
+		has_version -b 'sys-devel/gcc-config[-native-symlinks]'; then
+		ewarn "\'sys-devel/gcc-config[-native-symlinks]\' detected, tests call /usr/bin/cc directly (hardcoded)"
+		ewarn "and will fail without generic cc symlink"
+		ewarn "Skipping tests"
+	else
+		einfo "test may use optional tools if found: qmake gfortran valgrind"
+		# unit tests
+		cmake_run_in "${BUILD_DIR}/subprojects/Build/BearSource" ctest --verbose
+		# functional tests
+		cmake_run_in "${BUILD_DIR}/subprojects/Build/BearTest" ctest --verbose
+	fi
+}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index b7ac6547be6e..959733feb2ff 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -38,6 +38,9 @@ DIST cmake-3.27.3.tar.gz 10978618 BLAKE2B 00376f64031365b5b3ed53d18a51d64ac33b37
 DIST cmake-3.27.4-SHA-256.txt 1646 BLAKE2B 42c905f7550e0140ca28f334dc4cd8b244f57830af3011c098b3859cb5c50643141045a61e1e22559d2bb0cf29034229465e73aa4752e2a927fb8ce1426f7f74 SHA512 ecd9e60edee28dd272e8afcc7b0b2240e19f0676b9d634dbe02727bade880103b4a03a1f52a757264e825984a4c4bf7d290df5b32e9b1204555b56afb33d488f
 DIST cmake-3.27.4-SHA-256.txt.asc 833 BLAKE2B 983a89f1637596ebf72e5456a488293bd2dcc21ade8738051279ce43d18244573b912acb7bbe3ff5d52e4b5b52f2bb23784a0750c84997d311d925dd3a608c11 SHA512 f99f606f9907581c3f121b4e0d99ec54a439be35012ca94d4762ae95764c01ef5aeda848dd9c460e340a284e9c3d59fd97315006bfd259863551ae6764af2e4e
 DIST cmake-3.27.4.tar.gz 10980052 BLAKE2B 29991e736c3ed901d30f656742f236e78854fbc13b543f02b08348733e2d4fbc5ef2e4b32f5d2a641c0a1eeacd091db6cc71643f000e9c5505718d999897457c SHA512 fc04b041f5c73b0a969ba09251e00e20f33e7a76460630d60e95ce08086c6b41b82315bd8782c19070b5f12a4290858825687f816b69ad5df8101053b4a2b48a
+DIST cmake-3.27.5-SHA-256.txt 1646 BLAKE2B 46c70ee7811ba3ea6c02ccb25c35629711da9709f4db68ea6cbfe1a74d0ff76a384282c4c551a13ed839247f2773f00f7cee3b72f2dd06eebfa0e1fc6f9463b0 SHA512 5e1c86bf2c73f6a29d8e6f1bb85a094073b09e22a4ebdd45a4969745cca79c2e5b3cd45dc897748acdb79adf5db0d491d8ae2af636efc772b5eb272b79d91527
+DIST cmake-3.27.5-SHA-256.txt.asc 833 BLAKE2B 12c60af9e3778c6b3e1da68411abed35838ccdca291e002877e1944548deb671747e5a5faf32fa74ee5cd11b0862c69bc63e845a48167aaddd440c852970460c SHA512 ecfb1dadb264b614e345251eda2255bbbfe47fe8100b302c7e7bb038b157276443bec008c6272ebdaebb9ec8d1f06d559ba40d9026bd1f1a187ba5282ebea58f
+DIST cmake-3.27.5.tar.gz 10981172 BLAKE2B dcdc3236ce5dfa1d724b533f572037818d445f4fa9a9acf4194afa9871daee74d029163f5219a66aa525faf1c17aa653f81383ba8ab7611c3c86e95c9b2c9cae SHA512 db8f2929b956043a42e2cf73708f9435d427cff8f5d334d4631b67da8446c388c52960929d6e428496ca135758af315aad4adc8dc19268099dafc7a2e5a61d42
 EBUILD cmake-3.26.4-r3.ebuild 8804 BLAKE2B fdb48b62ba66d6aa0f162bded4ef491f9476a6289ca61804eb18f328d8bafffbbb10f0134dfc8d10fb54032d3703444244d3ea7a62069505b2ee600a9b957e3b SHA512 faef92a7b8f1822c1df936e5bf89f533eb33d192dca09e140e157b6d4d8589ab73bb49189de998e91f53c4180e4c014e38b4d64bc5865a0c2d1e47dfc70a477d
 EBUILD cmake-3.26.5-r2.ebuild 8805 BLAKE2B 1da0302fa4bd402e226a898ba1f43daf22ca6ad6d9f29850c57729448b9c83f6f39866e2f07f043849306bcf4568a85203c3b35be915428b712238d639aff5cf SHA512 ddb5480a9deba4eeaba8ee57d5a712887525544b720908ce5a5c3dfb5eb49c347b86f6f08d4cb85d2dc9cfad161761092c59900dee875ad07666ef0bb821da4a
 EBUILD cmake-3.27.0-r1.ebuild 8849 BLAKE2B ed6173861ae15105593bf630c3607deb052ebd0438730bc57c35ac9570b45a22553141e5740c15c3ca0ff36d8aeb19d382cb9233ed126ceb063f3220adf2391b SHA512 892305cbff5371e828df8b794e2937abebc5623f03d15c28d90bd128efb6225997135d581005aa23392867b1ec5c230c627d1082ec192c7e536633d15682440d
@@ -46,5 +49,6 @@ EBUILD cmake-3.27.2.ebuild 8850 BLAKE2B ed2824ad05508ae192ad1fe569a6d7687f969203
 EBUILD cmake-3.27.3-r1.ebuild 8861 BLAKE2B e2a142d9721dc64c1d067d297e67331327a4074cb04a9f18429e2f517967edbff3da7be8327d387515f10a5e32437235f3084a58033b52d8c86da6fc0cf98e1f SHA512 79b678f96b0aae1a30be53c975d97c42b624e5b4d7d20477459d6f548945fb954b6ec1f2629c12ce82ff7739ae2e5dd01d5a1302fade808a19f247e59d824880
 EBUILD cmake-3.27.4-r1.ebuild 9011 BLAKE2B c16ac6b71f644eb646545b0ce775bcf9158a50b4abea1d99f5cd4999d27bd60970bdfd146e2510c88892e806601a52559b32f28021648a726d0056db60cd1679 SHA512 5d425473d8e5f4db781fdc1c92a6303f5881cd8a46144b3fb360d0d73406f0b1c0d5edb1f5e28fdec260ba362ca0df6b6a74e05d4307a8a455086653644a34ab
 EBUILD cmake-3.27.4.ebuild 8861 BLAKE2B e2a142d9721dc64c1d067d297e67331327a4074cb04a9f18429e2f517967edbff3da7be8327d387515f10a5e32437235f3084a58033b52d8c86da6fc0cf98e1f SHA512 79b678f96b0aae1a30be53c975d97c42b624e5b4d7d20477459d6f548945fb954b6ec1f2629c12ce82ff7739ae2e5dd01d5a1302fade808a19f247e59d824880
+EBUILD cmake-3.27.5.ebuild 9040 BLAKE2B 745980ee4cc664f85c719ef78ba6e8be5b1f8ca0ced6fab3490e95b1fa2442e9274ba69efd0ffe8594c7995b1e1a6a2b9bbd02af5d40495b2d5939e3be90803a SHA512 5ea51af6c65c9175f2e492ab521faae09206a88d0d424dc99011304f65e761e3a3d7f606fdef67878d73cf6efc33b0c2d4d55b30d05bfa7ebfa4c158ec7f45fd
 EBUILD cmake-9999.ebuild 8860 BLAKE2B d91222af272d47dd1941eebecd08dd6abd1bea77f7f9f6d81d374ab7d799e4af13f6bb8f213f4eeb42fb8ec913c7eefb995a65c0c661e946916416582a6f0c43 SHA512 09f3fd9cf07aa8f147278394a319eef057d25da09e4e8ff3dc40d5fd1477473c79886c89b641445beac41cfed32407004824eb4295c84f6d44af50a678b2b2d3
 MISC metadata.xml 588 BLAKE2B 59754f6dd52986589583b875b48cdfb28f0d22e97fd6cdac9763ed2aa8981c692d81f6cfe73a93f7defde3e58fc0df60fba647760e9f20d00bd8141e4c39055e SHA512 ac463b9402727ba83b276fc206d2ea9101c6edc85142957c9be33bd8841c0396262ceaad545d133a84f6c294b5beee289e84c3226a1aac2d1f041dbfe08c047f
diff --git a/dev-util/cmake/cmake-3.27.5.ebuild b/dev-util/cmake/cmake-3.27.5.ebuild
new file mode 100644
index 000000000000..9dded913a3bc
--- /dev/null
+++ b/dev-util/cmake/cmake-3.27.5.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${CMAKE_DOCS_PREBUILT:=1}
+
+CMAKE_DOCS_PREBUILT_DEV=sam
+#CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+CMAKE_DOCS_VERSION=3.27.0
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+CMAKE_DOCS_USEFLAG="+doc"
+
+# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
+# ... but seems fine as of 3.22.3?
+# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+	toolchain-funcs virtualx xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+if [[ ${PV} == 9999 ]] ; then
+	CMAKE_DOCS_PREBUILT=0
+
+	EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
+	inherit git-r3
+else
+	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+	if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )"
+	fi
+
+	if [[ ${PV} != *_rc* ]] ; then
+		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
+		inherit verify-sig
+
+		SRC_URI+=" verify-sig? (
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
+		)"
+
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+		BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20230817 )"
+	fi
+fi
+
+[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="${CMAKE_DOCS_USEFLAG} dap emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/libarchive-3.3.3:=
+	app-crypt/rhash:0=
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/jsoncpp-1.9.2-r2:0=
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	dap? ( dev-cpp/cppdap )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND+="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+	test? ( app-arch/libarchive[zstd] )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# Prefix
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch
+	# Misc
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch
+
+	# Upstream fixes (can usually be removed with a version bump)
+        # pkgconf
+        # fixes https://github.com/pkgconf/pkgconf/issues/317
+        "${FILESDIR}"/${PN}-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch
+)
+
+cmake_src_bootstrap() {
+	# disable running of cmake in bootstrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+		|| die "Bootstrap failed"
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	elif [[ ${PV} == *_rc* ]] || ! use verify-sig ; then
+		default
+	else
+		cd "${DISTDIR}" || die
+
+		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
+		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
+		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
+
+		cd "${WORKDIR}" || die
+
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Disable Xcode hooks, bug #652134
+		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
+			Source/CMakeLists.txt || die
+		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
+			-e '/cmGlobalXCodeGenerator.h/d' \
+			Source/cmake.cxx || die
+
+		# Disable isysroot usage with GCC, we've properly instructed
+		# where things are via GCC configuration and ldwrapper
+		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+			Modules/Platform/Apple-GNU-*.cmake || die
+		# Disable isysroot usage with clang as well
+		sed -i -e '/_SYSROOT_FLAG/d' \
+			Modules/Platform/Apple-Clang.cmake || die
+		# Don't set a POSIX standard, system headers don't like that, #757426
+		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmLoadCommandCommand.cxx \
+			Source/cmStandardLexer.h \
+			Source/cmSystemTools.cxx \
+			Source/cmTimestamp.cxx
+		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmStandardLexer.h
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	# ODR warnings, bug #858335
+	# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
+	filter-lto
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMake_ENABLE_DEBUGGER=$(usex dap)
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DBUILD_TESTING=$(usex test)
+	)
+	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	# Fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    TestUpload, which requires network access
+	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
+	local myctestargs=(
+		--output-on-failure
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
+	)
+
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index 1a6a5bc3af0a..3a47d88eef76 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -5,6 +5,7 @@ DIST stripe-mock-0.171.0.tar.gz 1297648 BLAKE2B a152573e43363133b8a32f998d1a5ea4
 DIST stripe-mock-0.172.0.tar.gz 1297748 BLAKE2B a712f532e9b8af019212bcd744a97bdd195388debb29c153041539ebe640ad877d37d0de1ad6d878f75e0e3c72e53ae62ca97a4662e77b3b111e1d926e240bb9 SHA512 5ae159389aaa5ac5e2b9caec923824771bc8a75434146f915ecb23e81f25d43ec73bdfa73b1851101b4cad7db431cece61c111ddedc89f229e5dd7de963b72a9
 DIST stripe-mock-0.173.0.tar.gz 1297798 BLAKE2B dffa959b7e221217f19c636f4c75cf4fa4ed453066085d2cf81d915d1da3938e3d7310bd0cba08e2f8da217f957b35f24019c33b5da12852bcd972d044d77500 SHA512 9c516bbeb9845a9ab3b870232020eed71387f7a4e3270af85d74acab103c71fd49791b6e22b44a5e6b1490fa01c2d5a9358f866b54e9faaf0af50dd7b67d54dd
 DIST stripe-mock-0.174.0.tar.gz 1308840 BLAKE2B 7b5753d97428f63b03874e0bd5718a8f80d689ccdc533fbec4bd821c2b86acbfdae05d9f29d86d7d7811d449d225b170b0bb0806ea59c8d714b48dd53e19279e SHA512 d3dd4df02e8d52113eadcbed33ea7318474011128801c599962356bf6bcc1a57b68888bbde3b839ec84093fd700472934792e4219167564abfb2102710dd4b03
+DIST stripe-mock-0.175.0.tar.gz 1345538 BLAKE2B d669af5ca5b38eeca5ce30bc4ce8b446bd49524ad89f7ee04c8bfd465202d4fc58f848abfe0410e463f58871da7e2c6f26b6db9155c3253ad0ae29f151e480ee SHA512 9ce0e90ea94a0bbcece43913da40b717d668650e05c264cb42cb08f6ef7d5086f5337388556d33d23262fc474945b1f622bab0fa8912303a8b66657fe4b9b828
 EBUILD stripe-mock-0.168.0.ebuild 498 BLAKE2B a8e1dd0ac1f07195ecdadc4d5e68499e6d48ef5ac47fd770a7a421cc6b8fdc035bb1ae7c4f0ee7028c7ded5dbca4f260499f4fabb58d80794e807d6206232b1e SHA512 9fc51687f9fad3ac4c9c505c4a5f6b7bc668acd17f186bdec61a13cb4eb0b8d024b3eca7717434c6720f7ae4bd89431a7916575492700ad9dd9f86508b85d007
 EBUILD stripe-mock-0.169.0.ebuild 500 BLAKE2B 86bc55d32bc4a634af3ae5f31db1716bfe8bba864b44d5a78a75519cc9347f4593763d06337aa5c97b4cc96775469d64812f8b7072806ecdcf7f5ceaa3cde9af SHA512 df95803239ecb13e6c4943af3b6c61b1229d16ad15a5168e3261413a1bc9d98a28e3920b4aa64ca88a542619be5391db4adcedf3a9ba9218ad010b6e6823fb6b
 EBUILD stripe-mock-0.170.0.ebuild 500 BLAKE2B 86bc55d32bc4a634af3ae5f31db1716bfe8bba864b44d5a78a75519cc9347f4593763d06337aa5c97b4cc96775469d64812f8b7072806ecdcf7f5ceaa3cde9af SHA512 df95803239ecb13e6c4943af3b6c61b1229d16ad15a5168e3261413a1bc9d98a28e3920b4aa64ca88a542619be5391db4adcedf3a9ba9218ad010b6e6823fb6b
@@ -12,4 +13,5 @@ EBUILD stripe-mock-0.171.0.ebuild 500 BLAKE2B 86bc55d32bc4a634af3ae5f31db1716bfe
 EBUILD stripe-mock-0.172.0.ebuild 500 BLAKE2B 86bc55d32bc4a634af3ae5f31db1716bfe8bba864b44d5a78a75519cc9347f4593763d06337aa5c97b4cc96775469d64812f8b7072806ecdcf7f5ceaa3cde9af SHA512 df95803239ecb13e6c4943af3b6c61b1229d16ad15a5168e3261413a1bc9d98a28e3920b4aa64ca88a542619be5391db4adcedf3a9ba9218ad010b6e6823fb6b
 EBUILD stripe-mock-0.173.0.ebuild 500 BLAKE2B 86bc55d32bc4a634af3ae5f31db1716bfe8bba864b44d5a78a75519cc9347f4593763d06337aa5c97b4cc96775469d64812f8b7072806ecdcf7f5ceaa3cde9af SHA512 df95803239ecb13e6c4943af3b6c61b1229d16ad15a5168e3261413a1bc9d98a28e3920b4aa64ca88a542619be5391db4adcedf3a9ba9218ad010b6e6823fb6b
 EBUILD stripe-mock-0.174.0.ebuild 500 BLAKE2B 86bc55d32bc4a634af3ae5f31db1716bfe8bba864b44d5a78a75519cc9347f4593763d06337aa5c97b4cc96775469d64812f8b7072806ecdcf7f5ceaa3cde9af SHA512 df95803239ecb13e6c4943af3b6c61b1229d16ad15a5168e3261413a1bc9d98a28e3920b4aa64ca88a542619be5391db4adcedf3a9ba9218ad010b6e6823fb6b
+EBUILD stripe-mock-0.175.0.ebuild 500 BLAKE2B 86bc55d32bc4a634af3ae5f31db1716bfe8bba864b44d5a78a75519cc9347f4593763d06337aa5c97b4cc96775469d64812f8b7072806ecdcf7f5ceaa3cde9af SHA512 df95803239ecb13e6c4943af3b6c61b1229d16ad15a5168e3261413a1bc9d98a28e3920b4aa64ca88a542619be5391db4adcedf3a9ba9218ad010b6e6823fb6b
 MISC metadata.xml 643 BLAKE2B 6a45b4c6f7e3372850e8947db71b028a32f6fc63d202b912a0fed600dd7f426984828af2f80dbfbdafb69a15a3b58b82c2b738b424727b28704aefb43f43e361 SHA512 3a1d0724f14ca0885c6dde06b9c0fed1dcf7a9dcbfb32de75682cee9ad2b29fc94f9544319a2fe5d5fe3c25afb01e0f6492616e13e3d01640af7defd0ba9c098
diff --git a/dev-util/stripe-mock/stripe-mock-0.175.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.175.0.ebuild
new file mode 100644
index 000000000000..ca0f4e60efa7
--- /dev/null
+++ b/dev-util/stripe-mock/stripe-mock-0.175.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
+HOMEPAGE="https://github.com/stripe/stripe-mock/"
+SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT ISC BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() {
+	emake build
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	dobin stripe-mock
+	einstalldocs
+}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index e09e4e1cbb66..a39fd0b5b9c0 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/melonds-jg/Manifest b/games-emulation/melonds-jg/Manifest
index 8e06fb116ec9..97258cba273d 100644
--- a/games-emulation/melonds-jg/Manifest
+++ b/games-emulation/melonds-jg/Manifest
@@ -1,5 +1,6 @@
 AUX melonds-jg-0.9.5-format.patch 1078 BLAKE2B 00f471df8b8c6e622684cc4c3e925be1721cabd1dfa302e942a6f7f692aa842ccba5f5c13beb47bc184eee766a0dc71a8bfe1358e5f11cbedff36b9653b022a8 SHA512 1d72dc2d335ed68a894aaf686eaa7578d1332e647b3d65ab56b34dc90bc4d4c979a1c4a46d00759ba15ccfd88911f5cbc884c19a27c7f299af4bd94236018c5b
+AUX melonds-jg-0.9.5-teakra-no-test_generator.patch 1692 BLAKE2B 87ca4fef1e64501bee7d10d7095262b7eac6085a2c33a34401debd226b2a383aa7066129288df75758e71faedcde14e391206114725fec73e26465b38c77022b SHA512 301ccf85f735f21fe007c113b71680a208ac5680b928fc542d5ff8d85a66dc64f15369b915c14441042bd6dd3d46cf97ce6271f4d17f4176ea1432c627efa67d
 DIST melonds-0.9.5.tar.bz2 5396317 BLAKE2B 4f834c1037b0a1f2e6acdc52bc0b974107343485cdfeff35d16520afb46895abec3046fa9c91c53b6c02855b19af39a64bfc98722887e5090eb0b051ae0d106b SHA512 11a0a71b20e516f426f6fa6dbb46418c5afdd34997d2943a91149f527ca81c7c9a76db8460439e7593e245df92799a69a76dc426eea14a01383ce0a8c1a4b473
-EBUILD melonds-jg-0.9.5.ebuild 1042 BLAKE2B b22acf6fb266f4a6d0f6d767be26665447aef139d36fff7cfc3b5b26d7d8891c5192a1c935b82a656ace716ee277f4bd5fa2ac13db3b993d713374b669dc2cb8 SHA512 4c4a3aea07838debf7c09de2d29cd243496cad5dc8369a6455dca78fce6650a4ecd0f37226c86c03b8afc3ed60c97746b124c4727ccf4e892df5c8178674d6f3
+EBUILD melonds-jg-0.9.5.ebuild 1102 BLAKE2B 88eb1d3057aa998cd068b27d677bdb6b2f8e8c872d5d1ac31f70a1dc83272e1927ebceda7f40b14f3fabd8c93882ef64f78b590f9e6793c0642566715fdb28e1 SHA512 ad06eb850e78d835622337ca93831c50a52cf1b20f055ed271040e7e002c1046ea00206a6fd569466fb9be0546350d86c15056e7d7e702c436c063f72f3b74ca
 EBUILD melonds-jg-9999.ebuild 984 BLAKE2B 3d4412792e177b4265bb37f4bdab7f8b8f45843dbd11af306dc4fc0941bc98220151a771ee0be806d1c3fdf9465dc512c40a5ac6dc6cc5a9fab8a3ca5ec796c1 SHA512 29c4899b8b4e5720fa69e74497bd27de50c3053864bdbb5bcfbb9cccedd1fae6efe58fcab4d808379476fe303a84c04910e4985a6504a307d7bc8415b7000062
 MISC metadata.xml 684 BLAKE2B 05ae692b17183419eb6fa4dfea12b474da812062f69bcedd5a19074e5ff4c9423453081b6ba311b49344120fd1248c96bcefa45d9a1eb8c5004932365d7cc87d SHA512 f70aba91228dabcad4b9d299513277bdad7ddc398bd97334a76699940ff05bd424b7116cd9ed265bfa5ad4a97fa9572e04da37936a680b5e3bf9b161e38bc6fe
diff --git a/games-emulation/melonds-jg/files/melonds-jg-0.9.5-teakra-no-test_generator.patch b/games-emulation/melonds-jg/files/melonds-jg-0.9.5-teakra-no-test_generator.patch
new file mode 100644
index 000000000000..a482e93a52fe
--- /dev/null
+++ b/games-emulation/melonds-jg/files/melonds-jg-0.9.5-teakra-no-test_generator.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/914196
+https://gitlab.com/jgemu/melonds/-/merge_requests/9
+https://gitlab.com/jgemu/melonds/-/commit/0953b8874187bfdd35a0bf787c3bdbb6cc65dc9d
+
+From 0953b8874187bfdd35a0bf787c3bdbb6cc65dc9d Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Thu, 14 Sep 2023 09:58:18 -0700
+Subject: [PATCH] jollygood: don't build teakra's test_generator.cpp
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is unused in the jollygood core and causes build failures for i686.
+
+As reproduced on Gentoo:
+
+In file included from /usr/i686-pc-linux-musl/tmp/portage/games-emulation/melonds-jg-0.9.5/work/melonds-0.9.5/jollygood/../src/teakra/src/test_generator.cpp:10:
+/usr/i686-pc-linux-musl/tmp/portage/games-emulation/melonds-jg-0.9.5/work/melonds-0.9.5/jollygood/../src/teakra/src/test.h:37:32: error: static assertion failed
+   37 | static_assert(sizeof(TestCase) == 4312);
+      |               ~~~~~~~~~~~~~~~~~^~~~~~~
+/usr/i686-pc-linux-musl/tmp/portage/games-emulation/melonds-jg-0.9.5/work/melonds-0.9.5/jollygood/../src/teakra/src/test.h:37:32: note: the comparison reduces to ‘(4308 == 4312)’
+make: *** [Makefile:169: objs/src/teakra/src/test_generator.o] Error 1
+---
+ jollygood/Makefile | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/jollygood/Makefile b/jollygood/Makefile
+index 03f34a1..c206f05 100644
+--- a/jollygood/Makefile
++++ b/jollygood/Makefile
+@@ -68,7 +68,6 @@ CXXSRCS := src/teakra/src/ahbm.cpp \
+ 	src/teakra/src/parser.cpp \
+ 	src/teakra/src/processor.cpp \
+ 	src/teakra/src/teakra.cpp \
+-	src/teakra/src/test_generator.cpp \
+ 	src/teakra/src/timer.cpp \
+ 	src/ARCodeFile.cpp \
+ 	src/AREngine.cpp \
diff --git a/games-emulation/melonds-jg/melonds-jg-0.9.5.ebuild b/games-emulation/melonds-jg/melonds-jg-0.9.5.ebuild
index 56734daea220..b7c9f13cf065 100644
--- a/games-emulation/melonds-jg/melonds-jg-0.9.5.ebuild
+++ b/games-emulation/melonds-jg/melonds-jg-0.9.5.ebuild
@@ -35,6 +35,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${P}-format.patch
+	"${FILESDIR}"/${P}-teakra-no-test_generator.patch # 914196
 )
 
 src_compile() {
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 63366af0af6a..b8e44934a999 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index d15731bd718b..966b03f6a8d5 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,11 +1,9 @@
 AUX POST-UPGRADE_complete.txt 854 BLAKE2B e99a1ec9a316c90ee4adc112dd87f394d0e2ce37ca5d1195e3f812683a2da59bedf45688cd448cc3ca544a02ee1c0e125f3960e81a062b0f7949e2cde581563d SHA512 0328842265ca859e78fa7d5babeac7b6baa16fb25962f50d431bbca133d042694d98942f77ba3387832d66645cc4df8fb9f3c4591ca7ed4eade6782a92a3d445
-DIST roundcubemail-1.4.11-complete.tar.gz 7048262 BLAKE2B aaf5e6ce5b07577f687788730bc9181334402bb2ff5e78fb306425913b62b4a8f72505547bdcc8673806b48b9ba8252b8059b59399efc95a51877d5c672a4760 SHA512 2bfe0ff3716f76bf9eb5bf5f7b62c738b233c57e67d6ac767c044d1a3a694ae003642d9cc68a18d6f6ba94135aa7ee1692db920e9127128669faee9ddf78fe80
 DIST roundcubemail-1.5.2-complete.tar.gz 7852981 BLAKE2B 36920aa30301b96e1157a586508f3d460c26cfd692919b803bc8cecb31d99ebec5f93a62c725dd5d1dbd1ff68d59c97278b07eaabec42c5fb02c320c72fac8bf SHA512 96faa8c95c23b538ebfa91f58fb918b37185dbd1c09f2d128c9f8c800a0e3d6a2abbfa52753fb6a7ee47b633f35e2b31c92623107116dc760dfa9a22a4b2a23c
 DIST roundcubemail-1.6.1-complete.tar.gz 5970713 BLAKE2B b46545b4a26983fbb993550e2c2f1504aea26c2caba28eb86703c6a94ac61209fecf45041b07440a495b7d2ad58eb20cb688cf37718402ef409ccc5442f0f62e SHA512 d5804e91c2da3b732cf14ad86f06099254540dd826ae5b7f14b98a7af8b90a7e9457221da2945aace8d12a60381eec85161e8bc6e0af4572b798a66cb36f2f00
 DIST roundcubemail-1.6.2-complete.tar.gz 6004046 BLAKE2B 08e6b93cdb615ac2555dcf8a23317ac5be96c3ef2dd2a53b44992e04d17591fcbb16fa0e21cb22e92c3ccdc82c7da817cdb4f95c208476bcdd5d81b9d0fecc12 SHA512 1889548dbe9913555cec4115137157de9daf5e2cca9e4004fb19c8ddebd3081cce32b6d8634891341c890379c4f9e35a5c705739f24b0b3b93fc31449f090297
-EBUILD roundcube-1.4.11.ebuild 2289 BLAKE2B 3e24731cb8fa44a45ff7c34aeaf0f2766849d1cec59e6c5ae26fb639443e9288889e435a976686328860fdd6bc64b98369d0ad585f879b57202cdbf6dbdd6d06 SHA512 858450c270914701ad910de943f35985c538a817cc325cef345ed6d582507fc365b3df11df2d1f800c107cebd3cd8ed0251e5d055dcb568f91423c5c62017bc6
-EBUILD roundcube-1.5.2.ebuild 2352 BLAKE2B 1e64cd573981cb3c3840e8f8ef09069c4c22ee3cf12ea4b67398fb6c733d2042e396bf65f3614b905b6b72750be027847042a44c9ffa1ca828bf2caf7a6d8caf SHA512 9992c350daa90b41c0b4754f742e2dbcaf4c530cbcb94fa1f9d3a07bb18bfa391fdfb0fd2ff2a53da9cd3ef654c5ae6ed2e10997496506a2824441ec8f4e37ac
-EBUILD roundcube-1.6.1.ebuild 2358 BLAKE2B a841177c837ac4047b1303f6f9f48b7f88c3bff13e74935055a91553baff286a8fc412b46fcea094d8136170c72da08e9b26931b8bfaca0b016618f1969daaf3 SHA512 b55e0868a351b4d8346b90c982942cda0039becfbd5ff14b49d30f0bddafaab53fb89e7e49fb5ed536ec657ae65f92f9b0ec153d290b379fca0b4da20654e97f
-EBUILD roundcube-1.6.2.ebuild 2358 BLAKE2B a841177c837ac4047b1303f6f9f48b7f88c3bff13e74935055a91553baff286a8fc412b46fcea094d8136170c72da08e9b26931b8bfaca0b016618f1969daaf3 SHA512 b55e0868a351b4d8346b90c982942cda0039becfbd5ff14b49d30f0bddafaab53fb89e7e49fb5ed536ec657ae65f92f9b0ec153d290b379fca0b4da20654e97f
-EBUILD roundcube-9999.ebuild 2358 BLAKE2B dd2606aba7bc4f4a1fe6a1256f4ebece36d8e841828123e033c7402a67c49e56e0ad78014f51c05dc51467aafddd0fb7721d45f92bab42d4505149d0395bf2b3 SHA512 36d905618b994534ea6bf306c1f81c6994ea55bcb34cebff3997368973a7833686f16504c944e5d5a179dce8c9dd1c0725541b4e8e3e2e5aba4974270cf4e148
+EBUILD roundcube-1.5.2.ebuild 2350 BLAKE2B ff2a0434ccbf7d48fde64d6ac48cb3f30fa88424cd7ee992ee470d50d27a4557aef7b27053de747651555a7de060e2eefdf2eccb472d5d81370e3b783d4812da SHA512 b0a0c4f9765076f82d2009ea701039864d301fce32b84f2d45622a349b77685e584050efca992af389c15dcd4e92802d8807ef9ab67f5ab5982c04e14f1c7328
+EBUILD roundcube-1.6.1.ebuild 2356 BLAKE2B 34bc19151f4b75bddf7968f3525a25250a1e7d9835459324bddfb58e5453f77397ef148ff483528f5f7dbcba0f356e0e0e18492347b9321cbce81336ae8196ce SHA512 fcc05cdda5945ddf0e843052cb0011a4c5007d7547b586b54aa1bdfe49ae9f3f7b1307d1756d46ca365d669419be1a377810aacd07c4e1ebd653a15d99d194c7
+EBUILD roundcube-1.6.2.ebuild 2356 BLAKE2B 34bc19151f4b75bddf7968f3525a25250a1e7d9835459324bddfb58e5453f77397ef148ff483528f5f7dbcba0f356e0e0e18492347b9321cbce81336ae8196ce SHA512 fcc05cdda5945ddf0e843052cb0011a4c5007d7547b586b54aa1bdfe49ae9f3f7b1307d1756d46ca365d669419be1a377810aacd07c4e1ebd653a15d99d194c7
+EBUILD roundcube-9999.ebuild 2356 BLAKE2B 34bc19151f4b75bddf7968f3525a25250a1e7d9835459324bddfb58e5453f77397ef148ff483528f5f7dbcba0f356e0e0e18492347b9321cbce81336ae8196ce SHA512 fcc05cdda5945ddf0e843052cb0011a4c5007d7547b586b54aa1bdfe49ae9f3f7b1307d1756d46ca365d669419be1a377810aacd07c4e1ebd653a15d99d194c7
 MISC metadata.xml 1128 BLAKE2B b7ecf906ab635d9100c5c28e9950ff9a0d746a797502a672e8a8f3f2da36a67b4f42863133548dfe3b415382d8fe116229cdc6d24f7df1db0cdf3a4a9da7a4f3 SHA512 35e05c40b1175760b0e171acce265b1a5f0748824f010dfb93d7d3345e595c0814ba8ebd2ddfdb699893b5fd7fdd19fed68eccd3ec94a816876b88550412c486
diff --git a/mail-client/roundcube/roundcube-1.4.11.ebuild b/mail-client/roundcube/roundcube-1.4.11.ebuild
deleted file mode 100644
index 9e557b1fae0c..000000000000
--- a/mail-client/roundcube/roundcube-1.4.11.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-MY_PN=${PN}mail
-MY_PV=${PV/_/-}
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
-HOMEPAGE="https://roundcube.net"
-
-# roundcube is GPL-licensed, the rest of the licenses here are
-# for bundled PEAR components, googiespell and utf8.class.php
-LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
-
-IUSE="change-password enigma ldap mysql postgres sqlite ssl spell"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-# this function only sets DEPEND so we need to include that in RDEPEND
-need_httpd_cgi
-
-RDEPEND="
-	${DEPEND}
-	>=dev-lang/php-5.4.0[filter,gd,iconv,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml]
-	<dev-lang/php-8
-	virtual/httpd-php
-	change-password? (
-		dev-lang/php[sockets]
-	)
-	enigma? (
-		app-crypt/gnupg
-	)
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	spell? ( dev-lang/php[curl,spell] )
-"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/roundcube/roundcubemail"
-	EGIT_BRANCH="master"
-	BDEPEND="${BDEPEND}
-		app-arch/unzip
-		dev-php/composer
-		net-misc/curl"
-else
-	SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc x86"
-fi
-
-src_unpack() {
-	if [[ "${PV}" == *9999* ]]; then
-		git-r3_src_unpack
-		pushd "${S}" > /dev/null || die
-		mv composer.json-dist composer.json || die
-		composer install --no-dev || die
-		./bin/install-jsdeps.sh || die
-		popd > /dev/null || die
-	else
-		default
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CHANGELOG INSTALL README.md UPGRADING
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r [[:lower:]]* SQL
-	doins .htaccess
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/logs
-	webapp_serverowned "${MY_HTDOCSDIR}"/temp
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
-	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE_complete.txt"
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "You can review the post-upgrade instructions at:"
-		elog "${EROOT}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt"
-	fi
-}
diff --git a/mail-client/roundcube/roundcube-1.5.2.ebuild b/mail-client/roundcube/roundcube-1.5.2.ebuild
index 2ab9bf1c45f8..b93adaf8d619 100644
--- a/mail-client/roundcube/roundcube-1.5.2.ebuild
+++ b/mail-client/roundcube/roundcube-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ need_httpd_cgi
 
 RDEPEND="
 	${DEPEND}
-	>=dev-lang/php-5.5.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?]
+	>=dev-lang/php-8.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?]
 	virtual/httpd-php
 	change-password? (
 		dev-lang/php[sockets]
diff --git a/mail-client/roundcube/roundcube-1.6.1.ebuild b/mail-client/roundcube/roundcube-1.6.1.ebuild
index 190b5fa07b04..97463b150dea 100644
--- a/mail-client/roundcube/roundcube-1.6.1.ebuild
+++ b/mail-client/roundcube/roundcube-1.6.1.ebuild
@@ -24,7 +24,7 @@ need_httpd_cgi
 
 RDEPEND="
 	${DEPEND}
-	>=dev-lang/php-7.4.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?]
+	>=dev-lang/php-8.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?]
 	virtual/httpd-php
 	change-password? (
 		dev-lang/php[sockets]
diff --git a/mail-client/roundcube/roundcube-1.6.2.ebuild b/mail-client/roundcube/roundcube-1.6.2.ebuild
index 190b5fa07b04..97463b150dea 100644
--- a/mail-client/roundcube/roundcube-1.6.2.ebuild
+++ b/mail-client/roundcube/roundcube-1.6.2.ebuild
@@ -24,7 +24,7 @@ need_httpd_cgi
 
 RDEPEND="
 	${DEPEND}
-	>=dev-lang/php-7.4.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?]
+	>=dev-lang/php-8.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?]
 	virtual/httpd-php
 	change-password? (
 		dev-lang/php[sockets]
diff --git a/mail-client/roundcube/roundcube-9999.ebuild b/mail-client/roundcube/roundcube-9999.ebuild
index 30c03bb63b3f..97463b150dea 100644
--- a/mail-client/roundcube/roundcube-9999.ebuild
+++ b/mail-client/roundcube/roundcube-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ need_httpd_cgi
 
 RDEPEND="
 	${DEPEND}
-	>=dev-lang/php-7.4.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?]
+	>=dev-lang/php-8.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?]
 	virtual/httpd-php
 	change-password? (
 		dev-lang/php[sockets]
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 00bca0fb2be2..7cd8167f7819 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest
index 3ecad1001cc5..cc91a9a6182b 100644
--- a/media-gfx/exact-image/Manifest
+++ b/media-gfx/exact-image/Manifest
@@ -1,7 +1,6 @@
 AUX exact-image-1.0.2-dcraw.patch 496 BLAKE2B d9d86facb3b0f9721d3f5791d4744bbf71d3802c094e4d1f20de44898d817a8319b78c0cd011670d53beec35bbf9efb477c9b3e20ac2724a48017c5d0746c634 SHA512 409cf7ad9963b5e6f4997ad5b466a86c5c3179bbfe63f14311a1297c9e87423f7d838b2b037109029a8dfa6125d7bbacd53f069d8634c1ffdd2c946d40e70b99
 AUX exact-image-1.0.2-g++.patch 936 BLAKE2B 6ab787c1393228bb1671c8a2d7b76969fcd11d26f0c14ca08a95cee7241422205d8cb398f2a6b711e884c476cba662718705848a818b1944428b2a207133fede SHA512 44fafd62c713bc59c1cb774924394ad32a13c33b79696a4762e3730108650ccd3033f554fc8b0d7cf9b71126367bce5b90074f2c954ca57c8389975b57eac5e1
 AUX exact-image-1.0.2-gcc6.patch 2795 BLAKE2B 17282b91baa020b94654c92d87611001584f82360303a56e70cb8f081caf400394a367982e115bff094dfe11a0798503a606de106f1bf6427b57a9ede1cd6ed5 SHA512 ef42fccab6d0958df2dcf86578f9df1f84254515c2bea611f256e23227b9d6dc917467f2d8f54230f9386e9726152c6bbe4ab4f3d117e0da5a3e99b00e93e348
-AUX exact-image-1.0.2-php.patch 481 BLAKE2B bf9a3935813098c5248bac843c580d61266b60cf7063824c90e5b87df552d2b0fa125648f4ebcba46acc29d72f9bcd0a0c647467ebdc0d433616da5d8c16225f SHA512 b984095cc071558ce8b7d4b7db2915f793ed8d468f38757d2faab0f7ffc9e866a06838a5d0c578f67e9cc3e88f2bd07b0cde00ce95d909cdc07e5fbf24f3e62e
 DIST exact-image-1.0.2.tar.bz2 322174 BLAKE2B 67afefb4c5a52416459cd4ac6198012eb6d7895a73ea8363fae05286c7e7f62aa1a02166985f53b5638c7dc7b23b4dc1fb1c7b2272a9dc595ce329a7083ee1b9 SHA512 8ba5a198a236ddf5fa58f40c80f32ba9d300376c637a13a7acf3d2db7906fced373b33a7ecff9cff4d09d8b21de9ce1fb9f5bfb1f4522557bd01af0e3d6dcc65
-EBUILD exact-image-1.0.2-r8.ebuild 4124 BLAKE2B c0e53ed946aaf29bf960b6b1b729b8057db96af12f9a7d70ea293dbbd2a5702135e5a94f6c1343f39d3a94266328f7430d779406632d652f024e1d1a00186ccb SHA512 9a6aed9e081eb2154ff92641303af8d2f598daf19caadb30b6ba632a7edc9fbc7acd9fc2741357f3fe72c0689354f92eacbeb1d3acb2f3f8437ebd03b73e2e08
+EBUILD exact-image-1.0.2-r8.ebuild 2530 BLAKE2B 7d9e4ee881614b7df2f5c43dde2d4429883a7a97b79a94ce3fab06dfbf1cc50eae912d319acd35e237872e51db07ee867dced911849b71fb42dff343540533c6 SHA512 ea2f363b59052c719d0667125963a068b63037fc7762905464f979a3becb5c33c88650b6564640b4968dc5e8287611c573b0fb00e66caa04c30b5f1d8629d59a
 MISC metadata.xml 330 BLAKE2B 468dfd9c9bc2687f285c5a7496aa989843c32929b4c410253f1d046df2e2416604f6ff8b1cb4622e85e27f13f26cede91825d04b7748cb4f74fdff13478046c1 SHA512 01bc80b3dc7ed3ff2f3402ecd3214793d18267be1e1e4c4b42718b6f6a4982404e243771917fbbae7a1bd6b12a1cd80534d9738149ec9b2a88bbc1ad62fcdf14
diff --git a/media-gfx/exact-image/exact-image-1.0.2-r8.ebuild b/media-gfx/exact-image/exact-image-1.0.2-r8.ebuild
index 134a56faca8d..11e8e28d2a8b 100644
--- a/media-gfx/exact-image/exact-image-1.0.2-r8.ebuild
+++ b/media-gfx/exact-image/exact-image-1.0.2-r8.ebuild
@@ -1,16 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PHP_EXT_NAME="exactimage"
-USE_PHP="php7-4"
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_SKIP_PATCHES="yes"
-PHP_EXT_SKIP_PHPIZE="yes"
 LUA_COMPAT=( lua5-{1..4} luajit )
 
-inherit php-ext-source-r3 lua-single toolchain-funcs
+inherit lua-single toolchain-funcs
 
 DESCRIPTION="A fast, modern and generic image processing library"
 HOMEPAGE="https://exactcode.com/opensource/exactimage/"
@@ -19,8 +14,8 @@ SRC_URI="http://dl.exactcode.de/oss/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="expat jpeg lua openexr php perl png ruby swig tiff truetype X"
-REQUIRED_USE="lua? ( swig ) perl? ( swig ) php? ( swig ) ruby? ( swig )"
+IUSE="expat jpeg lua openexr perl png ruby swig tiff truetype X"
+REQUIRED_USE="lua? ( swig ) perl? ( swig ) ruby? ( swig )"
 # Tests are broken; 'make check' fails and referenced testsuite dir not found
 RESTRICT="test"
 
@@ -53,7 +48,6 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc6.patch
 	"${FILESDIR}"/${P}-g++.patch
 	"${FILESDIR}"/${P}-dcraw.patch
-	"${FILESDIR}"/${P}-php.patch
 )
 
 src_prepare() {
@@ -82,17 +76,6 @@ src_prepare() {
 	sed -i \
 		-e 's:Int64:uint64_t:g' \
 		codecs/openexr.cc || die
-
-	# When using PHP, the php-config binary should be specified by slot
-	# Cannot be done in a patch as it is live
-	if use php ; then
-		php-ext-source-r3_src_prepare
-		local slot
-		for slot in $(php_get_slots); do
-			php_init_slot_env "${slot}"
-			sed -i "s~php-config~${PHPCONFIG}~" configure || die
-		done
-	fi
 }
 
 src_configure() {
@@ -122,57 +105,4 @@ src_configure() {
 		--without-python \
 		--without-php \
 		$(use_with ruby) || die
-	if use php; then
-		local slot
-		for slot in $(php_get_slots); do
-			php_init_slot_env "${slot}"
-			./configure \
-				--prefix=/usr \
-				--libdir=/usr/$(get_libdir) \
-				--without-x11 \
-				$(use_with truetype freetype) \
-				--without-evas \
-				$(use_with jpeg libjpeg) \
-				$(use_with tiff libtiff) \
-				$(use_with png libpng) \
-				--without-jasper \
-				--without-libgif \
-				$(use_with openexr) \
-				$(use_with expat) \
-				--without-lcms \
-				--without-bardecode \
-				--without-lua \
-				--with-swig \
-				--without-perl \
-				--without-python \
-				--with-php \
-				--without-ruby || die
-		done
-	fi
-}
-
-src_compile() {
-	default
-	if use php ; then
-		local slot
-		for slot in $(php_get_slots); do
-			php_init_slot_env "${slot}"
-			# Copy built objects from default
-			cp -a "${S}/objdir" . || die
-			emake
-		done
-	fi
-}
-
-src_install() {
-	default
-	if use php ; then
-		local slot
-		for slot in $(php_get_slots); do
-			php_init_slot_env "${slot}"
-			exeinto "${EXT_DIR#$EPREFIX}"
-			newexe objdir/api/php/ExactImage.so "${PHP_EXT_NAME}.so"
-		done
-		php-ext-source-r3_createinifiles
-	fi
 }
diff --git a/media-gfx/exact-image/files/exact-image-1.0.2-php.patch b/media-gfx/exact-image/files/exact-image-1.0.2-php.patch
deleted file mode 100644
index 787d71335f38..000000000000
--- a/media-gfx/exact-image/files/exact-image-1.0.2-php.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/api/php/Makefile	2020-10-06 08:28:04.511865454 +0200
-+++ b/api/php/Makefile	2020-10-06 08:28:18.109638538 +0200
-@@ -8,7 +8,7 @@
- 
- $($(X_MODULE)_OUTPUT)/api-php-wrap.cc: $(X_MODULE)/../api.hh $(X_MODULE)/../api-swig.hh
- 	$(Q)echo "  SWIG      $(dir $@)"
--	$(Q)swig -php5 -c++ -outdir $(dir $@) -o '$@' $(X_MODULE)/../api-swig.hh
-+	$(Q)swig -php7 -c++ -outdir $(dir $@) -o '$@' $(X_MODULE)/../api-swig.hh
- 
- # we have an own install
- _X_BUILD_IMPLICIT := $(_X_BUILD_IMPLICIT)
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 2bf51274c2bc..3d2984dcb193 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 43c4b7d7a1fd..e2ba5a8a9639 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,11 +1,14 @@
 AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
 AUX alsa-lib-1.2.10-musl-string.patch 1435 BLAKE2B ad0e72c63652a2ba1c92f05a0b4154a35aa6fdd010cb3f095855345d99a4f2467fbdc1db79cb9970bada5b2f61fe07277ff179dcb912fedca634ed142d06e3b0 SHA512 6651379f50d72c06fbd8cdc298e3a31f6da2df4011faa00dcd8e0206e4858876f6a2ac50154dff70c2dc33676ee35306c0d85182aacbd136e3e5df311fa1adae
+AUX alsa-lib-1.2.10-pcm-fix-segfault-32bit-libs.patch 2319 BLAKE2B f56f6117f4513451de67ca91a00561891a979543bfe5d596a58d5a485e7a64bbb2a0e3100b83fd2a40a91dcc5f1f2465dbe9618bb195a870f25592957fefe357 SHA512 b0536d567bde218a989f1ab64129cd1967e0b0003490277233d299bcb751e3a4aa305dce7ac72ded354eae351e606b43718e62ca096611eb088e26910fc309d5
+AUX alsa-lib-1.2.10-reshuffle-included-files-config-h.patch 3874 BLAKE2B 87bd7a55d90e2186115bbc176562f3b69dd7db8984ef077a979c5a30ed772b4da0b6d7df4cf988d0be4655112ee42e9a79e8956e4ab97196098350247b8a9ae3 SHA512 940f012a5d3657cca9de20f4c27422143903fb5ed6bffa45dcbd32973d77d9c3e29488716c924ff3f4bb110498b4ccdd8302ecb516c453d8b762b901376532ef
 AUX alsa-lib-1.2.10-ump-header-detection.patch 1624 BLAKE2B da7a512d1e389d8dbf004ee3924a079f337e83fe7006dd8ed92bb838968c4550ac3474083e8ccef817e2f701a62c02c2890b2a384686fda9bd91622f41fad9d8 SHA512 98a22f53368265bed1918235adc12e9a2b7910e79d2151d48846837a7941cf8ecf7e1fe86b9def72c2b3facd6567e7c8d24051374e686353cb526762234a4528
 AUX alsa-lib-1.2.8-clang16-macro.patch 1171 BLAKE2B d9c48d70ece2365ce8d4783b4e5f932f472a2d6cc53c9d10373a76def7a7e7e21f33b6cf804630a7b6b4c37c8422fe4580cfa9e8e490abb2faf89cbf98d05f03 SHA512 5be97f4a609a285a976197b6f7320f82c2c1a3425e00b7c7c2f58cc4e8c61ce4270ec49c068882268924fe7dec32557f36c206870df5abf3b715e8ad2494655e
 DIST alsa-lib-1.2.10.tar.bz2 1107007 BLAKE2B b2e4f8431e61f5bb56b2b5d124e67d5a68bbca3c647bebfa93f5e5ff092ec9ef3f6cb6315801fcd93e21151784814ff238d357313b8b44f32d4e7c9ee565388f SHA512 4ccbd1dc5a612044571c26290923009e4c3f7959b30a5d0bed47daa68bbefaff9059c4f0fa3bc16f22c1eed2d36f079139369f40243da5921ae4de02a4541939
 DIST alsa-lib-1.2.8.tar.bz2 1091475 BLAKE2B e6171ac557db6265e3f02df7bd269eca62d09afaf2c04dc913d3bb217df23a8e66e808ad453fea5ed90d4d9226feb05065ad5d9b3575241b76675ccd27b9b4d4 SHA512 865ff05a8f589996f8d63d43a91c961f1b64144f3e1d17c7074b7ac16f25b3fd1c371d46ed63a8cc20fa01e63c76b75f1a9802b56889ae1073854dd050d27688
 DIST alsa-lib-1.2.9.tar.bz2 1094660 BLAKE2B ec0c6966802196016679652292a579c6301cce33a2e887fce79cdb80629b6df047269787445cf0645e6cf43d3d2aae8fa57ddad5ab79fc254ee65a0ed695f449 SHA512 8f39c8166c3648d46695a9287d9b9a35e5bfffed11d79e868ff7aba92d0fee792e82784186ebeb2a3e44d6b617c916025c7fce9a802565bb8e0dc8fdcce2311a
 EBUILD alsa-lib-1.2.10-r1.ebuild 2734 BLAKE2B 747f6f584ebcd3b97e593ccd79e20c7e51cd5399841421094fe5db544fe745a2435a7c1c86e40c6370a95a1402619cf52308490fcc08149ed4f7b0dc609a5a74 SHA512 890479bd7de7aa2add693e9d710dc0f5e26a95c04e4e8922331d5318c29d6e516292fcdc8e33cc8bf4ce7bafbd278cf5e830e6d5a1ff67b7c856250a9d48d657
+EBUILD alsa-lib-1.2.10-r2.ebuild 2870 BLAKE2B ad47c3debfc19ff6dfaa654a37645ac4cdc2ee6a4f3fd28f9c3503725b1e194df67faf326d5a1ef5862804ed73db4cea17a352c63c40dec4b95d293162cfafe6 SHA512 241c7dd97d1af1a56d18e1c6213f524556a62450eb0b0fdc028d41d729c3be2a36f938b99a97845ea89245062009d4a5000e0ed53426be1153124885f09f793d
 EBUILD alsa-lib-1.2.8-r1.ebuild 2540 BLAKE2B f4aff12b1da6ed6a5b3be7955d918a1dfbf3995ca17fbd7f7e947addb17b8570bd1f18e59d0d47c091ff493163f2fc61363558d52eb22ea19369904f7d162cc1 SHA512 114feb897ac54c94c8527af2953a3fc02c94fe6a32c3638e1056c3184e005a8e1f3f289447274a5a0155c8dbe0ef64ac55aa52b4edcfb07a3f186c16c56b9389
 EBUILD alsa-lib-1.2.9.ebuild 2593 BLAKE2B a1c38eb9ff96e6005713f6a7b21dbb44b2ab5d6afbe708b8801751ff0a6b46f9921b5690c940aae9dd5477b8d7bd04d9d5cec647bc8be20d24c94465f20a5621 SHA512 04711ea90325d7375158aecf9ecf3b6d42a44189b08414fe5e497508c2e178169d97c1618bc69f88765a104538dba39125f990e137b9216a3e0405bf352f946c
 MISC metadata.xml 562 BLAKE2B e5944d48c846097392d401c5aec1c25adc58aa78cc441df8ac6ecc351ee338094f70cbe526cb0c8b9b87750b76d11bd24ddfab63d9ef87938ee25d5a9930b23f SHA512 d2ea1565bc3dcd9899ce0c108aca7ecc50a89621fcfda7d2dc111dc12c83e7551468a54c08bc7ffbbab4884d2a8bcb280005e54d11f12e9c31770f94a7728c02
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.10-r2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.10-r2.ebuild
new file mode 100644
index 000000000000..4b5a3c65e8bb
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.2.10-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit autotools multilib-minimal flag-o-matic python-single-r1
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+if [[ ${PV} == *_p* ]] ; then
+	# Please set correct commit ID for a snapshot release!
+	COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd"
+	SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-${COMMIT:0:7}
+else
+	# TODO: Upstream does publish .sig files, so someone could implement verify-sig ;)
+	SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="alisp debug doc python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	media-libs/alsa-topology-conf
+	media-libs/alsa-ucm-conf
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
+	"${FILESDIR}/${P}-musl-string.patch" # bug #913573, backport
+	"${FILESDIR}/${P}-ump-header-detection.patch" # bug #913573, backport
+	"${FILESDIR}/${P}-pcm-fix-segfault-32bit-libs.patch" # backport
+	"${FILESDIR}/${P}-reshuffle-included-files-config-h.patch" # backport
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
+	# bug #545950
+	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Broken upstream. Could in theory work with -flto-partitions=none
+	# but it's a hack to workaround the real problem and not strictly safe.
+	# bug #616108, bug #669086, and https://github.com/alsa-project/alsa-lib/issues/6.
+	# (This bug is closed as of 1.2.9 but there's been no clear actual fix to it.
+	# Let us know if you can identify one.)
+	filter-lto
+
+	local myeconfargs=(
+		--disable-maintainer-mode
+		--disable-resmgr
+		--enable-aload
+		--enable-rawmidi
+		--enable-seq
+		--enable-shared
+		--enable-thread-safety
+
+		$(multilib_native_use_enable python)
+		$(use_enable alisp)
+		$(use_with debug)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi && use doc; then
+		emake doc
+		grep -FZrl "${S}" doc/doxygen/html | \
+			xargs -0 sed -i -e "s:${S}::" || die
+	fi
+}
+
+multilib_src_install() {
+	multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. )
+
+	default
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
+}
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-pcm-fix-segfault-32bit-libs.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.10-pcm-fix-segfault-32bit-libs.patch
new file mode 100644
index 000000000000..4cd3614ee943
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.10-pcm-fix-segfault-32bit-libs.patch
@@ -0,0 +1,91 @@
+https://github.com/alsa-project/alsa-lib/commit/0e3dfb9f705ca78be34cd70fd59d67c431e29cc7
+
+From 0e3dfb9f705ca78be34cd70fd59d67c431e29cc7 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Sat, 9 Sep 2023 17:42:03 +0200
+Subject: [PATCH] pcm: Fix segfault with 32bit libs
+
+The recent rearrangement of header inclusion order caused a regression
+showing segfaults on 32bit Arm.  The primary reason is the
+inconsistent compile condition depending on the inclusion of config.h;
+while most of other code include pcm_local.h (that implicitly includes
+config.h) at first, pcm_direct.c doesn't do it, hence the access with
+direct plugins crashes.
+
+For fixing it, we need to include config.h at the beginning.  But,
+it's better to include pcm_local.h for all relevant code for
+consistency.  The patch does it, and also it adds the guard in
+pcm_local.h for double inclusions.
+
+Fixes: ad3a8b8b314e ("reshuffle included files to include config.h as first")
+Link: https://github.com/alsa-project/alsa-lib/issues/352
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+--- a/src/pcm/pcm_direct.c
++++ b/src/pcm/pcm_direct.c
+@@ -19,6 +19,7 @@
+  *
+  */
+   
++#include "pcm_local.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
+--- a/src/pcm/pcm_dmix.c
++++ b/src/pcm/pcm_dmix.c
+@@ -26,7 +26,7 @@
+  *
+  */
+   
+-#include "config.h"
++#include "pcm_local.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
+--- a/src/pcm/pcm_dshare.c
++++ b/src/pcm/pcm_dshare.c
+@@ -26,6 +26,7 @@
+  *
+  */
+   
++#include "pcm_local.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
+--- a/src/pcm/pcm_dsnoop.c
++++ b/src/pcm/pcm_dsnoop.c
+@@ -26,6 +26,7 @@
+  *
+  */
+   
++#include "pcm_local.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
+--- a/src/pcm/pcm_local.h
++++ b/src/pcm/pcm_local.h
+@@ -20,6 +20,9 @@
+  *
+  */
+ 
++#ifndef __PCM_LOCAL_H
++#define __PCM_LOCAL_H
++
+ #include "config.h"
+ 
+ #include <stdio.h>
+@@ -1223,3 +1226,5 @@ static inline void snd_pcm_unlock(snd_pcm_t *pcm)
+ #define snd_pcm_lock(pcm)		do {} while (0)
+ #define snd_pcm_unlock(pcm)		do {} while (0)
+ #endif /* THREAD_SAFE_API */
++
++#endif /* __PCM_LOCAL_H */
+--- a/src/pcm/pcm_shm.c
++++ b/src/pcm/pcm_shm.c
+@@ -26,6 +26,7 @@
+  *
+  */
+   
++#include "pcm_local.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-reshuffle-included-files-config-h.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.10-reshuffle-included-files-config-h.patch
new file mode 100644
index 000000000000..42493fef6af1
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.10-reshuffle-included-files-config-h.patch
@@ -0,0 +1,174 @@
+https://github.com/alsa-project/alsa-lib/commit/81a7a93636d9472fcb0c2ff32d9bfdf6ed10763d
+
+From 81a7a93636d9472fcb0c2ff32d9bfdf6ed10763d Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Wed, 13 Sep 2023 12:27:21 +0200
+Subject: [PATCH] reshuffle included files to include config.h as first - v2
+
+config.h may contain defines like _FILE_OFFSET_BITS which influence
+the system wide include files (off_t types, open -> open64 function
+usage etc.).
+
+Fixes: ad3a8b8b ("reshuffle included files to include config.h as first")
+Related: https://github.com/alsa-project/alsa-lib/pull/333
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+--- a/src/control/setup.c
++++ b/src/control/setup.c
+@@ -29,13 +29,13 @@
+  *
+  */
+ 
++#include "local.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <ctype.h>
+-#include "local.h"
+ 
+ #ifndef DOC_HIDDEN
+ typedef struct {
+--- a/src/rawmidi/rawmidi.c
++++ b/src/rawmidi/rawmidi.c
+@@ -144,12 +144,12 @@ This example shows open and read/write rawmidi operations.
+  * Shows open and read/write rawmidi operations.
+  */
+  
++#include "rawmidi_local.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include "rawmidi_local.h"
+ 
+ /**
+  * \brief setup the default parameters
+--- a/src/rawmidi/rawmidi_local.h
++++ b/src/rawmidi/rawmidi_local.h
+@@ -19,10 +19,10 @@
+  *
+  */
+ 
++#include "local.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <limits.h>
+-#include "local.h"
+ 
+ typedef struct {
+ 	int (*close)(snd_rawmidi_t *rawmidi);
+--- a/src/rawmidi/rawmidi_virt.c
++++ b/src/rawmidi/rawmidi_virt.c
+@@ -19,13 +19,11 @@
+  *
+  */
+ 
+-#include <stdio.h>
+-#include <stdlib.h>
++#include "rawmidi_local.h"
+ #include <unistd.h>
+ #include <string.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+-#include "rawmidi_local.h"
+ #include "seq.h"
+ #include "seq_midi_event.h"
+ 
+--- a/src/rawmidi/ump.c
++++ b/src/rawmidi/ump.c
+@@ -4,10 +4,6 @@
+  * \brief Universal MIDI Protocol (UMP) Interface
+  */
+ 
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <limits.h>
+-#include "local.h"
+ #include "rawmidi_local.h"
+ #include "ump_local.h"
+ 
+--- a/src/seq/seq.c
++++ b/src/seq/seq.c
+@@ -777,8 +777,8 @@ void event_filter(snd_seq_t *seq, snd_seq_event_t *ev)
+ 
+ */
+ 
+-#include <poll.h>
+ #include "seq_local.h"
++#include <poll.h>
+ 
+ /****************************************************************************
+  *                                                                          *
+--- a/src/seq/seq_hw.c
++++ b/src/seq/seq_hw.c
+@@ -20,9 +20,9 @@
+  *
+  */
+ 
++#include "seq_local.h"
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+-#include "seq_local.h"
+ 
+ #ifndef PIC
+ /* entry for static linking */
+--- a/src/seq/seq_local.h
++++ b/src/seq/seq_local.h
+@@ -23,10 +23,10 @@
+ #ifndef __SEQ_LOCAL_H
+ #define __SEQ_LOCAL_H
+ 
++#include "local.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <limits.h>
+-#include "local.h"
+ 
+ #define SND_SEQ_OBUF_SIZE	(16*1024)	/* default size */
+ #define SND_SEQ_IBUF_SIZE	500		/* in event_size aligned */
+--- a/src/seq/seq_midi_event.c
++++ b/src/seq/seq_midi_event.c
+@@ -28,10 +28,10 @@
+  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
++#include "local.h"
+ #if HAVE_MALLOC_H
+ #include <malloc.h>
+ #endif
+-#include "local.h"
+ 
+ #ifndef DOC_HIDDEN
+ 
+--- a/src/seq/seqmid.c
++++ b/src/seq/seqmid.c
+@@ -20,14 +20,12 @@
+  *
+  */
+ 
+-#include <stdio.h>
+-#include <stdlib.h>
++#include "seq_local.h"
+ #include <unistd.h>
+ #include <string.h>
+ #include <fcntl.h>
+ #include <ctype.h>
+ #include <sys/ioctl.h>
+-#include "seq_local.h"
+ 
+ /**
+  * \brief queue controls - start/stop/continue
+--- a/src/userfile.c
++++ b/src/userfile.c
+@@ -18,7 +18,7 @@
+  *
+  */
+   
+-#include <config.h>
++#include "config.h"
+ #include <string.h>
+ #include <errno.h>
+ #include <assert.h>
+
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index f04aa6cd0057..c88ff7e42726 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/gpodder/Manifest b/media-sound/gpodder/Manifest
index 6e0f77c597d1..d2355391c8df 100644
--- a/media-sound/gpodder/Manifest
+++ b/media-sound/gpodder/Manifest
@@ -1,5 +1,5 @@
 DIST gpodder-3.11.1.tar.gz 1174163 BLAKE2B 703b545b576c8f119427e336e71e45301d4336fc82bca6ec6c4a0866591c8742866308da680564ff1543a5a65e2407295c46b3c5831d1e2d7335c5806d4cce5a SHA512 7570a4f0ac0c974fab58e30bb5bceb998cd7260ab91140a9801cf4fda1af3549ddf1ec4930081025215ecefd920a93c16252594915778e8ecb7524d3d7d3011b
 DIST gpodder-3.11.2.tar.gz 1177302 BLAKE2B de66191dd50f5041b10f52c18be31e059f6547c12f7e81f036939b3fdf1a9de5e18d6a25dac9db9487e3efa907c9967e220f41386929b9053fe1e5670b6babe7 SHA512 367c1e0eba7a5973b681e7b91463624b4e9ef2ad75ce1697f5d2e5937958c417bc3e6b1b34a54344f66ebb047479ab16a35dd913e54050f71ac54af05e62b30a
 EBUILD gpodder-3.11.1.ebuild 2119 BLAKE2B e383de02cb4211b2b0ae1c6ba6365dc634a255082f69e703cda33fc9a3799ecbbc75ca8a65c6a6c01a32345ce7a358b0bf4269d24a38b397a6c5e6538d8a0bf3 SHA512 e1c488309668e0fd14bcc9dce93d5c950e940b5db442e6b1d2dc1fe13fdd00934d49b7c1204f46f072b8fe9bdf18324757815972978feee279b2e30a4a362dff
-EBUILD gpodder-3.11.2.ebuild 2121 BLAKE2B d4e7319b707acc6660d181a87ecc01c77a36cdab2857eb2f653cc30e99109ab8f7d516f52607d85e8b52b0c75f1d6bd313e2904dfcf881295f569b89e3ac685d SHA512 8eebc09d6d853dc46b78ef96bc5849e796ba190a09fcac36c4ed98d142421760f0c82a9ec9d6e2af3896f869f014d2dfa064835a67ad6e32f214c8f24823a6fc
+EBUILD gpodder-3.11.2.ebuild 2119 BLAKE2B e383de02cb4211b2b0ae1c6ba6365dc634a255082f69e703cda33fc9a3799ecbbc75ca8a65c6a6c01a32345ce7a358b0bf4269d24a38b397a6c5e6538d8a0bf3 SHA512 e1c488309668e0fd14bcc9dce93d5c950e940b5db442e6b1d2dc1fe13fdd00934d49b7c1204f46f072b8fe9bdf18324757815972978feee279b2e30a4a362dff
 MISC metadata.xml 358 BLAKE2B 272a71d2d7d519dca74a2d1dbbd25d0c48b55b265eca16962967f57dc29edfeca9d454100a84a7dd505f5bab7778778ff45b89f2ddaca152b562733e8c0dcce8 SHA512 31b12848c3f24a103f2bfa39bec4b2c4e3251ed70de194d569acfbe2b7df3f8ea28dd5ba274b4add0fbc1b55d998cf13f5b8f7bf89bb4a95fd1e60e988bce6f6
diff --git a/media-sound/gpodder/gpodder-3.11.2.ebuild b/media-sound/gpodder/gpodder-3.11.2.ebuild
index d6e67e460c88..08280b1bfa58 100644
--- a/media-sound/gpodder/gpodder-3.11.2.ebuild
+++ b/media-sound/gpodder/gpodder-3.11.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+dbus bluetooth mtp"
 
 RDEPEND="
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index a162e9e16561..4197c138a840 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,3 +1,5 @@
 DIST qtractor-0.9.34.tar.gz 2012437 BLAKE2B c64b75bc8ecd761378dd0170e0fdcfcd5c612cabdf8c4dddcfaca2bbbd95db6328b36bfe1a10426744b9e75148263476bc17af80efcecf70a6c6a2b4089f7c26 SHA512 6ee5df583eb7e46c88aacb98d0dc79159b50e510158651d476e9516180e9bcb536e9642842714b62f7c4fde15fe386d85e6706f70b583ce0d8677e671985c695
+DIST qtractor-0.9.35.tar.gz 2548418 BLAKE2B 86ee849dac7dfd2cf071b7477356171736ff23df9bdc431334221f415e01bfac2887869b2bcb29c401f00cf6b85651709646c6e6034d8365f172854c71ca60ea SHA512 8e99a86afb5f1063cc8df8cb38210ca25c271d54e1cbc21daf288072aa48f67da25ffc4b2e953f27975ee9817fb28e64d9d957755aafe246ef7b1b03c958da0f
 EBUILD qtractor-0.9.34-r1.ebuild 2521 BLAKE2B dc8bb5185169a8e14468ade46f9d164d211b7a41cec833d27a7d58c260467896931a9487846727fd0897c678e16f07f820721e55ad336ee050c45a667cf8b578 SHA512 18e38db886a4ee9894bea573b297a3ab63994294262e56d322271604d1a0b420fd39cc2ed5fa12839ed0e475c05161a49a94d1a3a073038b231a5cc211586614
+EBUILD qtractor-0.9.35.ebuild 2523 BLAKE2B d74460c97a593ebce6308918245690bfe59abf6ef8580810cd7753a95ec68bdeb7562dad785994ff64bf13df12f7caa83c67613de5bd0389486787acaff896db SHA512 6d7a41379bafa41d7199d42c360633fd76fa8d4fe09f8d02f678876abc8d98ceaa7fde3cd378656447dd671a2b5dbc91514b043cd6f7a409c418371a7a8b0714
 MISC metadata.xml 891 BLAKE2B c85e76d86b5e559e2de880a440e8bdddfb8d67de2b7216a42ebb1ec7cce7b9a4dc8ccf20732e4b4ea489a14fcf5584aecef193e9fe3ac2bb0159011002607a60 SHA512 fcc0f8b61f0b9d9fd3d49c5f00f46b739012a6e8e4f7664bf08ae277b279d282d11056f9ca986788a7e444da53a17aeab46c2ee30fa945eb54dd271b11cf4a55
diff --git a/media-sound/qtractor/qtractor-0.9.35.ebuild b/media-sound/qtractor/qtractor-0.9.35.ebuild
new file mode 100644
index 000000000000..a3dd1301de67
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.9.35.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
+HOMEPAGE="https://qtractor.sourceforge.io"
+SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
+REQUIRED_USE="dssi? ( ladspa )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	media-libs/libsndfile
+	media-libs/lilv
+	media-libs/lv2
+	media-libs/suil
+	virtual/jack
+	x11-libs/libxcb:=
+	aubio? ( media-libs/aubio:= )
+	dssi? ( media-libs/dssi )
+	ladspa? ( media-libs/ladspa-sdk )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	osc? ( media-libs/liblo )
+	rubberband? ( media-libs/rubberband )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DSSI=$(usex dssi 1 0)
+		-DCONFIG_GRADIENT=1
+		-DCONFIG_JACK_LATENCY=1
+		-DCONFIG_JACK_METADATA=1
+		-DCONFIG_JACK_SESSION=1
+		-DCONFIG_LADSPA=$(usex ladspa 1 0)
+		-DCONFIG_LIBAUBIO=$(usex aubio 1 0)
+		-DCONFIG_LIBLILV=1
+		-DCONFIG_LIBLO=$(usex osc 1 0)
+		-DCONFIG_LIBMAD=$(usex mad 1 0)
+		-DCONFIG_LIBRUBBERBAND=$(usex rubberband 1 0)
+		-DCONFIG_LIBSAMPLERATE=$(usex libsamplerate 1 0)
+		-DCONFIG_LIBVORBIS=$(usex vorbis 1 0)
+		-DCONFIG_LIBZ=$(usex zlib 1 0)
+		-DCONFIG_LV2=1
+		-DCONFIG_LV2_UI_GTK2=0
+		-DCONFIG_NSM=0
+		-DCONFIG_QT6=0
+		-DCONFIG_SSE=$(usex cpu_flags_x86_sse 1 0)
+		-DCONFIG_STACKTRACE=$(usex debug 1 0)
+		-DCONFIG_VESTIGE=1
+		-DCONFIG_VST2=1
+		-DCONFIG_VST3=0
+		-DCONFIG_XUNIQUE=0
+	)
+	# Following options are left to the default
+	# CONFIG_LV2_ATOM
+	# CONFIG_LV2_BUF_SIZE
+	# CONFIG_LV2_CVPORT
+	# CONFIG_LV2_EVENT
+	# CONFIG_LV2_EXTERNAL_UI
+	# CONFIG_LV2_MIDNAM
+	# CONFIG_LV2_OPTIONS
+	# CONFIG_LV2_PARAMETERS
+	# CONFIG_LV2_PATCH
+	# CONFIG_LV2_PORT_EVENT
+	# CONFIG_LV2_PRESETS
+	# CONFIG_LV2_PROGRAMS
+	# CONFIG_LV2_STATE
+	# CONFIG_LV2_STATE_FILES
+	# CONFIG_LV2_STATE_MAKE_PATH
+	# CONFIG_LV2_TIME
+	# CONFIG_LV2_TIME_POSITION
+	# CONFIG_LV2_UI
+	# CONFIG_LV2_UI_IDLE
+	# CONFIG_LV2_UI_REQ_VALUE
+	# CONFIG_LV2_UI_SHOW
+	# CONFIG_LV2_UI_TOUCH
+	# CONFIG_LV2_WORKER
+	# CONFIG_LV2_UI_X11
+	cmake_src_configure
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4a9c7e593933..a5a7842260cb 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index dd28f34eab29..f2af6e565069 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -5,6 +5,7 @@ AUX 0.3.77/0001-gst-prevent-crash-stopping-device-provider.patch 1310 BLAKE2B 57
 AUX 0.3.77/0002-pulse-prevent-duplicates.patch 846 BLAKE2B ea2994854be1e235685e26cda9747c7866b394a154593e2c5108daaeea19512e98d52a8acd89d1113b6048843c93626402d375e72315c3eb09c8f2d1967164ab SHA512 d85485d3f94536d6446687cd4d0b3592b0f4411b0ee91cc2b4719beeb99272e26f611b24a70b251d58a1e3c6c163d2204ae54db328b342d6c9ee9486650b06d9
 AUX 0.3.79/0001-meson-better-check-dlopen-dir.patch 1223 BLAKE2B a7392d19824426ea9b2299a1bde125d917fa1f7aae95f48bda006d1848ca047be0a3c517c2e806c83aee29300a205f59f38e0ab1b83f741736e10e953addd309 SHA512 adc0dd0320cdc6133c5535555b42039d1673344b8521fcb70ace2df6aaf0e9387e566f97f7954f9d023e048a6218434c35f7b7a2c258e930fee986b53a0c9b1a
 AUX 0.3.79/0002-alsa-non-portable-isinf-use.patch 1264 BLAKE2B 2ac25b4c75ce211be0e13a3ba8d1e903a684929f6b6310121269fcec3f6fe6efdfebfe9134e936b5459365e26e662f1313e0708c71cd98d0c1f3476ace0b8622 SHA512 add0cbd1ab31108e305d09ed349b61f120e4b957215127153f49ec3c501b1a402b886f8151c8da1377a210737adcdbc93027522b3c538d1b5296d142327bb459
+AUX 0.3.80/0001-aes-support-both-webrtc-versions.patch 9037 BLAKE2B 9222a1b9004cf410a06bfb29f17b749f2c940b9ce91973d7d58785ba47899bc0cd22b010818aaebb68af729972b8fe5f99c04926ea51af92960bf9567e87ac79 SHA512 34f005a38a99d8d06c1adf8d71a28142f8d4450ae72ffd8d19001485555f681a3ebcdfc094fea558e3c9610b7c5c6bbecad9acea73d0de3c5e9de905d6080044
 AUX 99-pipewire-default-hook.conf 540 BLAKE2B cec76e78db9db290054bf766774c284d7a7a1374c453802eb1bdc19db9289856ec7b8643acbab916a39ca859d543deca111e3b0f110d1904343221c1573ffc17 SHA512 ef891e38c6f40fce2904e240307147a58c48d780e8470dac8e28044cfb86ddeb163885a2362687791779379ad814f58ad5649b75ac4e82931c5bdd3f37a6ed01
 AUX gentoo-pipewire-launcher.1 1633 BLAKE2B 36c8888693bd0389dc9b1e49d0501d2679956d88f6b7ac42f0347c3fe2259775dd7082cb0bbdeb54a232fcc8902faa8086203e0fe2437c0eea5f1927ba2d0de4 SHA512 8085c9a989f21ee7f2528d56d5b104c0d14024df06f5cb6cd2aa8168b58469c71b91c788706b11021d9dbddb647a2203175603f4f8aa7b33a63a7b7cf8b59d1f
 AUX gentoo-pipewire-launcher.in-r2 2630 BLAKE2B e1a176c2b8558c56e250970cf99b78425384cafbc7086856ad389af47041d9b5203f201ebe53510e2e0d663b95447d482d219b0c3476eba7caf26c270b334ae7 SHA512 f5200fc99071aa8b7f4dde4cb9518909db3a79ebeb98d6c25bb216bf794028c4cb9573761a1a8ea6441d3a9478ab8cca7c31239f1f497cb2e9e8231f069d00bc
@@ -15,11 +16,13 @@ DIST pipewire-0.3.75.tar.bz2 1629466 BLAKE2B e69dbb93ebe50f037bc602aa86733c8ba9c
 DIST pipewire-0.3.77.tar.bz2 1643767 BLAKE2B 3a2df9cdedf77d5b4927e115ddd7da0d1eecc85322ce7995a49945d41cc83b9a543c1382ad304bdb549f67ac444f7bca6871248654fb4d2e21b25eb55411940c SHA512 422c8504f608d6845b94351a336ab528f51195551418d0d245064972ed784817cacafc6afaad74eb0e0ea80474a9da33ef6917c1f60d3f8f45d70c54971f0760
 DIST pipewire-0.3.78.tar.bz2 1643536 BLAKE2B 44e04486850b0c68cea42ef911eaffae4c22bdedeff0783c119409d2e8d528c165f1f46f0a0e8b63e1c46cf8535b52b79291b54dd61496c6275c6e41f9d71edd SHA512 2fe0113eaaba1ffe67d20cf10b9ee927cb2bfc7c2663937b131f479d35ca6af43b5659cf8a16db849ecc5881e47a56507e775aad06e9765a3ab8ec354636f8eb
 DIST pipewire-0.3.79.tar.bz2 1647590 BLAKE2B dd7c88219310c77fd5b64cbfa4ab8130d81c47ff3a35c03ecfd260bc1e7e24fb108b5100bdbc977e3cd8e74ccfe90c11310b195e804a7fe04a64e1d1637c7233 SHA512 5853d4d9d0c21265e0fc0fd68369530d76ae63bad1aa28f6eaa4a0f76e5c939ffc0dee2d81fdf0526da3473f69bddcdb77938597ad004abe04c842d798409b1d
+DIST pipewire-0.3.80.tar.bz2 1655137 BLAKE2B cf55e01b6fff29e7ef1f40e9a8f28788b9f538380232821b334359844b33b12b913375ae14e4589d7ae9cd26d22bc841d8103d41c7eb3ea1a9f0c1db1abc6507 SHA512 77e26b6cbefc091ea703b53d147accbd9495f97ba57618a21366b0747074de3ed1060c03e91362f5cf9dc5c256da6d541eccaff8de306b369730400c7b7f46b2
 EBUILD pipewire-0.3.75-r3.ebuild 18118 BLAKE2B 08963fa4917ac0413ddc5eccd5415a218d130d749fa87c7d3041750cf4967ce48ed6f978b2060de753cad813382f38d9d88cdc568ee2c0e1c2b4b9f3f1aa9921 SHA512 450b2a6ee200f8f02a52443cad33b66526f92ec7fc7bee11efefb960d98667036e7999fa76e60d6b61e8c48a8a027005c75dc2f1533a79750e3d2a692e7ba09f
 EBUILD pipewire-0.3.77-r2.ebuild 18118 BLAKE2B 08963fa4917ac0413ddc5eccd5415a218d130d749fa87c7d3041750cf4967ce48ed6f978b2060de753cad813382f38d9d88cdc568ee2c0e1c2b4b9f3f1aa9921 SHA512 450b2a6ee200f8f02a52443cad33b66526f92ec7fc7bee11efefb960d98667036e7999fa76e60d6b61e8c48a8a027005c75dc2f1533a79750e3d2a692e7ba09f
 EBUILD pipewire-0.3.78-r1.ebuild 18124 BLAKE2B 89831f2c121db08312cb56dea53b629637b225dd2976dc41467f17de44ee555ffdf505e1ba8091f20b949f92666fd6d7bef6d5f79235ec152fe691aa1f47a4b1 SHA512 f2927eeabc9b18e2600411322deaa90baf735ea2416caba89c75fe71470424772cd95aa0cdd76c775ac446c25db4b818bb486512917d365f2a37632912a51b73
 EBUILD pipewire-0.3.79-r1.ebuild 18124 BLAKE2B 89831f2c121db08312cb56dea53b629637b225dd2976dc41467f17de44ee555ffdf505e1ba8091f20b949f92666fd6d7bef6d5f79235ec152fe691aa1f47a4b1 SHA512 f2927eeabc9b18e2600411322deaa90baf735ea2416caba89c75fe71470424772cd95aa0cdd76c775ac446c25db4b818bb486512917d365f2a37632912a51b73
 EBUILD pipewire-0.3.79-r2.ebuild 18195 BLAKE2B 767bef44553988357ba12eeeac9298130ea610f3e1fef1db083c98385a74db99f3d694eb8f58c4e2c850cb0e1c262bdc5e2754f6383886c3ebc39c4d15fdc1c2 SHA512 89af92506a99e5d556c76141ae1e2796631cd75a2c046171cd750f75a7d0e72e5aa1f75184455c287387dad6143d9208999908d0ac409851d05d53b086d24170
 EBUILD pipewire-0.3.79-r3.ebuild 18195 BLAKE2B 7b0a755c6ba881e8aad07683c3662e2891624ab7aa0c9567c9b3a33083892e3b753d387b3d718e26dc5b320720e364fae0253a5fa50614410aaf7b73287636c4 SHA512 750adb3020413ec3bffdc321090d699fb2e1cc14de8d1b25aebf408afd0866f83211914519a0062ea8698d87a4e44f0e0a0e8179e39ad68630b4bcfb62372e98
+EBUILD pipewire-0.3.80.ebuild 18195 BLAKE2B 7b0a755c6ba881e8aad07683c3662e2891624ab7aa0c9567c9b3a33083892e3b753d387b3d718e26dc5b320720e364fae0253a5fa50614410aaf7b73287636c4 SHA512 750adb3020413ec3bffdc321090d699fb2e1cc14de8d1b25aebf408afd0866f83211914519a0062ea8698d87a4e44f0e0a0e8179e39ad68630b4bcfb62372e98
 EBUILD pipewire-9999.ebuild 18195 BLAKE2B 7b0a755c6ba881e8aad07683c3662e2891624ab7aa0c9567c9b3a33083892e3b753d387b3d718e26dc5b320720e364fae0253a5fa50614410aaf7b73287636c4 SHA512 750adb3020413ec3bffdc321090d699fb2e1cc14de8d1b25aebf408afd0866f83211914519a0062ea8698d87a4e44f0e0a0e8179e39ad68630b4bcfb62372e98
 MISC metadata.xml 2156 BLAKE2B 974459115e0f3cf4e4c3ac15159740b42e01a093da37d8a27f80e122c9ab2a3fe9194443eaf08f9b66d613db90a14465abbe1b76816bce90e11a46c8409c7513 SHA512 cfe0fdb86c993f167507e22635878d6d7d5dcd48f4c23323231263551ceff986fc454700428ecb7d2ee2abe82093c35d8e7bd491020fd6dd3f3889c09e9020bb
diff --git a/media-video/pipewire/files/0.3.80/0001-aes-support-both-webrtc-versions.patch b/media-video/pipewire/files/0.3.80/0001-aes-support-both-webrtc-versions.patch
new file mode 100644
index 000000000000..f2afdde4f4be
--- /dev/null
+++ b/media-video/pipewire/files/0.3.80/0001-aes-support-both-webrtc-versions.patch
@@ -0,0 +1,233 @@
+https://bugs.gentoo.org/913693
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1f1c308c9766312e684f0b53fc2d1422c7414d31
+
+From 1f1c308c9766312e684f0b53fc2d1422c7414d31 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Thu, 14 Sep 2023 15:35:40 +0200
+Subject: [PATCH] aec: support both webrtc versions
+
+Version 1 does not seem to be packaged in many distros and so they would
+need to revert the patch or disable AEC. Enabling both allows for things
+to move forwards gracefully.
+--- a/meson.build
++++ b/meson.build
+@@ -377,9 +377,17 @@ cdata.set('HAVE_GSTREAMER_DEVICE_PROVIDER', get_option('gstreamer-device-provide
+ 
+ webrtc_dep = dependency('webrtc-audio-processing-1',
+   version : ['>= 1.2' ],
+-  required : get_option('echo-cancel-webrtc'))
+-summary({'WebRTC Echo Canceling': webrtc_dep.found()}, bool_yn: true, section: 'Misc dependencies')
+-cdata.set('HAVE_WEBRTC', webrtc_dep.found())
++  required : false)
++cdata.set('HAVE_WEBRTC1', webrtc_dep.found())
++if webrtc_dep.found()
++  summary({'WebRTC Echo Canceling >= 1.2': webrtc_dep.found()}, bool_yn: true, section: 'Misc dependencies')
++else
++  webrtc_dep = dependency('webrtc-audio-processing',
++    version : ['>= 0.2', '< 1.0'],
++    required : get_option('echo-cancel-webrtc'))
++  cdata.set('HAVE_WEBRTC', webrtc_dep.found())
++  summary({'WebRTC Echo Canceling < 1.0': webrtc_dep.found()}, bool_yn: true, section: 'Misc dependencies')
++endif
+ 
+ # On FreeBSD and MidnightBSD, epoll-shim library is required for eventfd() and timerfd()
+ epoll_shim_dep = (host_machine.system() == 'freebsd' or host_machine.system() == 'midnightbsd'
+--- a/spa/plugins/aec/aec-webrtc.cpp
++++ b/spa/plugins/aec/aec-webrtc.cpp
+@@ -3,6 +3,8 @@
+ /* SPDX-FileCopyrightText: Copyright © 2021 Arun Raghavan <arun@asymptotic.io> */
+ /* SPDX-License-Identifier: MIT */
+ 
++#include "config.h"
++
+ #include <memory>
+ #include <utility>
+ 
+@@ -13,7 +15,13 @@
+ #include <spa/utils/json.h>
+ #include <spa/support/plugin.h>
+ 
++#ifdef HAVE_WEBRTC
++#include <webrtc/modules/audio_processing/include/audio_processing.h>
++#include <webrtc/modules/interface/module_common_types.h>
++#include <webrtc/system_wrappers/include/trace.h>
++#else
+ #include <modules/audio_processing/include/audio_processing.h>
++#endif
+ 
+ struct impl_data {
+ 	struct spa_handle handle;
+@@ -39,6 +47,54 @@ static bool webrtc_get_spa_bool(const struct spa_dict *args, const char *key, bo
+ 	return default_value;
+ }
+ 
++#ifdef HAVE_WEBRTC
++/* [ f0 f1 f2 ] */
++static int parse_point(struct spa_json *it, float (&f)[3])
++{
++	struct spa_json arr;
++	int i, res;
++
++	if (spa_json_enter_array(it, &arr) <= 0)
++		return -EINVAL;
++
++	for (i = 0; i < 3; i++) {
++		if ((res = spa_json_get_float(&arr, &f[i])) <= 0)
++			return -EINVAL;
++	}
++	return 0;
++}
++
++/* [ point1 point2 ... ] */
++static int parse_mic_geometry(struct impl_data *impl, const char *mic_geometry,
++		std::vector<webrtc::Point>& geometry)
++{
++	int res;
++	size_t i;
++	struct spa_json it[2];
++
++	spa_json_init(&it[0], mic_geometry, strlen(mic_geometry));
++	if (spa_json_enter_array(&it[0], &it[1]) <= 0) {
++		spa_log_error(impl->log, "Error: webrtc.mic-geometry expects an array");
++		return -EINVAL;
++	}
++
++	for (i = 0; i < geometry.size(); i++) {
++		float f[3];
++
++		if ((res = parse_point(&it[1], f)) < 0) {
++			spa_log_error(impl->log, "Error: can't parse webrtc.mic-geometry points: %d", res);
++			return res;
++		}
++
++		spa_log_info(impl->log, "mic %zd position: (%g %g %g)", i, f[0], f[1], f[2]);
++		geometry[i].c[0] = f[0];
++		geometry[i].c[1] = f[1];
++		geometry[i].c[2] = f[2];
++	}
++	return 0;
++}
++#endif
++
+ static int webrtc_init2(void *object, const struct spa_dict *args,
+ 		struct spa_audio_info_raw *rec_info, struct spa_audio_info_raw *out_info,
+ 		struct spa_audio_info_raw *play_info)
+@@ -48,9 +104,18 @@ static int webrtc_init2(void *object, const struct spa_dict *args,
+ 
+ 	bool high_pass_filter = webrtc_get_spa_bool(args, "webrtc.high_pass_filter", true);
+ 	bool noise_suppression = webrtc_get_spa_bool(args, "webrtc.noise_suppression", true);
+-	bool transient_suppression = webrtc_get_spa_bool(args, "webrtc.transient_suppression", true);
+ 	bool voice_detection = webrtc_get_spa_bool(args, "webrtc.voice_detection", true);
+-
++#ifdef HAVE_WEBRTC
++	bool extended_filter = webrtc_get_spa_bool(args, "webrtc.extended_filter", true);
++	bool delay_agnostic = webrtc_get_spa_bool(args, "webrtc.delay_agnostic", true);
++	// Disable experimental flags by default
++	bool experimental_agc = webrtc_get_spa_bool(args, "webrtc.experimental_agc", false);
++	bool experimental_ns = webrtc_get_spa_bool(args, "webrtc.experimental_ns", false);
++
++	bool beamforming = webrtc_get_spa_bool(args, "webrtc.beamforming", false);
++#else
++	bool transient_suppression = webrtc_get_spa_bool(args, "webrtc.transient_suppression", true);
++#endif
+ 	// Note: AGC seems to mess up with Agnostic Delay Detection, especially with speech,
+ 	// result in very poor performance, disable by default
+ 	bool gain_control = webrtc_get_spa_bool(args, "webrtc.gain_control", false);
+@@ -59,6 +124,51 @@ static int webrtc_init2(void *object, const struct spa_dict *args,
+ 	// This filter will modify playback buffer (when calling ProcessReverseStream), but now
+ 	// playback buffer modifications are discarded.
+ 
++#ifdef HAVE_WEBRTC
++	webrtc::Config config;
++	config.Set<webrtc::ExtendedFilter>(new webrtc::ExtendedFilter(extended_filter));
++	config.Set<webrtc::DelayAgnostic>(new webrtc::DelayAgnostic(delay_agnostic));
++	config.Set<webrtc::ExperimentalAgc>(new webrtc::ExperimentalAgc(experimental_agc));
++	config.Set<webrtc::ExperimentalNs>(new webrtc::ExperimentalNs(experimental_ns));
++
++	if (beamforming) {
++		std::vector<webrtc::Point> geometry(rec_info->channels);
++		const char *mic_geometry, *target_direction;
++
++		/* The beamformer gives a single mono channel */
++		out_info->channels = 1;
++		out_info->position[0] = SPA_AUDIO_CHANNEL_MONO;
++
++		if ((mic_geometry = spa_dict_lookup(args, "webrtc.mic-geometry")) == NULL) {
++			spa_log_error(impl->log, "Error: webrtc.beamforming requires webrtc.mic-geometry");
++			return -EINVAL;
++		}
++
++		if ((res = parse_mic_geometry(impl, mic_geometry, geometry)) < 0)
++			return res;
++
++		if ((target_direction = spa_dict_lookup(args, "webrtc.target-direction")) != NULL) {
++			webrtc::SphericalPointf direction(0.0f, 0.0f, 0.0f);
++			struct spa_json it;
++			float f[3];
++
++			spa_json_init(&it, target_direction, strlen(target_direction));
++			if (parse_point(&it, f) < 0) {
++				spa_log_error(impl->log, "Error: can't parse target-direction %s",
++						target_direction);
++				return -EINVAL;
++			}
++
++			direction.s[0] = f[0];
++			direction.s[1] = f[1];
++			direction.s[2] = f[2];
++
++			config.Set<webrtc::Beamforming>(new webrtc::Beamforming(true, geometry, direction));
++		} else {
++			config.Set<webrtc::Beamforming>(new webrtc::Beamforming(true, geometry));
++		}
++	}
++#else
+ 	webrtc::AudioProcessing::Config config;
+ 	config.echo_canceller.enabled = true;
+ 	// FIXME: Example code enables both gain controllers, but that seems sus
+@@ -73,6 +183,7 @@ static int webrtc_init2(void *object, const struct spa_dict *args,
+ 	// FIXME: expose pre/postamp gain
+ 	config.transient_suppression.enabled = transient_suppression;
+ 	config.voice_detection.enabled = voice_detection;
++#endif
+ 
+ 	webrtc::ProcessingConfig pconfig = {{
+ 		webrtc::StreamConfig(rec_info->rate, rec_info->channels, false), /* input stream */
+@@ -81,15 +192,35 @@ static int webrtc_init2(void *object, const struct spa_dict *args,
+ 		webrtc::StreamConfig(play_info->rate, play_info->channels, false), /* reverse output stream */
+ 	}};
+ 
++#ifdef HAVE_WEBRTC
++	auto apm = std::unique_ptr<webrtc::AudioProcessing>(webrtc::AudioProcessing::Create(config));
++#else
+ 	auto apm = std::unique_ptr<webrtc::AudioProcessing>(webrtc::AudioProcessingBuilder().Create());
+ 
+ 	apm->ApplyConfig(config);
++#endif
+ 
+ 	if ((res = apm->Initialize(pconfig)) != webrtc::AudioProcessing::kNoError) {
+ 		spa_log_error(impl->log, "Error initialising webrtc audio processing module: %d", res);
+ 		return -EINVAL;
+ 	}
+ 
++#ifdef HAVE_WEBRTC
++	apm->high_pass_filter()->Enable(high_pass_filter);
++	// Always disable drift compensation since PipeWire will already do
++	// drift compensation on all sinks and sources linked to this echo-canceler
++	apm->echo_cancellation()->enable_drift_compensation(false);
++	apm->echo_cancellation()->Enable(true);
++	// TODO: wire up supression levels to args
++	apm->echo_cancellation()->set_suppression_level(webrtc::EchoCancellation::kHighSuppression);
++	apm->noise_suppression()->set_level(webrtc::NoiseSuppression::kHigh);
++	apm->noise_suppression()->Enable(noise_suppression);
++	apm->voice_detection()->Enable(voice_detection);
++	// TODO: wire up AGC parameters to args
++	apm->gain_control()->set_analog_level_limits(0, 255);
++	apm->gain_control()->set_mode(webrtc::GainControl::kAdaptiveDigital);
++	apm->gain_control()->Enable(gain_control);
++#endif
+ 	impl->apm = std::move(apm);
+ 	impl->rec_info = *rec_info;
+ 	impl->out_info = *out_info;
+-- 
+GitLab
diff --git a/media-video/pipewire/pipewire-0.3.80.ebuild b/media-video/pipewire/pipewire-0.3.80.ebuild
new file mode 100644
index 000000000000..7a471fb632bf
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.80.ebuild
@@ -0,0 +1,475 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
+#
+# 2. Upstream also sometimes amend release notes for the previous release to mention
+# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
+#
+# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *_p* ]] ; then
+		MY_COMMIT=""
+		SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+		S="${WORKDIR}"/${PN}-${MY_COMMIT}
+	else
+		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	fi
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+SLOT="0/0.4"
+IUSE="bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings ieee1394 jack-client jack-sdk liblc3 lv2"
+IUSE+=" modemmanager pipewire-alsa readline roc sound-server ssl system-service systemd test v4l X zeroconf"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+# - TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled
+# - TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work
+#   which provides adequate guarantee that alsa-lib will be able to provide audio services.
+#   If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
+#   When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
+# - ffmpeg is only used for pw-cat. We don't build the spa plugin which receives barely any activity.
+REQUIRED_USE="
+	ffmpeg? ( extra )
+	bluetooth? ( dbus )
+	jack-sdk? ( !jack-client )
+	modemmanager? ( bluetooth )
+	system-service? ( systemd )
+	!sound-server? ( !pipewire-alsa )
+	jack-client? ( dbus )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-util/meson-0.59
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+	dbus? ( dev-util/gdbus-codegen )
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+# While udev could technically be optional, it's needed for a numebr of options,
+# and not really worth it, bug #877769.
+RDEPEND="
+	acct-group/audio
+	acct-group/pipewire
+	media-libs/alsa-lib
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	virtual/libudev[${MULTILIB_USEDEP}]
+	bluetooth? (
+		dev-libs/glib
+		media-libs/fdk-aac
+		media-libs/libldac
+		media-libs/libfreeaptx
+		media-libs/opus
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+		virtual/libusb:1
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
+	extra? ( >=media-libs/libsndfile-1.0.20 )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flatpak? ( dev-libs/glib )
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gsettings? ( >=dev-libs/glib-2.26.0:2 )
+	ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
+	liblc3? ( media-sound/liblc3 )
+	lv2? ( media-libs/lilv )
+	modemmanager? ( >=net-misc/modemmanager-1.10.0 )
+	pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] )
+	sound-server? ( !media-sound/pulseaudio-daemon )
+	roc? ( media-libs/roc-toolkit )
+	readline? ( sys-libs/readline:= )
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd )
+	system-service? ( acct-user/pipewire )
+	v4l? ( media-libs/libv4l )
+	X? (
+		media-libs/libcanberra
+		x11-libs/libX11
+		x11-libs/libXfixes
+	)
+	zeroconf? ( net-dns/avahi )
+"
+
+DEPEND="${RDEPEND}"
+
+# TODO: Consider use cases where pipewire is not used for driving audio
+# Doing so with WirePlumber currently involves editing Lua scripts
+PDEPEND=">=media-video/wireplumber-0.4.8-r3"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	# Used for upstream backports
+	[[ -d "${FILESDIR}"/${PV} ]] && eapply "${FILESDIR}"/${PV}
+}
+
+multilib_src_configure() {
+	# https://bugs.gentoo.org/838301
+	filter-flags -fno-semantic-interposition
+
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+
+		$(meson_feature dbus)
+		$(meson_native_use_feature zeroconf avahi)
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_feature ieee1394 libffado)
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature gsettings)
+		$(meson_native_use_feature systemd)
+
+		$(meson_native_use_feature system-service systemd-system-service)
+		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
+		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
+
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
+		-Dcompress-offload=disabled # TODO: tinycompress unpackaged
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		# https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1379
+		$(meson_native_use_feature modemmanager bluez5-backend-native-mm)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature bluetooth bluez5-codec-aac)
+		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
+		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+		$(meson_native_use_feature bluetooth opus)
+		$(meson_native_use_feature bluetooth bluez5-codec-opus)
+		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
+		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		$(meson_native_use_feature ffmpeg pw-cat-ffmpeg)
+		$(meson_native_use_feature flatpak)
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_use jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		-Dbluez5-codec-lc3plus=disabled # unpackaged
+		$(meson_native_use_feature liblc3 bluez5-codec-lc3)
+		$(meson_native_use_feature lv2)
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		$(meson_native_use_feature roc)
+		$(meson_native_use_feature readline)
+		$(meson_native_use_feature ssl raop)
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		-Dudev=enabled
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		-Dlibmysofa=disabled # libmysofa is unpackaged
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
+
+		# We still have <5.16 kernels packaged in Gentoo and 6.1 (LTS) only
+		# just became stable, with 5.15 being the previous LTS. Many people
+		# are still on it.
+		-Dpam-defaults-install=true
+
+		# Just for bell sounds in X11 right now.
+		$(meson_native_use_feature X x11)
+		$(meson_native_use_feature X x11-xfixes)
+		$(meson_native_use_feature X libcanberra)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test --timeout-multiplier 10
+}
+
+multilib_src_install() {
+	# Our custom DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+
+		# Install pipewire conf loader hook
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/99-pipewire-default-hook.conf
+		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
+
+		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
+	fi
+
+	# Enable required wireplumber alsa and bluez monitors
+	if use sound-server; then
+		dodir /etc/wireplumber/main.lua.d
+		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
+
+		dodir /etc/wireplumber/bluetooth.lua.d
+		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
+	fi
+
+	if use system-service; then
+		newtmpfiles - pipewire.conf <<-EOF || die
+			d /run/pipewire 0755 pipewire pipewire - -
+		EOF
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop-r2 pipewire.desktop
+
+		exeinto /usr/bin
+		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r3 gentoo-pipewire-launcher
+
+		doman "${FILESDIR}"/gentoo-pipewire-launcher.1
+
+		# Disable pipewire-pulse if sound-server is disabled.
+		if ! use sound-server ; then
+			sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die
+		fi
+
+		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
+
+pkg_preinst() {
+	HAD_SOUND_SERVER=0
+	HAD_SYSTEM_SERVICE=0
+
+	if has_version "media-video/pipewire[sound-server(-)]" ; then
+		HAD_SOUND_SERVER=1
+	fi
+
+	if has_version "media-video/pipewire[system-service(-)]" ; then
+		HAD_SYSTEM_SERVICE=1
+	fi
+}
+
+pkg_postinst() {
+	udev_reload
+
+	use system-service && tmpfiles_process pipewire.conf
+
+	local ver
+	for ver in ${REPLACING_VERSIONS} ; do
+		if has_version kde-plasma/kwin[screencast] || has_version x11-wm/mutter[screencast] ; then
+			# https://bugs.gentoo.org/908490
+			# https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3243
+			ewarn "Please restart KWin/Mutter after upgrading PipeWire."
+			ewarn "Screencasting may not work until you do."
+		fi
+
+		if ver_test ${ver} -le 0.3.66-r1 ; then
+			elog ">=pipewire-0.3.66 uses the 'pipewire' group to manage permissions"
+			elog "and limits needed to function smoothly:"
+			elog
+			elog "1. Please make sure your user is in the 'pipewire' group for"
+			elog "the best experience with realtime scheduling (PAM limits behavior)!"
+			elog "You can add your account with:"
+			elog " usermod -aG pipewire <youruser>"
+			elog
+			elog "2. For the best experience with fast user switching, it is recommended"
+			elog "that you remove your user from the 'audio' group unless you rely on the"
+			elog "audio group for device access control or ACLs.:"
+			elog " usermod -rG audio <youruser>"
+			elog
+
+			if ! use jack-sdk ; then
+				elog
+				elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+				elog "alternative libraries have been installed to a non-default location."
+				elog "To use them, put pw-jack <application> before every JACK application."
+				elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+				elog "provider is still needed to compile the JACK applications themselves."
+				elog
+			fi
+
+			if use systemd ; then
+				ewarn
+				ewarn "PipeWire daemon startup has been moved to a launcher script!"
+				ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
+				ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
+				ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
+				ewarn
+				ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
+				ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
+				ewarn "advised that a D-Bus user session is set up before starting the script."
+				ewarn
+			fi
+
+			if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
+				elog
+				elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+				elog "are recommended to edit pulseaudio client configuration files:"
+				elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
+				elog "if it exists, and disable autospawning of the original daemon by setting:"
+				elog
+				elog "  autospawn = no"
+				elog
+				elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+				elog
+				elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+				elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
+				elog "command:"
+				elog
+				elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
+				elog
+			fi
+
+			if has_version 'net-misc/ofono' ; then
+				ewarn "Native backend has become default. Please disable oFono via:"
+				if systemd_is_booted ; then
+					ewarn "systemctl disable ofono"
+				else
+					ewarn "rc-update delete ofono"
+				fi
+			fi
+		fi
+	done
+
+	if [[ ${HAD_SOUND_SERVER} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then
+		# TODO: We could drop most of this if we set up systemd presets?
+		# They're worth looking into because right now, the out-of-the-box experience
+		# is automatic on OpenRC, while it needs manual intervention on systemd.
+		if use sound-server && use systemd ; then
+			elog
+			elog "When switching from PulseAudio, you may need to disable PulseAudio:"
+			elog
+			elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+			elog
+			elog "To use PipeWire, the user units must be manually enabled"
+			elog "by running this command as each user you use for desktop activities:"
+			elog
+			elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+			elog
+			elog "A reboot is recommended to avoid interferences from still running"
+			elog "PulseAudio daemon."
+			elog
+			elog "Both new users and those upgrading need to enable WirePlumber"
+			elog "for relevant users:"
+			elog
+			elog "  systemctl --user disable pipewire-media-session.service"
+			elog "  systemctl --user --force enable wireplumber.service"
+			elog
+			elog "Root user may replace --user with --global to change system default"
+			elog "configuration for all of the above commands."
+			elog
+		fi
+
+		if ! use sound-server ; then
+			ewarn
+			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
+			ewarn "your sound, please enable it. See the wiki at"
+			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
+			ewarn "for more details."
+			ewarn
+		fi
+	fi
+
+	if use system-service && [[ ${HAD_SYSTEM_SERVICE} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then
+		ewarn
+		ewarn "You have enabled the system-service USE flag, which installs"
+		ewarn "the system-wide systemd units that enable PipeWire to run as a system"
+		ewarn "service. This is more than likely NOT what you want. You are strongly"
+		ewarn "advised not to enable this mode and instead stick with systemd user"
+		ewarn "units. The default configuration files will likely not work out of the"
+		ewarn "box, and you are on your own with configuration."
+		ewarn
+	fi
+
+	elog "For latest tips and tricks, troubleshooting information, and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+
+	if use sound-server && ! use pipewire-alsa; then
+		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
+	fi
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 69bcca12cc88..8690df4d21c4 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index f1303ef00011..a41651987c83 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 15 Sep 2023 03:09:55 +0000
+Fri, 15 Sep 2023 09:10:05 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 544d9c04057f..6b72679218ee 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546444 BLAKE2B 427e6ba70311c66f33f8718c9e5205812a06f7180945f95cd2cc13a642ebd00b8ab6bde2ebd1ac16f0013a5d2c65c3729739daaa24b9e4c70888d6626437692d SHA512 666ed25ec3b20188903cb612d27562ec06741fff2c9cc4ee150980ae0801d6b66d3d117a8d3df13d953f8c0975e6b4fd3d287a501bb281b5093186361d8515d8
-TIMESTAMP 2023-09-15T03:09:59Z
+TIMESTAMP 2023-09-15T09:10:12Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUDywdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUEH3RfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCNzg/+OjrF6f3Mn3B71DHeU9n2Wk1QFYZ7o9M7na6S6CuibJYwmZbH17Ya0I5v
-AdvqBBqjXya4kt9KO4YJby7Ru6WZ1z7ESMTJQb5rULNsswu3qhOh3RS3qB2eAIaX
-xT+7IPTMmeYygaQRJJ7kVuDtuGW/1cOqv5h8DxEKogVkkEPJASMUKm3/OAd9RS28
-MqzZwUKmVgR0pxd3hRZwcOfyVMg9MHjD8ufBR4Fx1FOlWgsAa+TaBy0g8KIsBmpu
-+HWqItio/Y0PgQ1rN6pPfZad60FYI2/tvjOsb7oa7azTbann/62A93U6c1KV9cIX
-KmFscbiQhu+lHj7BKojMBSXTmsnNrB1OJ0aXJh2lu1Be6DpzRLQR8X+N5NfEpOqJ
-QUQW6PuQ+wi459RQaSfvG5ir/j4+gMKJn3uXXQUnSck0qxo3yiS6SK32UpoLdbS8
-nI+cnJbw/SorqC9zb1D7PbT2v2D+wMG3Br7v328846MgbRWU3MpMEDWJA9lclG0U
-7iLw+tMfXPYQeMAEk2x6Y8hseWZ4F5aOqOA3D1hv+N3khLxGgXNkAx0xQkG4Ogul
-6TaAwVW75EWX3TQr1w1oCkc4w6zBx8YfLVzmmUnoyQaF360hBZDngiCcxYqkxitV
-9BEwaOgfwOhSt65bV75J6I4iFwjDGmoTa4BHWZK0xcV+SlKNt+s=
-=GitM
+klAEWw/+JlnGW1sTsCFakyI+srVq7mchTURstDyyCW/cKGLyYXQXBBinz+WQS+53
+rd8gFCvYUd55pGcoYttCPfD3EMzSLfcnBbBxn3k+9uuolVgY8y/K+56LE1Y+I96w
+6yOUKU0t/Z2+sRJmUX5aY7aMibE3MMsCA0TEXYaN8uaW3W8Rj/+x3FMYjTPIFTU7
+cvECpJLgHHYDTMjHCv0yxpfIsrSv3xUQCCpNkQIV814ySVQ4fTCHGugS3jcluBd1
+6blNrrNQqsppoYaIYa11Zc1ihQLoPnPwbwU07WxAb9U/FOlpavUzcrrRiL7fyzIj
+IslvNfspsXP3dwh2xzCMoSi0hfTrgixYuZwwUEvoN2pIMCffBa64ENbdrOxkwfhZ
+7BKWACu81wmi5NmM+c2M8JZGJXMp/iItn0h+RmJX887+ip6KLVmbrJQCXzG2qxsk
+ZZyZatFnITtuv3cLLt+AKpJ9oigvG1eD3WeOfOWHp0UOrEbPgbvvWcC1CNw6VVAD
+15GwvAmQJXpWs9iOSZtw7uAeRdi3lBZQSrosTqzlGrzxCCKmisypmtAbTUaKXfwT
+JMEdjoUXnHiOuw3KxbBIlt1OhYIw7XyK51ON13wCh+PLDbo5TWUwX+aNavmiSsAh
+k/UTIxFhjJNhU3+D7hFY63Ba1aNMwI2G0rdbQ6pD8zDeB9F1QGY=
+=+snE
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index f1303ef00011..a41651987c83 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 15 Sep 2023 03:09:55 +0000
+Fri, 15 Sep 2023 09:10:05 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index c902d0ae9dbc..5e3603962ef4 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 2f663f95c82f..8448b959dc94 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.29.48 b/metadata/md5-cache/app-admin/awscli-1.29.48
new file mode 100644
index 000000000000..f49eb38e9aa5
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.29.48
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.31.48[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+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_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.31.48[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.29.48.tar.gz -> aws-cli-1.29.48.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=18ad0772e5c586a4bfc1f885e7a296ee
diff --git a/metadata/md5-cache/app-admin/makepasswd-1.10 b/metadata/md5-cache/app-admin/makepasswd-1.10-r1
index fd2741b43550..24ddef9c6c9d 100644
--- a/metadata/md5-cache/app-admin/makepasswd-1.10
+++ b/metadata/md5-cache/app-admin/makepasswd-1.10-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Random password generator
-EAPI=6
+EAPI=8
 HOMEPAGE=https://packages.debian.org/stable/admin/makepasswd
 KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=mirror://debian/dists/potato/main/source/admin/makepasswd_1.10.orig.tar.gz
-_md5_=7bcf83d78bc52e62e2f75095c5cd9a33
+_md5_=035371cdc5a24b585b784a536603e0bb
diff --git a/metadata/md5-cache/app-admin/paxtest-0.9.15-r2 b/metadata/md5-cache/app-admin/paxtest-0.9.15-r2
new file mode 100644
index 000000000000..b80c655fb168
--- /dev/null
+++ b/metadata/md5-cache/app-admin/paxtest-0.9.15-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-apps/paxctl
+DESCRIPTION=PaX regression test suite
+EAPI=8
+HOMEPAGE=https://pax.grsecurity.net
+INHERIT=toolchain-funcs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://grsecurity.net/~spender/paxtest-0.9.15.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=c8ddff72a316b43aa4528321dff3e3de
diff --git a/metadata/md5-cache/app-admin/pprocm-1.0-r3 b/metadata/md5-cache/app-admin/pprocm-1.0-r3
new file mode 100644
index 000000000000..2a8b8d7fdfee
--- /dev/null
+++ b/metadata/md5-cache/app-admin/pprocm-1.0-r3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=ncurses-based program to monitor CPU, disk, network and memory usage
+EAPI=8
+HOMEPAGE=http://www.fusedcreations.com/PProcM/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl dev-perl/IO-Pipely dev-perl/POE dev-perl/Sys-Statistics-Linux
+SLOT=0
+SRC_URI=http://www.fusedcreations.com/PProcM/PProcM-1.0.tar.gz
+_md5_=02f3692017b743d34c28b02a175a5e74
diff --git a/metadata/md5-cache/app-admin/restart-services-0.17.0-r1 b/metadata/md5-cache/app-admin/restart-services-0.17.0-r1
new file mode 100644
index 000000000000..83d70294e364
--- /dev/null
+++ b/metadata/md5-cache/app-admin/restart-services-0.17.0-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Tool to manage OpenRC and systemd services that need to be restarted
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mschiff/restart-services/
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=app-admin/lib_users app-portage/portage-utils || ( sys-apps/openrc sys-apps/systemd )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~mschiff/src/restart-services/restart-services-0.17.0.tgz
+_md5_=7b290703e6283686d05e40ec06029f61
diff --git a/metadata/md5-cache/app-admin/sxid-4.2-r3 b/metadata/md5-cache/app-admin/sxid-4.2-r3
new file mode 100644
index 000000000000..80d033d2a57f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sxid-4.2-r3
@@ -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-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=postinst prepare
+DESCRIPTION=suid, sgid file and directory checking
+EAPI=8
+HOMEPAGE=https://linukz.org/sxid.shtml https://github.com/taem/sxid
+INHERIT=autotools
+IUSE=selinux
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/mailx selinux? ( sec-policy/selinux-sxid )
+SLOT=0
+SRC_URI=https://linukz.org/download/sxid-4.2.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=5819498ea75ae7b043532c154a532c02
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 449053b0896b..94104ea0de7d 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/xz-utils-9999 b/metadata/md5-cache/app-arch/xz-utils-9999
index 14060c85e780..6cc4fc6b0662 100644
--- a/metadata/md5-cache/app-arch/xz-utils-9999
+++ b/metadata/md5-cache/app-arch/xz-utils-9999
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
 DESCRIPTION=Utils for managing LZMA compressed files
 EAPI=8
 HOMEPAGE=https://tukaani.org/xz/
-INHERIT=libtool multilib multilib-minimal preserve-libs usr-ldscript git-r3 autotools
+INHERIT=flag-o-matic libtool multilib multilib-minimal preserve-libs usr-ldscript git-r3 autotools
 IUSE=doc +extra-filters nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 LICENSE=public-domain LGPL-2.1+ GPL-2+
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	git-r3	2358a7b20091609e24bd3a83b3ac5991	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	toolchain-funcs	862d337d98edb576796827be2c6b11ca	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9
-_md5_=8068eae94596b5fc4a26704f4f9fed20
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	toolchain-funcs	862d337d98edb576796827be2c6b11ca	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9
+_md5_=7aa5d6dacf0f8e811946d57aeff4277a
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index f0c69d971cfb..9f3d66625737 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/snapper-0.10.6 b/metadata/md5-cache/app-backup/snapper-0.10.6
new file mode 100644
index 000000000000..9e66ce2e59e0
--- /dev/null
+++ b/metadata/md5-cache/app-backup/snapper-0.10.6
@@ -0,0 +1,16 @@
+BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/boost:= dev-libs/json-c:= dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux >=sys-fs/btrfs-progs-3.17.1 sys-libs/zlib virtual/libintl lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )
+DESCRIPTION=Command-line program for btrfs and lvm snapshot management
+EAPI=8
+HOMEPAGE=http://snapper.io/
+INHERIT=autotools systemd
+IUSE=lvm pam test systemd xattr
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/boost:= dev-libs/json-c:= dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux >=sys-fs/btrfs-progs-3.17.1 sys-libs/zlib virtual/libintl lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/openSUSE/snapper/archive/v0.10.6.tar.gz -> snapper-0.10.6.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=a2bd8eab698e20df5399305e8b374a73
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index b383f6aabdbd..fc9f27d628a6 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/boxes-2.2.1 b/metadata/md5-cache/app-misc/boxes-2.2.1
new file mode 100644
index 000000000000..7cb190297acf
--- /dev/null
+++ b/metadata/md5-cache/app-misc/boxes-2.2.1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bison sys-devel/flex test? ( app-editors/vim-core )
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/libpcre2[pcre32] dev-libs/libunistring:=
+DESCRIPTION=Draw any kind of boxes around your text
+EAPI=8
+HOMEPAGE=https://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes
+INHERIT=toolchain-funcs
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/libpcre2[pcre32] dev-libs/libunistring:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ascii-boxes/boxes/archive/refs/tags/v2.2.1.tar.gz -> boxes-2.2.1.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=93b26a531ea674526a233c6620a17ff7
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 2749891b089a..8e86eb3cfc85 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/urjtag-2019.12 b/metadata/md5-cache/dev-embedded/urjtag-2019.12
deleted file mode 100644
index 44c7af7d3d85..000000000000
--- a/metadata/md5-cache/dev-embedded/urjtag-2019.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=ftdi? ( dev-embedded/libftdi:1= ) ftd2xx? ( dev-embedded/libftd2xx ) readline? ( sys-libs/readline:= ) usb? ( virtual/libusb:1 )
-DESCRIPTION=Tool for communicating over JTAG with flash chips, CPUs, and many more
-EAPI=7
-HOMEPAGE=https://urjtag.sourceforge.net/
-IUSE=ftdi ftd2xx readline usb
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=ftdi? ( dev-embedded/libftdi:1= ) ftd2xx? ( dev-embedded/libftd2xx ) readline? ( sys-libs/readline:= ) usb? ( virtual/libusb:1 ) !dev-embedded/jtag
-SLOT=0
-SRC_URI=mirror://sourceforge/urjtag/urjtag-2019.12.tar.xz
-_md5_=3387bc60407fd4769291dc39912d1e75
diff --git a/metadata/md5-cache/dev-embedded/urjtag-2021.03 b/metadata/md5-cache/dev-embedded/urjtag-2021.03
index 910fb43e2fda..c3edb3a1acb5 100644
--- a/metadata/md5-cache/dev-embedded/urjtag-2021.03
+++ b/metadata/md5-cache/dev-embedded/urjtag-2021.03
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://urjtag.sourceforge.net/
 INHERIT=python-r1
 IUSE=ftdi ftd2xx python readline usb python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 ~ppc sparc x86
+KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=ftdi? ( dev-embedded/libftdi:1 ) ftd2xx? ( dev-embedded/libftd2xx ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) readline? ( sys-libs/readline:= ) usb? ( virtual/libusb:1 )
 REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/urjtag/urjtag-2021.03.tar.xz
 _eclasses_=multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=e9cf47ff95361a6705b900966d9709b7
+_md5_=80fbc7aa1214dcca31e10295a81d6ed0
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 35b2a18e289c..d62fb2c84ee4 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/javax-persistence-api-2.2 b/metadata/md5-cache/dev-java/javax-persistence-api-2.2
new file mode 100644
index 000000000000..f63ea632c1ad
--- /dev/null
+++ b/metadata/md5-cache/dev-java/javax-persistence-api-2.2
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Persistence API
+EAPI=8
+HOMEPAGE=https://www.jcp.org/en/jsr/detail?id=220
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=CDDL
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://repo1.maven.org/maven2/javax/persistence/javax.persistence-api/2.2/javax.persistence-api-2.2-sources.jar
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	1c8a695f6cae6a50261276f4b3da9914	java-utils-2	7311f5500eba17e0a599cd934f9db152
+_md5_=f7f78442a4b277ffbd718ee654d43a7b
diff --git a/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0-r1 b/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0-r1
new file mode 100644
index 000000000000..757ac05ae220
--- /dev/null
+++ b/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/cdi-api:0 dev-java/javax-persistence-api:0 dev-java/jakarta-servlet-api:4 dev-java/javax-inject:0 dev-java/jaxrs-api:0 dev-java/osgi-annotation:0 dev-java/osgi-core:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=OSGi Service Platform Compendium API (Companion Code)
+EAPI=8
+HOMEPAGE=https://docs.osgi.org
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0 OSGi-Specification-2.0
+RDEPEND=dev-java/cdi-api:0 dev-java/javax-persistence-api:0 dev-java/jakarta-servlet-api:4 dev-java/javax-inject:0 dev-java/jaxrs-api:0 dev-java/osgi-annotation:0 dev-java/osgi-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=8
+SRC_URI=https://docs.osgi.org/download/r8/osgi.cmpn-8.0.0.jar -> osgi-cmpn-8.0.0.jar
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	1c8a695f6cae6a50261276f4b3da9914	java-utils-2	7311f5500eba17e0a599cd934f9db152
+_md5_=81a4d890c6dfc8fc364e7fbfc989bd23
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.37 b/metadata/md5-cache/dev-java/tomcat-native-1.2.37
deleted file mode 100644
index 912303a2106e..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.37
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Allows Tomcat to use certain native resources for better performance
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/native-doc/
-INHERIT=java-pkg-2 java-ant-2
-IUSE=static-libs test
-KEYWORDS=amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/apr:1= dev-libs/openssl:0= >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.37/source/tomcat-native-1.2.37-src.tar.gz
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	7311f5500eba17e0a599cd934f9db152	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=6428a1dea360ab01d424557be405a20c
diff --git a/metadata/md5-cache/dev-java/tomcat-native-2.0.4 b/metadata/md5-cache/dev-java/tomcat-native-2.0.4
deleted file mode 100644
index 910ca69dfdbf..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-native-2.0.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Allows Tomcat to use certain native resources for better performance
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/native-doc/
-INHERIT=autotools java-pkg-2 java-pkg-simple verify-sig
-IUSE=static-libs doc source test verify-sig
-KEYWORDS=amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/apr:1= dev-libs/openssl:0/3 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/2.0.4/source/tomcat-native-2.0.4-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/2.0.4/source/tomcat-native-2.0.4-src.tar.gz.asc )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	1c8a695f6cae6a50261276f4b3da9914	java-utils-2	7311f5500eba17e0a599cd934f9db152	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	90255aaab6156b22ee05150fe5ffbe6b
-_md5_=def7f9abcbccc0094bda4a0bd423d9f1
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 31b4561f4e0b..87504ec30fee 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/eisl-3.40 b/metadata/md5-cache/dev-lang/eisl-3.40
index 30c37ba4adaa..2847f193a8f7 100644
--- a/metadata/md5-cache/dev-lang/eisl-3.40
+++ b/metadata/md5-cache/dev-lang/eisl-3.40
@@ -4,11 +4,11 @@ DESCRIPTION=Interpreter and compiler compatible with the ISLisp standard
 EAPI=8
 HOMEPAGE=https://github.com/sasagawa888/eisl/
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/sasagawa888/eisl/archive/v3.40.tar.gz -> eisl-3.40.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=301fd3953ac8d5c104684bae3a0d908b
+_md5_=c7debba2fe0933643f9eba90b0a3d7e3
diff --git a/metadata/md5-cache/dev-lang/php-7.4.33-r4 b/metadata/md5-cache/dev-lang/php-7.4.33-r4
deleted file mode 100644
index 4342838c65b3..000000000000
--- a/metadata/md5-cache/dev-lang/php-7.4.33-r4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( <dev-libs/openssl-3.0:= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
-DESCRIPTION=The PHP language runtime engine
-EAPI=7
-HOMEPAGE=https://www.php.net/
-INHERIT=flag-o-matic systemd autotools
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( <dev-libs/openssl-3.0:= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlrpc? ( xml iconv ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
-RESTRICT=!test? ( test )
-SLOT=7.4
-SRC_URI=https://www.php.net/distributions/php-7.4.33.tar.xz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=2a431de35494bded184d3627f395ca3a
diff --git a/metadata/md5-cache/dev-lang/php-7.4.33-r5 b/metadata/md5-cache/dev-lang/php-7.4.33-r5
deleted file mode 100644
index ac31e0524603..000000000000
--- a/metadata/md5-cache/dev-lang/php-7.4.33-r5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( <dev-libs/openssl-3.0:= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
-DESCRIPTION=The PHP language runtime engine
-EAPI=7
-HOMEPAGE=https://www.php.net/
-INHERIT=flag-o-matic systemd autotools
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( <dev-libs/openssl-3.0:= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlrpc? ( xml iconv ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
-RESTRICT=!test? ( test )
-SLOT=7.4
-SRC_URI=https://www.php.net/distributions/php-7.4.33.tar.xz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=f8b538897cc6d04c70328f22115f9dcb
diff --git a/metadata/md5-cache/dev-lang/php-7.4.33-r6 b/metadata/md5-cache/dev-lang/php-7.4.33-r6
deleted file mode 100644
index d208c95b176f..000000000000
--- a/metadata/md5-cache/dev-lang/php-7.4.33-r6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] virtual/libcrypt:= fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( <dev-libs/openssl-3.0:= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
-DESCRIPTION=The PHP language runtime engine
-EAPI=8
-HOMEPAGE=https://www.php.net/
-INHERIT=flag-o-matic systemd autotools
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] virtual/libcrypt:= fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( <dev-libs/openssl-3.0:= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlrpc? ( xml iconv ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
-RESTRICT=!test? ( test )
-SLOT=7.4
-SRC_URI=https://www.php.net/distributions/php-7.4.33.tar.xz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=f220ef6ab3483cb9ee51c427f9a218b3
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 44fb5974275a..e3fbe667f32f 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/libstrophe-0.12.3 b/metadata/md5-cache/dev-libs/libstrophe-0.12.3
index 553ff3d598e5..a6af28f0d335 100644
--- a/metadata/md5-cache/dev-libs/libstrophe-0.12.3
+++ b/metadata/md5-cache/dev-libs/libstrophe-0.12.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://strophe.im/libstrophe/
 INHERIT=autotools
 IUSE=doc expat gnutls
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=|| ( MIT GPL-3 )
 RDEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= )
 SLOT=0/0.1
 SRC_URI=https://github.com/strophe/libstrophe/releases/download/0.12.3/libstrophe-0.12.3.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=befcec395be30e4f5383915037752fed
+_md5_=01bc7a90c4d0485ce955aa6a92e01a6c
diff --git a/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r101 b/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r101
index 6fe1807869e7..5de44d305de9 100644
--- a/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r101
+++ b/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r101
@@ -1,17 +1,17 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/redland lua? ( 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 ) ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) ruby? ( dev-lang/ruby:* dev-ruby/log4r ) php? ( php_targets_php7-4? ( dev-lang/php:7.4[-threads] ) ) dev-lang/swig test? ( dev-libs/redland[berkdb] ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
+DEPEND=dev-libs/redland lua? ( 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 ) ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) ruby? ( dev-lang/ruby:* dev-ruby/log4r ) dev-lang/swig test? ( dev-libs/redland[berkdb] )
 DESCRIPTION=Language bindings for Redland
 EAPI=8
 HOMEPAGE=https://librdf.org/bindings/
-INHERIT=lua php-ext-source-r3 python-single-r1 autotools
-IUSE=lua perl python php ruby test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 php_targets_php7-4 python_single_target_python3_10 python_single_target_python3_11
+INHERIT=lua python-single-r1 autotools
+IUSE=lua perl python ruby test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-linux
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
-RDEPEND=dev-libs/redland lua? ( 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 ) ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) ruby? ( dev-lang/ruby:* dev-ruby/log4r ) php? ( php_targets_php7-4? ( dev-lang/php:7.4[-threads] ) ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
-REQUIRED_USE=lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ) php? ( || ( php_targets_php7-4 ) )
+RDEPEND=dev-libs/redland lua? ( 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 ) ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) ruby? ( dev-lang/ruby:* dev-ruby/log4r )
+REQUIRED_USE=lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.librdf.org/source/redland-bindings-1.0.17.1.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=d41fa2a8286b2935bd221065e2c32cd1
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=e4cc0deebf6594c0bd6fbeb4c5d9a4a8
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 66bc710ae0aa..17a0cf6271d7 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/PHP_CodeCoverage-7.0.12 b/metadata/md5-cache/dev-php/PHP_CodeCoverage-7.0.12
deleted file mode 100644
index 7b0a8eaa700f..000000000000
--- a/metadata/md5-cache/dev-php/PHP_CodeCoverage-7.0.12
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-php/theseer-Autoload test? ( dev-php/fedora-autoloader >=dev-php/File_Iterator-2.0.2 >=dev-php/Text_Template-1.2.1 >=dev-php/PHP_TokenStream-3.1.1 >=dev-php/sebastian-environment-4.2.2 >=dev-php/sebastian-version-2.0.1 >=dev-php/sebastian-code-unit-reverse-lookup-1.0.1 >=dev-php/theseer-tokenizer-1.1.3 >=dev-lang/php-7.2:*[xml(-),xmlwriter(-)] dev-php/phpunit )
-DEFINED_PHASES=install postinst prepare test
-DESCRIPTION=Collection, processing, and rendering for PHP code coverage
-EAPI=7
-HOMEPAGE=https://phpunit.de
-IUSE=test
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-php/File_Iterator-2.0.2 >=dev-php/Text_Template-1.2.1 >=dev-php/PHP_TokenStream-3.1.1 >=dev-php/sebastian-environment-4.2.2 >=dev-php/sebastian-version-2.0.1 >=dev-php/sebastian-code-unit-reverse-lookup-1.0.1 >=dev-php/theseer-tokenizer-1.1.3 >=dev-lang/php-7.2:*[xml(-),xmlwriter(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann/php-code-coverage/archive/7.0.12.tar.gz -> PHP_CodeCoverage-7.0.12.tar.gz
-_md5_=c0b75cf73f847abc1b0d7237c7c76292
diff --git a/metadata/md5-cache/dev-php/PHP_TokenStream-3.1.1 b/metadata/md5-cache/dev-php/PHP_TokenStream-3.1.1
deleted file mode 100644
index 5547fab6813a..000000000000
--- a/metadata/md5-cache/dev-php/PHP_TokenStream-3.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=test? ( dev-php/fedora-autoloader || ( dev-lang/php:7.2[tokenizer(-)] dev-lang/php:7.3[tokenizer(-)] dev-lang/php:7.4[tokenizer(-)] ) dev-php/phpunit )
-DEFINED_PHASES=install postinst prepare test
-DESCRIPTION=Wrapper around PHP's tokenizer extension
-EAPI=7
-HOMEPAGE=https://phpunit.de
-IUSE=test
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader || ( dev-lang/php:7.2[tokenizer(-)] dev-lang/php:7.3[tokenizer(-)] dev-lang/php:7.4[tokenizer(-)] )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann/php-token-stream/archive/3.1.1.tar.gz -> PHP_TokenStream-3.1.1.tar.gz
-_md5_=280a205f693016e071345a49b82ad279
diff --git a/metadata/md5-cache/dev-php/awl-0.62 b/metadata/md5-cache/dev-php/awl-0.62
index 19455f1bac84..dbf00f2acb7f 100644
--- a/metadata/md5-cache/dev-php/awl-0.62
+++ b/metadata/md5-cache/dev-php/awl-0.62
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/php:*[pdo,xml]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.davical.org/downloads/awl_0.62.orig.tar.xz -> awl-0.62.tar.xz
-_md5_=170f35409f914c7ddd375bc473dea48d
+_md5_=5e68e8698b34c9557dd13379e28bb978
diff --git a/metadata/md5-cache/dev-php/awl-0.63 b/metadata/md5-cache/dev-php/awl-0.63
index 9c23f6af7a1c..c9bbdcb5ba21 100644
--- a/metadata/md5-cache/dev-php/awl-0.63
+++ b/metadata/md5-cache/dev-php/awl-0.63
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/php:*[pdo,xml]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.davical.org/downloads/awl_0.63.orig.tar.xz -> awl-0.63.tar.xz
-_md5_=cfd1546adf58461049b74467b1cfd6d4
+_md5_=898f68f6abd200f593fa6145e115aa2b
diff --git a/metadata/md5-cache/dev-php/geos-php-1.0.0_p20220909 b/metadata/md5-cache/dev-php/geos-php-1.0.0_p20220909
index e18b83028866..0615ad4f1376 100644
--- a/metadata/md5-cache/dev-php/geos-php-1.0.0_p20220909
+++ b/metadata/md5-cache/dev-php/geos-php-1.0.0_p20220909
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/geos[-php(-)] php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+DEPEND=sci-libs/geos[-php(-)] php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DESCRIPTION=A PHP interface to GEOS - Geometry Engine, Open Source
 EAPI=8
 HOMEPAGE=https://libgeos.org/
 INHERIT=php-ext-source-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
+IUSE=php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=sci-libs/geos[-php(-)] php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
+RDEPEND=sci-libs/geos[-php(-)] php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
 SLOT=0
 SRC_URI=https://git.osgeo.org/gitea/geos/php-geos/archive/ee5ca8f3739a4e3c1cdeb0abf4f1a47d9ca751a5.tar.gz -> geos-php-1.0.0_p20220909.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=a1cd89a54ddd76bd71c0eb52b4833768
+_md5_=b6823c54df7152d1e863b8826f4c011c
diff --git a/metadata/md5-cache/dev-php/igbinary-3.2.7 b/metadata/md5-cache/dev-php/igbinary-3.2.7
index cbbfd6c6caae..5f8d42628604 100644
--- a/metadata/md5-cache/dev-php/igbinary-3.2.7
+++ b/metadata/md5-cache/dev-php/igbinary-3.2.7
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=A fast drop-in replacement for the standard PHP serialize
 EAPI=8
 HOMEPAGE=https://github.com/igbinary/igbinary
 INHERIT=php-ext-source-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=amd64 arm arm64 x86
 LICENSE=BSD
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=https://github.com/igbinary/igbinary/archive/3.2.7.tar.gz -> igbinary-3.2.7.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=b49784d47b5ece9dc818e386a72479e9
+_md5_=0e470136a3f2e5b6f252609039afbc0c
diff --git a/metadata/md5-cache/dev-php/igbinary-3.2.9 b/metadata/md5-cache/dev-php/igbinary-3.2.9
index 8d7191b6e61a..e11b66d81f66 100644
--- a/metadata/md5-cache/dev-php/igbinary-3.2.9
+++ b/metadata/md5-cache/dev-php/igbinary-3.2.9
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DESCRIPTION=A fast drop-in replacement for the standard PHP serialize
 EAPI=8
 HOMEPAGE=https://github.com/igbinary/igbinary
 INHERIT=php-ext-source-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
+IUSE=php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
 KEYWORDS=amd64 arm arm64 x86
 LICENSE=BSD
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
 SLOT=0
 SRC_URI=https://github.com/igbinary/igbinary/archive/3.2.9.tar.gz -> igbinary-3.2.9.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=2b28f78e65d1e0f4582ece40632858bb
+_md5_=b1de8a8661c180fb4fdb746ec233321f
diff --git a/metadata/md5-cache/dev-php/libvirt-php-0.5.6 b/metadata/md5-cache/dev-php/libvirt-php-0.5.6
index 4d88754fbda7..f1755a3f536d 100644
--- a/metadata/md5-cache/dev-php/libvirt-php-0.5.6
+++ b/metadata/md5-cache/dev-php/libvirt-php-0.5.6
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-emulation/libvirt dev-libs/libxml2 dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xhtml1 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=app-emulation/libvirt dev-libs/libxml2 dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xhtml1 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=PHP bindings for libvirt
 EAPI=8
 HOMEPAGE=http://libvirt.org/php/
 INHERIT=php-ext-source-r3 autotools
-IUSE=doc php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=doc php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1
-RDEPEND=app-emulation/libvirt dev-libs/libxml2 php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=app-emulation/libvirt dev-libs/libxml2 php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=http://libvirt.org/sources/php/libvirt-php-0.5.6.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=0e9472509b882f448c650f9c2364d7e0
+_md5_=329a82eb75250839e89c14ca67e650e2
diff --git a/metadata/md5-cache/dev-php/libvirt-php-0.5.7 b/metadata/md5-cache/dev-php/libvirt-php-0.5.7
index e61351b5b4b7..b0d5f7d6959b 100644
--- a/metadata/md5-cache/dev-php/libvirt-php-0.5.7
+++ b/metadata/md5-cache/dev-php/libvirt-php-0.5.7
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-emulation/libvirt dev-libs/libxml2 dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xhtml1 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=app-emulation/libvirt dev-libs/libxml2 dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xhtml1 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=PHP bindings for libvirt
 EAPI=8
 HOMEPAGE=http://libvirt.org/php/
 INHERIT=php-ext-source-r3 autotools
-IUSE=doc php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=doc php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1
-RDEPEND=app-emulation/libvirt dev-libs/libxml2 php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=app-emulation/libvirt dev-libs/libxml2 php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=http://libvirt.org/sources/php/libvirt-php-0.5.7.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=eea4c30a5adc219469390547007cb3d4
+_md5_=e741323e8df70f36a4de00ec0f95fefb
diff --git a/metadata/md5-cache/dev-php/libvirt-php-9999 b/metadata/md5-cache/dev-php/libvirt-php-9999
index 23b5ed3c2521..3e872a8df32a 100644
--- a/metadata/md5-cache/dev-php/libvirt-php-9999
+++ b/metadata/md5-cache/dev-php/libvirt-php-9999
@@ -1,15 +1,15 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-emulation/libvirt dev-libs/libxml2 dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xhtml1 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=app-emulation/libvirt dev-libs/libxml2 dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xhtml1 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=PHP bindings for libvirt
 EAPI=8
 HOMEPAGE=http://libvirt.org/php/
 INHERIT=php-ext-source-r3 git-r3 autotools
-IUSE=doc php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=doc php_targets_php8-0 php_targets_php8-1
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=app-emulation/libvirt dev-libs/libxml2 php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=app-emulation/libvirt dev-libs/libxml2 php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	git-r3	2358a7b20091609e24bd3a83b3ac5991	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=0d21ea3e1ebe3f07b4fe3ac9722fdc18
+_md5_=bcd27c2d98aea0c0ad92d6783c6e7764
diff --git a/metadata/md5-cache/dev-php/maxmind-db-reader-1.11.0 b/metadata/md5-cache/dev-php/maxmind-db-reader-1.11.0
index b002d4138628..e83fd028170f 100644
--- a/metadata/md5-cache/dev-php/maxmind-db-reader-1.11.0
+++ b/metadata/md5-cache/dev-php/maxmind-db-reader-1.11.0
@@ -1,17 +1,17 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool extension? ( php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool extension? ( php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) )
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=extension? ( dev-libs/libmaxminddb ) extension? ( php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) )
+DEPEND=extension? ( dev-libs/libmaxminddb ) extension? ( php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) )
 DESCRIPTION=PHP reader for the MaxMind database format
 EAPI=8
 HOMEPAGE=https://github.com/maxmind/MaxMind-DB-Reader-php
 INHERIT=php-ext-source-r3
-IUSE=extension test php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=extension test php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=extension? ( dev-libs/libmaxminddb ) extension? ( php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) )
-REQUIRED_USE=extension? ( || ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 ) )
+RDEPEND=extension? ( dev-libs/libmaxminddb ) extension? ( php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) )
+REQUIRED_USE=extension? ( || ( php_targets_php8-0 php_targets_php8-1 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxmind/MaxMind-DB-Reader-php/archive/v1.11.0.tar.gz -> MaxMind-DB-Reader-php-1.11.0.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=2c729a9efe582b75a0f698c37041820a
+_md5_=95f54185b6d2009d00a045ee8dffb317
diff --git a/metadata/md5-cache/dev-php/pecl-amqp-1.11.0 b/metadata/md5-cache/dev-php/pecl-amqp-1.11.0
index eda46028ce76..848d8e635d91 100644
--- a/metadata/md5-cache/dev-php/pecl-amqp-1.11.0
+++ b/metadata/md5-cache/dev-php/pecl-amqp-1.11.0
@@ -1,17 +1,17 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/rabbitmq-c-0.7.1:=[ssl(-)] php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+DEPEND=>=net-libs/rabbitmq-c-0.7.1:=[ssl(-)] php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DESCRIPTION=PHP Bindings for AMQP 0-9-1 compatible brokers
 EAPI=8
 HOMEPAGE=https://pecl.php.net/amqp
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
+IUSE=php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
 KEYWORDS=~amd64 ~x86
 LICENSE=PHP-3.01
-RDEPEND=>=net-libs/rabbitmq-c-0.7.1:=[ssl(-)] php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
+RDEPEND=>=net-libs/rabbitmq-c-0.7.1:=[ssl(-)] php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pecl.php.net/get/amqp-1.11.0.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=581ccfee646b8a0d29a57b841fd881cf
+_md5_=4c28248dffcfaab040c69f91cb0d0a6e
diff --git a/metadata/md5-cache/dev-php/pecl-apcu-5.1.21 b/metadata/md5-cache/dev-php/pecl-apcu-5.1.21
index 1d50934dc261..3307e438c388 100644
--- a/metadata/md5-cache/dev-php/pecl-apcu-5.1.21
+++ b/metadata/md5-cache/dev-php/pecl-apcu-5.1.21
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=Stripped down version of APC supporting only user cache
 EAPI=7
 HOMEPAGE=https://pecl.php.net/apcu
 INHERIT=php-ext-pecl-r3
-IUSE=+mmap lock-pthreadmutex +lock-pthreadrw lock-spinlock lock-semaphore php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=+mmap lock-pthreadmutex +lock-pthreadrw lock-spinlock lock-semaphore php_targets_php8-0 php_targets_php8-1
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=^^ ( lock-pthreadmutex lock-pthreadrw lock-spinlock lock-semaphore ) || ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=^^ ( lock-pthreadmutex lock-pthreadrw lock-spinlock lock-semaphore ) || ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/apcu-5.1.21.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=2dafd836507734be835cad9ae4e7c1c1
+_md5_=b0e79487cca6f4b77d6cd3b77aaa2d63
diff --git a/metadata/md5-cache/dev-php/pecl-apcu-5.1.22 b/metadata/md5-cache/dev-php/pecl-apcu-5.1.22
index 8c5485c0fe0e..7e68564cc178 100644
--- a/metadata/md5-cache/dev-php/pecl-apcu-5.1.22
+++ b/metadata/md5-cache/dev-php/pecl-apcu-5.1.22
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DESCRIPTION=Stripped down version of APC supporting only user cache
 EAPI=8
 HOMEPAGE=https://pecl.php.net/apcu
 INHERIT=php-ext-pecl-r3
-IUSE=+mmap lock-pthreadmutex +lock-pthreadrw lock-spinlock lock-semaphore php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
+IUSE=+mmap lock-pthreadmutex +lock-pthreadrw lock-spinlock lock-semaphore php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
 KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
-REQUIRED_USE=^^ ( lock-pthreadmutex lock-pthreadrw lock-spinlock lock-semaphore ) || ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+REQUIRED_USE=^^ ( lock-pthreadmutex lock-pthreadrw lock-spinlock lock-semaphore ) || ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/apcu-5.1.22.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=dbc00ed8c59d43313df583e09216233a
+_md5_=08bf00461b8fd828f809e5a8e4c28fea
diff --git a/metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.5 b/metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.5
deleted file mode 100644
index f206b2d0ffae..000000000000
--- a/metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.5
+++ /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-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-php/pecl-apcu-5.1.18:7[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?] php_targets_php7-4? ( dev-lang/php:7.4 )
-DESCRIPTION=Provides APC backwards compatibility functions via APCu
-EAPI=7
-HOMEPAGE=https://pecl.php.net/apcu_bc
-INHERIT=php-ext-pecl-r3 multilib
-IUSE=php_targets_php7-4
-KEYWORDS=amd64 x86
-LICENSE=PHP-3.01
-RDEPEND=>=dev-php/pecl-apcu-5.1.18:7[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?] php_targets_php7-4? ( dev-lang/php:7.4 )
-REQUIRED_USE=|| ( php_targets_php7-4 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/apcu_bc-1.0.5.tgz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=a79a0b8a0fab860a783d0af13ecaf6c7
diff --git a/metadata/md5-cache/dev-php/pecl-crack-0.4-r8 b/metadata/md5-cache/dev-php/pecl-crack-0.4-r8
index 4235126e511c..86be74b60f08 100644
--- a/metadata/md5-cache/dev-php/pecl-crack-0.4-r8
+++ b/metadata/md5-cache/dev-php/pecl-crack-0.4-r8
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0 )
 DESCRIPTION=PHP interface to the cracklib libraries
 EAPI=7
 HOMEPAGE=https://pecl.php.net/crack
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0
+IUSE=php_targets_php8-0
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=PHP-3 CRACKLIB
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php8-0 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/crack-0.4.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=c67c408a00072157e49f783b5c56a2a6
+_md5_=44f252bfe73e0ea58b591aa661565693
diff --git a/metadata/md5-cache/dev-php/pecl-dbase-7.1.1 b/metadata/md5-cache/dev-php/pecl-dbase-7.1.1
index 14616f142f4d..fd06cb676c47 100644
--- a/metadata/md5-cache/dev-php/pecl-dbase-7.1.1
+++ b/metadata/md5-cache/dev-php/pecl-dbase-7.1.1
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=dBase database file access functions
 EAPI=7
 HOMEPAGE=https://pecl.php.net/dbase
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64 ~x86
 LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/dbase-7.1.1.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=e52d4573f3f8f93cc37f7af8e667f146
+_md5_=1ccc4030973219b4bed0922631514e5f
diff --git a/metadata/md5-cache/dev-php/pecl-dio-0.2.0-r1 b/metadata/md5-cache/dev-php/pecl-dio-0.2.0-r1
index 7dacbfef7c65..22bf7310fe7d 100644
--- a/metadata/md5-cache/dev-php/pecl-dio-0.2.0-r1
+++ b/metadata/md5-cache/dev-php/pecl-dio-0.2.0-r1
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=Direct I/O functions for PHP
 EAPI=7
 HOMEPAGE=https://pecl.php.net/dio
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64 ~x86
 LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/dio-0.2.0.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=cfc260e4f45d0f82a512f0b85aa08366
+_md5_=ec6851b8a7ef75c679e7f1b15ea32fce
diff --git a/metadata/md5-cache/dev-php/pecl-eio-2.0.4-r1 b/metadata/md5-cache/dev-php/pecl-eio-2.0.4-r1
deleted file mode 100644
index 60c51adc2b00..000000000000
--- a/metadata/md5-cache/dev-php/pecl-eio-2.0.4-r1
+++ /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-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 )
-DESCRIPTION=PHP wrapper for libeio library
-EAPI=7
-HOMEPAGE=https://pecl.php.net/eio
-INHERIT=php-ext-pecl-r3
-IUSE=debug php_targets_php7-4
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 )
-REQUIRED_USE=|| ( php_targets_php7-4 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/eio-2.0.4.tgz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=a5ab67ee3cec7ebfd8c74a4d36234cf5
diff --git a/metadata/md5-cache/dev-php/pecl-eio-3.0.0_rc2 b/metadata/md5-cache/dev-php/pecl-eio-3.0.0_rc2
index 5717625dbde8..358966cb0cc3 100644
--- a/metadata/md5-cache/dev-php/pecl-eio-3.0.0_rc2
+++ b/metadata/md5-cache/dev-php/pecl-eio-3.0.0_rc2
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0 )
 DESCRIPTION=PHP wrapper for libeio library
 EAPI=7
 HOMEPAGE=https://pecl.php.net/eio
 INHERIT=php-ext-pecl-r3
-IUSE=debug php_targets_php7-4 php_targets_php8-0
+IUSE=debug php_targets_php8-0
 KEYWORDS=~amd64 ~x86
 LICENSE=PHP-3
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php8-0 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/eio-3.0.0RC2.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=feb88c91330c9f98bbdc1f645b3e4294
+_md5_=78680d63612420793e408fb060574385
diff --git a/metadata/md5-cache/dev-php/pecl-eio-3.0.0_rc4 b/metadata/md5-cache/dev-php/pecl-eio-3.0.0_rc4
index 07f36dfccd2a..3129aeeef0ad 100644
--- a/metadata/md5-cache/dev-php/pecl-eio-3.0.0_rc4
+++ b/metadata/md5-cache/dev-php/pecl-eio-3.0.0_rc4
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=PHP wrapper for libeio library
 EAPI=7
 HOMEPAGE=https://pecl.php.net/eio
 INHERIT=php-ext-pecl-r3
-IUSE=debug php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=debug php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64 ~x86
 LICENSE=PHP-3
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/eio-3.0.0RC4.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=05795260ed1af71c2f41516557c1795a
+_md5_=0a090158585d0e823f8919548f9e9d52
diff --git a/metadata/md5-cache/dev-php/pecl-eio-3.1.0_rc1 b/metadata/md5-cache/dev-php/pecl-eio-3.1.0_rc1
index e9d38c857e9f..e9f249b014d1 100644
--- a/metadata/md5-cache/dev-php/pecl-eio-3.1.0_rc1
+++ b/metadata/md5-cache/dev-php/pecl-eio-3.1.0_rc1
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=PHP wrapper for libeio library
 EAPI=7
 HOMEPAGE=https://pecl.php.net/eio
 INHERIT=php-ext-pecl-r3
-IUSE=debug php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=debug php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64 ~x86
 LICENSE=PHP-3
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/eio-3.1.0RC1.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=05795260ed1af71c2f41516557c1795a
+_md5_=0a090158585d0e823f8919548f9e9d52
diff --git a/metadata/md5-cache/dev-php/pecl-event-3.0.8 b/metadata/md5-cache/dev-php/pecl-event-3.0.8
index 1968a0e9be61..1935370d5eaf 100644
--- a/metadata/md5-cache/dev-php/pecl-event-3.0.8
+++ b/metadata/md5-cache/dev-php/pecl-event-3.0.8
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[sockets(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[sockets(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[sockets(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[sockets(-)?] )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0[sockets(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[sockets(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[sockets(-)?] )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libevent-2.0.2 ssl? ( dev-libs/openssl:0= ) php_targets_php7-4? ( dev-lang/php:7.4[sockets(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[sockets(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[sockets(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[sockets(-)?] )
+DEPEND=>=dev-libs/libevent-2.0.2 ssl? ( dev-libs/openssl:0= ) php_targets_php8-0? ( dev-lang/php:8.0[sockets(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[sockets(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[sockets(-)?] )
 DESCRIPTION=PHP wrapper for libevent2
 EAPI=8
 HOMEPAGE=https://pecl.php.net/event
 INHERIT=php-ext-pecl-r3
-IUSE=debug examples +extra +sockets +ssl threads php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
+IUSE=debug examples +extra +sockets +ssl threads php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
 KEYWORDS=amd64 ~ia64 x86
 LICENSE=PHP-3.01
-RDEPEND=>=dev-libs/libevent-2.0.2 ssl? ( dev-libs/openssl:0= ) !dev-php/pecl-libevent php_targets_php7-4? ( dev-lang/php:7.4[sockets(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[sockets(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[sockets(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[sockets(-)?] )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
+RDEPEND=>=dev-libs/libevent-2.0.2 ssl? ( dev-libs/openssl:0= ) !dev-php/pecl-libevent php_targets_php8-0? ( dev-lang/php:8.0[sockets(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[sockets(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[sockets(-)?] )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/event-3.0.8.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=6b8a76704baffcbf8e177d40a14df04f
+_md5_=3e7a336e5b3502499ad851c8e68072ed
diff --git a/metadata/md5-cache/dev-php/pecl-gnupg-1.5.0 b/metadata/md5-cache/dev-php/pecl-gnupg-1.5.0
index 88a6c73236fe..4030a372d7ad 100644
--- a/metadata/md5-cache/dev-php/pecl-gnupg-1.5.0
+++ b/metadata/md5-cache/dev-php/pecl-gnupg-1.5.0
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-crypt/gpgme app-crypt/gnupg php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=app-crypt/gpgme app-crypt/gnupg php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=PHP wrapper around the gpgme library
 EAPI=7
 HOMEPAGE=https://pecl.php.net/gnupg
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
-RDEPEND=app-crypt/gpgme app-crypt/gnupg php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=app-crypt/gpgme app-crypt/gnupg php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/gnupg-1.5.0.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=0e0978ef5062dc5e986c4bcf5e43f52c
+_md5_=510ce9b96fe72319d6a272a0bc57282d
diff --git a/metadata/md5-cache/dev-php/pecl-gnupg-1.5.1 b/metadata/md5-cache/dev-php/pecl-gnupg-1.5.1
index 988362b2eb75..21d9aa00c040 100644
--- a/metadata/md5-cache/dev-php/pecl-gnupg-1.5.1
+++ b/metadata/md5-cache/dev-php/pecl-gnupg-1.5.1
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-crypt/gpgme app-crypt/gnupg php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=app-crypt/gpgme app-crypt/gnupg php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=PHP wrapper around the gpgme library
 EAPI=8
 HOMEPAGE=https://pecl.php.net/gnupg
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
-RDEPEND=app-crypt/gpgme app-crypt/gnupg php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=app-crypt/gpgme app-crypt/gnupg php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/gnupg-1.5.1.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=41c1c839204c569d3dee91a330c0d879
+_md5_=0c86771eb518d598f6b1a7f733714ed6
diff --git a/metadata/md5-cache/dev-php/pecl-http-3.3.0 b/metadata/md5-cache/dev-php/pecl-http-3.3.0
deleted file mode 100644
index f87a0e0a6d50..000000000000
--- a/metadata/md5-cache/dev-php/pecl-http-3.3.0
+++ /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-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( app-arch/brotli:= dev-libs/libevent dev-php/pecl-propro:7[php_targets_php7-4(-)?] >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-4(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( >=net-misc/curl-7.77[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] ) !ssl? ( >=net-misc/curl-7.77[-ssl] ) dev-lang/php:7.4[session(-),iconv(-)] ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-DESCRIPTION=Extended HTTP Support for PHP
-EAPI=8
-HOMEPAGE=https://pecl.php.net/pecl_http
-INHERIT=php-ext-pecl-r3
-IUSE=ssl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
-KEYWORDS=amd64 x86
-LICENSE=BSD-2 MIT
-RDEPEND=php_targets_php7-4? ( app-arch/brotli:= dev-libs/libevent dev-php/pecl-propro:7[php_targets_php7-4(-)?] >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-4(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( >=net-misc/curl-7.77[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] ) !ssl? ( >=net-misc/curl-7.77[-ssl] ) dev-lang/php:7.4[session(-),iconv(-)] ) php_targets_php8-0? ( dev-php/pecl-http:8[php_targets_php8-0(-)] ) php_targets_php8-1? ( dev-php/pecl-http:8[php_targets_php8-1(-)] ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/pecl_http-3.3.0.tgz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=382fe7eec6319554a6bfcb222ccb02a6
diff --git a/metadata/md5-cache/dev-php/pecl-http-4.2.2 b/metadata/md5-cache/dev-php/pecl-http-4.2.2
index cad6d0aa9c8c..14c405dfbc91 100644
--- a/metadata/md5-cache/dev-php/pecl-http-4.2.2
+++ b/metadata/md5-cache/dev-php/pecl-http-4.2.2
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php8-0? ( app-arch/brotli:= dev-libs/libevent >=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?,php_targets_php8-1(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:8.0[session(-),iconv(-)] ) php_targets_php8-1? ( app-arch/brotli:= dev-libs/libevent >=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?,php_targets_php8-1(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:8.1[session(-),iconv(-)] ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=php_targets_php8-0? ( app-arch/brotli:= dev-libs/libevent >=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?,php_targets_php8-1(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:8.0[session(-),iconv(-)] ) php_targets_php8-1? ( app-arch/brotli:= dev-libs/libevent >=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?,php_targets_php8-1(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:8.1[session(-),iconv(-)] ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=Extended HTTP Support for PHP
 EAPI=8
 HOMEPAGE=https://pecl.php.net/pecl_http
 INHERIT=php-ext-pecl-r3
-IUSE=ssl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=ssl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl php_targets_php8-0 php_targets_php8-1
 KEYWORDS=amd64 x86
 LICENSE=BSD-2 MIT
-RDEPEND=php_targets_php8-0? ( app-arch/brotli:= dev-libs/libevent >=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?,php_targets_php8-1(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:8.0[session(-),iconv(-)] ) php_targets_php8-1? ( app-arch/brotli:= dev-libs/libevent >=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?,php_targets_php8-1(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:8.1[session(-),iconv(-)] ) php_targets_php7-4? ( dev-php/pecl-http:7[php_targets_php7-4(-)] ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=php_targets_php8-0? ( app-arch/brotli:= dev-libs/libevent >=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?,php_targets_php8-1(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:8.0[session(-),iconv(-)] ) php_targets_php8-1? ( app-arch/brotli:= dev-libs/libevent >=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?,php_targets_php8-1(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:8.1[session(-),iconv(-)] ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=8
 SRC_URI=https://pecl.php.net/get/pecl_http-4.2.2.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=9f2f4c16a7116d230178b293dc1cfbab
+_md5_=7b7808a68a88f53f8296b52402aa9e57
diff --git a/metadata/md5-cache/dev-php/pecl-imagick-3.7.0-r1 b/metadata/md5-cache/dev-php/pecl-imagick-3.7.0-r1
index c0be1c7b1b63..84d400e63192 100644
--- a/metadata/md5-cache/dev-php/pecl-imagick-3.7.0-r1
+++ b/metadata/md5-cache/dev-php/pecl-imagick-3.7.0-r1
@@ -1,17 +1,17 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] test? ( >=media-gfx/imagemagick-6.2.4:=[hdri,jpeg,png,svg,truetype,xml] ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+DEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] test? ( >=media-gfx/imagemagick-6.2.4:=[hdri,jpeg,png,svg,truetype,xml] ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DESCRIPTION=PHP wrapper for the ImageMagick library
 EAPI=8
 HOMEPAGE=https://pecl.php.net/package/imagick https://github.com/Imagick/imagick
 INHERIT=php-ext-pecl-r3
-IUSE=examples test php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
+IUSE=examples test php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=PHP-3.01
-RDEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
+RDEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/imagick-3.7.0.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=b54ab34c8841adfd133f2d27f9f346c5
+_md5_=de9ab7f2b5526277979bc2b3e0db62b6
diff --git a/metadata/md5-cache/dev-php/pecl-lzf-1.6.8-r1 b/metadata/md5-cache/dev-php/pecl-lzf-1.6.8-r1
index afc0767d54da..9eba2d202edd 100644
--- a/metadata/md5-cache/dev-php/pecl-lzf-1.6.8-r1
+++ b/metadata/md5-cache/dev-php/pecl-lzf-1.6.8-r1
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=This package handles LZF de/compression
 EAPI=7
 HOMEPAGE=https://pecl.php.net/LZF
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64 ~x86
 LICENSE=PHP-3
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/LZF-1.6.8.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=0eaae7cbdd00ed82de06cebecf2de797
+_md5_=13cb513c4489db917f95b9457a315397
diff --git a/metadata/md5-cache/dev-php/pecl-lzf-1.7.0 b/metadata/md5-cache/dev-php/pecl-lzf-1.7.0
index 9d6deac4a0d6..8766612ceab6 100644
--- a/metadata/md5-cache/dev-php/pecl-lzf-1.7.0
+++ b/metadata/md5-cache/dev-php/pecl-lzf-1.7.0
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=This package handles LZF de/compression
 EAPI=8
 HOMEPAGE=https://pecl.php.net/LZF
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64 ~x86
 LICENSE=PHP-3
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/LZF-1.7.0.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=7c266df02a23037173a90c8d6647ff5f
+_md5_=073864a3df02793cc30beaba0f9fa38c
diff --git a/metadata/md5-cache/dev-php/pecl-mailparse-3.1.3 b/metadata/md5-cache/dev-php/pecl-mailparse-3.1.3
index fdc14764781b..2a4824a1f715 100644
--- a/metadata/md5-cache/dev-php/pecl-mailparse-3.1.3
+++ b/metadata/md5-cache/dev-php/pecl-mailparse-3.1.3
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[unicode(-)] ) php_targets_php8-0? ( dev-lang/php:8.0[unicode(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[unicode(-)] )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0[unicode(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[unicode(-)] )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4[unicode(-)] ) php_targets_php8-0? ( dev-lang/php:8.0[unicode(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[unicode(-)] )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0[unicode(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[unicode(-)] )
 DESCRIPTION=PHP extension for parsing and working with RFC822 and MIME compliant messages
 EAPI=8
 HOMEPAGE=https://pecl.php.net/mailparse
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4[unicode(-)] ) php_targets_php8-0? ( dev-lang/php:8.0[unicode(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[unicode(-)] )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0[unicode(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[unicode(-)] )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/mailparse-3.1.3.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=2e14ffc2ca38defc0cb55a3f7994f46a
+_md5_=7e00429981c7b734713013d1332c0864
diff --git a/metadata/md5-cache/dev-php/pecl-mcrypt-1.0.4 b/metadata/md5-cache/dev-php/pecl-mcrypt-1.0.4
index fd8053cf5903..cc5e63e587e6 100644
--- a/metadata/md5-cache/dev-php/pecl-mcrypt-1.0.4
+++ b/metadata/md5-cache/dev-php/pecl-mcrypt-1.0.4
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libmcrypt php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEPEND=dev-libs/libmcrypt php_targets_php8-0? ( dev-lang/php:8.0 )
 DESCRIPTION=Bindings for the libmcrypt library
 EAPI=7
 HOMEPAGE=https://pecl.php.net/mcrypt
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0
+IUSE=php_targets_php8-0
 KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=PHP-3.01
-RDEPEND=dev-libs/libmcrypt php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 )
+RDEPEND=dev-libs/libmcrypt php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php8-0 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/mcrypt-1.0.4.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=870e7c88be5d8a3abef9dc70fbc23d91
+_md5_=bca699de3157274167861850792b9e9e
diff --git a/metadata/md5-cache/dev-php/pecl-mcrypt-1.0.5 b/metadata/md5-cache/dev-php/pecl-mcrypt-1.0.5
index 73191ff7c84e..9bc41a4fe799 100644
--- a/metadata/md5-cache/dev-php/pecl-mcrypt-1.0.5
+++ b/metadata/md5-cache/dev-php/pecl-mcrypt-1.0.5
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libltdl dev-libs/libmcrypt php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=dev-libs/libltdl dev-libs/libmcrypt php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=Bindings for the libmcrypt library
 EAPI=8
 HOMEPAGE=https://pecl.php.net/mcrypt
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=PHP-3.01
-RDEPEND=dev-libs/libltdl dev-libs/libmcrypt php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=dev-libs/libltdl dev-libs/libmcrypt php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/mcrypt-1.0.5.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=cb900ee20214b3b96309c18a887ed4c6
+_md5_=a002f296a66930d7c5bd9c71f646c287
diff --git a/metadata/md5-cache/dev-php/pecl-memcache-4.0.5.2-r1 b/metadata/md5-cache/dev-php/pecl-memcache-4.0.5.2-r1
deleted file mode 100644
index 642ef134e84a..000000000000
--- a/metadata/md5-cache/dev-php/pecl-memcache-4.0.5.2-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[session(-)?] )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( sys-libs/zlib ) php_targets_php7-4? ( dev-lang/php:7.4[session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[session(-)?] )
-DESCRIPTION=PHP extension for using memcached
-EAPI=7
-HOMEPAGE=https://pecl.php.net/memcache
-INHERIT=php-ext-pecl-r3
-IUSE=+session php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
-KEYWORDS=~amd64 ~hppa ~ppc64 ~x86
-LICENSE=PHP-3
-RDEPEND=php_targets_php7-4? ( sys-libs/zlib ) php_targets_php8-0? ( dev-php/pecl-memcache:8[php_targets_php8-0(-)?] ) php_targets_php8-1? ( dev-php/pecl-memcache:8[php_targets_php8-1(-)?] ) php_targets_php7-4? ( dev-lang/php:7.4[session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[session(-)?] )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
-RESTRICT=test
-SLOT=7
-SRC_URI=https://pecl.php.net/get/memcache-4.0.5.2.tgz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=897c2ac12b576e92ce72bf9099981002
diff --git a/metadata/md5-cache/dev-php/pecl-memcache-8.0 b/metadata/md5-cache/dev-php/pecl-memcache-8.0
index f9f70db99571..5d262cf28509 100644
--- a/metadata/md5-cache/dev-php/pecl-memcache-8.0
+++ b/metadata/md5-cache/dev-php/pecl-memcache-8.0
@@ -1,17 +1,17 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[session(-)?] )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0[session(-)?] )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php8-0? ( sys-libs/zlib ) php_targets_php7-4? ( dev-lang/php:7.4[session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[session(-)?] )
+DEPEND=php_targets_php8-0? ( sys-libs/zlib ) php_targets_php8-0? ( dev-lang/php:8.0[session(-)?] )
 DESCRIPTION=PHP extension for using memcached
 EAPI=7
 HOMEPAGE=https://pecl.php.net/memcache
 INHERIT=php-ext-pecl-r3
-IUSE=+session php_targets_php7-4 php_targets_php8-0
+IUSE=+session php_targets_php8-0
 KEYWORDS=~amd64 ~hppa ~ppc64 ~x86
 LICENSE=PHP-3
-RDEPEND=php_targets_php8-0? ( sys-libs/zlib ) php_targets_php7-4? ( dev-php/pecl-memcache:7[php_targets_php7-4(-)?] ) php_targets_php7-4? ( dev-lang/php:7.4[session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[session(-)?] )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 )
+RDEPEND=php_targets_php8-0? ( sys-libs/zlib ) php_targets_php8-0? ( dev-lang/php:8.0[session(-)?] )
+REQUIRED_USE=|| ( php_targets_php8-0 )
 RESTRICT=test
 SLOT=8
 SRC_URI=https://pecl.php.net/get/memcache-8.0.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=118ba0b3bb338f22bde207d612300454
+_md5_=386bee99d556dacefd7ef3b41e7a6c4e
diff --git a/metadata/md5-cache/dev-php/pecl-memcache-8.0-r1 b/metadata/md5-cache/dev-php/pecl-memcache-8.0-r1
index 29c7b7d4d2e1..8bdba9c217d8 100644
--- a/metadata/md5-cache/dev-php/pecl-memcache-8.0-r1
+++ b/metadata/md5-cache/dev-php/pecl-memcache-8.0-r1
@@ -1,17 +1,17 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[session(-)?] )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0[session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[session(-)?] )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php8-0? ( sys-libs/zlib ) php_targets_php8-1? ( sys-libs/zlib ) php_targets_php7-4? ( dev-lang/php:7.4[session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[session(-)?] )
+DEPEND=php_targets_php8-0? ( sys-libs/zlib ) php_targets_php8-1? ( sys-libs/zlib ) php_targets_php8-0? ( dev-lang/php:8.0[session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[session(-)?] )
 DESCRIPTION=PHP extension for using memcached
 EAPI=7
 HOMEPAGE=https://pecl.php.net/memcache
 INHERIT=php-ext-pecl-r3
-IUSE=+session php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=+session php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64 ~hppa ~ppc64 ~x86
 LICENSE=PHP-3
-RDEPEND=php_targets_php8-0? ( sys-libs/zlib ) php_targets_php8-1? ( sys-libs/zlib ) php_targets_php7-4? ( dev-php/pecl-memcache:7[php_targets_php7-4(-)?] ) php_targets_php7-4? ( dev-lang/php:7.4[session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[session(-)?] )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=php_targets_php8-0? ( sys-libs/zlib ) php_targets_php8-1? ( sys-libs/zlib ) php_targets_php8-0? ( dev-lang/php:8.0[session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[session(-)?] )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 RESTRICT=test
 SLOT=8
 SRC_URI=https://pecl.php.net/get/memcache-8.0.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=ece20f43b519ceb0af53bb030a8748af
+_md5_=c0004af8dc71327550e43964a9774dbc
diff --git a/metadata/md5-cache/dev-php/pecl-memcached-3.2.0-r1 b/metadata/md5-cache/dev-php/pecl-memcached-3.2.0-r1
index 2765efc9cffc..5b5dd9b9d4e8 100644
--- a/metadata/md5-cache/dev-php/pecl-memcached-3.2.0-r1
+++ b/metadata/md5-cache/dev-php/pecl-memcached-3.2.0-r1
@@ -1,17 +1,17 @@
-BDEPEND=|| ( dev-libs/libmemcached-awesome[sasl(-)?] >=dev-libs/libmemcached-1.0.14[sasl(-)?] ) sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] ) test? ( net-misc/memcached ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
+BDEPEND=|| ( dev-libs/libmemcached-awesome[sasl(-)?] >=dev-libs/libmemcached-1.0.14[sasl(-)?] ) sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php8-0(-)?,php_targets_php8-1(-)?] ) test? ( net-misc/memcached ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( dev-libs/libmemcached-awesome[sasl(-)?] >=dev-libs/libmemcached-1.0.14[sasl(-)?] ) sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] ) php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
+DEPEND=|| ( dev-libs/libmemcached-awesome[sasl(-)?] >=dev-libs/libmemcached-1.0.14[sasl(-)?] ) sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php8-0(-)?,php_targets_php8-1(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
 DESCRIPTION=Interface PHP with memcached via libmemcached library
 EAPI=8
 HOMEPAGE=https://pecl.php.net/memcached
 INHERIT=php-ext-pecl-r3
-IUSE=igbinary json sasl +session test php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=igbinary json sasl +session test php_targets_php8-0 php_targets_php8-1
 KEYWORDS=amd64 arm arm64 x86
 LICENSE=PHP-3.01
-RDEPEND=|| ( dev-libs/libmemcached-awesome[sasl(-)?] >=dev-libs/libmemcached-1.0.14[sasl(-)?] ) sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] ) php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=|| ( dev-libs/libmemcached-awesome[sasl(-)?] >=dev-libs/libmemcached-1.0.14[sasl(-)?] ) sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php8-0(-)?,php_targets_php8-1(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 RESTRICT=!test? ( test )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/memcached-3.2.0.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=23b183b07b49d471f8795c2df1ec7863
+_md5_=d777eada5338b46952425fc561c60205
diff --git a/metadata/md5-cache/dev-php/pecl-memcached-3.2.0_p20230419 b/metadata/md5-cache/dev-php/pecl-memcached-3.2.0_p20230419
index 6d4dae1b3384..0cb40b693c11 100644
--- a/metadata/md5-cache/dev-php/pecl-memcached-3.2.0_p20230419
+++ b/metadata/md5-cache/dev-php/pecl-memcached-3.2.0_p20230419
@@ -1,17 +1,17 @@
-BDEPEND=|| ( dev-libs/libmemcached-awesome[sasl(-)?] >=dev-libs/libmemcached-1.0.14[sasl(-)?] ) sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?,php_targets_php8-2(-)?] ) test? ( net-misc/memcached ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[json(+)?,session(-)?] )
+BDEPEND=|| ( dev-libs/libmemcached-awesome[sasl(-)?] >=dev-libs/libmemcached-1.0.14[sasl(-)?] ) sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php8-0(-)?,php_targets_php8-1(-)?,php_targets_php8-2(-)?] ) test? ( net-misc/memcached ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[json(+)?,session(-)?] )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( dev-libs/libmemcached-awesome[sasl(-)?] >=dev-libs/libmemcached-1.0.14[sasl(-)?] ) sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?,php_targets_php8-2(-)?] ) php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[json(+)?,session(-)?] )
+DEPEND=|| ( dev-libs/libmemcached-awesome[sasl(-)?] >=dev-libs/libmemcached-1.0.14[sasl(-)?] ) sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php8-0(-)?,php_targets_php8-1(-)?,php_targets_php8-2(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[json(+)?,session(-)?] )
 DESCRIPTION=Interface PHP with memcached via libmemcached library
 EAPI=8
 HOMEPAGE=https://pecl.php.net/memcached
 INHERIT=php-ext-pecl-r3
-IUSE=igbinary json sasl +session test php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
+IUSE=igbinary json sasl +session test php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=PHP-3.01
-RDEPEND=|| ( dev-libs/libmemcached-awesome[sasl(-)?] >=dev-libs/libmemcached-1.0.14[sasl(-)?] ) sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?,php_targets_php8-2(-)?] ) php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[json(+)?,session(-)?] )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
+RDEPEND=|| ( dev-libs/libmemcached-awesome[sasl(-)?] >=dev-libs/libmemcached-1.0.14[sasl(-)?] ) sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php8-0(-)?,php_targets_php8-1(-)?,php_targets_php8-2(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[json(+)?,session(-)?] )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
 RESTRICT=!test? ( test )
 SLOT=7
 SRC_URI=https://github.com/php-memcached-dev/php-memcached/archive/6926c53ac32a579b38a0dcc3c8aec662f8cd9dd5.tar.gz -> pecl-memcached-3.2.0_p20230419.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=bf7c3cc2025559d89af139f3df495de1
+_md5_=51d9c5046fbccb3703a6a4192fbb6b9d
diff --git a/metadata/md5-cache/dev-php/pecl-mongodb-1.10.0 b/metadata/md5-cache/dev-php/pecl-mongodb-1.10.0
index be32ea9cc474..03b79249e7ed 100644
--- a/metadata/md5-cache/dev-php/pecl-mongodb-1.10.0
+++ b/metadata/md5-cache/dev-php/pecl-mongodb-1.10.0
@@ -1,17 +1,17 @@
-BDEPEND=php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] ) php_targets_php8-0? ( dev-lang/php:8.0[ssl,zlib] ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+BDEPEND=php_targets_php8-0? ( dev-lang/php:8.0[ssl,zlib] ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] ) php_targets_php8-0? ( dev-lang/php:8.0[ssl,zlib] ) >=dev-libs/libbson-1.18.0 >=dev-libs/mongo-c-driver-1.18.0[sasl?,ssl] dev-libs/openssl:0= sasl? ( dev-libs/cyrus-sasl ) test? ( dev-db/mongodb ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0[ssl,zlib] ) >=dev-libs/libbson-1.18.0 >=dev-libs/mongo-c-driver-1.18.0[sasl?,ssl] dev-libs/openssl:0= sasl? ( dev-libs/cyrus-sasl ) test? ( dev-db/mongodb ) php_targets_php8-0? ( dev-lang/php:8.0 )
 DESCRIPTION=MongoDB database driver for PHP
 EAPI=7
 HOMEPAGE=https://pecl.php.net/mongodb
 INHERIT=php-ext-pecl-r3
-IUSE=sasl test php_targets_php7-4 php_targets_php8-0
+IUSE=sasl test php_targets_php8-0
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] ) php_targets_php8-0? ( dev-lang/php:8.0[ssl,zlib] ) >=dev-libs/libbson-1.18.0 >=dev-libs/mongo-c-driver-1.18.0[sasl?,ssl] dev-libs/openssl:0= sasl? ( dev-libs/cyrus-sasl ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0[ssl,zlib] ) >=dev-libs/libbson-1.18.0 >=dev-libs/mongo-c-driver-1.18.0[sasl?,ssl] dev-libs/openssl:0= sasl? ( dev-libs/cyrus-sasl ) php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php8-0 )
 RESTRICT=x86? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/mongodb-1.10.0.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=62eae2e76438ab86e603db1cf231fb62
+_md5_=ca3653ec3c0d788d7096bf04396aa8f6
diff --git a/metadata/md5-cache/dev-php/pecl-ncurses-1.0.2-r5 b/metadata/md5-cache/dev-php/pecl-ncurses-1.0.2-r5
deleted file mode 100644
index 39d6782badc0..000000000000
--- a/metadata/md5-cache/dev-php/pecl-ncurses-1.0.2-r5
+++ /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-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0= php_targets_php7-4? ( dev-lang/php:7.4 )
-DESCRIPTION=Terminal screen handling and optimization package
-EAPI=7
-HOMEPAGE=https://pecl.php.net/ncurses
-INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4
-KEYWORDS=~amd64
-LICENSE=PHP-3.01
-RDEPEND=sys-libs/ncurses:0= php_targets_php7-4? ( dev-lang/php:7.4 )
-REQUIRED_USE=|| ( php_targets_php7-4 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/ncurses-1.0.2.tgz https://dev.gentoo.org/~grknight/distfiles/pecl-ncurses-1.0.2-php7.patch.xz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=8d0216b815df1a1301700fd4795be8d7
diff --git a/metadata/md5-cache/dev-php/pecl-oauth-2.0.7 b/metadata/md5-cache/dev-php/pecl-oauth-2.0.7
index 6b89cb563484..ff2bf0c3c328 100644
--- a/metadata/md5-cache/dev-php/pecl-oauth-2.0.7
+++ b/metadata/md5-cache/dev-php/pecl-oauth-2.0.7
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=OAuth is an authorization protocol built on top of HTTP
 EAPI=7
 HOMEPAGE=https://pecl.php.net/oauth
 INHERIT=php-ext-pecl-r3
-IUSE=+curl examples php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=+curl examples php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/oauth-2.0.7.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=1fe5d75c04ed3388b8b752387e9d28d3
+_md5_=d57f16454f0d6158fdd659d6ccad43c0
diff --git a/metadata/md5-cache/dev-php/pecl-pam-2.2.3 b/metadata/md5-cache/dev-php/pecl-pam-2.2.3
index ae37ea641ae3..b39685e34669 100644
--- a/metadata/md5-cache/dev-php/pecl-pam-2.2.3
+++ b/metadata/md5-cache/dev-php/pecl-pam-2.2.3
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/pam php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=sys-libs/pam php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=This extension provides PAM (Pluggable Authentication Modules) integration
 EAPI=7
 HOMEPAGE=https://pecl.php.net/pam
 INHERIT=php-ext-pecl-r3 pam
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64 ~x86
 LICENSE=PHP-3.01
-RDEPEND=sys-libs/pam php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=sys-libs/pam php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/pam-2.2.3.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	b56d0c9c20fc5b553f13c8ae165a10a5	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=e7e63b851b9b929631556179b19185fe
+_md5_=25924601112eaa495a73fdea3ae3cb75
diff --git a/metadata/md5-cache/dev-php/pecl-pam-2.2.4 b/metadata/md5-cache/dev-php/pecl-pam-2.2.4
index 4ff4416b8121..5b87f3592033 100644
--- a/metadata/md5-cache/dev-php/pecl-pam-2.2.4
+++ b/metadata/md5-cache/dev-php/pecl-pam-2.2.4
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/pam php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=sys-libs/pam php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=This extension provides PAM (Pluggable Authentication Modules) integration
 EAPI=8
 HOMEPAGE=https://pecl.php.net/pam
 INHERIT=php-ext-pecl-r3 pam
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64 ~x86
 LICENSE=PHP-3.01
-RDEPEND=sys-libs/pam php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=sys-libs/pam php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/pam-2.2.4.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	b56d0c9c20fc5b553f13c8ae165a10a5	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=fe50aafb4a9006b639f6e2f50ea68f0a
+_md5_=62abd1fbcccbdbf8582dbf6d893a910f
diff --git a/metadata/md5-cache/dev-php/pecl-parallel-1.1.4-r1 b/metadata/md5-cache/dev-php/pecl-parallel-1.1.4-r1
deleted file mode 100644
index d2afea0580cc..000000000000
--- a/metadata/md5-cache/dev-php/pecl-parallel-1.1.4-r1
+++ /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-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[threads] )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4[threads] )
-DESCRIPTION=A succint parallel concurrency API for PHP
-EAPI=8
-HOMEPAGE=https://pecl.php.net/parallel
-INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4
-KEYWORDS=amd64 x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4[threads] )
-REQUIRED_USE=|| ( php_targets_php7-4 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/parallel-1.1.4.tgz -> pecl-parallel-1.1.4.tgz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=4beded2f3fcd8f2b1137cba6263e3539
diff --git a/metadata/md5-cache/dev-php/pecl-propro-2.1.0 b/metadata/md5-cache/dev-php/pecl-propro-2.1.0
deleted file mode 100644
index 7f69cfd4c739..000000000000
--- a/metadata/md5-cache/dev-php/pecl-propro-2.1.0
+++ /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-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 )
-DESCRIPTION=A reusable property proxy API for PHP
-EAPI=7
-HOMEPAGE=https://pecl.php.net/propro
-INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 )
-REQUIRED_USE=|| ( php_targets_php7-4 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/propro-2.1.0.tgz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=5e76f878091dc0f99a759831f95409d1
diff --git a/metadata/md5-cache/dev-php/pecl-ps-1.4.4 b/metadata/md5-cache/dev-php/pecl-ps-1.4.4
index ad8aa534f499..e8db710b8102 100644
--- a/metadata/md5-cache/dev-php/pecl-ps-1.4.4
+++ b/metadata/md5-cache/dev-php/pecl-ps-1.4.4
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[gd(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[gd(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[gd(-)?] )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0[gd(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[gd(-)?] )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/pslib gd? ( media-libs/gd:2= ) php_targets_php7-4? ( dev-lang/php:7.4[gd(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[gd(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[gd(-)?] )
+DEPEND=dev-libs/pslib gd? ( media-libs/gd:2= ) php_targets_php8-0? ( dev-lang/php:8.0[gd(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[gd(-)?] )
 DESCRIPTION=PHP extension for creating PostScript files
 EAPI=7
 HOMEPAGE=https://pecl.php.net/ps
 INHERIT=php-ext-pecl-r3
-IUSE=examples gd php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=examples gd php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
-RDEPEND=dev-libs/pslib gd? ( media-libs/gd:2= ) php_targets_php7-4? ( dev-lang/php:7.4[gd(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[gd(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[gd(-)?] )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=dev-libs/pslib gd? ( media-libs/gd:2= ) php_targets_php8-0? ( dev-lang/php:8.0[gd(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[gd(-)?] )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/ps-1.4.4.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=3770d9133c42b18a2608f90720287313
+_md5_=6363923b866affbd3434150e300a1a55
diff --git a/metadata/md5-cache/dev-php/pecl-psr-1.2.0 b/metadata/md5-cache/dev-php/pecl-psr-1.2.0
index 84f3ff0a5997..aca4a4588cea 100644
--- a/metadata/md5-cache/dev-php/pecl-psr-1.2.0
+++ b/metadata/md5-cache/dev-php/pecl-psr-1.2.0
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=Provides the accepted PSR interfaces, so they can be used in an extension
 EAPI=8
 HOMEPAGE=https://pecl.php.net/psr
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64
 LICENSE=BSD-2
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/psr-1.2.0.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=ebe7a4b77645cdb227e393525ca14379
+_md5_=4fe6a48862b76a89f29a08803ddac4d8
diff --git a/metadata/md5-cache/dev-php/pecl-radius-1.4.0_beta1-r3 b/metadata/md5-cache/dev-php/pecl-radius-1.4.0_beta1-r3
index a2366ebaa5d5..5d7b43fe556b 100644
--- a/metadata/md5-cache/dev-php/pecl-radius-1.4.0_beta1-r3
+++ b/metadata/md5-cache/dev-php/pecl-radius-1.4.0_beta1-r3
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[pcntl(-),sockets(-)] ) php_targets_php8-0? ( dev-lang/php:8.0[pcntl(-),sockets(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[pcntl(-),sockets(-)] ) php_targets_php8-2? ( dev-lang/php:8.2[pcntl(-),sockets(-)] )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0[pcntl(-),sockets(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[pcntl(-),sockets(-)] ) php_targets_php8-2? ( dev-lang/php:8.2[pcntl(-),sockets(-)] )
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4[pcntl(-),sockets(-)] ) php_targets_php8-0? ( dev-lang/php:8.0[pcntl(-),sockets(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[pcntl(-),sockets(-)] ) php_targets_php8-2? ( dev-lang/php:8.2[pcntl(-),sockets(-)] )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0[pcntl(-),sockets(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[pcntl(-),sockets(-)] ) php_targets_php8-2? ( dev-lang/php:8.2[pcntl(-),sockets(-)] )
 DESCRIPTION=Provides support for RADIUS authentication (RFC 2865) and accounting (RFC 2866)
 EAPI=8
 HOMEPAGE=https://pecl.php.net/radius
 INHERIT=php-ext-pecl-r3
-IUSE=examples php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
+IUSE=examples php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4[pcntl(-),sockets(-)] ) php_targets_php8-0? ( dev-lang/php:8.0[pcntl(-),sockets(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[pcntl(-),sockets(-)] ) php_targets_php8-2? ( dev-lang/php:8.2[pcntl(-),sockets(-)] )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0[pcntl(-),sockets(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[pcntl(-),sockets(-)] ) php_targets_php8-2? ( dev-lang/php:8.2[pcntl(-),sockets(-)] )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/radius-1.4.0b1.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=07398f8c1cad1e8e074f7d373c6342a8
+_md5_=ce433f3da1d505cfba8e9c0757434c95
diff --git a/metadata/md5-cache/dev-php/pecl-raphf-2.0.1-r1 b/metadata/md5-cache/dev-php/pecl-raphf-2.0.1-r1
index 620bc30bba61..dbf10030b6b5 100644
--- a/metadata/md5-cache/dev-php/pecl-raphf-2.0.1-r1
+++ b/metadata/md5-cache/dev-php/pecl-raphf-2.0.1-r1
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0 )
 DESCRIPTION=A reusable, persistent handle and resource factory API
 EAPI=7
 HOMEPAGE=https://pecl.php.net/raphf
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0
+IUSE=php_targets_php8-0
 KEYWORDS=amd64 x86
 LICENSE=BSD-2
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php8-0 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/raphf-2.0.1.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=75e67065b0d100cb5edf8abbbdcbcaa3
+_md5_=a2ea626504b0e7183018a4b4f8537666
diff --git a/metadata/md5-cache/dev-php/pecl-raphf-2.0.1-r2 b/metadata/md5-cache/dev-php/pecl-raphf-2.0.1-r2
index dee02e0a6c16..e120912871ad 100644
--- a/metadata/md5-cache/dev-php/pecl-raphf-2.0.1-r2
+++ b/metadata/md5-cache/dev-php/pecl-raphf-2.0.1-r2
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=A reusable, persistent handle and resource factory API
 EAPI=7
 HOMEPAGE=https://pecl.php.net/raphf
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=amd64 x86
 LICENSE=BSD-2
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/raphf-2.0.1.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=3cfd472aa0562fd5de14d2e3b29aedfb
+_md5_=3d8822c3b98496c75ac1ee9cae95d6c7
diff --git a/metadata/md5-cache/dev-php/pecl-redis-5.3.6 b/metadata/md5-cache/dev-php/pecl-redis-5.3.6
index 9d9b98b149d7..b3b44aafae2f 100644
--- a/metadata/md5-cache/dev-php/pecl-redis-5.3.6
+++ b/metadata/md5-cache/dev-php/pecl-redis-5.3.6
@@ -1,17 +1,17 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] ) lz4? ( app-arch/lz4:= ) zstd? ( app-arch/zstd:= ) php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
+DEPEND=igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php8-0(-)?,php_targets_php8-1(-)?] ) lz4? ( app-arch/lz4:= ) zstd? ( app-arch/zstd:= ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
 DESCRIPTION=PHP extension for interfacing with Redis
 EAPI=8
 HOMEPAGE=https://pecl.php.net/redis
 INHERIT=php-ext-pecl-r3
-IUSE=igbinary +json lz4 +session zstd php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=igbinary +json lz4 +session zstd php_targets_php8-0 php_targets_php8-1
 KEYWORDS=amd64 ~arm
 LICENSE=PHP-3.01
-RDEPEND=igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] ) lz4? ( app-arch/lz4:= ) zstd? ( app-arch/zstd:= ) !dev-php/pecl-redis:7 php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php8-0(-)?,php_targets_php8-1(-)?] ) lz4? ( app-arch/lz4:= ) zstd? ( app-arch/zstd:= ) !dev-php/pecl-redis:7 php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pecl.php.net/get/redis-5.3.6.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=2bbd515a7cbd9344a1736b2e165b7a8f
+_md5_=90fb296553e5e2f369708349a07149d4
diff --git a/metadata/md5-cache/dev-php/pecl-redis-5.3.7-r1 b/metadata/md5-cache/dev-php/pecl-redis-5.3.7-r1
index d3e9c5031fec..ec10cc2a3244 100644
--- a/metadata/md5-cache/dev-php/pecl-redis-5.3.7-r1
+++ b/metadata/md5-cache/dev-php/pecl-redis-5.3.7-r1
@@ -1,17 +1,17 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[json(+)?,session(-)?] )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[json(+)?,session(-)?] )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?,php_targets_php8-2(-)?] ) lz4? ( app-arch/lz4:= ) zstd? ( app-arch/zstd:= ) php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[json(+)?,session(-)?] )
+DEPEND=igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php8-0(-)?,php_targets_php8-1(-)?,php_targets_php8-2(-)?] ) lz4? ( app-arch/lz4:= ) zstd? ( app-arch/zstd:= ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[json(+)?,session(-)?] )
 DESCRIPTION=PHP extension for interfacing with Redis
 EAPI=8
 HOMEPAGE=https://pecl.php.net/redis
 INHERIT=php-ext-pecl-r3
-IUSE=igbinary +json lz4 +session zstd php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
+IUSE=igbinary +json lz4 +session zstd php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
 KEYWORDS=amd64 ~arm ~arm64
 LICENSE=PHP-3.01
-RDEPEND=igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?,php_targets_php8-2(-)?] ) lz4? ( app-arch/lz4:= ) zstd? ( app-arch/zstd:= ) !dev-php/pecl-redis:7 php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[json(+)?,session(-)?] )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
+RDEPEND=igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php8-0(-)?,php_targets_php8-1(-)?,php_targets_php8-2(-)?] ) lz4? ( app-arch/lz4:= ) zstd? ( app-arch/zstd:= ) !dev-php/pecl-redis:7 php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[json(+)?,session(-)?] )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pecl.php.net/get/redis-5.3.7.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=61b14b69331fddb03509e150054a41e7
+_md5_=609fd809dbbad4844603fb925ef5d475
diff --git a/metadata/md5-cache/dev-php/pecl-rrd-2.0.1-r4 b/metadata/md5-cache/dev-php/pecl-rrd-2.0.1-r4
index dd3a41b5fbb3..0e7412086122 100644
--- a/metadata/md5-cache/dev-php/pecl-rrd-2.0.1-r4
+++ b/metadata/md5-cache/dev-php/pecl-rrd-2.0.1-r4
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-analyzer/rrdtool[graph(-)] php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEPEND=net-analyzer/rrdtool[graph(-)] php_targets_php8-0? ( dev-lang/php:8.0 )
 DESCRIPTION=RRDtool bindings for PHP
 EAPI=7
 HOMEPAGE=https://pecl.php.net/rrd
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0
+IUSE=php_targets_php8-0
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=net-analyzer/rrdtool[graph(-)] php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 )
+RDEPEND=net-analyzer/rrdtool[graph(-)] php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php8-0 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/rrd-2.0.1.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=d7f23aab059610281135ff2421bba54a
+_md5_=83632b51dbae3c7ba494fa98275ebb0e
diff --git a/metadata/md5-cache/dev-php/pecl-rrd-2.0.3 b/metadata/md5-cache/dev-php/pecl-rrd-2.0.3
index 0487b6a64ebb..ae407b6d5bd0 100644
--- a/metadata/md5-cache/dev-php/pecl-rrd-2.0.3
+++ b/metadata/md5-cache/dev-php/pecl-rrd-2.0.3
@@ -1,16 +1,16 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-analyzer/rrdtool[graph(-)] php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+DEPEND=net-analyzer/rrdtool[graph(-)] php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DESCRIPTION=RRDtool bindings for PHP
 EAPI=8
 HOMEPAGE=https://pecl.php.net/rrd
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
+IUSE=php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=net-analyzer/rrdtool[graph(-)] php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
+RDEPEND=net-analyzer/rrdtool[graph(-)] php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/rrd-2.0.3.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=b3787c1f7db6b57691b2ced4efb5981f
+_md5_=d6e1b0ce6a430da9d2fdd80da1564c01
diff --git a/metadata/md5-cache/dev-php/pecl-ssh2-1.3.1 b/metadata/md5-cache/dev-php/pecl-ssh2-1.3.1
index 766ff825a737..2c2c7bdd38a7 100644
--- a/metadata/md5-cache/dev-php/pecl-ssh2-1.3.1
+++ b/metadata/md5-cache/dev-php/pecl-ssh2-1.3.1
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/libssh2-1.2[-gcrypt] php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEPEND=>=net-libs/libssh2-1.2[-gcrypt] php_targets_php8-0? ( dev-lang/php:8.0 )
 DESCRIPTION=PHP bindings for the libssh2 library
 EAPI=7
 HOMEPAGE=https://pecl.php.net/ssh2
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0
+IUSE=php_targets_php8-0
 KEYWORDS=amd64 x86
 LICENSE=PHP-3.01
-RDEPEND=>=net-libs/libssh2-1.2[-gcrypt] php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 )
+RDEPEND=>=net-libs/libssh2-1.2[-gcrypt] php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php8-0 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/ssh2-1.3.1.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=44e7812222b8a569d611ef76afea0f58
+_md5_=a7645c1d89121f3c3a190b9330f2f1df
diff --git a/metadata/md5-cache/dev-php/pecl-ssh2-1.3.1-r1 b/metadata/md5-cache/dev-php/pecl-ssh2-1.3.1-r1
index 09b94afcabb7..f291e3517dbd 100644
--- a/metadata/md5-cache/dev-php/pecl-ssh2-1.3.1-r1
+++ b/metadata/md5-cache/dev-php/pecl-ssh2-1.3.1-r1
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/libssh2-1.2[-gcrypt] php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+DEPEND=>=net-libs/libssh2-1.2[-gcrypt] php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DESCRIPTION=PHP bindings for the libssh2 library
 EAPI=8
 HOMEPAGE=https://pecl.php.net/ssh2
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
+IUSE=php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
 KEYWORDS=amd64 x86
 LICENSE=PHP-3.01
-RDEPEND=>=net-libs/libssh2-1.2[-gcrypt] php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
+RDEPEND=>=net-libs/libssh2-1.2[-gcrypt] php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/ssh2-1.3.1.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=0ee86c801086b6d138b659b2df9a4767
+_md5_=c8fbb3eca2b2670435b2838e9a71029c
diff --git a/metadata/md5-cache/dev-php/pecl-ssh2-9999 b/metadata/md5-cache/dev-php/pecl-ssh2-9999
index 81151963d064..f34c36f14634 100644
--- a/metadata/md5-cache/dev-php/pecl-ssh2-9999
+++ b/metadata/md5-cache/dev-php/pecl-ssh2-9999
@@ -1,15 +1,15 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=net-libs/libssh2-1.2 php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+DEPEND=>=net-libs/libssh2-1.2 php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DESCRIPTION=PHP bindings for the libssh2 library
 EAPI=8
 HOMEPAGE=https://pecl.php.net/package/ssh2
 INHERIT=php-ext-source-r3 git-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
+IUSE=php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
 LICENSE=PHP-3.01
 PROPERTIES=live
-RDEPEND=>=net-libs/libssh2-1.2 php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
+RDEPEND=>=net-libs/libssh2-1.2 php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
 SLOT=7
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	git-r3	2358a7b20091609e24bd3a83b3ac5991	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=9361d419019b1f761a4491f3c8e6e02a
+_md5_=bae047b114346ce378faa85a4ec621d6
diff --git a/metadata/md5-cache/dev-php/pecl-stomp-2.0.3 b/metadata/md5-cache/dev-php/pecl-stomp-2.0.3
index 4cd5e2976677..9b7e0b55a3f3 100644
--- a/metadata/md5-cache/dev-php/pecl-stomp-2.0.3
+++ b/metadata/md5-cache/dev-php/pecl-stomp-2.0.3
@@ -1,17 +1,17 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[ssl(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[ssl(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[ssl(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[ssl(-)?] )
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0[ssl(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[ssl(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[ssl(-)?] )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4[ssl(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[ssl(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[ssl(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[ssl(-)?] )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0[ssl(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[ssl(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[ssl(-)?] )
 DESCRIPTION=PHP extension to communicate with Stomp message brokers
 EAPI=8
 HOMEPAGE=https://pecl.php.net/stomp
 INHERIT=php-ext-pecl-r3
-IUSE=examples ssl test php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
+IUSE=examples ssl test php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
 KEYWORDS=~amd64 ~x86
 LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4[ssl(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[ssl(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[ssl(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[ssl(-)?] )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0[ssl(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[ssl(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[ssl(-)?] )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
 RESTRICT=!test? ( test )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/stomp-2.0.3.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=e7e36b326623d25862bc6172b5c4ca15
+_md5_=8c4edb0985876b3a21bcac13bb789d35
diff --git a/metadata/md5-cache/dev-php/pecl-taint-2.1.0 b/metadata/md5-cache/dev-php/pecl-taint-2.1.0
deleted file mode 100644
index 6d3395773378..000000000000
--- a/metadata/md5-cache/dev-php/pecl-taint-2.1.0
+++ /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-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 )
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 )
-DESCRIPTION=Extension used for detecting XSS code (tainted strings)
-EAPI=7
-HOMEPAGE=https://pecl.php.net/taint
-INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 )
-REQUIRED_USE=|| ( php_targets_php7-4 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/taint-2.1.0.tgz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=d755829c7bbd140b33a875e2f76a3775
diff --git a/metadata/md5-cache/dev-php/pecl-timezonedb-2021.5 b/metadata/md5-cache/dev-php/pecl-timezonedb-2021.5
index fcee3b6f15d6..021865691360 100644
--- a/metadata/md5-cache/dev-php/pecl-timezonedb-2021.5
+++ b/metadata/md5-cache/dev-php/pecl-timezonedb-2021.5
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=Timezone Database to be used with PHP's date and time functions
 EAPI=8
 HOMEPAGE=https://pecl.php.net/timezonedb
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=PHP-3
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/timezonedb-2021.5.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=4f8378c7e2e0b2271635c92f5f5d9611
+_md5_=ee17647ede9a211965c577a0a9848dfe
diff --git a/metadata/md5-cache/dev-php/pecl-translit-0.7.1 b/metadata/md5-cache/dev-php/pecl-translit-0.7.1
index 7134dd51eb41..1d415481f04f 100644
--- a/metadata/md5-cache/dev-php/pecl-translit-0.7.1
+++ b/metadata/md5-cache/dev-php/pecl-translit-0.7.1
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=Transliterates non-latin character sets to latin
 EAPI=8
 HOMEPAGE=https://github.com/derickr/pecl-translit
 INHERIT=php-ext-source-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=https://github.com/derickr/pecl-translit/archive/0.7.1.tar.gz -> pecl-translit-0.7.1.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=c452c6f030f7ea1773faa8e460178984
+_md5_=f81932021cabfa8d864f270761746936
diff --git a/metadata/md5-cache/dev-php/pecl-uploadprogress-2.0.2-r1 b/metadata/md5-cache/dev-php/pecl-uploadprogress-2.0.2-r1
index 7f52dd139c60..287a947a3de0 100644
--- a/metadata/md5-cache/dev-php/pecl-uploadprogress-2.0.2-r1
+++ b/metadata/md5-cache/dev-php/pecl-uploadprogress-2.0.2-r1
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DESCRIPTION=An extension to track progress of a file upload
 EAPI=8
 HOMEPAGE=https://pecl.php.net/uploadprogress
 INHERIT=php-ext-pecl-r3
-IUSE=examples php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
+IUSE=examples php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
 KEYWORDS=~amd64 ~x86
 LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-4? ( || ( dev-lang/php:7.4[apache2(-),fileinfo(-)] dev-lang/php:7.4[fileinfo(-),fpm(-)] ) ) php_targets_php8-0? ( || ( dev-lang/php:8.0[apache2(-),fileinfo(-)] dev-lang/php:8.0[fileinfo(-),fpm(-)] ) ) php_targets_php8-1? ( || ( dev-lang/php:8.1[apache2(-),fileinfo(-)] dev-lang/php:8.1[fileinfo(-),fpm(-)] ) ) php_targets_php8-2? ( || ( dev-lang/php:8.2[apache2(-),fileinfo(-)] dev-lang/php:8.2[fileinfo(-),fpm(-)] ) ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
+RDEPEND=php_targets_php8-0? ( || ( dev-lang/php:8.0[apache2(-),fileinfo(-)] dev-lang/php:8.0[fileinfo(-),fpm(-)] ) ) php_targets_php8-1? ( || ( dev-lang/php:8.1[apache2(-),fileinfo(-)] dev-lang/php:8.1[fileinfo(-),fpm(-)] ) ) php_targets_php8-2? ( || ( dev-lang/php:8.2[apache2(-),fileinfo(-)] dev-lang/php:8.2[fileinfo(-),fpm(-)] ) ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/uploadprogress-2.0.2.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=ac0c9142cfa60945523085e604037ac7
+_md5_=736b2c6071dde8e39e57399daa827f95
diff --git a/metadata/md5-cache/dev-php/pecl-uuid-1.2.0 b/metadata/md5-cache/dev-php/pecl-uuid-1.2.0
index 546f0ca6f490..c5b09fd24855 100644
--- a/metadata/md5-cache/dev-php/pecl-uuid-1.2.0
+++ b/metadata/md5-cache/dev-php/pecl-uuid-1.2.0
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-apps/util-linux php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=sys-apps/util-linux php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=A wrapper around libuuid
 EAPI=8
 HOMEPAGE=https://pecl.php.net/uuid
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1
-RDEPEND=sys-apps/util-linux php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=sys-apps/util-linux php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/uuid-1.2.0.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=ca536184b76ed1e79b26767a109eca0f
+_md5_=b0e7837172c4470666bb4b38bd211f58
diff --git a/metadata/md5-cache/dev-php/pecl-xdiff-2.1.0 b/metadata/md5-cache/dev-php/pecl-xdiff-2.1.0
index 81507dc8ccb4..44f3069e2b50 100644
--- a/metadata/md5-cache/dev-php/pecl-xdiff-2.1.0
+++ b/metadata/md5-cache/dev-php/pecl-xdiff-2.1.0
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libxdiff php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=dev-libs/libxdiff php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=PHP extension for generating diff files
 EAPI=8
 HOMEPAGE=https://pecl.php.net/xdiff
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64 ~x86
 LICENSE=PHP-3.01
-RDEPEND=dev-libs/libxdiff php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=dev-libs/libxdiff php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/xdiff-2.1.0.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=ae297035a7865d54622d6ae7b8f3165e
+_md5_=b22a6a723c3439c6224245b93fcd5825
diff --git a/metadata/md5-cache/dev-php/pecl-xdiff-2.1.1 b/metadata/md5-cache/dev-php/pecl-xdiff-2.1.1
index eca2467b90e2..aed8d39d928d 100644
--- a/metadata/md5-cache/dev-php/pecl-xdiff-2.1.1
+++ b/metadata/md5-cache/dev-php/pecl-xdiff-2.1.1
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libxdiff php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+DEPEND=dev-libs/libxdiff php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DESCRIPTION=PHP extension for generating diff files
 EAPI=8
 HOMEPAGE=https://pecl.php.net/xdiff
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
+IUSE=php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
 KEYWORDS=~amd64 ~x86
 LICENSE=PHP-3.01
-RDEPEND=dev-libs/libxdiff php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
+RDEPEND=dev-libs/libxdiff php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/xdiff-2.1.1.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=8c0409686d5d30137f4eb777fef88920
+_md5_=6300c47a24679e51875fec861b650692
diff --git a/metadata/md5-cache/dev-php/pecl-yaml-2.2.2 b/metadata/md5-cache/dev-php/pecl-yaml-2.2.2
index 651afa706072..d11e56a1a9b9 100644
--- a/metadata/md5-cache/dev-php/pecl-yaml-2.2.2
+++ b/metadata/md5-cache/dev-php/pecl-yaml-2.2.2
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libyaml php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+DEPEND=dev-libs/libyaml php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DESCRIPTION=YAML 1.1 (YAML Ain't Markup Language) serialization for PHP
 EAPI=8
 HOMEPAGE=https://pecl.php.net/yaml
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
+IUSE=php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=dev-libs/libyaml php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
+RDEPEND=dev-libs/libyaml php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/yaml-2.2.2.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=07a8c4dcb979d7cf3c237498ca5816f2
+_md5_=7d6db67a7e024d464604f16e0a13c60c
diff --git a/metadata/md5-cache/dev-php/pecl-yaz-1.2.3-r1 b/metadata/md5-cache/dev-php/pecl-yaz-1.2.3-r1
index 72c8dbb14c23..90c8d0546836 100644
--- a/metadata/md5-cache/dev-php/pecl-yaz-1.2.3-r1
+++ b/metadata/md5-cache/dev-php/pecl-yaz-1.2.3-r1
@@ -1,17 +1,17 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/yaz-3.0.2:0= php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEPEND=>=dev-libs/yaz-3.0.2:0= php_targets_php8-0? ( dev-lang/php:8.0 )
 DESCRIPTION=This extension implements a Z39.50 client for PHP using the YAZ toolkit
 EAPI=7
 HOMEPAGE=https://pecl.php.net/yaz
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0
+IUSE=php_targets_php8-0
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=BSD
-RDEPEND=>=dev-libs/yaz-3.0.2:0= php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 )
+RDEPEND=>=dev-libs/yaz-3.0.2:0= php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php8-0 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pecl.php.net/get/yaz-1.2.3.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=68f421cb414d506c0fbaefa932f26424
+_md5_=36a28b0c857fadfd65443676c2d449ef
diff --git a/metadata/md5-cache/dev-php/pecl-yaz-1.2.4 b/metadata/md5-cache/dev-php/pecl-yaz-1.2.4
index d62689a615bb..e4943e294150 100644
--- a/metadata/md5-cache/dev-php/pecl-yaz-1.2.4
+++ b/metadata/md5-cache/dev-php/pecl-yaz-1.2.4
@@ -1,18 +1,18 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/yaz-3.0.2:0= php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+DEPEND=>=dev-libs/yaz-3.0.2:0= php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DESCRIPTION=This extension implements a Z39.50 client for PHP using the YAZ toolkit
 EAPI=8
 HOMEPAGE=https://pecl.php.net/yaz
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
+IUSE=php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=BSD
 PROPERTIES=test_network
-RDEPEND=>=dev-libs/yaz-3.0.2:0= php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
+RDEPEND=>=dev-libs/yaz-3.0.2:0= php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pecl.php.net/get/yaz-1.2.4.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=6ef771f1ad6fd60824ba37ab081b9296
+_md5_=8dc17e22848b975f6549f591ff119c51
diff --git a/metadata/md5-cache/dev-php/pecl-zmq-1.1.3_p20211103 b/metadata/md5-cache/dev-php/pecl-zmq-1.1.3_p20211103
index 2eceff21e72c..370039636002 100644
--- a/metadata/md5-cache/dev-php/pecl-zmq-1.1.3_p20211103
+++ b/metadata/md5-cache/dev-php/pecl-zmq-1.1.3_p20211103
@@ -1,16 +1,16 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-libs/zeromq php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=net-libs/zeromq php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=PHP Bindings for ZeroMQ messaging
 EAPI=8
 HOMEPAGE=https://pecl.php.net/zmq
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=net-libs/zeromq:= php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=net-libs/zeromq:= php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=https://github.com/zeromq/php-zmq/archive/ee5fbc693f07b2d6f0d9fd748f131be82310f386.tar.gz -> pecl-zmq-1.1.3_p20211103.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=3b9645a20dca700bfac7052ef906982f
+_md5_=e7740869b00a60deea48fdaabb1b5431
diff --git a/metadata/md5-cache/dev-php/pecl-zmq-9999 b/metadata/md5-cache/dev-php/pecl-zmq-9999
index df32a6665cfd..30e3514d6a26 100644
--- a/metadata/md5-cache/dev-php/pecl-zmq-9999
+++ b/metadata/md5-cache/dev-php/pecl-zmq-9999
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=net-libs/zeromq php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=net-libs/zeromq php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=PHP Bindings for ZeroMQ messaging
 EAPI=8
 HOMEPAGE=https://pecl.php.net/zmq
 INHERIT=php-ext-pecl-r3 git-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=net-libs/zeromq:= php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=net-libs/zeromq:= php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	git-r3	2358a7b20091609e24bd3a83b3ac5991	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=7ba8b99d431c16dd2da04abc8869dd64
+_md5_=22fa90affda1ba2f9e50ed1728cdd54d
diff --git a/metadata/md5-cache/dev-php/phpspec-prophecy-1.14.0 b/metadata/md5-cache/dev-php/phpspec-prophecy-1.14.0
deleted file mode 100644
index cf60acf3ed4d..000000000000
--- a/metadata/md5-cache/dev-php/phpspec-prophecy-1.14.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Highly opinionated mocking framework
-EAPI=7
-HOMEPAGE=https://github.com/phpspec/prophecy
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=dev-php/fedora-autoloader <dev-php/doctrine-instantiator-2 <dev-php/phpdocumentor-reflection-docblock-6 <dev-php/sebastian-comparator-4 <dev-php/sebastian-recursion-context-4 >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/phpspec/prophecy/archive/refs/tags/1.14.0.tar.gz -> phpspec-prophecy-1.14.0.tar.gz
-_md5_=24fa2ea586e0ee78d51c93937b9f596f
diff --git a/metadata/md5-cache/dev-php/phpunit-8.5.11 b/metadata/md5-cache/dev-php/phpunit-8.5.11
deleted file mode 100644
index 55b0029b979e..000000000000
--- a/metadata/md5-cache/dev-php/phpunit-8.5.11
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=dev-php/theseer-Autoload
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=A PHP Unit Testing framework
-EAPI=7
-HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-php/File_Iterator-2.0.2 >=dev-php/Text_Template-1.2.1 >=dev-php/PHP_CodeCoverage-7.0.12 >=dev-php/PHP_Timer-2.1.2 >=dev-php/doctrine-instantiator-1.3.1 >=dev-php/myclabs-deepcopy-1.10.0 >=dev-php/phar-io-manifest-1.0.3 >=dev-php/phar-io-version-2.0.1 >=dev-php/phpspec-prophecy-1.10.3 >=dev-php/sebastian-comparator-3.0.2 >=dev-php/sebastian-diff-3.0.2 >=dev-php/sebastian-environment-4.2.3 >=dev-php/sebastian-exporter-3.1.2 >=dev-php/sebastian-global-state-3.0.0 >=dev-php/sebastian-object-enumerator-3.0.3 >=dev-php/sebastian-resource-operations-2.0.1 >=dev-php/sebastian-type-1.1.3 >=dev-php/sebastian-version-2.0.1 || ( dev-lang/php:7.4[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] dev-lang/php:7.3[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] dev-lang/php:7.2[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] ) !dev-php/phpunit-mock-objects
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann/phpunit/archive/8.5.11.tar.gz -> phpunit-8.5.11.tar.gz
-_md5_=28666633f0561f298a609ce04e3f8497
diff --git a/metadata/md5-cache/dev-php/phpunit-8.5.14 b/metadata/md5-cache/dev-php/phpunit-8.5.14
deleted file mode 100644
index 27cfcea2b2a2..000000000000
--- a/metadata/md5-cache/dev-php/phpunit-8.5.14
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=dev-php/theseer-Autoload
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=A PHP Unit Testing framework
-EAPI=7
-HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-php/File_Iterator-2.0.2 >=dev-php/Text_Template-1.2.1 >=dev-php/PHP_CodeCoverage-7.0.12 >=dev-php/PHP_Timer-2.1.2 >=dev-php/doctrine-instantiator-1.3.1 >=dev-php/myclabs-deepcopy-1.10.0 >=dev-php/phar-io-manifest-2.0.1 >=dev-php/phar-io-version-3.0.2 >=dev-php/phpspec-prophecy-1.10.3 >=dev-php/sebastian-comparator-3.0.2 >=dev-php/sebastian-diff-3.0.2 >=dev-php/sebastian-environment-4.2.3 >=dev-php/sebastian-exporter-3.1.2 >=dev-php/sebastian-global-state-3.0.0 >=dev-php/sebastian-object-enumerator-3.0.3 >=dev-php/sebastian-resource-operations-2.0.1 >=dev-php/sebastian-type-1.1.3 >=dev-php/sebastian-version-2.0.1 || ( dev-lang/php:8.0[cli(-),unicode(-),xml(-),xmlwriter(-)] dev-lang/php:7.4[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] dev-lang/php:7.3[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] dev-lang/php:7.2[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] ) !dev-php/phpunit-mock-objects
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann/phpunit/archive/8.5.14.tar.gz -> phpunit-8.5.14.tar.gz
-_md5_=55cf75698ec05d79812e2dc180a16736
diff --git a/metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3 b/metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3
deleted file mode 100644
index a24ea83c945c..000000000000
--- a/metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Mock Object library for PHPUnit
-EAPI=6
-HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-php/Text_Template-1.2 !>=dev-php/Text_Template-2.0 <dev-php/doctrine-instantiator-2.0 <dev-php/sebastian-exporter-3.0 !<dev-php/phpunit-5.4.0 >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann/phpunit-mock-objects/archive/3.4.3.tar.gz -> phpunit-mock-objects-3.4.3.tar.gz
-_md5_=99dd411da98a5fb39420f1fa0989f247
diff --git a/metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3-r1 b/metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3-r1
deleted file mode 100644
index 9a622994f327..000000000000
--- a/metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Mock Object library for PHPUnit
-EAPI=6
-HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-php/Text_Template-1.2 <dev-php/Text_Template-2.0 <dev-php/doctrine-instantiator-2.0 <dev-php/sebastian-exporter-3.0 !<dev-php/phpunit-5.4.0 >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann/phpunit-mock-objects/archive/3.4.3.tar.gz -> phpunit-mock-objects-3.4.3.tar.gz
-_md5_=674fe358f9c87b5006b6c1342a8b0e06
diff --git a/metadata/md5-cache/dev-php/realpath_turbo-2.0.0 b/metadata/md5-cache/dev-php/realpath_turbo-2.0.0
index a715340f9dad..6a392aaebf2e 100644
--- a/metadata/md5-cache/dev-php/realpath_turbo-2.0.0
+++ b/metadata/md5-cache/dev-php/realpath_turbo-2.0.0
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=PHP extension to re-enable realpath cache when using open_basedir restriction
 EAPI=7
 HOMEPAGE=https://github.com/Whissi/realpath_turbo/
 INHERIT=php-ext-source-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=https://github.com/Whissi/realpath_turbo/releases/download/v2.0.0/realpath_turbo-2.0.0.tar.bz2
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=d2671bda54b3fe321896180bcafc5363
+_md5_=5e09fdd749805e3e3b40382ff64b5395
diff --git a/metadata/md5-cache/dev-php/scrypt-2.0.0 b/metadata/md5-cache/dev-php/scrypt-2.0.0
index 2a910ac5f64c..03d60045f628 100644
--- a/metadata/md5-cache/dev-php/scrypt-2.0.0
+++ b/metadata/md5-cache/dev-php/scrypt-2.0.0
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-util/re2c php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+DEPEND=dev-util/re2c php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DESCRIPTION=A PHP wrapper for the scrypt hashing algorithm
 EAPI=8
 HOMEPAGE=https://pecl.php.net/scrypt
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
+IUSE=php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/scrypt-2.0.0.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=23acaa2c96626128bb2ef2e7f36bbc24
+_md5_=e2eccd23c8fcc6a1c03217b351f1aedc
diff --git a/metadata/md5-cache/dev-php/sebastian-comparator-1.2.4 b/metadata/md5-cache/dev-php/sebastian-comparator-1.2.4
deleted file mode 100644
index 3ceb233d445f..000000000000
--- a/metadata/md5-cache/dev-php/sebastian-comparator-1.2.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Compare PHP values for equality
-EAPI=6
-HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader <dev-php/sebastian-diff-2.0 <dev-php/sebastian-exporter-3.0 >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann//comparator/archive/1.2.4.tar.gz -> sebastian-comparator-1.2.4.tar.gz
-_md5_=f7df87d562d05ec4a3d0b37eb44088eb
diff --git a/metadata/md5-cache/dev-php/sebastian-comparator-3.0.2 b/metadata/md5-cache/dev-php/sebastian-comparator-3.0.2
deleted file mode 100644
index 38f5cc495d6a..000000000000
--- a/metadata/md5-cache/dev-php/sebastian-comparator-3.0.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Compare PHP values for equality
-EAPI=7
-HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-php/sebastian-diff-3.0 <dev-php/sebastian-diff-4.0 >=dev-php/sebastian-exporter-3.1 <dev-php/sebastian-exporter-4.0 >=dev-lang/php-7.1:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann//comparator/archive/3.0.2.tar.gz -> sebastian-comparator-3.0.2.tar.gz
-_md5_=23595624c7d0d44f44798b54c0d0b707
diff --git a/metadata/md5-cache/dev-php/sebastian-exporter-2.0.0 b/metadata/md5-cache/dev-php/sebastian-exporter-2.0.0
deleted file mode 100644
index 6cf2fd4dfab8..000000000000
--- a/metadata/md5-cache/dev-php/sebastian-exporter-2.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Export PHP variables for visualization
-EAPI=6
-HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader =dev-php/sebastian-recursion-context-2* >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann//exporter/archive/2.0.0.tar.gz -> sebastian-exporter-2.0.0.tar.gz
-_md5_=8b1564d2b13dfff7ab05277ee49996dc
diff --git a/metadata/md5-cache/dev-php/sebastian-exporter-3.1.2 b/metadata/md5-cache/dev-php/sebastian-exporter-3.1.2
deleted file mode 100644
index 8d407f09170e..000000000000
--- a/metadata/md5-cache/dev-php/sebastian-exporter-3.1.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Export PHP variables for visualization
-EAPI=7
-HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader =dev-php/sebastian-recursion-context-3* =dev-lang/php-7*:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann//exporter/archive/3.1.2.tar.gz -> sebastian-exporter-3.1.2.tar.gz
-_md5_=9c7f12fef1106bc2c050e119eedd9ac8
diff --git a/metadata/md5-cache/dev-php/sebastian-global-state-1.1.1 b/metadata/md5-cache/dev-php/sebastian-global-state-1.1.1
deleted file mode 100644
index cf57fa193c69..000000000000
--- a/metadata/md5-cache/dev-php/sebastian-global-state-1.1.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Snapshotting of global state
-EAPI=6
-HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann//global-state/archive/1.1.1.tar.gz -> sebastian-global-state-1.1.1.tar.gz
-_md5_=7b7cf7f28998f63c477f6a826ccb0fec
diff --git a/metadata/md5-cache/dev-php/sebastian-global-state-3.0.0 b/metadata/md5-cache/dev-php/sebastian-global-state-3.0.0
deleted file mode 100644
index 5afb2c50413a..000000000000
--- a/metadata/md5-cache/dev-php/sebastian-global-state-3.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Snapshotting of global state
-EAPI=7
-HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-7.2:* >=dev-php/sebastian-object-reflector-1.1.1 <dev-php/sebastian-object-reflector-2.0 =dev-php/sebastian-recursion-context-3*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann//global-state/archive/3.0.0.tar.gz -> sebastian-global-state-3.0.0.tar.gz
-_md5_=cf7c825dccb88ea7f28560e09f6da1bf
diff --git a/metadata/md5-cache/dev-php/sebastian-object-enumerator-2.0.1 b/metadata/md5-cache/dev-php/sebastian-object-enumerator-2.0.1
deleted file mode 100644
index 1fde0ef533c5..000000000000
--- a/metadata/md5-cache/dev-php/sebastian-object-enumerator-2.0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Traverses array structures and object graphs to enumerate all referenced objects
-EAPI=6
-HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader <dev-php/sebastian-recursion-context-3.0 >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann//object-enumerator/archive/2.0.1.tar.gz -> sebastian-object-enumerator-2.0.1.tar.gz
-_md5_=f727ba578bd341f59fb774e3fdde4c23
diff --git a/metadata/md5-cache/dev-php/sebastian-object-enumerator-3.0.3 b/metadata/md5-cache/dev-php/sebastian-object-enumerator-3.0.3
deleted file mode 100644
index 93ab06dc3aba..000000000000
--- a/metadata/md5-cache/dev-php/sebastian-object-enumerator-3.0.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Traverses array structures and object graphs to enumerate all referenced objects
-EAPI=7
-HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader <dev-php/sebastian-object-reflector-2.0 >=dev-php/sebastian-recursion-context-3.0 <dev-php/sebastian-recursion-context-4.0 =dev-lang/php-7*:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann//object-enumerator/archive/3.0.3.tar.gz -> sebastian-object-enumerator-3.0.3.tar.gz
-_md5_=a55b76d27dee6a6a7ddca71ecf93e615
diff --git a/metadata/md5-cache/dev-php/sebastian-object-reflector-1.1.1 b/metadata/md5-cache/dev-php/sebastian-object-reflector-1.1.1
deleted file mode 100644
index 3d1a4c1ab38d..000000000000
--- a/metadata/md5-cache/dev-php/sebastian-object-reflector-1.1.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Allows reflection of object attributes, including inherited and non-public ones
-EAPI=7
-HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader =dev-lang/php-7*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann/object-reflector/archive/1.1.1.tar.gz -> sebastian-object-reflector-1.1.1.tar.gz
-_md5_=eaa2e98cbe6f1703ba63e6c0ebda1647
diff --git a/metadata/md5-cache/dev-php/sebastian-object-reflector-1.1.2 b/metadata/md5-cache/dev-php/sebastian-object-reflector-1.1.2
deleted file mode 100644
index c72f9ed8677c..000000000000
--- a/metadata/md5-cache/dev-php/sebastian-object-reflector-1.1.2
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=dev-php/theseer-Autoload
-DEFINED_PHASES=install prepare
-DESCRIPTION=Allows reflection of object attributes, including inherited and non-public ones
-EAPI=7
-HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-7.1:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann/object-reflector/archive/1.1.2.tar.gz -> sebastian-object-reflector-1.1.2.tar.gz
-_md5_=beaba8c9f57b6596026385dc71fb4aac
diff --git a/metadata/md5-cache/dev-php/sebastian-object-reflector-2.0.4 b/metadata/md5-cache/dev-php/sebastian-object-reflector-2.0.4
deleted file mode 100644
index 0a110ba5b354..000000000000
--- a/metadata/md5-cache/dev-php/sebastian-object-reflector-2.0.4
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=dev-php/theseer-Autoload
-DEFINED_PHASES=install prepare
-DESCRIPTION=Allows reflection of object attributes, including inherited and non-public ones
-EAPI=7
-HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-7.3:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann/object-reflector/archive/2.0.4.tar.gz -> sebastian-object-reflector-2.0.4.tar.gz
-_md5_=b8a22445deb8eb4a31e4855875364e7c
diff --git a/metadata/md5-cache/dev-php/sebastian-recursion-context-2.0.0 b/metadata/md5-cache/dev-php/sebastian-recursion-context-2.0.0
deleted file mode 100644
index b190f80327ee..000000000000
--- a/metadata/md5-cache/dev-php/sebastian-recursion-context-2.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Recursively process PHP variables
-EAPI=6
-HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann//recursion-context/archive/2.0.0.tar.gz -> sebastian-recursion-context-2.0.0.tar.gz
-_md5_=5ee87fb4c1b7ad362010967cb350ca3a
diff --git a/metadata/md5-cache/dev-php/sebastian-recursion-context-3.0.0 b/metadata/md5-cache/dev-php/sebastian-recursion-context-3.0.0
deleted file mode 100644
index 1bab04237aca..000000000000
--- a/metadata/md5-cache/dev-php/sebastian-recursion-context-3.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Recursively process PHP variables
-EAPI=7
-HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader =dev-lang/php-7*:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann//recursion-context/archive/3.0.0.tar.gz -> sebastian-recursion-context-3.0.0.tar.gz
-_md5_=7d4beb8739bbf676efa5388f3e11f078
diff --git a/metadata/md5-cache/dev-php/snuffleupagus-0.8.3 b/metadata/md5-cache/dev-php/snuffleupagus-0.8.3
index 023d139d3db1..82f42425ce30 100644
--- a/metadata/md5-cache/dev-php/snuffleupagus-0.8.3
+++ b/metadata/md5-cache/dev-php/snuffleupagus-0.8.3
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[session(+)] ) php_targets_php8-0? ( dev-lang/php:8.0[session(+)] ) php_targets_php8-1? ( dev-lang/php:8.1[session(+)] )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0[session(+)] ) php_targets_php8-1? ( dev-lang/php:8.1[session(+)] )
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4[session(+)] ) php_targets_php8-0? ( dev-lang/php:8.0[session(+)] ) php_targets_php8-1? ( dev-lang/php:8.1[session(+)] )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0[session(+)] ) php_targets_php8-1? ( dev-lang/php:8.1[session(+)] )
 DESCRIPTION=A PHP module to drastically raise the cost of attacks against websites
 EAPI=8
 HOMEPAGE=https://snuffleupagus.readthedocs.io/index.html
 INHERIT=php-ext-source-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64
 LICENSE=LGPL-3 PHP-3.01
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4[session(+)] ) php_targets_php8-0? ( dev-lang/php:8.0[session(+)] ) php_targets_php8-1? ( dev-lang/php:8.1[session(+)] )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0[session(+)] ) php_targets_php8-1? ( dev-lang/php:8.1[session(+)] )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=https://github.com/jvoisin/snuffleupagus/archive/refs/tags/v0.8.3.tar.gz -> snuffleupagus-0.8.3.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=c803d1dd7345c5121aeed65f593da6df
+_md5_=d900fee3bfb11a09660e1dbb7a3e4689
diff --git a/metadata/md5-cache/dev-php/swoole-4.8.7 b/metadata/md5-cache/dev-php/swoole-4.8.7
index 786db42b454c..105fba610266 100644
--- a/metadata/md5-cache/dev-php/swoole-4.8.7
+++ b/metadata/md5-cache/dev-php/swoole-4.8.7
@@ -1,17 +1,17 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[cli,sockets?] ) php_targets_php8-0? ( dev-lang/php:8.0[cli,sockets?] ) php_targets_php8-1? ( dev-lang/php:8.1[cli,sockets?] )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0[cli,sockets?] ) php_targets_php8-1? ( dev-lang/php:8.1[cli,sockets?] )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/brotli:0= dev-libs/libpcre sys-libs/zlib:0= ssl? ( dev-libs/openssl:0= ) mysql? ( php_targets_php7-4? ( dev-lang/php:7.4[mysql,mysqli(+)] ) php_targets_php8-0? ( dev-lang/php:8.0[mysql,mysqli(+)] ) php_targets_php8-1? ( dev-lang/php:8.1[mysql,mysqli(+)] ) ) php_targets_php7-4? ( dev-lang/php:7.4[cli,sockets?] ) php_targets_php8-0? ( dev-lang/php:8.0[cli,sockets?] ) php_targets_php8-1? ( dev-lang/php:8.1[cli,sockets?] )
+DEPEND=app-arch/brotli:0= dev-libs/libpcre sys-libs/zlib:0= ssl? ( dev-libs/openssl:0= ) mysql? ( php_targets_php8-0? ( dev-lang/php:8.0[mysql,mysqli(+)] ) php_targets_php8-1? ( dev-lang/php:8.1[mysql,mysqli(+)] ) ) php_targets_php8-0? ( dev-lang/php:8.0[cli,sockets?] ) php_targets_php8-1? ( dev-lang/php:8.1[cli,sockets?] )
 DESCRIPTION=Event-driven asynchronous & concurrent & coroutine networking engine
 EAPI=8
 HOMEPAGE=https://www.swoole.co.uk
 INHERIT=php-ext-pecl-r3
-IUSE=debug http2 mysql sockets ssl php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=debug http2 mysql sockets ssl php_targets_php8-0 php_targets_php8-1
 KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=app-arch/brotli:0= dev-libs/libpcre sys-libs/zlib:0= ssl? ( dev-libs/openssl:0= ) mysql? ( php_targets_php7-4? ( dev-lang/php:7.4[mysql,mysqli(+)] ) php_targets_php8-0? ( dev-lang/php:8.0[mysql,mysqli(+)] ) php_targets_php8-1? ( dev-lang/php:8.1[mysql,mysqli(+)] ) ) php_targets_php7-4? ( dev-lang/php:7.4[cli,sockets?] ) php_targets_php8-0? ( dev-lang/php:8.0[cli,sockets?] ) php_targets_php8-1? ( dev-lang/php:8.1[cli,sockets?] )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=app-arch/brotli:0= dev-libs/libpcre sys-libs/zlib:0= ssl? ( dev-libs/openssl:0= ) mysql? ( php_targets_php8-0? ( dev-lang/php:8.0[mysql,mysqli(+)] ) php_targets_php8-1? ( dev-lang/php:8.1[mysql,mysqli(+)] ) ) php_targets_php8-0? ( dev-lang/php:8.0[cli,sockets?] ) php_targets_php8-1? ( dev-lang/php:8.1[cli,sockets?] )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pecl.php.net/get/swoole-4.8.7.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=decde0183550afa1c878989daa4b6b0f
+_md5_=465d336fe5f4433a78758f319d025e60
diff --git a/metadata/md5-cache/dev-php/swoole-async-4.4.16-r1 b/metadata/md5-cache/dev-php/swoole-async-4.4.16-r1
deleted file mode 100644
index cf2500d5c170..000000000000
--- a/metadata/md5-cache/dev-php/swoole-async-4.4.16-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-php/swoole-4.4.16[php_targets_php7-4(-)?] php_targets_php7-4? ( dev-lang/php:7.4 )
-DESCRIPTION=An extension of Swoole, including the async callback style API
-EAPI=7
-HOMEPAGE=https://www.swoole.co.uk
-INHERIT=php-ext-pecl-r3
-IUSE=debug php_targets_php7-4
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=~dev-php/swoole-4.4.16[php_targets_php7-4(-)?] php_targets_php7-4? ( dev-lang/php:7.4 )
-REQUIRED_USE=|| ( php_targets_php7-4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/swoole/ext-async/archive/v4.4.16.tar.gz -> swoole-async-4.4.16.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=3ae8df826dd3fd1a023c1fddbb854bee
diff --git a/metadata/md5-cache/dev-php/xdebug-3.1.1 b/metadata/md5-cache/dev-php/xdebug-3.1.1
index 3b286613c62c..f660439c374e 100644
--- a/metadata/md5-cache/dev-php/xdebug-3.1.1
+++ b/metadata/md5-cache/dev-php/xdebug-3.1.1
@@ -1,17 +1,17 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[-threads(-)] ) php_targets_php8-0? ( dev-lang/php:8.0[-threads(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[-threads(-)] )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0[-threads(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[-threads(-)] )
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4[-threads(-)] ) php_targets_php8-0? ( dev-lang/php:8.0[-threads(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[-threads(-)] )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0[-threads(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[-threads(-)] )
 DESCRIPTION=A PHP debugging and profiling extension
 EAPI=7
 HOMEPAGE=https://xdebug.org/
 INHERIT=php-ext-source-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=amd64 ~hppa ppc ppc64 x86
 LICENSE=Xdebug
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4[-threads(-)] ) php_targets_php8-0? ( dev-lang/php:8.0[-threads(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[-threads(-)] )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0[-threads(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[-threads(-)] )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/xdebug/xdebug/archive/3.1.1.tar.gz -> xdebug-3.1.1.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=a4959333dd04078d76a306176f10c03f
+_md5_=34414eacc1ef4b4b40ae26933ab88b3e
diff --git a/metadata/md5-cache/dev-php/xdebug-3.1.3 b/metadata/md5-cache/dev-php/xdebug-3.1.3
index d0e0d5661579..4e137e724dfd 100644
--- a/metadata/md5-cache/dev-php/xdebug-3.1.3
+++ b/metadata/md5-cache/dev-php/xdebug-3.1.3
@@ -1,17 +1,17 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[-threads(-)] ) php_targets_php8-0? ( dev-lang/php:8.0[-threads(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[-threads(-)] )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0[-threads(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[-threads(-)] )
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4[-threads(-)] ) php_targets_php8-0? ( dev-lang/php:8.0[-threads(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[-threads(-)] )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0[-threads(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[-threads(-)] )
 DESCRIPTION=A PHP debugging and profiling extension
 EAPI=7
 HOMEPAGE=https://xdebug.org/
 INHERIT=php-ext-source-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64 ~hppa ~ppc ppc64 x86
 LICENSE=Xdebug
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4[-threads(-)] ) php_targets_php8-0? ( dev-lang/php:8.0[-threads(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[-threads(-)] )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0[-threads(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[-threads(-)] )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/xdebug/xdebug/archive/3.1.3.tar.gz -> xdebug-3.1.3.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=6ae655e2722a81eb7309bede7069d872
+_md5_=415b36aeb1fdfef8dfe4bad9e197a172
diff --git a/metadata/md5-cache/dev-php/xdebug-3.1.5 b/metadata/md5-cache/dev-php/xdebug-3.1.5
index b48d608e3e76..a6400ea839e9 100644
--- a/metadata/md5-cache/dev-php/xdebug-3.1.5
+++ b/metadata/md5-cache/dev-php/xdebug-3.1.5
@@ -1,17 +1,17 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[-threads(-)] ) php_targets_php8-0? ( dev-lang/php:8.0[-threads(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[-threads(-)] )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0[-threads(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[-threads(-)] )
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4[-threads(-)] ) php_targets_php8-0? ( dev-lang/php:8.0[-threads(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[-threads(-)] )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0[-threads(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[-threads(-)] )
 DESCRIPTION=A PHP debugging and profiling extension
 EAPI=8
 HOMEPAGE=https://xdebug.org/
 INHERIT=php-ext-source-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=Xdebug
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4[-threads(-)] ) php_targets_php8-0? ( dev-lang/php:8.0[-threads(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[-threads(-)] )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0[-threads(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[-threads(-)] )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/xdebug/xdebug/archive/3.1.5.tar.gz -> xdebug-3.1.5.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=954525a38c3615c50d7684e929868ba9
+_md5_=24110af9d516af7fc414fc558bb90dd9
diff --git a/metadata/md5-cache/dev-php/xhprof-2.3.5 b/metadata/md5-cache/dev-php/xhprof-2.3.5
index 2b2edb9aac55..3cf57e967a57 100644
--- a/metadata/md5-cache/dev-php/xhprof-2.3.5
+++ b/metadata/md5-cache/dev-php/xhprof-2.3.5
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=A Hierarchical Profiler for PHP
 EAPI=7
 HOMEPAGE=https://pecl.php.net/package/xhprof
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/xhprof-2.3.5.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=3427555771f358bd656cea66173784ba
+_md5_=fa61aafc9572961df4dc7c3df3d26ed2
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 553923e2e201..77caa76dfbd5 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/PyQt6-6.5.2 b/metadata/md5-cache/dev-python/PyQt6-6.5.2
index 845bd1e44b48..997372753921 100644
--- a/metadata/md5-cache/dev-python/PyQt6-6.5.2
+++ b/metadata/md5-cache/dev-python/PyQt6-6.5.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/
 INHERIT=distutils-r1 flag-o-matic multiprocessing pypi qmake-utils
 IUSE=bluetooth +dbus debug designer examples gles2-only +gui help multimedia +network nfc opengl positioning +printsupport qml quick quick3d serialport sensors spatialaudio speech +sql +ssl svg testlib webchannel websockets +widgets +xml python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3
 RDEPEND=>=dev-qt/qtbase-6.5:6=[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml?] bluetooth? ( >=dev-qt/qtconnectivity-6.5:6[bluetooth] ) dbus? ( dev-python/dbus-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sys-apps/dbus ) designer? ( >=dev-qt/qttools-6.5:6[designer] ) help? ( >=dev-qt/qttools-6.5:6[assistant] ) multimedia? ( >=dev-qt/qtmultimedia-6.5:6 ) nfc? ( >=dev-qt/qtconnectivity-6.5:6[nfc] ) opengl? ( gles2-only? ( media-libs/libglvnd ) ) positioning? ( >=dev-qt/qtpositioning-6.5:6 ) qml? ( >=dev-qt/qtdeclarative-6.5:6 ) quick3d? ( >=dev-qt/qtquick3d-6.5:6 ) sensors? ( >=dev-qt/qtsensors-6.5:6 ) serialport? ( >=dev-qt/qtserialport-6.5:6 ) speech? ( >=dev-qt/qtspeech-6.5:6 ) svg? ( >=dev-qt/qtsvg-6.5:6 ) webchannel? ( >=dev-qt/qtwebchannel-6.5:6 ) websockets? ( >=dev-qt/qtwebsockets-6.5:6 ) >=dev-python/PyQt6-sip-13.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=designer? ( gui widgets ) help? ( gui widgets ) multimedia? ( gui network ) opengl? ( gui ) printsupport? ( gui widgets ) qml? ( network ) quick3d? ( gui qml ) quick? ( gui qml ) spatialaudio? ( multimedia ) sql? ( widgets ) svg? ( gui ) testlib? ( gui widgets ) webchannel? ( network ) websockets? ( network ) widgets? ( gui ) || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/P/PyQt6/PyQt6-6.5.2.tar.gz
 _eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=81b27b101e5cc898024a62451bc4fdaa
+_md5_=ea3862d639f8763279b9ed3e19c4b2f8
diff --git a/metadata/md5-cache/dev-python/PyQt6-WebEngine-6.5.0 b/metadata/md5-cache/dev-python/PyQt6-WebEngine-6.5.0
index 2fb4a4ecb992..ef2ddaf325a5 100644
--- a/metadata/md5-cache/dev-python/PyQt6-WebEngine-6.5.0
+++ b/metadata/md5-cache/dev-python/PyQt6-WebEngine-6.5.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqtwebengine/
 INHERIT=distutils-r1 flag-o-matic multiprocessing pypi qmake-utils
 IUSE=debug quick +widgets python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3
 RDEPEND=>=dev-python/PyQt6-6.5.0[gui,ssl,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-qt/qtbase-6.5:6= >=dev-qt/qtwebengine-6.5:6[widgets] quick? ( dev-python/PyQt6[qml] ) widgets? ( dev-python/PyQt6[network,printsupport,webchannel,widgets] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/P/PyQt6_WebEngine/PyQt6_WebEngine-6.5.0.tar.gz
 _eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=c72a3d05a18e65559d95809cbf567fb1
+_md5_=456acc380ed2929ec30999b0916f1486
diff --git a/metadata/md5-cache/dev-python/PyQt6-sip-13.5.2 b/metadata/md5-cache/dev-python/PyQt6-sip-13.5.2
index 97d8b4d5b635..d24ea03294da 100644
--- a/metadata/md5-cache/dev-python/PyQt6-sip-13.5.2
+++ b/metadata/md5-cache/dev-python/PyQt6-sip-13.5.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.riverbankcomputing.com/software/sip/
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 SIP )
 RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/P/PyQt6_sip/PyQt6_sip-13.5.2.tar.gz
 _eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=ff87d1100908087dc435cf4637aa08ed
+_md5_=3a55ba728604b73865e4354b6aa911eb
diff --git a/metadata/md5-cache/dev-python/ansible-runner-2.2.1 b/metadata/md5-cache/dev-python/ansible-runner-2.2.1
deleted file mode 100644
index a56b16e65a3d..000000000000
--- a/metadata/md5-cache/dev-python/ansible-runner-2.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/pexpect[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-daemon[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A tool and python library that helps when interfacing with Ansible
-EAPI=8
-HOMEPAGE=https://github.com/ansible/ansible-runner
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/pexpect[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-daemon[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/a/ansible-runner/ansible-runner-2.2.1.tar.gz
-_eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=8773259941e0208b85c1584fb4c4313b
diff --git a/metadata/md5-cache/dev-python/boto3-1.28.48 b/metadata/md5-cache/dev-python/boto3-1.28.48
new file mode 100644
index 000000000000..e223d5824ae9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.28.48
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.31.48[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+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=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.31.48[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.28.48.tar.gz -> boto3-1.28.48.gh.tar.gz
+_eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=b00f633e18ee837367fca0ef11fac03c
diff --git a/metadata/md5-cache/dev-python/botocore-1.31.48 b/metadata/md5-cache/dev-python/botocore-1.31.48
new file mode 100644
index 000000000000..95e1a4e2686c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.31.48
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+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=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/botocore/archive/1.31.48.tar.gz -> botocore-1.31.48.gh.tar.gz
+_eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=a7ced2e7cc030cae76a19171103bdc35
diff --git a/metadata/md5-cache/dev-python/cx_Freeze-6.14.5 b/metadata/md5-cache/dev-python/cx_Freeze-6.14.5
deleted file mode 100644
index 882d5b27fa25..000000000000
--- a/metadata/md5-cache/dev-python/cx_Freeze-6.14.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/bcrypt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/openpyxl[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pydantic[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/importlib-metadata[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/patchelf virtual/libcrypt:= >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Create standalone executables from Python scripts
-EAPI=8
-HOMEPAGE=https://cx-freeze.readthedocs.io/ https://github.com/marcelotduarte/cx_Freeze/ https://pypi.org/project/cx-Freeze/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
-LICENSE=PYTHON
-RDEPEND=dev-python/importlib-metadata[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/patchelf virtual/libcrypt:= python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/marcelotduarte/cx_Freeze/archive/6.14.5.tar.gz -> cx_Freeze-6.14.5.gh.tar.gz
-_eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=9f55c5fe31ef2469081343adb64406cb
diff --git a/metadata/md5-cache/dev-python/cx_Freeze-6.15.1 b/metadata/md5-cache/dev-python/cx_Freeze-6.15.1
deleted file mode 100644
index b9c490c851a5..000000000000
--- a/metadata/md5-cache/dev-python/cx_Freeze-6.15.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( app-arch/rpm dev-python/bcrypt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/openpyxl[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pydantic[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-util/patchelf virtual/libcrypt:= >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Create standalone executables from Python scripts
-EAPI=8
-HOMEPAGE=https://cx-freeze.readthedocs.io/ https://github.com/marcelotduarte/cx_Freeze/ https://pypi.org/project/cx-Freeze/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~x86
-LICENSE=PYTHON
-RDEPEND=dev-util/patchelf virtual/libcrypt:= python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/marcelotduarte/cx_Freeze/archive/6.15.1.tar.gz -> cx_Freeze-6.15.1.gh.tar.gz
-_eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=64047958cdae2c46762cc417b78b6c89
diff --git a/metadata/md5-cache/dev-python/cx_Freeze-6.15.2 b/metadata/md5-cache/dev-python/cx_Freeze-6.15.2
deleted file mode 100644
index fdade7c7a04f..000000000000
--- a/metadata/md5-cache/dev-python/cx_Freeze-6.15.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( app-arch/rpm dev-python/bcrypt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/openpyxl[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pydantic[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-datafiles[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-util/patchelf virtual/libcrypt:= >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Create standalone executables from Python scripts
-EAPI=8
-HOMEPAGE=https://cx-freeze.readthedocs.io/ https://github.com/marcelotduarte/cx_Freeze/ https://pypi.org/project/cx-Freeze/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=PYTHON
-RDEPEND=dev-util/patchelf virtual/libcrypt:= python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/marcelotduarte/cx_Freeze/archive/6.15.2.tar.gz -> cx_Freeze-6.15.2.gh.tar.gz
-_eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=38a78d13ae8a37c408f038b5540f0870
diff --git a/metadata/md5-cache/dev-python/frozenlist-1.4.0 b/metadata/md5-cache/dev-python/frozenlist-1.4.0
index 7641dad6838a..28c7281d0636 100644
--- a/metadata/md5-cache/dev-python/frozenlist-1.4.0
+++ b/metadata/md5-cache/dev-python/frozenlist-1.4.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/frozenlist/ https://github.com/aio-libs/frozenlist/
 INHERIT=distutils-r1
 IUSE=+native-extensions test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-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=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/frozenlist/archive/v1.4.0.tar.gz -> frozenlist-1.4.0.gh.tar.gz
 _eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=a89b42328d35d327092c4c4ff7954b6f
+_md5_=d37a3c7c7e5d36f789b3541b27d0590d
diff --git a/metadata/md5-cache/dev-python/jupyterlab-4.0.6 b/metadata/md5-cache/dev-python/jupyterlab-4.0.6
new file mode 100644
index 000000000000..2f5d4f71436c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyterlab-4.0.6
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/hatch-jupyter-builder[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-console-scripts[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-jupyter-0.5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-tornasync[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-cache[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/async-lru[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-core[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-lsp-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-2.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyterlab-server-2.19[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyterlab-server-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/notebook-shim-0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-libs/nodejs >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DESCRIPTION=JupyterLab computational environment
+EAPI=8
+HOMEPAGE=https://jupyter.org/ https://github.com/jupyterlab/jupyterlab/ https://pypi.org/project/jupyterlab/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=distutils-r1 pypi xdg
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=BSD MIT GPL-3 Apache-2.0
+RDEPEND=dev-python/async-lru[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-core[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-lsp-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-2.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyterlab-server-2.19[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyterlab-server-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/notebook-shim-0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-libs/nodejs python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyterlab/jupyterlab-4.0.6.tar.gz
+_eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=cf18ef859a07ead327f097d0f97f0efe
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-5.2.0 b/metadata/md5-cache/dev-python/python-keystoneclient-5.2.0
new file mode 100644
index 000000000000..045db1dd2c70
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-keystoneclient-5.2.0
@@ -0,0 +1,16 @@
+BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oauthlib-0.6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/os-client-config-1.28.0 >=dev-python/oslotest-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tempest-17.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testresources-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/keystoneauth1-3.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/oslo-serialization-2.19.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.14.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Client Library for OpenStack Identity
+EAPI=8
+HOMEPAGE=https://opendev.org/openstack/python-keystoneclient/ https://github.com/openstack/python-keystoneclient/ https://pypi.org/project/python-keystoneclient/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/keystoneauth1-3.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/oslo-serialization-2.19.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.14.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-keystoneclient/python-keystoneclient-5.2.0.tar.gz
+_eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=6e3c5f2c7911fd25fd7774bff8f0c426
diff --git a/metadata/md5-cache/dev-python/stripe-6.5.0 b/metadata/md5-cache/dev-python/stripe-6.5.0
new file mode 100644
index 000000000000..defcab35c3fa
--- /dev/null
+++ b/metadata/md5-cache/dev-python/stripe-6.5.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-util/stripe-mock-0.175.0 dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] net-misc/curl ) test? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/typing-extensions-4.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Stripe python bindings
+EAPI=8
+HOMEPAGE=https://github.com/stripe/stripe-python/ https://pypi.org/project/stripe/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/typing-extensions-4.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/s/stripe/stripe-6.5.0.tar.gz
+_eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=8d2763774da749720a8f6c33a07de2ab
diff --git a/metadata/md5-cache/dev-python/tikzplotlib-0.10.1-r1 b/metadata/md5-cache/dev-python/tikzplotlib-0.10.1-r1
deleted file mode 100644
index 8f76307de171..000000000000
--- a/metadata/md5-cache/dev-python/tikzplotlib-0.10.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pandas[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-codeblocks[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( app-text/texlive[extra] <dev-python/matplotlib-3.6.0[latex,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/webcolors[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( dev-lang/python:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/mock[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit-core-3.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Convert matplotlib figures into TikZ/PGFPlots
-EAPI=8
-HOMEPAGE=https://github.com/texworld/tikzplotlib/ https://pypi.org/project/tikzplotlib/
-INHERIT=distutils-r1 virtualx
-IUSE=test doc python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-text/texlive[extra] <dev-python/matplotlib-3.6.0[latex,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/webcolors[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/texworld/tikzplotlib/archive/v0.10.1.tar.gz -> tikzplotlib-0.10.1.gh.tar.gz
-_eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca	virtualx	817571665ee28575da44ee08135089e5
-_md5_=8b942d94475773e926d98290d54cb7ef
diff --git a/metadata/md5-cache/dev-python/vncdotool-0.13.0-r1 b/metadata/md5-cache/dev-python/vncdotool-0.13.0-r1
deleted file mode 100644
index d93cd2ec1b65..000000000000
--- a/metadata/md5-cache/dev-python/vncdotool-0.13.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pluggy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ptyprocess[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/py[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tox[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/twisted[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-interface[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( dev-lang/python:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Command line VNC client
-EAPI=8
-HOMEPAGE=https://github.com/sibson/vncdotool
-INHERIT=distutils-r1
-IUSE=test doc python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=MIT
-RDEPEND=dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/twisted[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-interface[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sibson/vncdotool/archive/v0.13.0.tar.gz -> vncdotool-0.13.0.tar.gz
-_eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=d9b78b72289373eea22ba9be0b4685f5
diff --git a/metadata/md5-cache/dev-python/vncdotool-1.0.0-r1 b/metadata/md5-cache/dev-python/vncdotool-1.0.0-r1
deleted file mode 100644
index 6a73f4b64c04..000000000000
--- a/metadata/md5-cache/dev-python/vncdotool-1.0.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pluggy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ptyprocess[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/py[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tox[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/twisted[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-interface[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( dev-lang/python:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Command line VNC client
-EAPI=8
-HOMEPAGE=https://github.com/sibson/vncdotool
-INHERIT=distutils-r1
-IUSE=test doc python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/twisted[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-interface[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sibson/vncdotool/archive/v1.0.0.tar.gz -> vncdotool-1.0.0.tar.gz
-_eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=dcbe1e2baf912137247aec7fa13254e9
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index ea977c7cc41d..b93294274b03 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qt-docs-6.5.2_p202307080352 b/metadata/md5-cache/dev-qt/qt-docs-6.5.2_p202307080352
index 717ee2a3102b..404fd0ad831a 100644
--- a/metadata/md5-cache/dev-qt/qt-docs-6.5.2_p202307080352
+++ b/metadata/md5-cache/dev-qt/qt-docs-6.5.2_p202307080352
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://doc.qt.io/
 INHERIT=unpacker
 IUSE=+examples +html +qch +tools +quick3d +webchannel grpc +3d +qt5compat +imageformats +multimedia lottie +networkauth +sensors +speech quick3dphysics webview +connectivity +webengine +positioning activeqt +charts +declarative +svg remoteobjects httpserver +websockets +serialport datavis serialbus +wayland +shadertools +timeline +virtualkeyboard +scxml +location
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=FDL-1.3
 REQUIRED_USE=|| ( examples html qch )
 SLOT=6
 SRC_URI=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qmake-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtcmake-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtconcurrent-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtcore-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtdbus-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtgui-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtnetwork-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtopengl-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtplatformintegration-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtprintsupport-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtsql-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qttestlib-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtwidgets-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtxml-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples/6.5.2-0-202307080352qtbase-examples-6.5.2.7z ) 3d? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qt3d/6.5.2-0-202307080352qt3d-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qt3d/6.5.2-0-202307080352qt3d-examples-6.5.2.7z ) ) activeqt? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtactiveqt/6.5.2-0-202307080352activeqt-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtactiveqt/6.5.2-0-202307080352qtactiveqt-examples-6.5.2.7z ) ) charts? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtcharts/6.5.2-0-202307080352qtcharts-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtcharts/6.5.2-0-202307080352qtcharts-examples-6.5.2.7z ) ) connectivity? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtbluetooth/6.5.2-0-202307080352qtbluetooth-documentation.tar.xz ) connectivity? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtbluetooth/6.5.2-0-202307080352qtbluetooth-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtconnectivity/6.5.2-0-202307080352qtconnectivity-examples-6.5.2.7z ) ) connectivity? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtnfc/6.5.2-0-202307080352qtnfc-documentation.tar.xz ) datavis? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtdatavis3d/6.5.2-0-202307080352qtdatavis3d-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtdatavis3d/6.5.2-0-202307080352qtdatavis3d-examples-6.5.2.7z ) ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtlabsplatform-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtqml-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtqmlcore-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtqmlmodels-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtqmltest-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtqmlworkerscript-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtqmlxmllistmodel-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtquick-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtquickcontrols-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtquickdialogs-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples/6.5.2-0-202307080352qtdeclarative-examples-6.5.2.7z ) ) https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtdoc-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples/6.5.2-0-202307080352qtdoc-examples-6.5.2.7z ) grpc? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtgrpc/6.5.2-0-202307080352qtprotobuf-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtgrpc/6.5.2-0-202307080352qtgrpc-examples-6.5.2.7z ) ) httpserver? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qthttpserver/6.5.2-0-202307080352qthttpserver-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qthttpserver/6.5.2-0-202307080352qthttpserver-examples-6.5.2.7z ) ) imageformats? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtimageformats/6.5.2-0-202307080352qtimageformats-documentation.tar.xz ) location? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtlocation/6.5.2-0-202307080352qtlocation-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtlocation/6.5.2-0-202307080352qtlocation-examples-6.5.2.7z ) ) lottie? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtlottie/6.5.2-0-202307080352qtlottieanimation-documentation.tar.xz ) multimedia? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtmultimedia/6.5.2-0-202307080352qtmultimedia-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtmultimedia/6.5.2-0-202307080352qtmultimedia-examples-6.5.2.7z ) ) networkauth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtnetworkauth/6.5.2-0-202307080352qtnetworkauth-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtnetworkauth/6.5.2-0-202307080352qtnetworkauth-examples-6.5.2.7z ) ) positioning? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtpositioning/6.5.2-0-202307080352qtpositioning-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtpositioning/6.5.2-0-202307080352qtpositioning-examples-6.5.2.7z ) ) qt5compat? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qt5compat/6.5.2-0-202307080352qtcore5compat-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qt5compat/6.5.2-0-202307080352qtgraphicaleffects5compat-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qt5compat/6.5.2-0-202307080352qt5compat-examples-6.5.2.7z ) ) quick3dphysics? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtquick3dphysics/6.5.2-0-202307080352qtquick3dphysics-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtquick3dphysics/6.5.2-0-202307080352qtquick3dphysics-examples-6.5.2.7z ) ) quick3d? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtquick3d/6.5.2-0-202307080352qtquick3d-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtquick3d/6.5.2-0-202307080352qtquick3d-examples-6.5.2.7z ) ) remoteobjects? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtremoteobjects/6.5.2-0-202307080352qtremoteobjects-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtremoteobjects/6.5.2-0-202307080352qtremoteobjects-examples-6.5.2.7z ) ) scxml? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtscxml/6.5.2-0-202307080352qtscxml-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtscxml/6.5.2-0-202307080352qtscxml-examples-6.5.2.7z ) ) sensors? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtsensors/6.5.2-0-202307080352qtsensors-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtsensors/6.5.2-0-202307080352qtsensors-examples-6.5.2.7z ) ) serialbus? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtserialbus/6.5.2-0-202307080352qtserialbus-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtserialbus/6.5.2-0-202307080352qtserialbus-examples-6.5.2.7z ) ) serialport? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtserialport/6.5.2-0-202307080352qtserialport-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtserialport/6.5.2-0-202307080352qtserialport-examples-6.5.2.7z ) ) shadertools? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtshadertools/6.5.2-0-202307080352qtshadertools-documentation.tar.xz ) speech? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtspeech/6.5.2-0-202307080352qttexttospeech-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtspeech/6.5.2-0-202307080352qtspeech-examples-6.5.2.7z ) ) svg? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtsvg-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples/6.5.2-0-202307080352qtsvg-examples-6.5.2.7z ) ) timeline? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtquicktimeline/6.5.2-0-202307080352qtquicktimeline-documentation.tar.xz ) tools? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qdoc-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtassistant-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtdesigner-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtdistancefieldgenerator-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qthelp-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtlinguist-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtuitools-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples/6.5.2-0-202307080352qttools-examples-6.5.2.7z ) ) virtualkeyboard? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtvirtualkeyboard/6.5.2-0-202307080352qtvirtualkeyboard-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtvirtualkeyboard/6.5.2-0-202307080352qtvirtualkeyboard-examples-6.5.2.7z ) ) wayland? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtwaylandcompositor-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples/6.5.2-0-202307080352qtwayland-examples-6.5.2.7z ) ) webchannel? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtwebchannel/6.5.2-0-202307080352qtwebchannel-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtwebchannel/6.5.2-0-202307080352qtwebchannel-examples-6.5.2.7z ) ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtpdf/6.5.2-0-202307080352qtpdf-documentation.tar.xz ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtwebengine/6.5.2-0-202307080352qtwebengine-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtwebengine/6.5.2-0-202307080352qtwebengine-examples-6.5.2.7z ) ) websockets? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtwebsockets/6.5.2-0-202307080352qtwebsockets-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtwebsockets/6.5.2-0-202307080352qtwebsockets-examples-6.5.2.7z ) ) webview? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtwebview/6.5.2-0-202307080352qtwebview-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtwebview/6.5.2-0-202307080352qtwebview-examples-6.5.2.7z ) )
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca	unpacker	aa6a4e924009232d8b78b31e932c30b5
-_md5_=a66c5b269786023d44a6e688d8abcc92
+_md5_=49ec5d1475d02dc5c977abe356873c8c
diff --git a/metadata/md5-cache/dev-qt/qt3d-6.5.2-r1 b/metadata/md5-cache/dev-qt/qt3d-6.5.2-r1
index 29de4294cb62..fc47b101fe9e 100644
--- a/metadata/md5-cache/dev-qt/qt3d-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qt3d-6.5.2-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=gles2-only qml vulkan test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.5.2:6[concurrent,gles2-only=,gui,network,opengl,vulkan=] ~dev-qt/qtshadertools-6.5.2:6 media-libs/assimp:= qml? ( ~dev-qt/qtdeclarative-6.5.2:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qt3d-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e819c83623b317dc39622a13bd1f0ad1
+_md5_=06705bd5a0398edd24e05bcc0454b8e3
diff --git a/metadata/md5-cache/dev-qt/qt5compat-6.5.2-r1 b/metadata/md5-cache/dev-qt/qt5compat-6.5.2-r1
index 74b17ba3d34d..649342dc50fa 100644
--- a/metadata/md5-cache/dev-qt/qt5compat-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qt5compat-6.5.2-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=icu qml test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.5.2:6[gui,icu=,network,xml] icu? ( dev-libs/icu:= ) qml? ( ~dev-qt/qtdeclarative-6.5.2:6 ~dev-qt/qtshadertools-6.5.2:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qt5compat-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7fa58c1c7fd8e3e0b3b2c12a723df1ec
+_md5_=d529e10263910a9363503cba0ff07624
diff --git a/metadata/md5-cache/dev-qt/qtbase-6.5.2-r2 b/metadata/md5-cache/dev-qt/qtbase-6.5.2-r2
index d51c3b9e95d6..1c12bb27092c 100644
--- a/metadata/md5-cache/dev-qt/qtbase-6.5.2-r2
+++ b/metadata/md5-cache/dev-qt/qtbase-6.5.2-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=flag-o-matic qt6-build toolchain-funcs
 IUSE=+X accessibility eglfs evdev gles2-only +libinput opengl tslib vulkan +widgets +ssl +udev zstd brotli gssapi libproxy sctp +concurrent +dbus +gui +network +sql +xml icu mysql oci8 odbc postgres +sqlite cups gtk nls wayland test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=nls? ( ~dev-qt/qttranslations-6.5.2:6 ) wayland? ( ~dev-qt/qtwayland-6.5.2:6 )
 RDEPEND=sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) dbus? ( sys-apps/dbus ) gui? ( media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:= x11-libs/libdrm x11-libs/libxkbcommon[X?] X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) accessibility? ( app-accessibility/at-spi2-core:2 ) eglfs? ( media-libs/mesa[gbm(+)] ) evdev? ( sys-libs/mtdev ) libinput? ( dev-libs/libinput:= ) opengl? ( media-libs/libglvnd[X?] ) tslib? ( x11-libs/tslib ) widgets? ( cups? ( net-print/cups ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango ) ) ) network? ( brotli? ( app-arch/brotli:= ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) ) sql? ( mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtbase-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b990aaa2db95e70d05c0dc3e947519c0
+_md5_=98ef1b2dda6dd3f611053cfa1586f42a
diff --git a/metadata/md5-cache/dev-qt/qtcharts-6.5.2-r1 b/metadata/md5-cache/dev-qt/qtcharts-6.5.2-r1
index 401d8d692dde..8c2655ba05ae 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qtcharts-6.5.2-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=gles2-only qml test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.5.2:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qtdeclarative-6.5.2:6[opengl] )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtcharts-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b1ff7fb48c687d933f12e0f5cc1fba17
+_md5_=ea2d8562d5340ec8117f4a9b68c19f73
diff --git a/metadata/md5-cache/dev-qt/qtconnectivity-6.5.2 b/metadata/md5-cache/dev-qt/qtconnectivity-6.5.2
index 892435cf8392..da5bc1ad748b 100644
--- a/metadata/md5-cache/dev-qt/qtconnectivity-6.5.2
+++ b/metadata/md5-cache/dev-qt/qtconnectivity-6.5.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=+bluetooth nfc smartcard test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.5.2:6[network] bluetooth? ( ~dev-qt/qtbase-6.5.2:6[dbus] net-wireless/bluez:= ) nfc? ( smartcard? ( sys-apps/pcsc-lite ) )
 REQUIRED_USE=|| ( bluetooth nfc )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtconnectivity-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2492a4fbb0880231ba31941a88359001
+_md5_=ba141ff238a45432deaebb7f818c0c0b
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-6.5.2-r1 b/metadata/md5-cache/dev-qt/qtdeclarative-6.5.2-r1
index d836cffd67e5..8f6030c56144 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-6.5.2-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=opengl +sql vulkan +widgets test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.5.2:6[network,opengl=,sql?,vulkan=,widgets=]
 RESTRICT=test !test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtdeclarative-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=92b125c3ded90f9ad92aaa29e76a3f73
+_md5_=ce2e46be8a279a8168601da96584e226
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-6.5.2 b/metadata/md5-cache/dev-qt/qtimageformats-6.5.2
index dea1aee7621b..ac8701514251 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-6.5.2
+++ b/metadata/md5-cache/dev-qt/qtimageformats-6.5.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=mng test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.5.2:6[gui] media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtimageformats-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f1ccd2dc6848f654ae8a4f80e30c1d20
+_md5_=ebc16f6e3de8467ba07fa2604bd9b62c
diff --git a/metadata/md5-cache/dev-qt/qtlocation-6.5.2-r1 b/metadata/md5-cache/dev-qt/qtlocation-6.5.2-r1
index 67dbbd6f0112..b4971a0a26bd 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qtlocation-6.5.2-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.5.2:6[network] ~dev-qt/qtdeclarative-6.5.2:6 ~dev-qt/qtpositioning-6.5.2:6[qml(+)]
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtlocation-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=38d040a524123c74252284cd00ec25be
+_md5_=7b95c93be40cdb187678f6e0ef838066
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-6.5.2-r1 b/metadata/md5-cache/dev-qt/qtmultimedia-6.5.2-r1
index ccfbe0d13840..f1819f7a512f 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-6.5.2-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=flag-o-matic qt6-build
 IUSE=+X alsa +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.5.2:6[gui,network,opengl=,vulkan=,widgets] alsa? ( media-libs/alsa-lib ) ffmpeg? ( ~dev-qt/qtbase-6.5.2:6[X=] media-video/ffmpeg:=[vaapi?] X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr ) vaapi? ( media-libs/libglvnd media-libs/libva:= ) ) gstreamer? ( dev-libs/glib:2 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0[X=,opengl?] media-libs/gstreamer:1.0 opengl? ( media-libs/libglvnd ) ) pulseaudio? ( media-libs/libpulse ) qml? ( ~dev-qt/qtdeclarative-6.5.2:6 ~dev-qt/qtquick3d-6.5.2:6 )
 REQUIRED_USE=|| ( ffmpeg gstreamer ) vaapi? ( ffmpeg ) test? ( qml )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtmultimedia-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5ae9e6fea5924918050a0f24a61a3c2a
+_md5_=0d2b00d0a74745fb46b0e61a592ef672
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-6.5.2-r1 b/metadata/md5-cache/dev-qt/qtnetworkauth-6.5.2-r1
index 1e0c9be11e28..8a4816493a3b 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-6.5.2-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.5.2:6[network]
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtnetworkauth-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=092cfc506ac81cf758ff21d590cab8d0
+_md5_=f0bae8abb8fdf45d056d305aa58f0cfa
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-6.5.2-r2 b/metadata/md5-cache/dev-qt/qtpositioning-6.5.2-r2
index 66637635865e..b4bf660354c8 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-6.5.2-r2
+++ b/metadata/md5-cache/dev-qt/qtpositioning-6.5.2-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=geoclue nmea +qml test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.5.2:6 geoclue? ( ~dev-qt/qtbase-6.5.2:6[dbus] ) nmea? ( ~dev-qt/qtbase-6.5.2:6[network] ~dev-qt/qtserialport-6.5.2:6 ) qml? ( ~dev-qt/qtdeclarative-6.5.2:6 ) geoclue? ( app-misc/geoclue:2.0 )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtpositioning-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=210a08fff081e0d2664f28f19f5bc3a4
+_md5_=ef095e2d155534281f396fad9261db76
diff --git a/metadata/md5-cache/dev-qt/qtquick3d-6.5.2-r1 b/metadata/md5-cache/dev-qt/qtquick3d-6.5.2-r1
index 779853028ff7..623ffa6dd711 100644
--- a/metadata/md5-cache/dev-qt/qtquick3d-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qtquick3d-6.5.2-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=opengl vulkan test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.5.2:6[concurrent,gui,opengl=,vulkan=,widgets] ~dev-qt/qtdeclarative-6.5.2:6 ~dev-qt/qtquicktimeline-6.5.2:6 ~dev-qt/qtshadertools-6.5.2:6 media-libs/assimp:= sys-libs/zlib:=
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtquick3d-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a7f424ec41cecbcf0dc383f563ef5418
+_md5_=4af9446e53240b137f977187052e8a72
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-6.5.2 b/metadata/md5-cache/dev-qt/qtquicktimeline-6.5.2
index 15770c6d22bc..2055806e314d 100644
--- a/metadata/md5-cache/dev-qt/qtquicktimeline-6.5.2
+++ b/metadata/md5-cache/dev-qt/qtquicktimeline-6.5.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.5.2:6 ~dev-qt/qtdeclarative-6.5.2:6
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtquicktimeline-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e368262fa5ab625118b788bbe9d39b52
+_md5_=456aec2882f12febf7eed052ce8abef6
diff --git a/metadata/md5-cache/dev-qt/qtscxml-6.5.2-r1 b/metadata/md5-cache/dev-qt/qtscxml-6.5.2-r1
index 381d09bf60e5..d8757eed6ffa 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qtscxml-6.5.2-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=qml test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.5.2:6[gui] qml? ( ~dev-qt/qtdeclarative-6.5.2:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtscxml-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1541e61c05caa2a6c7131789f860fa49
+_md5_=6e39bd2d3c5fe98979bbf48317b767ce
diff --git a/metadata/md5-cache/dev-qt/qtsensors-6.5.2 b/metadata/md5-cache/dev-qt/qtsensors-6.5.2
index 17f2e85030ad..4fb1a3d6916c 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-6.5.2
+++ b/metadata/md5-cache/dev-qt/qtsensors-6.5.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=qml test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.5.2:6[dbus] qml? ( ~dev-qt/qtdeclarative-6.5.2:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtsensors-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=43a1fabbed9a66b18f333b00f5ead6da
+_md5_=e08cb0a00ac714b0fbb78b5713ea05f8
diff --git a/metadata/md5-cache/dev-qt/qtserialport-6.5.2 b/metadata/md5-cache/dev-qt/qtserialport-6.5.2
index 8722576619b9..8bed94b094e7 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-6.5.2
+++ b/metadata/md5-cache/dev-qt/qtserialport-6.5.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.5.2:6 virtual/libudev:=
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtserialport-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4d9520c4bacf762d8b7b7991110e9040
+_md5_=50f7860b18fe435c484b070ededc0f5c
diff --git a/metadata/md5-cache/dev-qt/qtshadertools-6.5.2 b/metadata/md5-cache/dev-qt/qtshadertools-6.5.2
index c456c1542ae7..235d530ef654 100644
--- a/metadata/md5-cache/dev-qt/qtshadertools-6.5.2
+++ b/metadata/md5-cache/dev-qt/qtshadertools-6.5.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.5.2:6[gui]
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtshadertools-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=88b7c7ec2a3ccc23774fd1d3b214c45b
+_md5_=fb988f527c064f3824188c6b9633a862
diff --git a/metadata/md5-cache/dev-qt/qtspeech-6.5.2 b/metadata/md5-cache/dev-qt/qtspeech-6.5.2
index 6ba59af5f849..9b1d2a5a5b7e 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-6.5.2
+++ b/metadata/md5-cache/dev-qt/qtspeech-6.5.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=flite +speechd test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.5.2:6 ~dev-qt/qtdeclarative-6.5.2:6 flite? ( app-accessibility/flite ~dev-qt/qtmultimedia-6.5.2:6 ) speechd? ( app-accessibility/speech-dispatcher )
 REQUIRED_USE=|| ( flite speechd )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtspeech-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=954b554123cf1ec6c4956787eca66cd9
+_md5_=992fec7793d91d5b29b4ddb26ec85573
diff --git a/metadata/md5-cache/dev-qt/qtsvg-6.5.2 b/metadata/md5-cache/dev-qt/qtsvg-6.5.2
index 934031397179..94de2a92c658 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-6.5.2
+++ b/metadata/md5-cache/dev-qt/qtsvg-6.5.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.5.2:6[gui,widgets] sys-libs/zlib:=
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtsvg-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3036c837f5d24dbe40d2e008fb0a3b79
+_md5_=ba702f66e78dc79974c606da5477c716
diff --git a/metadata/md5-cache/dev-qt/qttools-6.5.2-r1 b/metadata/md5-cache/dev-qt/qttools-6.5.2-r1
index b3e05b69a15c..23b27f073f91 100644
--- a/metadata/md5-cache/dev-qt/qttools-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qttools-6.5.2-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=llvm optfeature qt6-build
 IUSE=assistant clang designer distancefieldgenerator gles2-only +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner qtdiag qtplugininfo vulkan +widgets test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.5.2:6[network,widgets?] assistant? ( ~dev-qt/qtbase-6.5.2:6[sql,sqlite] ) clang? ( <sys-devel/clang-18:= ) designer? ( ~dev-qt/qtbase-6.5.2:6[xml] ) qdbus? ( ~dev-qt/qtbase-6.5.2:6[dbus,xml] ) qml? ( ~dev-qt/qtdeclarative-6.5.2:6[widgets?] ) qtdiag? ( ~dev-qt/qtbase-6.5.2:6[gles2-only=,vulkan=] ) widgets? ( ~dev-qt/qtbase-6.5.2:6[opengl=] )
 REQUIRED_USE=assistant? ( widgets ) designer? ( qml widgets ) distancefieldgenerator? ( qml widgets ) pixeltool? ( widgets ) qdoc? ( clang )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qttools-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=73a9888c8101693a49d22c25eb0b6c5e
+_md5_=03382f8ce69385eb4f62c61e2dade5a4
diff --git a/metadata/md5-cache/dev-qt/qttranslations-6.5.2 b/metadata/md5-cache/dev-qt/qttranslations-6.5.2
index 943de97c909d..c7e0408df243 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-6.5.2
+++ b/metadata/md5-cache/dev-qt/qttranslations-6.5.2
@@ -5,9 +5,9 @@ DESCRIPTION=Translation files for the Qt6 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qttranslations-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9ec45dd8d7116befc61ece6dab1da29f
+_md5_=c3c54218c866950651bd6d854a7bf1f2
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.5.2 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.5.2
index 98a1ac3019bc..0d4b63a2bf47 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.5.2
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.5.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=+spell test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.5.2:6[gui] ~dev-qt/qtdeclarative-6.5.2:6 ~dev-qt/qtsvg-6.5.2:6 spell? ( app-text/hunspell:= )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2e0674f24b32e925078055f974d870ff
+_md5_=80db045a8107bf8a1e468ea46910b664
diff --git a/metadata/md5-cache/dev-qt/qtwayland-6.5.2-r3 b/metadata/md5-cache/dev-qt/qtwayland-6.5.2-r3
index 2ba668707522..359e101012e7 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-6.5.2-r3
+++ b/metadata/md5-cache/dev-qt/qtwayland-6.5.2-r3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=compositor qml vulkan test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/wayland ~dev-qt/qtbase-6.5.2:6[egl(+),gui,opengl,vulkan=] media-libs/libglvnd x11-libs/libxkbcommon compositor? ( qml? ( ~dev-qt/qtdeclarative-6.5.2:6 ) )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtwayland-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9004dcc146b78d02c0ed2cc621548a24
+_md5_=ebe84b04e4bac69c4ccb64981bc5ed61
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-6.5.2-r2 b/metadata/md5-cache/dev-qt/qtwebchannel-6.5.2-r2
index cf5f9412f1f4..a2cf12c4f9fd 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-6.5.2-r2
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-6.5.2-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=qml test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.5.2:6[concurrent] qml? ( ~dev-qt/qtdeclarative-6.5.2:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtwebchannel-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=be84afd79247b94b8fdbe0bd2aec09fd
+_md5_=4aa2e8a80c0c9797d936e1ec5dde1749
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-6.5.2-r1 b/metadata/md5-cache/dev-qt/qtwebengine-6.5.2-r1
index 5eb757b2a017..a92826bbf488 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qtwebengine-6.5.2-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=check-reqs flag-o-matic multiprocessing optfeature prefix python-any-r1 qt6-build toolchain-funcs
 IUSE=+alsa bindist custom-cflags designer geolocation +jumbo-build kerberos opengl pulseaudio qml screencast +system-icu vulkan +widgets test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=app-arch/snappy:= dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/nspr dev-libs/nss ~dev-qt/qtbase-6.5.2:6[gui,opengl=,vulkan?,widgets?] ~dev-qt/qtwebchannel-6.5.2:6[qml?] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:= media-libs/libwebp:= media-libs/openjpeg:2= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib:=[minizip] virtual/libudev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon x11-libs/libxkbfile alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/qttools-6.5.2:6[designer] ) geolocation? ( ~dev-qt/qtpositioning-6.5.2:6 ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse[glib] ) qml? ( ~dev-qt/qtdeclarative-6.5.2:6 ) screencast? ( dev-libs/glib:2 media-libs/mesa[gbm(+)] media-video/pipewire:= x11-libs/libdrm ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-6.5.2:6[widgets] )
 REQUIRED_USE=designer? ( qml widgets )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtwebengine-everywhere-src-6.5.2.tar.xz https://dev.gentoo.org/~ionen/distfiles/qtwebengine-6.5-patchset-1.tar.xz
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c4fc69866a69716c340503c4696b092d
+_md5_=8eefcaccf318a01fab3ab3528ef47cc6
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-6.5.2-r1 b/metadata/md5-cache/dev-qt/qtwebsockets-6.5.2-r1
index 0784b5c49019..b4af3554860d 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-6.5.2-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=qml test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.5.2:6[network,ssl] qml? ( ~dev-qt/qtdeclarative-6.5.2:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtwebsockets-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=31cbc2937c40b87d374587fcea47e4f9
+_md5_=dd8661498174a4b667e1dad03fbc842f
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 18b77438c6dd..f5d9107e11c7 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/acts_as_list-1.1.0 b/metadata/md5-cache/dev-ruby/acts_as_list-1.1.0
index 2a4c41d4e25f..d1082dfd6f45 100644
--- a/metadata/md5-cache/dev-ruby/acts_as_list-1.1.0
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-1.1.0
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby30? ( >=dev-ruby/activerecord-4.2:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/activerecord-4.2:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] dev-ruby/timecop[ruby_targets_ruby30(-)] dev-ruby/activerecord[ruby_targets_ruby30(-),sqlite] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/mocha[ruby_targets_ruby31(-)] dev-ruby/test-unit:2[ruby_targets_ruby31(-)] dev-ruby/timecop[ruby_targets_ruby31(-)] dev-ruby/activerecord[ruby_targets_ruby31(-),sqlite] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby30? ( >=dev-ruby/activerecord-4.2:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/activerecord-4.2:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/activerecord-4.2:*[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] dev-ruby/timecop[ruby_targets_ruby30(-)] dev-ruby/activerecord[ruby_targets_ruby30(-),sqlite] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/mocha[ruby_targets_ruby31(-)] dev-ruby/test-unit:2[ruby_targets_ruby31(-)] dev-ruby/timecop[ruby_targets_ruby31(-)] dev-ruby/activerecord[ruby_targets_ruby31(-),sqlite] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/mocha[ruby_targets_ruby32(-)] dev-ruby/test-unit:2[ruby_targets_ruby32(-)] dev-ruby/timecop[ruby_targets_ruby32(-)] dev-ruby/activerecord[ruby_targets_ruby32(-),sqlite] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=Capabilities for sorting and reordering a number of objects in a list
 EAPI=8
 HOMEPAGE=https://github.com/brendon/acts_as_list
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( >=dev-ruby/activerecord-4.2:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/activerecord-4.2:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby30? ( >=dev-ruby/activerecord-4.2:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/activerecord-4.2:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/activerecord-4.2:*[ruby_targets_ruby32(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/acts_as_list-1.1.0.gem
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=c31b1e46d387faa30960987f1dd9f2ad
+_md5_=af4b7f3fa5eb4615eaaf96a9d56c2e9c
diff --git a/metadata/md5-cache/dev-ruby/excon-0.103.0 b/metadata/md5-cache/dev-ruby/excon-0.103.0
new file mode 100644
index 000000000000..1f947810af7a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/excon-0.103.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby31? ( dev-ruby/rake[ruby_targets_ruby31(-)] test? ( dev-ruby/activesupport[ruby_targets_ruby31(-)] >=dev-ruby/json-1.8.5[ruby_targets_ruby31(-)] dev-ruby/open4[ruby_targets_ruby31(-)] >=dev-ruby/rack-2.2.7-r1:2.2[ruby_targets_ruby31(-)] dev-ruby/rdoc[ruby_targets_ruby31(-)] dev-ruby/sinatra[ruby_targets_ruby31(-)] dev-ruby/webrick[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( dev-ruby/rake[ruby_targets_ruby32(-)] test? ( dev-ruby/activesupport[ruby_targets_ruby32(-)] >=dev-ruby/json-1.8.5[ruby_targets_ruby32(-)] dev-ruby/open4[ruby_targets_ruby32(-)] >=dev-ruby/rack-2.2.7-r1:2.2[ruby_targets_ruby32(-)] dev-ruby/rdoc[ruby_targets_ruby32(-)] dev-ruby/sinatra[ruby_targets_ruby32(-)] dev-ruby/webrick[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=EXtended http(s) CONnections
+EAPI=8
+HOMEPAGE=https://github.com/excon/excon
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/excon/excon/archive/v0.103.0.tar.gz -> excon-0.103.0.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=62feffdd17edf40b48691cf5e43da934
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.16.1 b/metadata/md5-cache/dev-ruby/mocha-1.16.1
new file mode 100644
index 000000000000..b67189b8749b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mocha-1.16.1
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby31? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby31(-)] dev-ruby/introspection[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby32(-)] dev-ruby/introspection[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Mocking and stubbing using a syntax like that of JMock and SchMock
+EAPI=8
+HOMEPAGE=https://mocha.jamesmead.org/
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=1.0
+SRC_URI=https://github.com/freerange/mocha/archive/v1.16.1.tar.gz -> mocha-1.16.1.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=9127fd47e17a145956b42439bc1ae4f7
diff --git a/metadata/md5-cache/dev-ruby/sanitize-6.1.0 b/metadata/md5-cache/dev-ruby/sanitize-6.1.0
new file mode 100644
index 000000000000..b39247596ef4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sanitize-6.1.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby31? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby31(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby31(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby32(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby32(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/minitest[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Sanitize is a whitelist-based HTML sanitizer
+EAPI=8
+HOMEPAGE=https://github.com/rgrove/sanitize
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 test test
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby31? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby31(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby31(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby32(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby32(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby32(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=6
+SRC_URI=https://github.com/rgrove/sanitize/archive/v6.1.0.tar.gz -> sanitize-6.1.0.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=9fa9866ad42411b95db31e6664f00789
diff --git a/metadata/md5-cache/dev-ruby/serialport-1.3.2-r1 b/metadata/md5-cache/dev-ruby/serialport-1.3.2-r1
index 765ac020505f..b765df626605 100644
--- a/metadata/md5-cache/dev-ruby/serialport-1.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/serialport-1.3.2-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/hparra/ruby-serialport/
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/serialport-1.3.2.gem
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=fd26ae93c2f5ec62f235123869f45a72
+_md5_=908d96f5623e0715f3897c5cdbec5074
diff --git a/metadata/md5-cache/dev-ruby/tilt-2.3.0 b/metadata/md5-cache/dev-ruby/tilt-2.3.0
new file mode 100644
index 000000000000..a464c940659a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/tilt-2.3.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby31? ( test? ( dev-ruby/erubi[ruby_targets_ruby31(-)] dev-ruby/nokogiri[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/erubi[ruby_targets_ruby32(-)] dev-ruby/nokogiri[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Thin interface over template engines to make their usage as generic as possible
+EAPI=8
+HOMEPAGE=https://github.com/jeremyevans/tilt
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby31 ruby_targets_ruby32 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/jeremyevans/tilt/archive/v2.3.0.tar.gz -> tilt-2.3.0.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=bb128876235cc6dba6b0ec125ca9b6e4
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index bab4e0d9c641..bd94889ce7c0 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/bear-3.1.3 b/metadata/md5-cache/dev-util/bear-3.1.3
new file mode 100644
index 000000000000..ca0dcdab065b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bear-3.1.3
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig test? ( sys-devel/libtool || ( ( dev-lang/python:3.12 dev-python/lit[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-cpp/nlohmann_json-3.11.2:= >=dev-db/sqlite-3.14:= >=dev-libs/libfmt-9.1.0:= dev-libs/protobuf:= >=dev-libs/spdlog-1.11.0:= >=net-libs/grpc-1.49.2:= test? ( >=dev-cpp/gtest-1.13 )
+DESCRIPTION=Build EAR generates a compilation database for clang tooling
+EAPI=8
+HOMEPAGE=https://github.com/rizsotto/Bear
+INHERIT=cmake python-any-r1
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-cpp/nlohmann_json-3.11.2:= >=dev-db/sqlite-3.14:= >=dev-libs/libfmt-9.1.0:= dev-libs/protobuf:= >=dev-libs/spdlog-1.11.0:= >=net-libs/grpc-1.49.2:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/rizsotto/Bear/archive/3.1.3.tar.gz -> bear-3.1.3.tar.gz
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=758b9fcec8fc1100bece4fda0c03b283
diff --git a/metadata/md5-cache/dev-util/cmake-3.27.5 b/metadata/md5-cache/dev-util/cmake-3.27.5
new file mode 100644
index 000000000000..6b09bc15a45d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cmake-3.27.5
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-bradking-20230817 ) doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash:0= >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig dap? ( dev-cpp/cppdap ) emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+DESCRIPTION=Cross platform Make
+EAPI=8
+HOMEPAGE=https://cmake.org/
+INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing toolchain-funcs virtualx xdg-utils verify-sig
+IUSE=doc dap emacs ncurses qt5 test test verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash:0= >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig dap? ( dev-cpp/cppdap ) emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://cmake.org/files/v3.27/cmake-3.27.5.tar.gz !doc? ( https://dev.gentoo.org/~sam/distfiles/dev-util/cmake/cmake-3.27.0-docs.tar.xz ) verify-sig? ( https://github.com/Kitware/CMake/releases/download/v3.27.5/cmake-3.27.5-SHA-256.txt https://github.com/Kitware/CMake/releases/download/v3.27.5/cmake-3.27.5-SHA-256.txt.asc )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	fc2f89084f590ac95c004ea95b0d2f80	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	90255aaab6156b22ee05150fe5ffbe6b	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=0bbe163a64fe6b32a3c97705d21686c1
diff --git a/metadata/md5-cache/dev-util/stripe-mock-0.175.0 b/metadata/md5-cache/dev-util/stripe-mock-0.175.0
new file mode 100644
index 000000000000..95441afb363e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/stripe-mock-0.175.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=Mock HTTP server that responds like the real Stripe API
+EAPI=8
+HOMEPAGE=https://github.com/stripe/stripe-mock/
+INHERIT=go-module
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT ISC BSD-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/stripe/stripe-mock/archive/v0.175.0.tar.gz -> stripe-mock-0.175.0.tar.gz
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=908dfcc3e5829b18cfa35c52d83291b9
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index c656621f0dcb..c6a82f1e44c9 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/melonds-jg-0.9.5 b/metadata/md5-cache/games-emulation/melonds-jg-0.9.5
index 273fc48a79f1..54adca01ba10 100644
--- a/metadata/md5-cache/games-emulation/melonds-jg-0.9.5
+++ b/metadata/md5-cache/games-emulation/melonds-jg-0.9.5
@@ -11,4 +11,4 @@ RDEPEND=media-libs/jg:1= media-libs/libsamplerate games-emulation/jgrf
 SLOT=1
 SRC_URI=https://gitlab.com/jgemu/melonds/-/archive/0.9.5/melonds-0.9.5.tar.bz2
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=39d6cc034751080a5121ff3882636d95
+_md5_=5df52ce5cb7d672126c5553e39ba389b
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 42df57ab3009..2b881f1ee180 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/roundcube-1.4.11 b/metadata/md5-cache/mail-client/roundcube-1.4.11
deleted file mode 100644
index f65e6336e9fc..000000000000
--- a/metadata/md5-cache/mail-client/roundcube-1.4.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup unpack
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
-DESCRIPTION=A browser-based multilingual IMAP client with an application-like user interface
-EAPI=7
-HOMEPAGE=https://roundcube.net
-INHERIT=webapp
-IUSE=change-password enigma ldap mysql postgres sqlite ssl spell vhosts
-KEYWORDS=amd64 arm ~hppa ppc ppc64 sparc x86
-LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
-RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-5.4.0[filter,gd,iconv,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml] <dev-lang/php-8 virtual/httpd-php change-password? ( dev-lang/php[sockets] ) enigma? ( app-crypt/gnupg ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) app-admin/webapp-config
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=1.4.11
-SRC_URI=https://github.com/roundcube/roundcubemail/releases/download/1.4.11/roundcubemail-1.4.11-complete.tar.gz
-_eclasses_=webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=149ce59f5b6d13369208fe7d8ae6f343
diff --git a/metadata/md5-cache/mail-client/roundcube-1.5.2 b/metadata/md5-cache/mail-client/roundcube-1.5.2
index abf3f0cacd92..270dad5fe4d7 100644
--- a/metadata/md5-cache/mail-client/roundcube-1.5.2
+++ b/metadata/md5-cache/mail-client/roundcube-1.5.2
@@ -7,9 +7,9 @@ INHERIT=webapp
 IUSE=change-password enigma exif fileinfo ldap mysql postgres sqlite ssl spell zip vhosts
 KEYWORDS=amd64 arm ~hppa ppc ppc64 sparc x86
 LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
-RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-5.5.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?] virtual/httpd-php change-password? ( dev-lang/php[sockets] ) enigma? ( app-crypt/gnupg ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) app-admin/webapp-config
+RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-8.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?] virtual/httpd-php change-password? ( dev-lang/php[sockets] ) enigma? ( app-crypt/gnupg ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) app-admin/webapp-config
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=1.5.2
 SRC_URI=https://github.com/roundcube/roundcubemail/releases/download/1.5.2/roundcubemail-1.5.2-complete.tar.gz
 _eclasses_=webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=873cad175e2e7bd43aacd91d62b35a93
+_md5_=d72e5e8d33b4d7663ed82d8df66700ae
diff --git a/metadata/md5-cache/mail-client/roundcube-1.6.1 b/metadata/md5-cache/mail-client/roundcube-1.6.1
index daf09c961c13..604872f62e34 100644
--- a/metadata/md5-cache/mail-client/roundcube-1.6.1
+++ b/metadata/md5-cache/mail-client/roundcube-1.6.1
@@ -7,9 +7,9 @@ INHERIT=webapp
 IUSE=change-password enigma exif fileinfo ldap mysql postgres sqlite ssl spell zip vhosts
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
-RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-7.4.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?] virtual/httpd-php change-password? ( dev-lang/php[sockets] ) enigma? ( app-crypt/gnupg ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) app-admin/webapp-config
+RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-8.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?] virtual/httpd-php change-password? ( dev-lang/php[sockets] ) enigma? ( app-crypt/gnupg ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) app-admin/webapp-config
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=1.6.1
 SRC_URI=https://github.com/roundcube/roundcubemail/releases/download/1.6.1/roundcubemail-1.6.1-complete.tar.gz
 _eclasses_=webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=61e763dddbcacb09af1e4e7ae50657fa
+_md5_=b746b1d1208ea735c7eb366674e7bcc1
diff --git a/metadata/md5-cache/mail-client/roundcube-1.6.2 b/metadata/md5-cache/mail-client/roundcube-1.6.2
index 6eda520fedc0..02f8bcb31251 100644
--- a/metadata/md5-cache/mail-client/roundcube-1.6.2
+++ b/metadata/md5-cache/mail-client/roundcube-1.6.2
@@ -7,9 +7,9 @@ INHERIT=webapp
 IUSE=change-password enigma exif fileinfo ldap mysql postgres sqlite ssl spell zip vhosts
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
-RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-7.4.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?] virtual/httpd-php change-password? ( dev-lang/php[sockets] ) enigma? ( app-crypt/gnupg ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) app-admin/webapp-config
+RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-8.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?] virtual/httpd-php change-password? ( dev-lang/php[sockets] ) enigma? ( app-crypt/gnupg ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) app-admin/webapp-config
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=1.6.2
 SRC_URI=https://github.com/roundcube/roundcubemail/releases/download/1.6.2/roundcubemail-1.6.2-complete.tar.gz
 _eclasses_=webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=61e763dddbcacb09af1e4e7ae50657fa
+_md5_=b746b1d1208ea735c7eb366674e7bcc1
diff --git a/metadata/md5-cache/mail-client/roundcube-9999 b/metadata/md5-cache/mail-client/roundcube-9999
index f6cf9b72fdfc..003bde0736e6 100644
--- a/metadata/md5-cache/mail-client/roundcube-9999
+++ b/metadata/md5-cache/mail-client/roundcube-9999
@@ -8,8 +8,8 @@ INHERIT=webapp git-r3
 IUSE=change-password enigma exif fileinfo ldap mysql postgres sqlite ssl spell zip vhosts
 LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
 PROPERTIES=live
-RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-7.4.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?] virtual/httpd-php change-password? ( dev-lang/php[sockets] ) enigma? ( app-crypt/gnupg ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) app-admin/webapp-config
+RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-8.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?] virtual/httpd-php change-password? ( dev-lang/php[sockets] ) enigma? ( app-crypt/gnupg ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) app-admin/webapp-config
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=9999
 _eclasses_=git-r3	2358a7b20091609e24bd3a83b3ac5991	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=9e5900db22771b4cd6b6a67c9f52f869
+_md5_=b746b1d1208ea735c7eb366674e7bcc1
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 7af72f9131a3..cf0c813217b1 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/exact-image-1.0.2-r8 b/metadata/md5-cache/media-gfx/exact-image-1.0.2-r8
index c7887f84e96f..8356e443bfa2 100644
--- a/metadata/md5-cache/media-gfx/exact-image-1.0.2-r8
+++ b/metadata/md5-cache/media-gfx/exact-image-1.0.2-r8
@@ -1,17 +1,17 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=x11-libs/agg[truetype] sys-libs/zlib expat? ( dev-libs/expat ) jpeg? ( media-libs/libjpeg-turbo:= ) lua? ( 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 ) ) openexr? ( media-libs/openexr:= ) perl? ( dev-lang/perl ) png? ( >=media-libs/libpng-1.2.43 ) ruby? ( dev-lang/ruby:* ) tiff? ( media-libs/tiff:= ) truetype? ( >=media-libs/freetype-2 ) X? ( x11-libs/libXext x11-libs/libXt x11-libs/libICE x11-libs/libSM ) swig? ( dev-lang/swig ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure prepare setup
+DEPEND=x11-libs/agg[truetype] sys-libs/zlib expat? ( dev-libs/expat ) jpeg? ( media-libs/libjpeg-turbo:= ) lua? ( 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 ) ) openexr? ( media-libs/openexr:= ) perl? ( dev-lang/perl ) png? ( >=media-libs/libpng-1.2.43 ) ruby? ( dev-lang/ruby:* ) tiff? ( media-libs/tiff:= ) truetype? ( >=media-libs/freetype-2 ) X? ( x11-libs/libXext x11-libs/libXt x11-libs/libICE x11-libs/libSM ) swig? ( dev-lang/swig )
 DESCRIPTION=A fast, modern and generic image processing library
 EAPI=7
 HOMEPAGE=https://exactcode.com/opensource/exactimage/
-INHERIT=php-ext-source-r3 lua-single toolchain-funcs
-IUSE=expat jpeg lua openexr php perl png ruby swig tiff truetype X php_targets_php7-4 lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+INHERIT=lua-single toolchain-funcs
+IUSE=expat jpeg lua openexr perl png ruby swig tiff truetype X lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=x11-libs/agg[truetype] sys-libs/zlib expat? ( dev-libs/expat ) jpeg? ( media-libs/libjpeg-turbo:= ) lua? ( 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 ) ) openexr? ( media-libs/openexr:= ) perl? ( dev-lang/perl ) png? ( >=media-libs/libpng-1.2.43 ) ruby? ( dev-lang/ruby:* ) tiff? ( media-libs/tiff:= ) truetype? ( >=media-libs/freetype-2 ) X? ( x11-libs/libXext x11-libs/libXt x11-libs/libICE x11-libs/libSM ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
-REQUIRED_USE=lua? ( swig ) perl? ( swig ) php? ( swig ) ruby? ( swig ) php? ( || ( php_targets_php7-4 ) )
+RDEPEND=x11-libs/agg[truetype] sys-libs/zlib expat? ( dev-libs/expat ) jpeg? ( media-libs/libjpeg-turbo:= ) lua? ( 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 ) ) openexr? ( media-libs/openexr:= ) perl? ( dev-lang/perl ) png? ( >=media-libs/libpng-1.2.43 ) ruby? ( dev-lang/ruby:* ) tiff? ( media-libs/tiff:= ) truetype? ( >=media-libs/freetype-2 ) X? ( x11-libs/libXext x11-libs/libXt x11-libs/libICE x11-libs/libSM )
+REQUIRED_USE=lua? ( swig ) perl? ( swig ) ruby? ( swig )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dl.exactcode.de/oss/exact-image/exact-image-1.0.2.tar.bz2
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=bcafde1d741d229ea76152db47ec25ea
+_eclasses_=lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=fe82b4a0dd47d3b244799ad9df9be76e
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 8be27121ba97..9b3f6dcbe6a1 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/alsa-lib-1.2.10-r2 b/metadata/md5-cache/media-libs/alsa-lib-1.2.10-r2
new file mode 100644
index 000000000000..121243fabc39
--- /dev/null
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.2.10-r2
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( >=app-doc/doxygen-1.2.6 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=media-libs/alsa-topology-conf media-libs/alsa-ucm-conf python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) )
+DESCRIPTION=Advanced Linux Sound Architecture Library
+EAPI=8
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
+INHERIT=autotools multilib-minimal flag-o-matic python-single-r1
+IUSE=alisp debug doc python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=media-libs/alsa-topology-conf media-libs/alsa-ucm-conf python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
+SLOT=0
+SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.10.tar.bz2
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=61611281044db7dcaa62a8c466d0d1bf
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index f87c5577306a..d16b2cab9b47 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/gpodder-3.11.2 b/metadata/md5-cache/media-sound/gpodder-3.11.2
index 80a658b8dc2a..689eaedfce7a 100644
--- a/metadata/md5-cache/media-sound/gpodder-3.11.2
+++ b/metadata/md5-cache/media-sound/gpodder-3.11.2
@@ -6,7 +6,7 @@ HOMEPAGE=https://gpodder.github.io/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=distutils-r1 optfeature xdg
 IUSE=+dbus bluetooth mtp test python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python3_10? ( dev-python/html5lib[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/podcastparser[python_targets_python3_10(-)] dev-python/mygpoclient[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/html5lib[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/podcastparser[python_targets_python3_11(-)] dev-python/mygpoclient[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dbus? ( dev-python/dbus-python[python_targets_python3_11(-)] ) ) bluetooth? ( net-wireless/bluez ) mtp? ( media-libs/libmtp:= ) kernel_linux? ( sys-apps/iproute2 ) python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite] )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gpodder/gpodder/archive/3.11.2.tar.gz -> gpodder-3.11.2.tar.gz
 _eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=40c52b78639f32a703684d8884cf1b31
+_md5_=4983b0d4d37dc380b9e1c7c8c4c663c8
diff --git a/metadata/md5-cache/media-sound/qtractor-0.9.35 b/metadata/md5-cache/media-sound/qtractor-0.9.35
new file mode 100644
index 000000000000..724262a03a06
--- /dev/null
+++ b/metadata/md5-cache/media-sound/qtractor-0.9.35
@@ -0,0 +1,17 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack x11-libs/libxcb:= aubio? ( media-libs/aubio:= ) dssi? ( media-libs/dssi ) ladspa? ( media-libs/ladspa-sdk ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Audio/MIDI multi-track sequencer written in C++ with the Qt framework
+EAPI=8
+HOMEPAGE=https://qtractor.sourceforge.io
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake xdg
+IUSE=aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack x11-libs/libxcb:= aubio? ( media-libs/aubio:= ) dssi? ( media-libs/dssi ) ladspa? ( media-libs/ladspa-sdk ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=dssi? ( ladspa )
+SLOT=0
+SRC_URI=mirror://sourceforge/qtractor/qtractor-0.9.35.tar.gz
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=1c33d72e3f2969984b68cbe18f484175
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 3e593215519e..1170eb1a100f 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/pipewire-0.3.80 b/metadata/md5-cache/media-video/pipewire-0.3.80
new file mode 100644
index 000000000000..7a2dbf24f67f
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.80
@@ -0,0 +1,18 @@
+BDEPEND=>=dev-util/meson-0.59 virtual/pkgconfig || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.12 dev-python/docutils[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ) dbus? ( dev-util/gdbus-codegen ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=acct-group/audio acct-group/pipewire media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( dev-libs/glib media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) ffmpeg? ( media-video/ffmpeg:= ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) gsettings? ( >=dev-libs/glib-2.26.0:2 ) ieee1394? ( media-libs/libffado[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) liblc3? ( media-sound/liblc3 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio-daemon ) roc? ( media-libs/roc-toolkit ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
+DESCRIPTION=Multimedia processing graphs
+EAPI=8
+HOMEPAGE=https://pipewire.org/
+INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev
+IUSE=bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings ieee1394 jack-client jack-sdk liblc3 lv2 modemmanager pipewire-alsa readline roc sound-server ssl system-service systemd test v4l X 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=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT LGPL-2.1+ GPL-2
+PDEPEND=>=media-video/wireplumber-0.4.8-r3
+RDEPEND=acct-group/audio acct-group/pipewire media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( dev-libs/glib media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) ffmpeg? ( media-video/ffmpeg:= ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) gsettings? ( >=dev-libs/glib-2.26.0:2 ) ieee1394? ( media-libs/libffado[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) liblc3? ( media-sound/liblc3 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio-daemon ) roc? ( media-libs/roc-toolkit ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi ) virtual/tmpfiles
+REQUIRED_USE=ffmpeg? ( extra ) bluetooth? ( dbus ) jack-sdk? ( !jack-client ) modemmanager? ( bluetooth ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
+RESTRICT=!test? ( test )
+SLOT=0/0.4
+SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.80/pipewire-0.3.80.tar.bz2
+_eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	meson	08b7183c3f4811568ee93eb0f79a89fe	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	862d337d98edb576796827be2c6b11ca	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=a511169b97f3b2d265fe513468fd8376
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 0e9abb95ed47..e0b34c522f6e 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/profanity-0.14.0-r1 b/metadata/md5-cache/net-im/profanity-0.14.0-r1
index 23f8c5e1e69f..ea63323163b4 100644
--- a/metadata/md5-cache/net-im/profanity-0.14.0-r1
+++ b/metadata/md5-cache/net-im/profanity-0.14.0-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/profanity-im/profanity/releases/download/0.14.0/profanity-0.14.0.tar.gz https://github.com/profanity-im/profanity/commit/122434a.patch -> profanity-0.14.0-ox-carbons.patch https://github.com/profanity-im/profanity/commit/2ed6211c.patch -> profanity-0.14.0-xscreensaver.patch
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=387ba1aa16d2af261ed06ab8c27390f0
+_md5_=e591c5d4453610449595e33ea452b497
diff --git a/metadata/md5-cache/net-im/profanity-0.14.0-r2 b/metadata/md5-cache/net-im/profanity-0.14.0-r2
new file mode 100644
index 000000000000..33d2674bae08
--- /dev/null
+++ b/metadata/md5-cache/net-im/profanity-0.14.0-r2
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install setup
+DEPEND=>=app-accessibility/at-spi2-core-2.46.0 dev-db/sqlite:3 dev-libs/glib:2 >=dev-libs/libstrophe-0.12.3:= media-libs/harfbuzz:= net-misc/curl sys-libs/ncurses:=[unicode(+)] sys-libs/readline:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango x11-misc/shared-mime-info gpg? ( app-crypt/gpgme:= ) libnotify? ( x11-libs/libnotify ) omemo? ( dev-libs/libgcrypt:= net-libs/libsignal-protocol-c ) omemo-qrcode? ( media-gfx/qrencode:= ) otr? ( net-libs/libotr ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) xscreensaver? ( x11-libs/libXScrnSaver x11-libs/libX11 ) test? ( dev-util/cmocka ) python? ( python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cython[python_targets_python3_11(-)] ) )
+DESCRIPTION=A console based XMPP client inspired by Irssi
+EAPI=8
+HOMEPAGE=https://profanity-im.github.io
+INHERIT=python-single-r1
+IUSE=libnotify omemo omemo-qrcode otr gpg test xscreensaver python python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-3
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0 dev-db/sqlite:3 dev-libs/glib:2 >=dev-libs/libstrophe-0.12.3:= media-libs/harfbuzz:= net-misc/curl sys-libs/ncurses:=[unicode(+)] sys-libs/readline:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango x11-misc/shared-mime-info gpg? ( app-crypt/gpgme:= ) libnotify? ( x11-libs/libnotify ) omemo? ( dev-libs/libgcrypt:= net-libs/libsignal-protocol-c ) omemo-qrcode? ( media-gfx/qrencode:= ) otr? ( net-libs/libotr ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) xscreensaver? ( x11-libs/libXScrnSaver x11-libs/libX11 )
+REQUIRED_USE=omemo-qrcode? ( omemo ) python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/profanity-im/profanity/releases/download/0.14.0/profanity-0.14.0.tar.gz https://github.com/profanity-im/profanity/commit/122434a.patch -> profanity-0.14.0-ox-carbons.patch https://github.com/profanity-im/profanity/commit/2ed6211c.patch -> profanity-0.14.0-xscreensaver.patch https://github.com/profanity-im/profanity/commit/b8817470.patch -> profanity-0.14.0-plugins-install.patch
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=758b620ba180786f7a409012307dd775
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 1bb3c7b0696e..c69e47c424a2 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/inspircd-3.15.0 b/metadata/md5-cache/net-irc/inspircd-3.15.0
deleted file mode 100644
index d930ef36ce73..000000000000
--- a/metadata/md5-cache/net-irc/inspircd-3.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst
-DEPEND=acct-group/inspircd acct-user/inspircd dev-lang/perl argon2? ( app-crypt/argon2 ) gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap:= ) maxminddb? ( dev-libs/libmaxminddb:= ) mbedtls? ( net-libs/mbedtls:= ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2 ) postgres? ( dev-db/postgresql:= ) re2? ( dev-libs/re2:= ) sqlite? ( >=dev-db/sqlite-3.0 ) ssl? ( dev-libs/openssl:= ) tre? ( dev-libs/tre )
-DESCRIPTION=Inspire IRCd - The Stable, High-Performance Modular IRCd
-EAPI=8
-HOMEPAGE=https://www.inspircd.org/
-INHERIT=systemd toolchain-funcs
-IUSE=argon2 debug gnutls ldap maxminddb mbedtls mysql pcre pcre2 postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=acct-group/inspircd acct-user/inspircd dev-lang/perl argon2? ( app-crypt/argon2 ) gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap:= ) maxminddb? ( dev-libs/libmaxminddb:= ) mbedtls? ( net-libs/mbedtls:= ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2 ) postgres? ( dev-db/postgresql:= ) re2? ( dev-libs/re2:= ) sqlite? ( >=dev-db/sqlite-3.0 ) ssl? ( dev-libs/openssl:= ) tre? ( dev-libs/tre )
-SLOT=0
-SRC_URI=https://github.com/inspircd/inspircd/archive/v3.15.0.tar.gz -> inspircd-3.15.0.tar.gz https://github.com/clinew/gentoo-distfiles/raw/master/inspircd-3.15.0-fix-build-paths.patch.bz2
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=e9da909c74c8b07713c13bbc7f9c4e57
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index a609ba62404d..953b62b51a80 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/nativebiginteger-1.6.1 b/metadata/md5-cache/net-libs/nativebiginteger-1.6.1
deleted file mode 100644
index 900d80506e6b..000000000000
--- a/metadata/md5-cache/net-libs/nativebiginteger-1.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-libs/gmp:0= virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=jbigi library used by net-vpn/i2p
-EAPI=7
-HOMEPAGE=https://geti2p.net
-INHERIT=java-pkg-2 toolchain-funcs
-IUSE=test
-KEYWORDS=amd64 ~arm ~x86
-LICENSE=public-domain
-RDEPEND=dev-libs/gmp:0= virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.i2p-projekt.de/1.6.1/i2psource_1.6.1.tar.bz2
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	7311f5500eba17e0a599cd934f9db152	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=f14e92015b562a0a49d47d9e55460f66
diff --git a/metadata/md5-cache/net-libs/nativebiginteger-2.1.0 b/metadata/md5-cache/net-libs/nativebiginteger-2.1.0
deleted file mode 100644
index 8329dcb914f8..000000000000
--- a/metadata/md5-cache/net-libs/nativebiginteger-2.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-libs/gmp:0= >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=jbigi library used by net-vpn/i2p
-EAPI=8
-HOMEPAGE=https://geti2p.net
-INHERIT=java-pkg-2 toolchain-funcs
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=public-domain
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.i2p-projekt.de/2.1.0/i2psource_2.1.0.tar.bz2
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	7311f5500eba17e0a599cd934f9db152	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=e0f953f15e3cbdfdec4695fb439f1c88
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index c3835c2cf875..83126f8bebb7 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/iperf-3.15 b/metadata/md5-cache/net-misc/iperf-3.15
new file mode 100644
index 000000000000..fb54b41a8a37
--- /dev/null
+++ b/metadata/md5-cache/net-misc/iperf-3.15
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/cJSON-1.7.15 dev-libs/openssl:= sctp? ( net-misc/lksctp-tools )
+DESCRIPTION=A TCP, UDP, and SCTP network bandwidth measurement tool
+EAPI=8
+HOMEPAGE=https://github.com/esnet/iperf
+INHERIT=autotools systemd
+IUSE=sctp
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=BSD
+RDEPEND=>=dev-libs/cJSON-1.7.15 dev-libs/openssl:= sctp? ( net-misc/lksctp-tools )
+SLOT=3
+SRC_URI=https://github.com/esnet/iperf/releases/download/3.15/iperf-3.15.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=b974399b5f8d8b4e13faa43271b5bf60
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-3.8.2-r1 b/metadata/md5-cache/net-misc/nextcloud-client-3.8.2-r1
index 23b5696cd4a1..2d5f541226d4 100644
--- a/metadata/md5-cache/net-misc/nextcloud-client-3.8.2-r1
+++ b/metadata/md5-cache/net-misc/nextcloud-client-3.8.2-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nextcloud/desktop/archive/v3.8.2.tar.gz -> nextcloud-client-3.8.2.tar.gz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ba13083e7bb29a91f778788c722bf534
+_md5_=0865e721894e0df8038f3a9912ce2117
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-3.9.0 b/metadata/md5-cache/net-misc/nextcloud-client-3.9.0
deleted file mode 100644
index 329555cf5896..000000000000
--- a/metadata/md5-cache/net-misc/nextcloud-client-3.9.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dolphin? ( kde-frameworks/extra-cmake-modules ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-db/sqlite-3.34:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 net-libs/libcloudproviders kde-frameworks/karchive:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) webengine? ( dev-qt/qtwebengine:5[widgets] ) dev-qt/qtconcurrent:5 dev-qt/qtxml:5 || ( gnome-base/librsvg media-gfx/inkscape ) doc? ( dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra virtual/latex-base ) test? ( dev-qt/qttest:5 dev-util/cmocka )
-DESCRIPTION=Desktop Syncing Client for Nextcloud
-EAPI=8
-HOMEPAGE=https://github.com/nextcloud/desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake virtualx xdg
-IUSE=doc dolphin nautilus test webengine test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=CC-BY-3.0 GPL-2
-RDEPEND=>=dev-db/sqlite-3.34:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 net-libs/libcloudproviders kde-frameworks/karchive:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) webengine? ( dev-qt/qtwebengine:5[widgets] )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nextcloud/desktop/archive/v3.9.0.tar.gz -> nextcloud-client-3.9.0.tar.gz
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=839ea2aab55f0bdf39a198e724f75b83
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-3.9.1 b/metadata/md5-cache/net-misc/nextcloud-client-3.9.1
index a949cdcac392..66cc8bbed6a0 100644
--- a/metadata/md5-cache/net-misc/nextcloud-client-3.9.1
+++ b/metadata/md5-cache/net-misc/nextcloud-client-3.9.1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nextcloud/desktop/archive/v3.9.1.tar.gz -> nextcloud-client-3.9.1.tar.gz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ba13083e7bb29a91f778788c722bf534
+_md5_=0865e721894e0df8038f3a9912ce2117
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-3.9.4 b/metadata/md5-cache/net-misc/nextcloud-client-3.9.4
index 65f207bbbc84..f27a32c408f4 100644
--- a/metadata/md5-cache/net-misc/nextcloud-client-3.9.4
+++ b/metadata/md5-cache/net-misc/nextcloud-client-3.9.4
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nextcloud/desktop/archive/v3.9.4.tar.gz -> nextcloud-client-3.9.4.tar.gz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=839ea2aab55f0bdf39a198e724f75b83
+_md5_=ccaf23d615a2e09ae0e21d79c0b9be8a
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 3ac2ba13d92e..3018a7598d0c 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/mapserver-8.0.1 b/metadata/md5-cache/sci-geosciences/mapserver-8.0.1
index 468eb708627a..aa73eccb7fd9 100644
--- a/metadata/md5-cache/sci-geosciences/mapserver-8.0.1
+++ b/metadata/md5-cache/sci-geosciences/mapserver-8.0.1
@@ -1,17 +1,17 @@
-BDEPEND=virtual/pkgconfig perl? ( >=dev-lang/swig-4.0 ) php? ( >=dev-lang/swig-4.0 ) python? ( >=dev-lang/swig-4.0 >=dev-python/setuptools-44.1.0 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup test
-DEPEND=>=dev-libs/expat-2.2.8 dev-libs/libxml2:2= dev-libs/libxslt[crypt] >=dev-libs/protobuf-c-1.3.2:= >=media-libs/freetype-2.9.1-r3 >=media-libs/gd-2.0.12:=[truetype,jpeg,png,zlib] >=media-libs/giflib-5.2.1:= media-libs/libjpeg-turbo >=media-libs/libpng-1.6.37:= >=net-misc/curl-7.69.1 >=sci-libs/gdal-3.0.4:=[oracle?] >=sci-libs/proj-6.2.1:= virtual/libiconv >=x11-libs/agg-2.5-r3 apache? ( app-admin/webapp-config dev-libs/fcgi ) bidi? ( dev-libs/fribidi media-libs/harfbuzz:= ) cairo? ( x11-libs/cairo ) geos? ( sci-libs/geos ) mysql? ( dev-db/mysql-connector-c:= ) oracle? ( dev-db/oracle-instantclient:= ) perl? ( dev-lang/perl:= ) postgis? ( dev-db/postgis dev-db/postgresql:= ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) ) apache? ( =www-servers/apache-2* ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
+BDEPEND=virtual/pkgconfig perl? ( >=dev-lang/swig-4.0 ) python? ( >=dev-lang/swig-4.0 >=dev-python/setuptools-44.1.0 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=>=dev-libs/expat-2.2.8 dev-libs/libxml2:2= dev-libs/libxslt[crypt] >=dev-libs/protobuf-c-1.3.2:= >=media-libs/freetype-2.9.1-r3 >=media-libs/gd-2.0.12:=[truetype,jpeg,png,zlib] >=media-libs/giflib-5.2.1:= media-libs/libjpeg-turbo >=media-libs/libpng-1.6.37:= >=net-misc/curl-7.69.1 >=sci-libs/gdal-3.0.4:=[oracle?] >=sci-libs/proj-6.2.1:= virtual/libiconv >=x11-libs/agg-2.5-r3 apache? ( app-admin/webapp-config dev-libs/fcgi ) bidi? ( dev-libs/fribidi media-libs/harfbuzz:= ) cairo? ( x11-libs/cairo ) geos? ( sci-libs/geos ) mysql? ( dev-db/mysql-connector-c:= ) oracle? ( dev-db/oracle-instantclient:= ) perl? ( dev-lang/perl:= ) postgis? ( dev-db/postgis dev-db/postgresql:= ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) ) apache? ( =www-servers/apache-2* )
 DESCRIPTION=Development environment for building spatially enabled webapps
 EAPI=7
 HOMEPAGE=https://mapserver.org/
-INHERIT=cmake depend.apache perl-functions php-ext-source-r3 python-r1 webapp
-IUSE=apache bidi cairo geos mysql oracle perl php postgis python apache php_targets_php7-4 python_targets_python3_10 python_targets_python3_11
+INHERIT=cmake depend.apache perl-functions python-r1 webapp
+IUSE=apache bidi cairo geos mysql oracle perl postgis python apache python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=Boost-1.0 BSD BSD-2 ISC MIT tcltk
-RDEPEND=>=dev-libs/expat-2.2.8 dev-libs/libxml2:2= dev-libs/libxslt[crypt] >=dev-libs/protobuf-c-1.3.2:= >=media-libs/freetype-2.9.1-r3 >=media-libs/gd-2.0.12:=[truetype,jpeg,png,zlib] >=media-libs/giflib-5.2.1:= media-libs/libjpeg-turbo >=media-libs/libpng-1.6.37:= >=net-misc/curl-7.69.1 >=sci-libs/gdal-3.0.4:=[oracle?] >=sci-libs/proj-6.2.1:= virtual/libiconv >=x11-libs/agg-2.5-r3 apache? ( app-admin/webapp-config dev-libs/fcgi ) bidi? ( dev-libs/fribidi media-libs/harfbuzz:= ) cairo? ( x11-libs/cairo ) geos? ( sci-libs/geos ) mysql? ( dev-db/mysql-connector-c:= ) oracle? ( dev-db/oracle-instantclient:= ) perl? ( dev-lang/perl:= ) postgis? ( dev-db/postgis dev-db/postgresql:= ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) ) apache? ( =www-servers/apache-2* ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) php? ( || ( php_targets_php7-4 ) )
+RDEPEND=>=dev-libs/expat-2.2.8 dev-libs/libxml2:2= dev-libs/libxslt[crypt] >=dev-libs/protobuf-c-1.3.2:= >=media-libs/freetype-2.9.1-r3 >=media-libs/gd-2.0.12:=[truetype,jpeg,png,zlib] >=media-libs/giflib-5.2.1:= media-libs/libjpeg-turbo >=media-libs/libpng-1.6.37:= >=net-misc/curl-7.69.1 >=sci-libs/gdal-3.0.4:=[oracle?] >=sci-libs/proj-6.2.1:= virtual/libiconv >=x11-libs/agg-2.5-r3 apache? ( app-admin/webapp-config dev-libs/fcgi ) bidi? ( dev-libs/fribidi media-libs/harfbuzz:= ) cairo? ( x11-libs/cairo ) geos? ( sci-libs/geos ) mysql? ( dev-db/mysql-connector-c:= ) oracle? ( dev-db/oracle-instantclient:= ) perl? ( dev-lang/perl:= ) postgis? ( dev-db/postgis dev-db/postgresql:= ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) ) apache? ( =www-servers/apache-2* )
+REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.osgeo.org/mapserver/mapserver-8.0.1.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	cmake	fc2f89084f590ac95c004ea95b0d2f80	depend.apache	416d1c5005c5f4594e79812fb7323f0d	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	perl-functions	c3fca037246e877693badea0df3b0ef8	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca	webapp	1aad5c010cfdf11d0376c80467b0de4c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9d1465c0a71c0b9ec83d7acb4a99e6c8
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	depend.apache	416d1c5005c5f4594e79812fb7323f0d	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	perl-functions	c3fca037246e877693badea0df3b0ef8	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca	webapp	1aad5c010cfdf11d0376c80467b0de4c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=64c78533db1f5dfdaef3461f970fc016
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index cc305bcf25e2..5fc09a83ac2c 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/rosetta-db-3.4 b/metadata/md5-cache/sci-libs/rosetta-db-3.4
deleted file mode 100644
index 40eeb067c222..000000000000
--- a/metadata/md5-cache/sci-libs/rosetta-db-3.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch
-DESCRIPTION=Essential database for rosetta
-EAPI=6
-HOMEPAGE=http://www.rosettacommons.org
-INHERIT=vcs-clean
-KEYWORDS=~amd64 ~x86
-LICENSE=rosetta
-RESTRICT=fetch binchecks strip
-SLOT=0
-SRC_URI=rosetta3.4_database.tgz
-_eclasses_=vcs-clean	d271b7bc7e6a009758d7d4ef749174e3
-_md5_=181fb3379bb252513edaf5f03ae5d7c3
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 1445d0232552..8b5c8b1923ba 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/eza-0.12.0 b/metadata/md5-cache/sys-apps/eza-0.12.0
new file mode 100644
index 000000000000..bfddc4e20645
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/eza-0.12.0
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/rust-1.65.0 man? ( virtual/pandoc ) >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=git? ( dev-libs/libgit2:= )
+DESCRIPTION=A modern, maintained replacement for ls
+EAPI=8
+HOMEPAGE=https://github.com/eza-community/eza
+INHERIT=shell-completion cargo
+IUSE=+git man debug
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT Apache-2.0 MIT Unicode-DFS-2016
+RDEPEND=git? ( dev-libs/libgit2:= )
+SLOT=0
+SRC_URI=https://github.com/eza-community/eza/archive/refs/tags/v0.12.0.tar.gz -> eza-0.12.0.tar.gz https://crates.io/api/v1/crates/android-tzdata/0.1.1/download -> android-tzdata-0.1.1.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/ansiterm/0.12.2/download -> ansiterm-0.12.2.crate https://crates.io/api/v1/crates/anstream/0.5.0/download -> anstream-0.5.0.crate https://crates.io/api/v1/crates/anstyle-parse/0.2.1/download -> anstyle-parse-0.2.1.crate https://crates.io/api/v1/crates/anstyle-query/1.0.0/download -> anstyle-query-1.0.0.crate https://crates.io/api/v1/crates/anstyle-wincon/2.1.0/download -> anstyle-wincon-2.1.0.crate https://crates.io/api/v1/crates/anstyle/1.0.3/download -> anstyle-1.0.3.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bitflags/2.4.0/download -> bitflags-2.4.0.crate https://crates.io/api/v1/crates/bumpalo/3.13.0/download -> bumpalo-3.13.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.30/download -> chrono-0.4.30.crate https://crates.io/api/v1/crates/colorchoice/1.0.0/download -> colorchoice-1.0.0.crate https://crates.io/api/v1/crates/content_inspector/0.2.4/download -> content_inspector-0.2.4.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.4/download -> core-foundation-sys-0.8.4.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.8/download -> crossbeam-channel-0.5.8.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.3/download -> crossbeam-deque-0.8.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.15/download -> crossbeam-epoch-0.9.15.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.16/download -> crossbeam-utils-0.8.16.crate https://crates.io/api/v1/crates/datetime/0.5.2/download -> datetime-0.5.2.crate https://crates.io/api/v1/crates/dunce/1.0.4/download -> dunce-1.0.4.crate https://crates.io/api/v1/crates/either/1.9.0/download -> either-1.9.0.crate https://crates.io/api/v1/crates/equivalent/1.0.1/download -> equivalent-1.0.1.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/errno/0.3.3/download -> errno-0.3.3.crate https://crates.io/api/v1/crates/fastrand/2.0.0/download -> fastrand-2.0.0.crate https://crates.io/api/v1/crates/filetime/0.2.22/download -> filetime-0.2.22.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/gethostname/0.4.3/download -> gethostname-0.4.3.crate https://crates.io/api/v1/crates/git2/0.18.0/download -> git2-0.18.0.crate https://crates.io/api/v1/crates/glob/0.3.1/download -> glob-0.3.1.crate https://crates.io/api/v1/crates/hashbrown/0.14.0/download -> hashbrown-0.14.0.crate https://crates.io/api/v1/crates/hermit-abi/0.3.2/download -> hermit-abi-0.3.2.crate https://crates.io/api/v1/crates/humantime-serde/1.1.1/download -> humantime-serde-1.1.1.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.2/download -> iana-time-zone-haiku-0.1.2.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.57/download -> iana-time-zone-0.1.57.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/indexmap/2.0.0/download -> indexmap-2.0.0.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.11/download -> io-lifetimes-1.0.11.crate https://crates.io/api/v1/crates/jobserver/0.1.22/download -> jobserver-0.1.22.crate https://crates.io/api/v1/crates/js-sys/0.3.64/download -> js-sys-0.3.64.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.147/download -> libc-0.2.147.crate https://crates.io/api/v1/crates/libgit2-sys/0.16.1+1.7.1/download -> libgit2-sys-0.16.1+1.7.1.crate https://crates.io/api/v1/crates/libz-sys/1.1.2/download -> libz-sys-1.1.2.crate https://crates.io/api/v1/crates/linux-raw-sys/0.3.8/download -> linux-raw-sys-0.3.8.crate https://crates.io/api/v1/crates/linux-raw-sys/0.4.7/download -> linux-raw-sys-0.4.7.crate https://crates.io/api/v1/crates/locale/0.2.2/download -> locale-0.2.2.crate https://crates.io/api/v1/crates/log/0.4.20/download -> log-0.4.20.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.6.3/download -> memchr-2.6.3.crate https://crates.io/api/v1/crates/memoffset/0.9.0/download -> memoffset-0.9.0.crate https://crates.io/api/v1/crates/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.16.0/download -> num_cpus-1.16.0.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/once_cell/1.18.0/download -> once_cell-1.18.0.crate https://crates.io/api/v1/crates/openssl-src/111.26.0+1.1.1u/download -> openssl-src-111.26.0+1.1.1u.crate https://crates.io/api/v1/crates/openssl-sys/0.9.61/download -> openssl-sys-0.9.61.crate https://crates.io/api/v1/crates/os_pipe/1.1.4/download -> os_pipe-1.1.4.crate https://crates.io/api/v1/crates/partition-identity/0.3.0/download -> partition-identity-0.3.0.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.11.2/download -> phf-0.11.2.crate https://crates.io/api/v1/crates/phf_generator/0.11.2/download -> phf_generator-0.11.2.crate https://crates.io/api/v1/crates/phf_macros/0.11.2/download -> phf_macros-0.11.2.crate https://crates.io/api/v1/crates/phf_shared/0.11.2/download -> phf_shared-0.11.2.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.66/download -> proc-macro2-1.0.66.crate https://crates.io/api/v1/crates/proc-mounts/0.3.0/download -> proc-mounts-0.3.0.crate https://crates.io/api/v1/crates/quote/1.0.33/download -> quote-1.0.33.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rayon-core/1.11.0/download -> rayon-core-1.11.0.crate https://crates.io/api/v1/crates/rayon/1.7.0/download -> rayon-1.7.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_syscall/0.3.5/download -> redox_syscall-0.3.5.crate https://crates.io/api/v1/crates/rustix/0.37.23/download -> rustix-0.37.23.crate https://crates.io/api/v1/crates/rustix/0.38.13/download -> rustix-0.38.13.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/scopeguard/1.2.0/download -> scopeguard-1.2.0.crate https://crates.io/api/v1/crates/serde/1.0.188/download -> serde-1.0.188.crate https://crates.io/api/v1/crates/serde_derive/1.0.188/download -> serde_derive-1.0.188.crate https://crates.io/api/v1/crates/serde_spanned/0.6.3/download -> serde_spanned-0.6.3.crate https://crates.io/api/v1/crates/shlex/1.2.0/download -> shlex-1.2.0.crate https://crates.io/api/v1/crates/similar/2.2.1/download -> similar-2.2.1.crate https://crates.io/api/v1/crates/siphasher/0.3.11/download -> siphasher-0.3.11.crate https://crates.io/api/v1/crates/snapbox-macros/0.3.5/download -> snapbox-macros-0.3.5.crate https://crates.io/api/v1/crates/snapbox/0.4.12/download -> snapbox-0.4.12.crate https://crates.io/api/v1/crates/syn/2.0.29/download -> syn-2.0.29.crate https://crates.io/api/v1/crates/tempfile/3.8.0/download -> tempfile-3.8.0.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/terminal_size/0.2.6/download -> terminal_size-0.2.6.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.48/download -> thiserror-impl-1.0.48.crate https://crates.io/api/v1/crates/thiserror/1.0.48/download -> thiserror-1.0.48.crate https://crates.io/api/v1/crates/timeago/0.4.1/download -> timeago-0.4.1.crate https://crates.io/api/v1/crates/tinyvec/1.2.0/download -> tinyvec-1.2.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml_datetime/0.6.3/download -> toml_datetime-0.6.3.crate https://crates.io/api/v1/crates/toml_edit/0.19.15/download -> toml_edit-0.19.15.crate https://crates.io/api/v1/crates/trycmd/0.14.17/download -> trycmd-0.14.17.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.5/download -> unicode-bidi-0.3.5.crate https://crates.io/api/v1/crates/unicode-ident/1.0.11/download -> unicode-ident-1.0.11.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.17/download -> unicode-normalization-0.1.17.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/url/2.2.1/download -> url-2.2.1.crate https://crates.io/api/v1/crates/urlencoding/2.1.3/download -> urlencoding-2.1.3.crate https://crates.io/api/v1/crates/utf8parse/0.2.1/download -> utf8parse-0.2.1.crate https://crates.io/api/v1/crates/uzers/0.11.3/download -> uzers-0.11.3.crate https://crates.io/api/v1/crates/vcpkg/0.2.12/download -> vcpkg-0.2.12.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.4.0/download -> walkdir-2.4.0.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.87/download -> wasm-bindgen-backend-0.2.87.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.87/download -> wasm-bindgen-macro-support-0.2.87.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.87/download -> wasm-bindgen-macro-0.2.87.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.87/download -> wasm-bindgen-shared-0.2.87.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.87/download -> wasm-bindgen-0.2.87.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/windows-sys/0.48.0/download -> windows-sys-0.48.0.crate https://crates.io/api/v1/crates/windows-targets/0.48.5/download -> windows-targets-0.48.5.crate https://crates.io/api/v1/crates/windows/0.48.0/download -> windows-0.48.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.5/download -> windows_aarch64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.5/download -> windows_aarch64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.5/download -> windows_i686_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.5/download -> windows_i686_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.5/download -> windows_x86_64_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.5/download -> windows_x86_64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.5/download -> windows_x86_64_msvc-0.48.5.crate https://crates.io/api/v1/crates/winnow/0.5.15/download -> winnow-0.5.15.crate https://crates.io/api/v1/crates/zoneinfo_compiled/0.5.1/download -> zoneinfo_compiled-0.5.1.crate
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	8520ae1bed0e6965d027399b471a3595	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	shell-completion	bb7eb6bc232cd6c4bf8af739cdd2ee14	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=1a98ec1ce6a71a242807ae8347153d19
diff --git a/metadata/md5-cache/sys-apps/system-monitoring-center-2.21.1 b/metadata/md5-cache/sys-apps/system-monitoring-center-2.21.1
index 2ea90fa56608..3d30080ab5de 100644
--- a/metadata/md5-cache/sys-apps/system-monitoring-center-2.21.1
+++ b/metadata/md5-cache/sys-apps/system-monitoring-center-2.21.1
@@ -6,11 +6,11 @@ HOMEPAGE=https://github.com/hakandundar34coding/system-monitoring-center/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=meson python-single-r1 xdg
 IUSE=python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) gui-libs/gtk:4[introspection] gui-libs/libadwaita:1 sys-apps/dmidecode sys-apps/hwdata python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pycairo[python_targets_python3_12(-)] dev-python/pygobject:3[python_targets_python3_12(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 SLOT=0
 SRC_URI=https://github.com/hakandundar34coding/system-monitoring-center/archive/v2.21.1.tar.gz -> system-monitoring-center-2.21.1.tar.gz
 _eclasses_=meson	08b7183c3f4811568ee93eb0f79a89fe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b2b70f65f9e2b291026d63251c50a8b9
+_md5_=75b8205f5b02bf809372835ea98fc521
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 5a4382d8ac16..cc442c121e68 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/charliecloud-0.32 b/metadata/md5-cache/sys-cluster/charliecloud-0.34
index 62528cd8a3b0..46eaa122aef1 100644
--- a/metadata/md5-cache/sys-cluster/charliecloud-0.32
+++ b/metadata/md5-cache/sys-cluster/charliecloud-0.34
@@ -1,17 +1,17 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=ch-image? ( python_single_target_python3_10? ( dev-python/lark[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lark[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] ) ) doc? ( python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) net-misc/rsync )
+DEPEND=ch-image? ( python_single_target_python3_10? ( dev-python/lark[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lark[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/lark[python_targets_python3_12(-)] dev-python/requests[python_targets_python3_12(-)] ) ) doc? ( python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/sphinx[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) net-misc/rsync )
 DESCRIPTION=Lightweight user-defined software stacks for high-performance computing
 EAPI=8
 HOMEPAGE=https://hpc.github.io/charliecloud/
 INHERIT=autotools optfeature python-single-r1
-IUSE=ch-image doc python_single_target_python3_10 python_single_target_python3_11
+IUSE=ch-image doc python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
 KEYWORDS=~amd64 ~x86 ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) elibc_musl? ( sys-libs/argp-standalone )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) elibc_musl? ( sys-libs/argp-standalone )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/hpc/charliecloud/archive/v0.32.tar.gz -> charliecloud-0.32.tar.gz
+SRC_URI=https://github.com/hpc/charliecloud/archive/v0.34.tar.gz -> charliecloud-0.34.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=d3b2e629063408c470b9412690f4b5be
+_md5_=5a8a0c301dddeb8b43357f6a1731443a
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-9999 b/metadata/md5-cache/sys-cluster/charliecloud-9999
index 18211beb1bd0..3636df169f93 100644
--- a/metadata/md5-cache/sys-cluster/charliecloud-9999
+++ b/metadata/md5-cache/sys-cluster/charliecloud-9999
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst prepare setup unpack
-DEPEND=ch-image? ( python_single_target_python3_10? ( dev-python/lark[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lark[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] ) ) doc? ( python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) net-misc/rsync )
+DEPEND=ch-image? ( python_single_target_python3_10? ( dev-python/lark[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lark[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/lark[python_targets_python3_12(-)] dev-python/requests[python_targets_python3_12(-)] ) ) doc? ( python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/sphinx[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) net-misc/rsync )
 DESCRIPTION=Lightweight user-defined software stacks for high-performance computing
 EAPI=8
 HOMEPAGE=https://hpc.github.io/charliecloud/
 INHERIT=autotools optfeature python-single-r1 git-r3
-IUSE=ch-image doc python_single_target_python3_10 python_single_target_python3_11
+IUSE=ch-image doc python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) elibc_musl? ( sys-libs/argp-standalone )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) elibc_musl? ( sys-libs/argp-standalone )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	git-r3	2358a7b20091609e24bd3a83b3ac5991	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=d3b2e629063408c470b9412690f4b5be
+_md5_=5a8a0c301dddeb8b43357f6a1731443a
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-10.2-r2 b/metadata/md5-cache/sys-cluster/glusterfs-10.2-r2
deleted file mode 100644
index 93486f18c05f..000000000000
--- a/metadata/md5-cache/sys-cluster/glusterfs-10.2-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/openssl:=[-bindist(-)] net-libs/rpcsvc-proto dev-libs/userspace-rcu:= sys-apps/util-linux sys-libs/readline:= python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) !elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) selinux? ( sec-policy/selinux-glusterfs ) tcmalloc? ( dev-util/google-perftools ) uring? ( sys-libs/liburing:= ) xml? ( dev-libs/libxml2 ) virtual/acl test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
-DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
-EAPI=7
-HOMEPAGE=https://www.gluster.org/ https://github.com/gluster/glusterfs/
-INHERIT=autotools elisp-common python-single-r1 tmpfiles systemd
-IUSE=debug emacs +fuse georeplication ipv6 +libtirpc rsyslog selinux static-libs tcmalloc test +uring xml python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 LGPL-3+ )
-RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/openssl:=[-bindist(-)] net-libs/rpcsvc-proto dev-libs/userspace-rcu:= sys-apps/util-linux sys-libs/readline:= python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) !elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) selinux? ( sec-policy/selinux-glusterfs ) tcmalloc? ( dev-util/google-perftools ) uring? ( sys-libs/liburing:= ) xml? ( dev-libs/libxml2 ) virtual/tmpfiles
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) georeplication? ( xml ) ipv6? ( libtirpc )
-RESTRICT=test
-SLOT=0/10
-SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/10/10.2/glusterfs-10.2.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=fdd9f8c9ef8412cb155155ac604f300f
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index f21386f68535..a8c740f32e05 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/rar2fs-1.29.6 b/metadata/md5-cache/sys-fs/rar2fs-1.29.6
new file mode 100644
index 000000000000..73d7cb65151c
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/rar2fs-1.29.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=>=app-arch/unrar-5:= sys-fs/fuse:0
+DESCRIPTION=A FUSE based filesystem that can mount one or multiple RAR archive(s)
+EAPI=8
+HOMEPAGE=https://hasse69.github.io/rar2fs/ https://github.com/hasse69/rar2fs
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/unrar-5:= sys-fs/fuse:0
+SLOT=0
+SRC_URI=https://github.com/hasse69/rar2fs/releases/download/v1.29.6/rar2fs-1.29.6.tar.gz
+_md5_=23b59e24e37263b8810ce27b712cbbcf
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index d40eabd8c82e..7a93c0622015 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/httpd-php-7.4 b/metadata/md5-cache/virtual/httpd-php-7.4
deleted file mode 100644
index df96fd516ca7..000000000000
--- a/metadata/md5-cache/virtual/httpd-php-7.4
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to provide PHP-enabled webservers
-EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-RDEPEND=|| ( dev-lang/php:7.4[fpm] dev-lang/php:7.4[apache2] dev-lang/php:7.4[cgi] )
-SLOT=7.4
-_md5_=5ab7e571815f160fa515cbbfa4707113
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 011bce7d1e14..d33617e6d619 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/dokuwiki-20230404a b/metadata/md5-cache/www-apps/dokuwiki-20230404a-r1
index 7d51bbb821e0..71d2719d0da7 100644
--- a/metadata/md5-cache/www-apps/dokuwiki-20230404a
+++ b/metadata/md5-cache/www-apps/dokuwiki-20230404a-r1
@@ -7,8 +7,8 @@ INHERIT=webapp
 IUSE=gd vhosts
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/php-7.4[xml] virtual/httpd-php:* gd? ( || ( dev-lang/php[gd] media-gfx/imagemagick ) ) app-admin/webapp-config
-SLOT=20230404a
+RDEPEND=>=dev-lang/php-8.0[xml] virtual/httpd-php:* gd? ( || ( dev-lang/php[gd] media-gfx/imagemagick ) ) app-admin/webapp-config
+SLOT=20230404a-r1
 SRC_URI=https://download.dokuwiki.org/src/dokuwiki/dokuwiki-2023-04-04a.tgz
 _eclasses_=webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=b273be010bce3d522a94c35fcaf0c692
+_md5_=6cc7b07cb6d256182d691038534eee1f
diff --git a/metadata/md5-cache/www-apps/icingadb-web-1.0.1 b/metadata/md5-cache/www-apps/icingadb-web-1.0.1
deleted file mode 100644
index 7887747558fc..000000000000
--- a/metadata/md5-cache/www-apps/icingadb-web-1.0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=UI for Icinga DB
-EAPI=8
-HOMEPAGE=https://icinga.com/docs/icinga-db-web/
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=|| ( dev-lang/php:7.4[curl,xml] dev-lang/php:8.0[curl,xml] dev-lang/php:8.1[curl,xml] dev-lang/php:8.2[curl,xml] ) >=dev-libs/icinga-php-library-0.9 >=dev-libs/icinga-php-thirdparty-0.11 >=www-apps/icingaweb2-2.9.0
-SLOT=0
-SRC_URI=https://github.com/Icinga/icingadb-web/archive/refs/tags/v1.0.1.tar.gz -> icingadb-web-1.0.1.tar.gz
-_md5_=a28449b939e04b2b4fab05c2209ab6e8
diff --git a/metadata/md5-cache/www-apps/icingadb-web-1.0.1-r1 b/metadata/md5-cache/www-apps/icingadb-web-1.0.1-r1
new file mode 100644
index 000000000000..b8628a3f8800
--- /dev/null
+++ b/metadata/md5-cache/www-apps/icingadb-web-1.0.1-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=UI for Icinga DB
+EAPI=8
+HOMEPAGE=https://icinga.com/docs/icinga-db-web/
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=|| ( dev-lang/php:8.0[curl,xml] dev-lang/php:8.1[curl,xml] dev-lang/php:8.2[curl,xml] ) >=dev-libs/icinga-php-library-0.9 >=dev-libs/icinga-php-thirdparty-0.11 >=www-apps/icingaweb2-2.9.0
+SLOT=0
+SRC_URI=https://github.com/Icinga/icingadb-web/archive/refs/tags/v1.0.1.tar.gz -> icingadb-web-1.0.1.tar.gz
+_md5_=003c244a1cd7d85be720e44b6e0436d3
diff --git a/metadata/md5-cache/www-apps/icingadb-web-1.0.2 b/metadata/md5-cache/www-apps/icingadb-web-1.0.2
deleted file mode 100644
index c6a90234067f..000000000000
--- a/metadata/md5-cache/www-apps/icingadb-web-1.0.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=UI for Icinga DB
-EAPI=8
-HOMEPAGE=https://icinga.com/docs/icinga-db-web/
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=|| ( dev-lang/php:7.4[curl,xml] dev-lang/php:8.0[curl,xml] dev-lang/php:8.1[curl,xml] dev-lang/php:8.2[curl,xml] ) >=dev-libs/icinga-php-library-0.9 >=dev-libs/icinga-php-thirdparty-0.11 >=www-apps/icingaweb2-2.9.0
-SLOT=0
-SRC_URI=https://github.com/Icinga/icingadb-web/archive/refs/tags/v1.0.2.tar.gz -> icingadb-web-1.0.2.tar.gz
-_md5_=a28449b939e04b2b4fab05c2209ab6e8
diff --git a/metadata/md5-cache/www-apps/icingadb-web-1.0.2-r1 b/metadata/md5-cache/www-apps/icingadb-web-1.0.2-r1
new file mode 100644
index 000000000000..daae636a6a56
--- /dev/null
+++ b/metadata/md5-cache/www-apps/icingadb-web-1.0.2-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=UI for Icinga DB
+EAPI=8
+HOMEPAGE=https://icinga.com/docs/icinga-db-web/
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=|| ( dev-lang/php:8.0[curl,xml] dev-lang/php:8.1[curl,xml] dev-lang/php:8.2[curl,xml] ) >=dev-libs/icinga-php-library-0.9 >=dev-libs/icinga-php-thirdparty-0.11 >=www-apps/icingaweb2-2.9.0
+SLOT=0
+SRC_URI=https://github.com/Icinga/icingadb-web/archive/refs/tags/v1.0.2.tar.gz -> icingadb-web-1.0.2.tar.gz
+_md5_=003c244a1cd7d85be720e44b6e0436d3
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.11.4 b/metadata/md5-cache/www-apps/icingaweb2-2.11.4
deleted file mode 100644
index c3d3c484fbd1..000000000000
--- a/metadata/md5-cache/www-apps/icingaweb2-2.11.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=config install postinst setup
-DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) >=dev-libs/icinga-php-library-0.8.1 >=dev-libs/icinga-php-thirdparty-0.11.0 acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
-DESCRIPTION=Icinga Web 2 - Frontend for icinga2
-EAPI=7
-HOMEPAGE=http://www.icinga.org/
-INHERIT=depend.apache multilib
-IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) >=dev-libs/icinga-php-library-0.8.1 >=dev-libs/icinga-php-thirdparty-0.11.0 acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
-SLOT=0
-SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.11.4 -> icingaweb2-2.11.4.tar.gz
-_eclasses_=depend.apache	416d1c5005c5f4594e79812fb7323f0d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=6a26c4b5d5b11d145367b322831c902d
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.11.4-r1 b/metadata/md5-cache/www-apps/icingaweb2-2.11.4-r1
new file mode 100644
index 000000000000..ae3607b35181
--- /dev/null
+++ b/metadata/md5-cache/www-apps/icingaweb2-2.11.4-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=config install postinst setup
+DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) >=dev-libs/icinga-php-library-0.8.1 >=dev-libs/icinga-php-thirdparty-0.11.0 acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
+DESCRIPTION=Icinga Web 2 - Frontend for icinga2
+EAPI=7
+HOMEPAGE=http://www.icinga.org/
+INHERIT=depend.apache multilib
+IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) >=dev-libs/icinga-php-library-0.8.1 >=dev-libs/icinga-php-thirdparty-0.11.0 acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
+REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
+SLOT=0
+SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.11.4 -> icingaweb2-2.11.4.tar.gz
+_eclasses_=depend.apache	416d1c5005c5f4594e79812fb7323f0d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=4e3e08ca8f4db77e8291609a0ee64fa9
diff --git a/metadata/md5-cache/www-apps/icingaweb2-9999 b/metadata/md5-cache/www-apps/icingaweb2-9999
index 17bd28232ae6..47dacbefa0f2 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-9999
+++ b/metadata/md5-cache/www-apps/icingaweb2-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=config install postinst setup unpack
-DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) >=dev-libs/icinga-php-library-0.8.1 >=dev-libs/icinga-php-thirdparty-0.11.0 acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
+DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) >=dev-libs/icinga-php-library-0.8.1 >=dev-libs/icinga-php-thirdparty-0.11.0 acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
 DESCRIPTION=Icinga Web 2 - Frontend for icinga2
 EAPI=7
 HOMEPAGE=http://www.icinga.org/
@@ -8,8 +8,8 @@ INHERIT=depend.apache multilib git-r3
 IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) >=dev-libs/icinga-php-library-0.8.1 >=dev-libs/icinga-php-thirdparty-0.11.0 acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
+RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) >=dev-libs/icinga-php-library-0.8.1 >=dev-libs/icinga-php-thirdparty-0.11.0 acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
 SLOT=0
 _eclasses_=depend.apache	416d1c5005c5f4594e79812fb7323f0d	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=0c9c7ce8f6f00f411a29c21291e5383d
+_md5_=ef416fc8e6cc6ef5e6a2daa213a0623c
diff --git a/metadata/md5-cache/www-apps/selfoss-2.19 b/metadata/md5-cache/www-apps/selfoss-2.19
deleted file mode 100644
index 6f83e32e5536..000000000000
--- a/metadata/md5-cache/www-apps/selfoss-2.19
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=app-admin/webapp-config
-DESCRIPTION=The multipurpose rss reader, live stream, mashup, aggregation web application
-EAPI=8
-HOMEPAGE=https://selfoss.aditu.de/
-INHERIT=readme.gentoo-r1 webapp
-IUSE=vhosts
-KEYWORDS=amd64 arm arm64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-lang/php-5.6.0[curl,gd] <dev-lang/php-8 virtual/httpd-php || ( dev-db/mysql dev-db/postgresql dev-db/sqlite ) app-admin/webapp-config
-SLOT=2.19
-SRC_URI=https://github.com/SSilence/selfoss/releases/download/2.19/selfoss-2.19.zip
-_eclasses_=readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=e0744aa57b840d546acb83d1699cccbe
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index b2b575dc0436..97d6eb43347a 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/firefox-102.15.1 b/metadata/md5-cache/www-client/firefox-102.15.1
index 0ac398c474b6..7613e8a3d037 100644
--- a/metadata/md5-cache/www-client/firefox-102.15.1
+++ b/metadata/md5-cache/www-client/firefox-102.15.1
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.mozilla.com/firefox
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs virtualx xdg
 IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi geckodriver +gmp-autoupdate screencast l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_ach l10n_an l10n_az l10n_bn l10n_bs l10n_ca-valencia l10n_eo l10n_es-CL l10n_es-MX l10n_fa l10n_ff l10n_gn l10n_gu l10n_hi l10n_hy l10n_ia l10n_km l10n_kn l10n_lij l10n_mk l10n_mr l10n_my l10n_ne l10n_oc l10n_sco l10n_si l10n_son l10n_szl l10n_ta l10n_te l10n_tl l10n_trs l10n_ur l10n_xh pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc64 ~x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=!www-client/firefox:0 !www-client/firefox:rapid screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.79.2 >=dev-libs/nspr-4.34 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme virtual/opengl x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] )
 REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus ) screencast? ( wayland )
 SLOT=esr
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/source/firefox-102.15.1esr.source.tar.xz -> firefox-102.15.1esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-13.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-13.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-13.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/af.xpi -> firefox-102.15.1esr-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/ar.xpi -> firefox-102.15.1esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/ast.xpi -> firefox-102.15.1esr-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/be.xpi -> firefox-102.15.1esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/bg.xpi -> firefox-102.15.1esr-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/br.xpi -> firefox-102.15.1esr-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/ca.xpi -> firefox-102.15.1esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/cak.xpi -> firefox-102.15.1esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/cs.xpi -> firefox-102.15.1esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/cy.xpi -> firefox-102.15.1esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/da.xpi -> firefox-102.15.1esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/de.xpi -> firefox-102.15.1esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/dsb.xpi -> firefox-102.15.1esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/el.xpi -> firefox-102.15.1esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/en-CA.xpi -> firefox-102.15.1esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/en-GB.xpi -> firefox-102.15.1esr-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/es-AR.xpi -> firefox-102.15.1esr-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/es-ES.xpi -> firefox-102.15.1esr-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/et.xpi -> firefox-102.15.1esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/eu.xpi -> firefox-102.15.1esr-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/fi.xpi -> firefox-102.15.1esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/fr.xpi -> firefox-102.15.1esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-102.15.1esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-102.15.1esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/gd.xpi -> firefox-102.15.1esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/gl.xpi -> firefox-102.15.1esr-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/he.xpi -> firefox-102.15.1esr-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/hr.xpi -> firefox-102.15.1esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/hsb.xpi -> firefox-102.15.1esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/hu.xpi -> firefox-102.15.1esr-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/id.xpi -> firefox-102.15.1esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/is.xpi -> firefox-102.15.1esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/it.xpi -> firefox-102.15.1esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/ja.xpi -> firefox-102.15.1esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/ka.xpi -> firefox-102.15.1esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/kab.xpi -> firefox-102.15.1esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/kk.xpi -> firefox-102.15.1esr-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/ko.xpi -> firefox-102.15.1esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/lt.xpi -> firefox-102.15.1esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/lv.xpi -> firefox-102.15.1esr-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/ms.xpi -> firefox-102.15.1esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-102.15.1esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/nl.xpi -> firefox-102.15.1esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-102.15.1esr-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-102.15.1esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/pl.xpi -> firefox-102.15.1esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-102.15.1esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-102.15.1esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/rm.xpi -> firefox-102.15.1esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/ro.xpi -> firefox-102.15.1esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/ru.xpi -> firefox-102.15.1esr-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/sk.xpi -> firefox-102.15.1esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/sl.xpi -> firefox-102.15.1esr-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/sq.xpi -> firefox-102.15.1esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/sr.xpi -> firefox-102.15.1esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-102.15.1esr-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/th.xpi -> firefox-102.15.1esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/tr.xpi -> firefox-102.15.1esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/uk.xpi -> firefox-102.15.1esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/uz.xpi -> firefox-102.15.1esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/vi.xpi -> firefox-102.15.1esr-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-102.15.1esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-102.15.1esr-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/ach.xpi -> firefox-102.15.1esr-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/an.xpi -> firefox-102.15.1esr-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/az.xpi -> firefox-102.15.1esr-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/bn.xpi -> firefox-102.15.1esr-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/bs.xpi -> firefox-102.15.1esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-102.15.1esr-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/eo.xpi -> firefox-102.15.1esr-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/es-CL.xpi -> firefox-102.15.1esr-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/es-MX.xpi -> firefox-102.15.1esr-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/fa.xpi -> firefox-102.15.1esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/ff.xpi -> firefox-102.15.1esr-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/gn.xpi -> firefox-102.15.1esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-102.15.1esr-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-102.15.1esr-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-102.15.1esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/ia.xpi -> firefox-102.15.1esr-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/km.xpi -> firefox-102.15.1esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/kn.xpi -> firefox-102.15.1esr-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/lij.xpi -> firefox-102.15.1esr-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/mk.xpi -> firefox-102.15.1esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/mr.xpi -> firefox-102.15.1esr-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/my.xpi -> firefox-102.15.1esr-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-102.15.1esr-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/oc.xpi -> firefox-102.15.1esr-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/sco.xpi -> firefox-102.15.1esr-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/si.xpi -> firefox-102.15.1esr-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/son.xpi -> firefox-102.15.1esr-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/szl.xpi -> firefox-102.15.1esr-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/ta.xpi -> firefox-102.15.1esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/te.xpi -> firefox-102.15.1esr-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/tl.xpi -> firefox-102.15.1esr-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/trs.xpi -> firefox-102.15.1esr-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/ur.xpi -> firefox-102.15.1esr-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/102.15.1esr/linux-x86_64/xpi/xh.xpi -> firefox-102.15.1esr-xh.xpi )
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	976dc8267d6a5af8b259cb956b52d51f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8f46c93ad4b9caabb29bfe2a66b94e37
+_md5_=0e31ac5dcaac69f650564865cd9e81db
diff --git a/metadata/md5-cache/www-client/qutebrowser-3.0.0 b/metadata/md5-cache/www-client/qutebrowser-3.0.0
index d583c6c69348..14b291f7fe47 100644
--- a/metadata/md5-cache/www-client/qutebrowser-3.0.0
+++ b/metadata/md5-cache/www-client/qutebrowser-3.0.0
@@ -6,7 +6,7 @@ HOMEPAGE=https://qutebrowser.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=distutils-r1 xdg verify-sig
 IUSE=+adblock pdf +qt6 widevine test python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 verify-sig
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=GPL-3+
 RDEPEND=python_single_target_python3_10? ( dev-python/colorama[python_targets_python3_10(-)] dev-python/jinja[python_targets_python3_10(-)] dev-python/markupsafe[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/zipp[python_targets_python3_10(-)] adblock? ( dev-python/adblock[python_targets_python3_10(-)] ) qt6? ( dev-qt/qtbase:6[icu,sqlite] dev-python/PyQt6[python_targets_python3_10(-),dbus,gui,network,opengl,printsupport,qml,sql,widgets] dev-python/PyQt6-WebEngine[python_targets_python3_10(-),widgets] pdf? ( www-plugins/pdfjs ) ) !qt6? ( dev-qt/qtcore:5[icu] dev-qt/qtgui:5[png] dev-qt/qtsql:5[sqlite] dev-python/PyQt5[python_targets_python3_10(-),dbus,declarative,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_10(-)] pdf? ( <www-plugins/pdfjs-3 ) ) widevine? ( www-plugins/chrome-binary-plugins ) ) python_single_target_python3_11? ( dev-python/colorama[python_targets_python3_11(-)] dev-python/jinja[python_targets_python3_11(-)] dev-python/markupsafe[python_targets_python3_11(-)] dev-python/pygments[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/zipp[python_targets_python3_11(-)] adblock? ( dev-python/adblock[python_targets_python3_11(-)] ) qt6? ( dev-qt/qtbase:6[icu,sqlite] dev-python/PyQt6[python_targets_python3_11(-),dbus,gui,network,opengl,printsupport,qml,sql,widgets] dev-python/PyQt6-WebEngine[python_targets_python3_11(-),widgets] pdf? ( www-plugins/pdfjs ) ) !qt6? ( dev-qt/qtcore:5[icu] dev-qt/qtgui:5[png] dev-qt/qtsql:5[sqlite] dev-python/PyQt5[python_targets_python3_11(-),dbus,declarative,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_11(-)] pdf? ( <www-plugins/pdfjs-3 ) ) widevine? ( www-plugins/chrome-binary-plugins ) ) python_single_target_python3_12? ( dev-python/colorama[python_targets_python3_12(-)] dev-python/jinja[python_targets_python3_12(-)] dev-python/markupsafe[python_targets_python3_12(-)] dev-python/pygments[python_targets_python3_12(-)] dev-python/pyyaml[python_targets_python3_12(-)] dev-python/zipp[python_targets_python3_12(-)] adblock? ( dev-python/adblock[python_targets_python3_12(-)] ) qt6? ( dev-qt/qtbase:6[icu,sqlite] dev-python/PyQt6[python_targets_python3_12(-),dbus,gui,network,opengl,printsupport,qml,sql,widgets] dev-python/PyQt6-WebEngine[python_targets_python3_12(-),widgets] pdf? ( www-plugins/pdfjs ) ) !qt6? ( dev-qt/qtcore:5[icu] dev-qt/qtgui:5[png] dev-qt/qtsql:5[sqlite] dev-python/PyQt5[python_targets_python3_12(-),dbus,declarative,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_12(-)] pdf? ( <www-plugins/pdfjs-3 ) ) widevine? ( www-plugins/chrome-binary-plugins ) ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v3.0.0/qutebrowser-3.0.0.tar.gz verify-sig? ( https://github.com/qutebrowser/qutebrowser/releases/download/v3.0.0/qutebrowser-3.0.0.tar.gz.asc )
 _eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	90255aaab6156b22ee05150fe5ffbe6b	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2a4755fd450337f76850b204f87186bd
+_md5_=64ac410c938a910f2805ee660a55e398
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index cf93e3943a27..0f27ae5ce754 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/tomcat-10.1.11 b/metadata/md5-cache/www-servers/tomcat-10.1.11
deleted file mode 100644
index a0fa9bda7664..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-10.1.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.11:10.1.11 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core >=virtual/jdk-11:* test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/
-INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
-IUSE=extra-webapps doc source test verify-sig
-KEYWORDS=amd64 ~arm ~arm64 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=10.1
-SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.11/src/apache-tomcat-10.1.11-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.0/biz.aQute.bnd-6.4.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.11/src/apache-tomcat-10.1.11-src.tar.gz.asc )
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	7311f5500eba17e0a599cd934f9db152	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	90255aaab6156b22ee05150fe5ffbe6b
-_md5_=978de0a9d3beb49f66001aa572ca0721
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.91 b/metadata/md5-cache/www-servers/tomcat-8.5.91
deleted file mode 100644
index a62b2397ef6c..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-8.5.91
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-8.5.91:8.5.91 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/eclipse-ecj:4.15 app-admin/pwgen dev-java/ant-core >=virtual/jdk-1.8:* doc? ( dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 ) test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/
-INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
-IUSE=extra-webapps doc source test verify-sig
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.15 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=8.5
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.91/src/apache-tomcat-8.5.91-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.91/src/apache-tomcat-8.5.91-src.tar.gz.asc )
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	7311f5500eba17e0a599cd934f9db152	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	90255aaab6156b22ee05150fe5ffbe6b
-_md5_=7955f81eb23457c5c48117eca424c49f
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.78 b/metadata/md5-cache/www-servers/tomcat-9.0.78
deleted file mode 100644
index c4d0992e2f46..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-9.0.78
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.78:9.0.78 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/eclipse-ecj:4.15 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core >=virtual/jdk-1.8:* test? ( dev-java/ant-junit dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/
-INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
-IUSE=extra-webapps doc source test verify-sig
-KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=9
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.78/src/apache-tomcat-9.0.78-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.0/biz.aQute.bnd-6.4.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.78/src/apache-tomcat-9.0.78-src.tar.gz.asc )
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	7311f5500eba17e0a599cd934f9db152	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	90255aaab6156b22ee05150fe5ffbe6b
-_md5_=0b135ba59aa2a83396cea1c703e479c5
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.21 b/metadata/md5-cache/www-servers/uwsgi-2.0.21
index 7dbdc6f19f88..b2e7885a7ee1 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.21
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.21
@@ -1,16 +1,16 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 ) )
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php? ( php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 ) )
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/zlib virtual/libcrypt:= caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson:= ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( dev-libs/openssl:= ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( postgres_targets_postgres15? ( dev-db/postgresql:15= ) postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap:= ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( php_targets_php7-4? ( dev-lang/php:7.4[embed] ) php_targets_php8-0? ( dev-lang/php:8.0[embed] ) php_targets_php8-1? ( dev-lang/php:8.1[embed] ) php_targets_php8-2? ( dev-lang/php:8.2[embed] ) ) python? ( python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) ) python-asyncio? ( virtual/python-greenlet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ruby? ( ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 ) )
+DEPEND=sys-libs/zlib virtual/libcrypt:= caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson:= ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( dev-libs/openssl:= ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( postgres_targets_postgres15? ( dev-db/postgresql:15= ) postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap:= ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( php_targets_php8-0? ( dev-lang/php:8.0[embed] ) php_targets_php8-1? ( dev-lang/php:8.1[embed] ) php_targets_php8-2? ( dev-lang/php:8.2[embed] ) ) python? ( python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) ) python-asyncio? ( virtual/python-greenlet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ruby? ( ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ) php? ( php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 ) )
 DESCRIPTION=uWSGI server for Python web applications
 EAPI=7
 HOMEPAGE=https://uwsgi-docs.readthedocs.io/en/latest/
 INHERIT=lua-single multiprocessing pax-utils php-ext-source-r3 postgres python-r1 ruby-ng
-IUSE=apache2 +caps debug +embedded expat jemalloc json +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl go lua php python python-asyncio ruby +lua_single_target_lua5-1 php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 postgres_targets_postgres15 postgres_targets_postgres14 postgres_targets_postgres13 python_targets_python3_10 python_targets_python3_11 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32
+IUSE=apache2 +caps debug +embedded expat jemalloc json +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl go lua php python python-asyncio ruby +lua_single_target_lua5-1 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 postgres_targets_postgres15 postgres_targets_postgres14 postgres_targets_postgres13 python_targets_python3_10 python_targets_python3_11 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32
 KEYWORDS=amd64 arm ~arm64 x86 ~amd64-linux
 LICENSE=GPL-2
-RDEPEND=sys-libs/zlib virtual/libcrypt:= caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson:= ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( dev-libs/openssl:= ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( postgres_targets_postgres15? ( dev-db/postgresql:15= ) postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap:= ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( php_targets_php7-4? ( dev-lang/php:7.4[embed] ) php_targets_php8-0? ( dev-lang/php:8.0[embed] ) php_targets_php8-1? ( dev-lang/php:8.1[embed] ) php_targets_php8-2? ( dev-lang/php:8.2[embed] ) ) python? ( python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) ) python-asyncio? ( virtual/python-greenlet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ruby? ( ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 ) )
-REQUIRED_USE=|| ( cgi mono perl go lua php python python-asyncio ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_pg? ( || ( postgres_targets_postgres15 postgres_targets_postgres14 postgres_targets_postgres13 ) ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) python-asyncio? ( python ) expat? ( xml ) php? ( || ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 ) )
+RDEPEND=sys-libs/zlib virtual/libcrypt:= caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson:= ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( dev-libs/openssl:= ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( postgres_targets_postgres15? ( dev-db/postgresql:15= ) postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap:= ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( php_targets_php8-0? ( dev-lang/php:8.0[embed] ) php_targets_php8-1? ( dev-lang/php:8.1[embed] ) php_targets_php8-2? ( dev-lang/php:8.2[embed] ) ) python? ( python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) ) python-asyncio? ( virtual/python-greenlet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ruby? ( ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) php? ( php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 ) )
+REQUIRED_USE=|| ( cgi mono perl go lua php python python-asyncio ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_pg? ( || ( postgres_targets_postgres15 postgres_targets_postgres14 postgres_targets_postgres13 ) ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) python-asyncio? ( python ) expat? ( xml ) php? ( || ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.21.tar.gz -> uwsgi-2.0.21.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	postgres	f7e8262a0ea1d45b88075bf93d1a74bd	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=bec7b91f9b410da3adc377487c934e31
+_md5_=e749f30c05938679350ab99af39a2bc2
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 8f72ed5ccf64..3d2054078576 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-09-15T03:09:59Z
+TIMESTAMP 2023-09-15T09:10:12Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUDywdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUEH3RfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAwaxAAjVz3uOX5gzNU3lf3Qof/GBI5ButNloc/iWPEc3UqravmW65h9vZQ+uLE
-ztAfkuGDtnpU1sDaUEyy0oIrJpiRcU85JstwvgjayPT8nyEXm9a9M0gYbtmW3cv/
-zZ5XxbMgGohIDncDn3vx1LlDh7NC5Z5au14mUu4OJ1cSdC9aTCRv2X67aWkjQ6O5
-KV+J/p1YHhLtbHXepLaC2lUPNn5xxQgNt4R6KA5T6v9xFuRisUEPcibgoM9Ue1zo
-5SXNdnh6GCIG1LgPe8n8y4w2fPp3Tprd7O+9bE3k67voRLxvizaMizWUcWr7PsG+
-J538Ld6tDmVdugJj71xpiWHBOr7h65tuafHZddzuCs5d4mLy9ZYS652ZNRRKn+29
-2lFJpSaOurhwGtKKqh6kTkMlZvm4CIEFIcdxpSZ6h5BICU+OAtnO/pCbwFdDDbAX
-9Bd/icvCWEvH8aqyqcgV6O3QqVJuhSMRzvGCYTJjfajW9TyNefeMMgkwKkdSt+/t
-AIYrV1ofCFSpli1oSGkQOFQSYfBcA+66y5q6exdVR7pHVpQpYcZrsH7aE8sFxQII
-E+WrGBYRq/fHSP4/7MUPUui6Twuirr0b/uBgishmi8oM4zTsYzoXKYEH9WuGxD1f
-yx/lHfQRSIqzlAc6Ilm+C+EliwkNQchyv92yQmERw3nkPU5amro=
-=KyPy
+klD8Ig//TVCFFUTh9pKhfXBlb2wqh07GR1ET6vnkaXX69DJAR5HsuADnik9vKrMj
+sLsoPo7Xf9u6JQYwY6r6sLic5O4w4wNOyRuxvQjiDSR6qqZe433Buz38MmPvKUie
+o4yej3XLwknOA58XEfoYro34qtKqdEVBQFsjAl6dzuN1HUO3fHlez+XXQl43Ztvr
+z+wdyPz5X53uS5IwxepB/M7u3RThJcv+ZGjmF24eBbr5q/I8pt8QidN0OplgFz+l
+VeUL2JIqR2PJ0p4b3i4bdI4rkQwQgwSUAwXymllPoiCxDUNcLKUUVc6VB8FRzobR
+R270/wiUhShIy5r46UJrB+0+p0rnPuqfSnqmBZNcmZiVRRiGbyueYFBpXv9N/qpf
+9H9smRcjq6kEWe0BlOczwju5pJbAcqzqFyFb8uC5u0/cLOySlu4BW5H+/dIS1fP5
+l5hYkYnCXsWyFPUR1hOfG3oyRzLmBciecld9RKJbMUzoHSeokQbEChqMpm9hIxUT
+kiN8dV07akpA7yAV1nXhI7oThQDrJ2SmrYnLGcpM700VLWxIjcRJEiDuQ9mXNuZJ
+x7ixHTEyg2rLUS9LytiUW+y7JCO7S8lGzJTZCx+0wQ4yVnJyjGi/E/54LbDjtQlF
+6qHrXK5WQslkS2DrMK5LWtAoD2gilNSb0yHs5bCoHpZsMGT/1iE=
+=Ti8v
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index f1303ef00011..e8a4de17d1de 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 15 Sep 2023 03:09:55 +0000
+Fri, 15 Sep 2023 09:10:06 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index be8945735ca8..2f7008f7bd0b 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Sep 15 03:09:55 AM UTC 2023
+Fri Sep 15 09:10:05 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a88f12bb80e7..af1e6ceb34d4 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 15 Sep 2023 03:15:01 +0000
+Fri, 15 Sep 2023 09:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 97ae7ba86881..4fd5a1aef4e8 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-f1515d619ced146bfadc7d15d6d9970ecc1c0390 1694742137 2023-09-15T01:42:17+00:00
+57c41ab13ffae170a7d3123a9ec41e2e4d81d3ff 1694768014 2023-09-15T08:53:34+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c8c67c8a562f..6f7f8e3df07f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1694747401 Fri 15 Sep 2023 03:10:01 AM UTC
+1694769001 Fri 15 Sep 2023 09:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index f1303ef00011..a41651987c83 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 15 Sep 2023 03:09:55 +0000
+Fri, 15 Sep 2023 09:10:05 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index f39b03a020e4..f98b05a443c1 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/profanity/Manifest b/net-im/profanity/Manifest
index 83d458dad93b..cd1619e03731 100644
--- a/net-im/profanity/Manifest
+++ b/net-im/profanity/Manifest
@@ -1,8 +1,10 @@
 DIST profanity-0.13.1.tar.xz 621836 BLAKE2B e038fa01272150cb7974b03f88f64335bf1690115dbbb1c6fe04c79acb69db18c556edf41316af1d363f9715cd2e7aeb3f3bd867836704b620d9a87976b64fa9 SHA512 6d7d3c96c65e26c15cac1157bd296c1dbd3e2471aec959d6c319c68b70ec21cef0c40d7b4eed40c30c377a766db9f13a774ccb4880c227ee368e4dd607d9c267
 DIST profanity-0.14.0-ox-carbons.patch 1525 BLAKE2B 85fe9a76a8c735047365d56555c8e1df7906b5a676740a165fc5d9eab3933124b58abf6bdd0b448b5030a51cd1fad3ce8627cc03a2fbdacdd20c5dcc71d194e1 SHA512 36cfbb12ef7889ae5f318e35da2b0edf39dca067cefb9ac921f27cba0f52746eaae9d65b7631be392dd6e9a15d1fc8f8a3de36efe8707c756e9b008291e7f55e
+DIST profanity-0.14.0-plugins-install.patch 2295 BLAKE2B 8b67718abdb620875b9040f550685189acf5a2776aa5f45422e3471c13ae05bd773c05652048940d5b8d10d88c9a013c3262742db7c84b0ff0c108f5f78ead45 SHA512 a8912d5a33d4d6eebf85733f616ed729a05688b4acf70c927aa733755527fd4e523c3a485bbb0390b2006225e8420e1d76db7e91d2122af41496c0081e3b0cea
 DIST profanity-0.14.0-xscreensaver.patch 1678 BLAKE2B fe350b2249e45224b6510bb5730f38eafeb47e60a44035eaf88771940c9f0e556cc72ca737cb68c0b148b9faff442b9c9b6cdf9169a3db7ff6c7a60c2bdfc025 SHA512 2875df728b9957fc3bc8734a87c0e1a48913170b9718d6664ea65187327e26da1a7b2f5b80fe243a5ce5ab74983e4f3d22113747f44f8b8e8c13c871d31cf651
 DIST profanity-0.14.0.tar.gz 936272 BLAKE2B ec2ae625950a838ee50d6d3a87910bec76f28777bd662e909f394f18c277662694611a59d3be6c7f66821c2800a94b08f94b27a68d82e4de33b7d2f7b14ddf18 SHA512 25afd2f3146e6ed9f573f0e073cad0f06f7f8a21441c3c2c61641442d1aa5b9a7a817cdccc17354b32045ab9a965a95495a30c49088577a5060e8969725ea86e
 EBUILD profanity-0.13.1.ebuild 1432 BLAKE2B d82eda77c79054e906e97999c74aacd97a799890880a2329a2824570a518b3b694fde9cf9508e8fc76746ea70f09be0c5940d18e408d30ae14f3e135e292c303 SHA512 eeca616896f0552070e0530cf7a5f352daf6f305e7f98aa473070343be69ca3bc20596cf17245fe96a7f05659283b0d5f2fd3ca215a7f16936c181e111a3443b
-EBUILD profanity-0.14.0-r1.ebuild 2138 BLAKE2B 5b5dd729f34a15d3312e2d0ee2309348f289272b52cec79d376ba4d9e78601ec2e8cdebe223a87660501f7820a0078fe999a61874159258b57993bda4d2a0323 SHA512 3a22a455a0bd6e1008dd35d96eaa3b67037672916e319c60b01bc760502cb26d73616aa8b5cbe8d28012955efe42d1b028e80dd334db1ab23e03fd3596833513
+EBUILD profanity-0.14.0-r1.ebuild 2102 BLAKE2B 32617ab8c9b5a6c2d461f9ebecb4b2599e0b8dbd3afdba495f10b0a9f0dc7238a8dac7a1f9225c34a94650538187744577c7b289067eeac30af62c1561cad21b SHA512 ffbdd6ebae7205233932b3316d7ab98b56f915c0192d77a5adb34372c8a21d940b1f2aa906ee0907f82b92aa374b8be0d1998bb4cc9a16acf23c5f11f6b77b9b
+EBUILD profanity-0.14.0-r2.ebuild 2256 BLAKE2B 65657712187670df6d2873cf879899701b197f1fce074ae512e0fa91db7b5fb7d67dd9518f43d8c79930f123e97dbe4b7843ee12167584bbd7808ad76981dc7e SHA512 4ca7cf56a400a80c282423bd70e28b2e38785876a19d9188f4dbb51902da545f181901f11e09729ef080d11e2e6f1e39221abe2c22f7f132e151b210dd131d21
 EBUILD profanity-0.14.0.ebuild 1483 BLAKE2B 2031ef9c2f1fb2a7e0902c542790fd5fb15ce7c26873a03f78623e7b7e370ffa2154c2a3ab5dc50f259a648177b33121a6ce2a621a4ef4668e61601468c9a659 SHA512 1f7af3c0acfec07adabbbaf1a6bd6e52fb58544b8592ea744fc5df0b03dc059d237789eaf1aca63421fa28c759297890254d3d7976ae9a176caf5c61e0322d51
 MISC metadata.xml 978 BLAKE2B ebf55a164f1618c73881b073fa44937d8a9c158bcc7b4badbc830530b4256388edb6036e7118353f7b04f6633b97daf5689d5164806560ac5ba3f69b3a954f45 SHA512 ea13a1161d0d21f6c43fcae81b5750310553a0cdc36b1bca68ad4145dc5b48460da119424b948b15bfc0cd1c13d55f326a8edf50505e8c08ac067635b63c0148
diff --git a/net-im/profanity/profanity-0.14.0-r1.ebuild b/net-im/profanity/profanity-0.14.0-r1.ebuild
index f5c591413f3e..7ffbb30da303 100644
--- a/net-im/profanity/profanity-0.14.0-r1.ebuild
+++ b/net-im/profanity/profanity-0.14.0-r1.ebuild
@@ -9,11 +9,11 @@ inherit python-single-r1
 DESCRIPTION="A console based XMPP client inspired by Irssi"
 HOMEPAGE="https://profanity-im.github.io"
 SRC_URI="
-    https://github.com/profanity-im/profanity/releases/download/${PV}/${P}.tar.gz
-    https://github.com/profanity-im/profanity/commit/122434a.patch
-        -> ${PN}-0.14.0-ox-carbons.patch
-    https://github.com/profanity-im/profanity/commit/2ed6211c.patch
-        -> ${PN}-0.14.0-xscreensaver.patch
+	https://github.com/profanity-im/profanity/releases/download/${PV}/${P}.tar.gz
+	https://github.com/profanity-im/profanity/commit/122434a.patch
+		-> ${PN}-0.14.0-ox-carbons.patch
+	https://github.com/profanity-im/profanity/commit/2ed6211c.patch
+		-> ${PN}-0.14.0-xscreensaver.patch
 "
 
 LICENSE="GPL-3"
@@ -54,11 +54,11 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	test? ( dev-util/cmocka )
-    python? (
-	  $(python_gen_cond_dep '
-        dev-python/cython[${PYTHON_USEDEP}]
-      ')
-   )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_USEDEP}]
+		')
+	)
 "
 
 PATCHES=(
diff --git a/net-im/profanity/profanity-0.14.0-r2.ebuild b/net-im/profanity/profanity-0.14.0-r2.ebuild
new file mode 100644
index 000000000000..3426b20cecea
--- /dev/null
+++ b/net-im/profanity/profanity-0.14.0-r2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit python-single-r1
+
+DESCRIPTION="A console based XMPP client inspired by Irssi"
+HOMEPAGE="https://profanity-im.github.io"
+SRC_URI="
+	https://github.com/profanity-im/profanity/releases/download/${PV}/${P}.tar.gz
+	https://github.com/profanity-im/profanity/commit/122434a.patch
+		-> ${PN}-0.14.0-ox-carbons.patch
+	https://github.com/profanity-im/profanity/commit/2ed6211c.patch
+		-> ${PN}-0.14.0-xscreensaver.patch
+	https://github.com/profanity-im/profanity/commit/b8817470.patch
+		-> ${PN}-0.14.0-plugins-install.patch
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="libnotify omemo omemo-qrcode otr gpg test xscreensaver python"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="omemo-qrcode? ( omemo ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	>=dev-libs/libstrophe-0.12.3:=
+	media-libs/harfbuzz:=
+	net-misc/curl
+	sys-libs/ncurses:=[unicode(+)]
+	sys-libs/readline:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/pango
+	x11-misc/shared-mime-info
+	gpg? ( app-crypt/gpgme:= )
+	libnotify? ( x11-libs/libnotify )
+	omemo? (
+		dev-libs/libgcrypt:=
+		net-libs/libsignal-protocol-c
+	)
+	omemo-qrcode? ( media-gfx/qrencode:= )
+	otr? ( net-libs/libotr )
+	python? ( ${PYTHON_DEPS} )
+	xscreensaver? (
+		x11-libs/libXScrnSaver
+		x11-libs/libX11
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${DISTDIR}/${PN}-0.14.0-ox-carbons.patch"
+	"${DISTDIR}/${PN}-0.14.0-xscreensaver.patch"
+	"${DISTDIR}/${PN}-0.14.0-plugins-install.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-gdk-pixbuf
+		$(use_enable libnotify notifications)
+		$(use_enable omemo)
+		$(use_enable omemo-qrcode)
+		$(use_enable otr)
+		$(use_enable python python-plugins)
+		$(use_enable gpg pgp)
+		$(use_with xscreensaver)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 7e0829e329c6..084a864fd0a5 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 97be954bb3e5..987e39133a95 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,9 +1,6 @@
 AUX inspircd.confd 1224 BLAKE2B 84545ec9acdb9c0a4368f64cbfb4a2483d487f3664818951aa0a952b4dfa270f5738a5016fe64057791f2b4002ce207fb42ff8128734cab4ab9b856c8a0ebda4 SHA512 5c47c8588bf39e33e07584492fc672ffe5529b80d7d357ff48d7b6b3bd89a58915c856eeb78d7a68aa2897760a086c193b661641d8a0741c602010d9d0d0efd2
 AUX inspircd.initd 1189 BLAKE2B 1149e138cdcc189e53857538023a63b68261d6434f3b987fd74a2fe4c5b58087bcac6c42bd5c09262db2eafc29ef11847d1f8c000db663bec9851d64ae168dda SHA512 30bf71ec6fde9eb73f87179f55d33ec64367e447dba2c2ab5e383cd6b16e8f7db446a28017b115443e321305e245558f1f706185c4c2fb45c709380ac8cf67ff
-DIST inspircd-3.15.0-fix-build-paths.patch.bz2 4733 BLAKE2B 72bc94f8feb5620ce8bd735dd84a5805b086855af39ca204b2159c41f951fd8285e01aca69f9ef1c1b546060eb46a5b6a42c66e8831ab9289663429a8b0371fc SHA512 8d021f04b861d5b3a7bfd19f8b49e34498f1bdda02fda967d78b35af8329819a37a446db42c8c1f7c8543b3fa533dcff214b92b5393cd380a1d47fd32cdf0679
-DIST inspircd-3.15.0.tar.gz 874629 BLAKE2B 50dd2cdba497e85da6d72c22f612cae5944f2a654783d6edc673e956a33132c539ab71bc7ab9647468bd96cc3e2c73031a300e39df0753886af8ac532d07b696 SHA512 32d10cd7f6a06c79720c138fc4aff3c8db667754c7a2fe3ad7c07a1e56604bedcf17e3dd5d5f54a6fd49b37414acd57b97afc1d4accbf3e5fbd92b483fe6c394
 DIST inspircd-3.16.1-fix-build-paths.patch.bz2 4751 BLAKE2B 78ae06bfbdd6d389af2890aadebc5765f16d1616bb9c1b8820a21b2f2a283f4f4aea5bc4f7edc5d61acc80da67ca80a2d0b007a669cf7a37f1ea77b11f552643 SHA512 1fec0c784a1d306a62c9a5320236bfb53bffd4278bbcc8439ea640500b8668cec4e6c23174d1d88f8109bc88549c931ff889b4c07a8f0f5446bb85a434665702
 DIST inspircd-3.16.1.tar.gz 877817 BLAKE2B a54992c32a13a512bce93157b23a17d433fbdbf7efcaa54a66be17628335db379d0abbb14e22a455e069fd8fb2a1f3e0152a112acbe634e6de87208b4a1b8cd5 SHA512 2b488858b0012bcb3eb92a33960e9927c861587c7b7451a47fd3e10a97fad9c392524d98712593fd455c5cbae7fd1779e4b90b9e55680c2f36b483e0acf2bba5
-EBUILD inspircd-3.15.0.ebuild 3216 BLAKE2B 09a26b34e697b5542daf3ff9b9bd31ab3659af4b253a1c8373512bf10c060c42f837f3f4b7ac9d9897ddc934de0189d036451b4d6b3a642e4368df92bed14808 SHA512 069ab762dc6ba9876e2241d86f64be579950896ce2baccd47ce40850becbc11919e03425c99408b41ce3e3092696de9b4d9c994fe4f1879ba932b24fef81d160
 EBUILD inspircd-3.16.1.ebuild 3216 BLAKE2B 09a26b34e697b5542daf3ff9b9bd31ab3659af4b253a1c8373512bf10c060c42f837f3f4b7ac9d9897ddc934de0189d036451b4d6b3a642e4368df92bed14808 SHA512 069ab762dc6ba9876e2241d86f64be579950896ce2baccd47ce40850becbc11919e03425c99408b41ce3e3092696de9b4d9c994fe4f1879ba932b24fef81d160
 MISC metadata.xml 2021 BLAKE2B 59037d8af5049bc7b6a71325a649bc51dcc8eddbb2119848fe2acad4343977d46331878bd120b0ae132a65c27dcd0a208ddd00fbd9f5e4832af2057e6f66389f SHA512 d95ec80c8fb8d2ec08c12c81e384f84ea82f3e6aa5d708d63d96f1dd9021150470702a2b2d177af06d4ff3cf63eefddd4d16e21487e61a29562e5e56be16c6c1
diff --git a/net-irc/inspircd/inspircd-3.15.0.ebuild b/net-irc/inspircd/inspircd-3.15.0.ebuild
deleted file mode 100644
index e179adf0a0da..000000000000
--- a/net-irc/inspircd/inspircd-3.15.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
-HOMEPAGE="https://www.inspircd.org/"
-SRC_URI="
-	https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/clinew/gentoo-distfiles/raw/master/inspircd-${PV}-fix-build-paths.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="argon2 debug gnutls ldap maxminddb mbedtls mysql pcre pcre2 postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre"
-
-RDEPEND="
-	acct-group/inspircd
-	acct-user/inspircd
-	dev-lang/perl
-	argon2? ( app-crypt/argon2 )
-	gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
-	ldap? ( net-nds/openldap:= )
-	maxminddb? ( dev-libs/libmaxminddb:= )
-	mbedtls? ( net-libs/mbedtls:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	pcre? ( dev-libs/libpcre )
-	pcre2? ( dev-libs/libpcre2 )
-	postgres? ( dev-db/postgresql:= )
-	re2? ( dev-libs/re2:= )
-	sqlite? ( >=dev-db/sqlite-3.0 )
-	ssl? ( dev-libs/openssl:= )
-	tre? ( dev-libs/tre )"
-DEPEND="${RDEPEND}"
-
-DOCS=( docs/. .configure/apparmor )
-PATCHES=( "${WORKDIR}"/${P}-fix-build-paths.patch )
-
-src_configure() {
-	local extras=""
-
-	use argon2 && extras+="argon2,"
-	use gnutls && extras+="ssl_gnutls,"
-	use ldap && extras+="ldap,"
-	use maxminddb && extras+="geo_maxmind,"
-	use mbedtls && extras+="ssl_mbedtls,"
-	use mysql && extras+="mysql,"
-	use pcre && extras+="regex_pcre,"
-	use pcre2 && extras+="regex_pcre2,"
-	use postgres && extras+="pgsql,"
-	use re2 && extras+="regex_re2,"
-	use regex-posix && extras+="regex_posix,"
-	use regex-stdlib && extras+="regex_stdlib,"
-	use sqlite && extras+="sqlite3,"
-	use ssl && extras+="ssl_openssl,"
-	use sslrehashsignal && extras+="sslrehashsignal,"
-	use tre && extras+="regex_tre,"
-
-	# The first configuration run enables certain "extra" InspIRCd
-	# modules, the second run generates the actual makefile.
-	if [[ -n "${extras}" ]]; then
-		./configure --enable-extras=${extras%,}
-	fi
-
-	local myconf=(
-		--disable-auto-extras
-		--disable-ownership
-		--system
-		--uid ${PN}
-		--gid ${PN}
-		--binary-dir="/usr/bin"
-		--data-dir="/var/lib/${PN}/data"
-		--example-dir="/usr/share/doc/${PV}"
-		--manual-dir="/usr/share/man"
-		--module-dir="/usr/$(get_libdir)/${PN}/modules")
-	CXX="$(tc-getCXX)" ./configure "${myconf[@]}"
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" $(usev debug INSPIRCD_DEBUG=2) INSPIRCD_VERBOSE=1
-}
-
-src_install() {
-	default
-
-	insinto "/usr/include/${PN}"
-	doins -r include/.
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit .configure/inspircd.service
-
-	keepdir "/var/log/${PN}"
-	insinto "/etc/logrotate.d"
-	newins .configure/logrotate "${PN}"
-
-	diropts -o"${PN}" -g"${PN}" -m0700
-	keepdir "/var/lib/${PN}/data"
-
-	rmdir "${ED}"/run{/inspircd,} || die
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "You will find example configuration files under "
-		elog "/usr/share/doc/${PN}"
-		elog "Read the ${PN}.conf.example file carefully before "
-		elog "starting the service."
-	fi
-}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 70ef95aba1ff..46041b65aa03 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest
deleted file mode 100644
index bc43daa0c598..000000000000
--- a/net-libs/nativebiginteger/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST i2psource_1.6.1.tar.bz2 33043548 BLAKE2B dd7394ec596b016e76e9d74ee06c5db12bce50a859b0bd1194b0d3dd30cb1c2b9116abf3fdf9847c0b89b71a2a2b553f999fd29901567ddd5e4462c43d25c866 SHA512 c7c26ce10e159bc1f46b55ad2ef9773f24cb647d2ac01ff6acbb08c7020cb488fd1aeb9bb2d50122d2e87e0606f8fe46d2cc4360fa5df62bb1e9af0ce5e9a52a
-DIST i2psource_2.1.0.tar.bz2 32817295 BLAKE2B d37463522143c02e04c96d58578312b536ab5e2842e5647dbe5ba3d5c139329c447f16de7e326ef48ef4c6b3c11631e23300b5327cc31d9da5288240f86c926f SHA512 e8639c2b2869d3c7856b598d4cd3505458ed5cab5dce3570cafdaec3ccd77dbaec35787cccc6782acc75adb423b7baaab724ac3c98e5b91b41cf4c76f3614355
-EBUILD nativebiginteger-1.6.1.ebuild 1550 BLAKE2B ad743caba9b4c19637ddfbd9949658b47f20f289f26baa09cf42f44d67a6e8eba73fb319773bf76ea17ca0c402994bee2273b465e952d6a830624819a30d8530 SHA512 e4e9e39d611d2cd14f7b1b9246b2c3e6c2909fd413c25d2f67d49c313a78fae7994a4388a5cde9887489db3b16fe3325d109a446d0c55cd2dcdef3da177cdb43
-EBUILD nativebiginteger-2.1.0.ebuild 1565 BLAKE2B 7eff967b1dbec9491572c261374432e5204c6ade96410069de5e10cd1f55fb73c41336d343d78e98a71d2ed4bdabbda7c5b6246a6bc82d120bfee9e51fa31642 SHA512 dd70845dd6c3decd9d8b4d7f2f829ee69ec3ec982b15650c7ddcc6de89bd7e67fd282f086109822d1b10c8eb14f768ae28c5beb6552300ea9083299915cf98cb
-MISC metadata.xml 479 BLAKE2B 80b27521b677083a9c64fe4774e24d572341f26135a5dfcd9f5a53f7f784a01b494def960cf9de3354458cc265378283901a9686ffb1c9afadccf20bcc2d6e58 SHA512 98569e6b4e008289ea71b9fab9624a6ead5ac5765dab6bfa8c735802d3b981632c3fa54e4f72db78d35afac9e2b6caedb05ae28b905d6e6881fa7f844363f8e2
diff --git a/net-libs/nativebiginteger/metadata.xml b/net-libs/nativebiginteger/metadata.xml
deleted file mode 100644
index 43ca1801042d..000000000000
--- a/net-libs/nativebiginteger/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>tharvik@gmail.com</email>
-		<name>Valérian Rousset</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">hyphanet/contrib</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-libs/nativebiginteger/nativebiginteger-1.6.1.ebuild b/net-libs/nativebiginteger/nativebiginteger-1.6.1.ebuild
deleted file mode 100644
index 2a18973b1659..000000000000
--- a/net-libs/nativebiginteger/nativebiginteger-1.6.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2018-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 toolchain-funcs
-
-DESCRIPTION="jbigi library used by net-vpn/i2p"
-HOMEPAGE="https://geti2p.net"
-SRC_URI="https://files.i2p-projekt.de/${PV}/i2psource_${PV}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/gmp:0=
-	virtual/jdk:1.8
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/i2p-${PV}/core"
-
-src_compile() {
-	local compile_lib
-	compile_lib() {
-		local name="${1}"
-		local file="${2}"
-		shift 2
-
-		"$(tc-getCC)" "${@}" ${CFLAGS} $(java-pkg_get-jni-cflags) \
-			${LDFLAGS} -shared -fPIC "-Wl,-soname,lib${name}.so" \
-			"${file}" -o "lib${name}.so"
-	}
-
-	cd "${S}/c/jbigi/jbigi" || die "unable to cd to jbigi"
-	compile_lib jbigi src/jbigi.c -Iinclude -lgmp ||
-		die "unable to build jbigi"
-
-	if use amd64 || use x86; then
-		cd "${S}/c/jcpuid" || die "unable to cd to jcpuid"
-		compile_lib jcpuid src/jcpuid.c -Iinclude ||
-			die "unable to build jcpuid"
-	fi
-
-	if use test; then
-		cd "${S}/java/src" || die "unable to cd to java/src"
-		ejavac -encoding UTF-8 net/i2p/util/NativeBigInteger.java ||
-			die "unable to build tests"
-	fi
-}
-
-src_test() {
-	cd "${S}/java/src" || die "unable to cd to java/src"
-	"$(java-config -J)" -Djava.library.path="${S}/c/jbigi/jbigi" net/i2p/util/NativeBigInteger ||
-		die "unable to pass tests"
-}
-
-src_install() {
-	dolib.so c/jbigi/jbigi/libjbigi.so
-
-	if use amd64 || use x86; then
-		dolib.so c/jcpuid/libjcpuid.so
-	fi
-}
diff --git a/net-libs/nativebiginteger/nativebiginteger-2.1.0.ebuild b/net-libs/nativebiginteger/nativebiginteger-2.1.0.ebuild
deleted file mode 100644
index ac10184a706c..000000000000
--- a/net-libs/nativebiginteger/nativebiginteger-2.1.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2018-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="test"
-
-inherit java-pkg-2 toolchain-funcs
-
-DESCRIPTION="jbigi library used by net-vpn/i2p"
-HOMEPAGE="https://geti2p.net"
-SRC_URI="https://files.i2p-projekt.de/${PV}/i2psource_${PV}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-DEPEND="
-	dev-libs/gmp:0=
-	>=virtual/jdk-1.8:*
-"
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/i2p-${PV}"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	java-pkg_clean
-}
-
-src_compile() {
-	local compile_lib
-	compile_lib() {
-		local name="${1}"
-		local file="${2}"
-		shift 2
-
-		"$(tc-getCC)" "${@}" ${CFLAGS} $(java-pkg_get-jni-cflags) \
-			${LDFLAGS} -shared -fPIC "-Wl,-soname,lib${name}.so" \
-			"${file}" -o "lib${name}.so"
-	}
-
-	cd "${S}/core/c/jbigi/jbigi" || die "unable to cd to jbigi"
-	compile_lib jbigi src/jbigi.c -Iinclude -lgmp ||
-		die "unable to build jbigi"
-
-	if use amd64 || use x86; then
-		cd "${S}/core/c/jcpuid" || die "unable to cd to jcpuid"
-		compile_lib jcpuid src/jcpuid.c -Iinclude ||
-			die "unable to build jcpuid"
-	fi
-}
-
-src_test() {
-	cd core/java/src || die "unable to cd to java/src"
-
-	ejavac -encoding UTF-8 net/i2p/util/NativeBigInteger.java ||
-		die "unable to build tests"
-	"$(java-config -J)" -Djava.library.path="${S}/core/c/jbigi/jbigi" net/i2p/util/NativeBigInteger ||
-		die "unable to pass tests"
-}
-
-src_install() {
-	java-pkg_doso core/c/jbigi/jbigi/libjbigi.so
-
-	if use amd64 || use x86; then
-		java-pkg_doso core/c/jcpuid/libjcpuid.so
-	fi
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index b5b824becb63..b7d75fffcc59 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 671768516f99..3b6dfbc4c334 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -8,8 +8,10 @@ AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712
 DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
 DIST iperf-3.13.tar.gz 648754 BLAKE2B 8b08ae0e67ed066c7dabd115b757fefff03196aa2d732b6d88e20cf82ea3a5431b9be753fcc7b331932a5e59dc3e24ff4b929a7a1af5b500704cdd5094bf6859 SHA512 067147edffa1d7482a9fc5d54638091f8bc099b9c45d9a471f4e33730463548fb2350749620f2ca3ff509cd7a9c4f63bf01f84cab36718edd8784ce7a15ca368
 DIST iperf-3.14.tar.gz 650626 BLAKE2B 3809689964721ec2f58d29985c1767bc12473f9b659fd8bd430adb00558ceda2519276dbc0df5cb9634ef96d3d98708b8413a712cdb372bd34a28a330049349f SHA512 a90fbaddd73e5b721a84cee71cefb63391c13f64107f5785e954e7c44e9a8c5072e402b6fe45434966d3cc58ac97227c608ca9719161fc23459c5e5efcf8232b
+DIST iperf-3.15.tar.gz 649330 BLAKE2B f086d506d1de8e8b333a7ad46a94279aa5b42800ded7cc6724c3400e479a6523b336c74b5956d07117a178b5f89934553535824a05daafcdb2eb8d31754680e1 SHA512 988bc558f40a16c3d94df3956705712829c1c529efd577db16213783846c84bc3edbad19a4d7890b7aba08fbc4e1c6807105df29931e9b45981066b609d87aa2
 EBUILD iperf-2.0.14a.ebuild 863 BLAKE2B 48a3db3ec6b41bad2abef2854e694949a1e14cb71c01b52de2ca28149c9430a9b052f70959b1eb0630ca6ee6460dd54e0e0420a65892e6a86eb3e67875b673b0 SHA512 cd0241a86c550a18572042151c402913ec5e362611580b7a70de5b38c6664c3398f06258be706d311704046f4add0b868a81f913c7afd1d06622307fdc215913
 EBUILD iperf-2.9999.ebuild 670 BLAKE2B bb3d273743f45439dbcf4b88ea83010ceac93f7659a33a4c1197b1c946366dc4c00a7f7b017ff2050642b6a1b333934b272345aa3713b1a508f9c232f31dbbae SHA512 4b2ef29cca81a9d849356163c1d2e5c2f8eb19f45ee8c468c30950a2397e4a8a6f8c5ade0db47e9769f8a8e7d2fb77026bfa75b1325475ed9fcf80e07fa731c7
 EBUILD iperf-3.13.ebuild 1144 BLAKE2B a8dd65ba919a755de98b36345eda0b394195d7c898cce1a45a72b94681ed065d465ba5cd49b4002c759f16fdc6bd15ab1b3afa0a875aa86ef8b1336f96f011fa SHA512 cc05d282e01ddb988bba00d41deb347c4e34434bb808783b35e96e65960e64e944338bca5374afc828e2d4e8f8eae19c7a01c4dd770177f14de1168000c98ff7
 EBUILD iperf-3.14.ebuild 1144 BLAKE2B a8dd65ba919a755de98b36345eda0b394195d7c898cce1a45a72b94681ed065d465ba5cd49b4002c759f16fdc6bd15ab1b3afa0a875aa86ef8b1336f96f011fa SHA512 cc05d282e01ddb988bba00d41deb347c4e34434bb808783b35e96e65960e64e944338bca5374afc828e2d4e8f8eae19c7a01c4dd770177f14de1168000c98ff7
+EBUILD iperf-3.15.ebuild 1149 BLAKE2B cb36cc58e479128d68984b25f6ad43f4bf8784fe0489e1592e9e1cb0b6f126fb36fc84473a6dddeb232f1692d091a042812b41d43e9df0ae40f3d9ff5d550fcb SHA512 d130491dcc822d6e89ff341cebc6aa7abf49425ff1d7b421f207c986540df407b4a35e5e69aaab153079bea5f782b5ebe8c750810a041c895529e4d0d70db911
 MISC metadata.xml 570 BLAKE2B e17cc2b8458663f6ed2e9de7cca4e6a0d2e21e7f0c22a92c7b2d8589a944a466436f0dec4e18843641cc9364f407b061ff44dbbe342162ab28556ec953b029b4 SHA512 e3acd2262d442675557b837bbed0feaf7a1f148f7306b64139d8ba39d052794a9e7b60f125eee8745b0d13cdeafbb93012c62d1c524caa1e0f4730d1200426cc
diff --git a/net-misc/iperf/iperf-3.15.ebuild b/net-misc/iperf/iperf-3.15.ebuild
new file mode 100644
index 000000000000..e9a1b344d9db
--- /dev/null
+++ b/net-misc/iperf/iperf-3.15.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
+HOMEPAGE="https://github.com/esnet/iperf"
+SRC_URI="https://github.com/esnet/iperf/releases/download/${PV}/${P}.tar.gz"
+S="${WORKDIR}"/${P/_/}
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="sctp"
+
+DEPEND="
+	>=dev-libs/cJSON-1.7.15
+	dev-libs/openssl:=
+	sctp? ( net-misc/lksctp-tools )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README.md RELNOTES.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch
+	"${FILESDIR}"/${PN}-3.12-Unbundle-cJSON.patch
+)
+
+src_prepare() {
+	default
+
+	# Drop bundled cjson
+	rm src/cjson.{c,h} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with sctp)
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/iperf.confd iperf3
+	newinitd "${FILESDIR}"/iperf3.initd iperf3
+	systemd_dounit contrib/iperf3.service
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index c35c14ce991c..f9eaac8d536f 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,10 +1,8 @@
 AUX nextcloud-client-3.6.6-no-redefine-fortify-source.patch 1447 BLAKE2B 14a3a1a1206a0a0027aa9c59e07b6d81174428aaaf90fba5706e9c7a2f076753a4b2f364ffa0f22dabf785d58832dde1aeba61e3cb3cc92feffa8b4b614c5d65 SHA512 808c10f8ea1905d54f62f895b2089c2acb602e838143f6a4268a5ab1e966ffe6ff01f132b8b65e0eebde21435a859cc7fb4f868a2ca81da4dcaa02292a337ed7
 DIST nextcloud-client-3.8.2.tar.gz 15605319 BLAKE2B babd45d0a38d5206afd9c2b69e7ea580aeb90df2606932cbfc28f688b20bb026e566ca8a30112975ae38c8d9807339433c8b972230c6a8122cb93ffadd2eecab SHA512 231e074fd3dcc8f69d62616ff4aeec5e748891bf93fc783861008a4e04a12066e77e1449d94f599e5edfa9861bad684403aef80e909e095c16170d8607626a9d
-DIST nextcloud-client-3.9.0.tar.gz 15648917 BLAKE2B 50d26c101143d0d3ca690f142d54f195fbdaea2b58e97f8c0199519300053e27cd87290425de396b6e236dd3629aaedd6220a53b03249fa4376e3007e31dba85 SHA512 be289d1714484bfa1b49f23f0db898b3c345df924cfb6cc7ab1db5715524bec7e80eedb8cfc19112778337f81424d498eb2a34d6b3fd05fc6daa161bbcceb480
 DIST nextcloud-client-3.9.1.tar.gz 15733029 BLAKE2B e7e792b2ea7985c02627661b4686bf568dfe8cfe722babbf5507293daec57b754566d259d3fd4bc0b224e1dc34ae0afa4c757e75910c4d6d4ded692f0d7c2b02 SHA512 b3c77243efed3b70a59c157ae6f45ebf8eb8c4926e23bd78b364e93cbc2612ec220db60ef6bd55e288a2eb5a454fea87fd348116057b052a15b5c6c69f0654d2
 DIST nextcloud-client-3.9.4.tar.gz 15768508 BLAKE2B 7c06434538e9e95bed284ba07692d0d4d594639a145c2f3b67b8e81586fb98e1592eca54b9ee3cc638f8226ebb83e89e60a79238c76696fe9ca033209646eb13 SHA512 9f99278deb024ce105bae14d8dadc626b835486858e94f5483e9da3d06340a29e0941648cccfc30714c15ce25a6b77c4aa05a17fc213d7aa84803ffc13dca5a4
-EBUILD nextcloud-client-3.8.2-r1.ebuild 2476 BLAKE2B 77378505eab3f92d0f8d6fc091e6b07f1fa7387e2ef4e36528620290c3b1a8651ed375edb1359751b7c2aee9dc96481c545a5176262b3b95716ee3afbe4f8e2d SHA512 aee5f77f61fcccc44b25c94ec3f9f1689a476b8370d8ec645d7ceb3e80f0ea4a4d2bdc7bccc5f67804b6cb920cc0ef8310f585ede5df7a45cb63c8eb87854ddf
-EBUILD nextcloud-client-3.9.0.ebuild 2478 BLAKE2B 638089d2bd4ff88c3cd31b20e3001e229430b248de2d9411c30b3e4dfb52b9012f78e0cc483bea59d77ed4610c90a67d251bbee5603e3d2f06d55c308f1dda66 SHA512 b7fc99a8d01e54282ef4293147c0c19dc9eaf3c3aa892c93b5f68802e85b4848af55a607b1c2bd47cedffc992a61221dbacf3141fa2a4cd532906440329ab6a2
-EBUILD nextcloud-client-3.9.1.ebuild 2476 BLAKE2B 77378505eab3f92d0f8d6fc091e6b07f1fa7387e2ef4e36528620290c3b1a8651ed375edb1359751b7c2aee9dc96481c545a5176262b3b95716ee3afbe4f8e2d SHA512 aee5f77f61fcccc44b25c94ec3f9f1689a476b8370d8ec645d7ceb3e80f0ea4a4d2bdc7bccc5f67804b6cb920cc0ef8310f585ede5df7a45cb63c8eb87854ddf
-EBUILD nextcloud-client-3.9.4.ebuild 2478 BLAKE2B 638089d2bd4ff88c3cd31b20e3001e229430b248de2d9411c30b3e4dfb52b9012f78e0cc483bea59d77ed4610c90a67d251bbee5603e3d2f06d55c308f1dda66 SHA512 b7fc99a8d01e54282ef4293147c0c19dc9eaf3c3aa892c93b5f68802e85b4848af55a607b1c2bd47cedffc992a61221dbacf3141fa2a4cd532906440329ab6a2
+EBUILD nextcloud-client-3.8.2-r1.ebuild 2717 BLAKE2B 637408938ba4ae238a40ae275860ee1db8e4f036d921cd7eac6c20500dd78ab86f3aa2c98fa12edf402f14550755bd993a0e55adb0dc99f1cb1da1952dcb3d3c SHA512 57d91d98de4ff61ba6f5c32a8e122c290ace8c135bfccadb0279b78580f9d05870a59580edf1fa774728132f8653e1ef5a098fa090f2f19cadb50ac916c4a047
+EBUILD nextcloud-client-3.9.1.ebuild 2717 BLAKE2B 637408938ba4ae238a40ae275860ee1db8e4f036d921cd7eac6c20500dd78ab86f3aa2c98fa12edf402f14550755bd993a0e55adb0dc99f1cb1da1952dcb3d3c SHA512 57d91d98de4ff61ba6f5c32a8e122c290ace8c135bfccadb0279b78580f9d05870a59580edf1fa774728132f8653e1ef5a098fa090f2f19cadb50ac916c4a047
+EBUILD nextcloud-client-3.9.4.ebuild 2719 BLAKE2B 08d1ee57eea57daf8c2786911d189b9840b5cd732e744b6840bebc157167f0c5d89af5c24aedf7995863580c7b0aa0a00730d2b598c9983d0d1e41a8cdec508d SHA512 595258969684088b6b304bfdadbe80a3aa6b5a9dfed7d1062c1fb5f0f1b6deb59050cdedf11c62697c91fdcf3cf72ef1a19127fa2d01862fd9bdb6a868e3a8ce
 MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.8.2-r1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.8.2-r1.ebuild
index 982596d05a8f..23b5a83aabf2 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.8.2-r1.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.8.2-r1.ebuild
@@ -106,8 +106,10 @@ src_compile() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
+	if ! has_version -r "dev-libs/qtkeychain[keyring]"; then
+		elog "dev-libs/qtkeychain has not been build with the 'keyring' USE flag."
+		elog "Please consider enabling the 'keyring' USE flag. Otherwise you may"
+		elog "have to authenticate manually every time you start the nextlcoud client."
+		elog "See https://bugs.gentoo.org/912844 for more information."
 	fi
 }
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.9.0.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.9.0.ebuild
deleted file mode 100644
index 78bd99d7580a..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.9.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake virtualx xdg
-
-DESCRIPTION="Desktop Syncing Client for Nextcloud"
-HOMEPAGE="https://github.com/nextcloud/desktop"
-SRC_URI="
-	https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz
-"
-S="${WORKDIR}/desktop-${PV/_/-}"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc dolphin nautilus test webengine"
-RESTRICT="!test? ( test )"
-
-# slot op for qtqui as this package uses private API parts of qtqui
-# src/gui/generalsettings.cpp:#include <private/qzipwriter_p.h>
-RDEPEND="
-	>=dev-db/sqlite-3.34:3
-	>=dev-libs/openssl-1.1.0:0=
-	dev-libs/qtkeychain:=[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5=
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebsockets:5
-	dev-qt/qtwidgets:5
-	net-libs/libcloudproviders
-	kde-frameworks/karchive:5
-	sys-libs/zlib
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-DEPEND="
-	${RDEPEND}
-	dev-qt/qtconcurrent:5
-	dev-qt/qtxml:5
-	|| ( gnome-base/librsvg media-gfx/inkscape )
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	test? (
-		dev-qt/qttest:5
-		dev-util/cmocka
-	)
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch
-)
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DBUILD_UPDATER=OFF
-		$(cmake_use_find_package doc Sphinx)
-		$(cmake_use_find_package doc PdfLatex)
-		$(cmake_use_find_package webengine Qt5WebEngine)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
-		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_compile() {
-	local compile_targets=(all)
-	if use doc; then
-		compile_targets+=(doc doc-man)
-	fi
-	cmake_src_compile ${compile_targets[@]}
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.9.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.9.1.ebuild
index 982596d05a8f..23b5a83aabf2 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.9.1.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.9.1.ebuild
@@ -106,8 +106,10 @@ src_compile() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
+	if ! has_version -r "dev-libs/qtkeychain[keyring]"; then
+		elog "dev-libs/qtkeychain has not been build with the 'keyring' USE flag."
+		elog "Please consider enabling the 'keyring' USE flag. Otherwise you may"
+		elog "have to authenticate manually every time you start the nextlcoud client."
+		elog "See https://bugs.gentoo.org/912844 for more information."
 	fi
 }
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.9.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.9.4.ebuild
index 78bd99d7580a..94cff32e49fb 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.9.4.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.9.4.ebuild
@@ -106,8 +106,10 @@ src_compile() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
+	if ! has_version -r "dev-libs/qtkeychain[keyring]"; then
+		elog "dev-libs/qtkeychain has not been build with the 'keyring' USE flag."
+		elog "Please consider enabling the 'keyring' USE flag. Otherwise you may"
+		elog "have to authenticate manually every time you start the nextlcoud client."
+		elog "See https://bugs.gentoo.org/912844 for more information."
 	fi
 }
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index abcb3a64860f..8a0c820083e6 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index 2f33e3ec9765..dc93eb4e00b2 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -6,8 +6,6 @@
 
 # Jimi Huotari <chiitoo@gentoo.org> (2023-03-03)
 # Mask until stable.
-qt6
-pyqt6
 pyside6
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-06-06)
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 1d4f5b92865d..fa6cbeccc5ad 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -18,10 +18,6 @@ php_targets_php8-0
 # Ruby version.
 ruby_targets_ruby30
 
-# Michael Orlitzky <mjo@gentoo.org> (2023-08-11)
-# PHP 7.x is end-of-life. Please upgrade to a newer slot.
-php_targets_php7-4
-
 # Hans de Graaff <graaff@gentoo.org> (2023-04-10)
 # Ruby 2.7 is masked for removal.
 ruby_targets_ruby27
diff --git a/profiles/package.mask b/profiles/package.mask
index 77812ebfd7cd..d40f7dadede1 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -257,69 +257,10 @@ app-dicts/edictionary
 # Masked for removal on 2023-09-17.
 app-emacs/ruby-mode
 
-# Michael Orlitzky <mjo@gentoo.org> (2023-08-12)
-# More php:7.4 casualties that I missed the first time around.
-# They'll be removed whenever php:7.4 is removed.
-#
-#   * pecl-apcu_bc dead since 2019
-#   * pecl-http:7 is the old slot
-#   * pecl-ncurses dead since 2012
-#   * pecl-propro dead since 2020
-#   * pecl-taint dead in 2021
-#
-dev-php/pecl-apcu_bc
-dev-php/pecl-http:7
-dev-php/pecl-ncurses
-dev-php/pecl-propro
-dev-php/pecl-taint
-
-
-# Michael Orlitzky <mjo@gentoo.org> (2023-08-11)
-# php-7.x is End Of Life (EOL) upstream and no longer receives security
-# fixes. We lose phpunit because it depends on CodeCoverage which
-# depends on TokenStream, and TokenStream is limited to 7.x. Bug 887739
-# to upgrade moodle is seven months old, which I think is long enough to
-# have waited. Selfoss has a newer version. Removal after 2023-09-11.
-dev-lang/php:7.4
-dev-php/PHP_TokenStream
-dev-php/PHP_CodeCoverage
-dev-php/phpspec-prophecy
-dev-php/phpunit
-dev-php/phpunit-mock-objects
-dev-php/sebastian-comparator
-dev-php/sebastian-exporter
-dev-php/sebastian-global-state
-dev-php/sebastian-object-enumerator
-dev-php/sebastian-object-reflector
-dev-php/sebastian-recursion-context
-=mail-client/roundcube-1.4.11
-=virtual/httpd-php-7.4
-=www-apps/moodle-3.11.15
-=www-apps/moodle-4.0.9
-=www-apps/moodle-4.1.4
-=www-apps/moodle-4.2.1
-=www-apps/selfoss-2.19
-
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2023-07-05)
-# Library without consumers. Bug #906882
-# Removal on 2023-08-05.
-net-libs/nativebiginteger
-
 # Sam James <sam@gentoo.org> (2023-08-04)
 # Stricter behavior which causes some packages to fail, see bug #911721.
 =dev-util/pkgconf-2.0.0
 
-# David Seifert <soap@gentoo.org> (2023-07-29)
-# EAPI 6, fetch restrictions require annoying registration, no other
-# distro packages this, over 10 years old. Removal on 2023-08-28.
-sci-libs/rosetta-db
-
-# Michael Orlitzky <mjo@gentoo.org> (2023-07-27)
-# Obsolete as of dev-php/swoole-4.3.0, according to
-# its github README. Stuck on php-7.4. Removal on or
-# after 30 days.
-dev-php/swoole-async
-
 # Mike Gilbert <floppym@gentoo.org> (2023-07-24)
 # Migrated to sys-apps/systemd-utils.
 # Removal on 2023-08-24.
@@ -327,32 +268,6 @@ sys-apps/systemd-tmpfiles
 sys-boot/systemd-boot
 sys-fs/udev
 
-# Michał Górny <mgorny@gentoo.org> (2023-07-24)
-# Incompatible with modern dev-python/matplotlib versions.  No upstream
-# activity since 2022-02.  No revdeps.
-# Removal on 2023-08-23.  Bug #904734.
-dev-python/tikzplotlib
-
-# Michał Górny <mgorny@gentoo.org> (2023-07-23)
-# Package with no maintainer and tests restricted (also test deps look
-# suspicious).  It was only needed for tests
-# in dev-python/pyvirtualdisplay, and that package didn't support
-# the newest version anyway.  No revdeps left.
-# Removal on 2023-08-22.  Bug #910708.
-dev-python/vncdotool
-
-# Michał Górny <mgorny@gentoo.org> (2023-07-21)
-# Fragile package requiring custom patching.  The maintainer resigned.
-# No reverse dependencies.
-# Removal on 2023-08-20.  Bug #910619.
-dev-python/cx_Freeze
-
-# Michał Górny <mgorny@gentoo.org> (2023-07-21)
-# The ebuild has not been bumped for a year now.  It doesn't have
-# working tests.  No reverse dependencies.
-# Removal on 2023-08-20.  Bug #907460.
-dev-python/ansible-runner
-
 # Michał Górny <mgorny@gentoo.org> (2023-07-19)
 # Backport package specific to Python 3.9.  No longer necessary now
 # that pypy3 is 3.10.
@@ -450,6 +365,12 @@ acct-group/spi
 # may or may not lead to useful results.
 <dev-util/catalyst-4
 
+# Joonas Niilola <juippis@gentoo.org> (2023-07-12)
+# Testing. An upgrade from 102 isn't recommended due to downgrading
+# most likely not being possible. Back up your profile before
+# attempting. Fresh install should be fine. Bug #910229
+>=mail-client/thunderbird-115.0
+
 # Michał Górny <mgorny@gentoo.org> (2023-07-12)
 # Having scikit-build-core installed still breaks building setuptools
 # extensions in some scenarios.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0a69f45122f3..aa6f99b850a0 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1742,7 +1742,6 @@ dev-lang/php:gd - Enable the Image Processing and GD extension (requires media-l
 dev-lang/php:inifile - Add dbm support for .ini files
 dev-lang/php:intl - Enables the intl extension for extended internalization support
 dev-lang/php:jit - Enable PCRE JIT support
-dev-lang/php:json - Enable the JavaScript Object Notation extension
 dev-lang/php:ldap-sasl - Add SASL support for the PHP LDAP extension using dev-libs/cyrus-sasl
 dev-lang/php:lmdb - Enable support for dev-db/lmdb db backend
 dev-lang/php:opcache - Enables built-in opcode cache, replacing pecl-apc et al.
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 5660c6619d64..4164fc680904 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 8dad8c17de3a..bab06b26431f 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,3 +1,3 @@
 DIST mapserver-8.0.1.tar.gz 2950164 BLAKE2B 5b14006d513aa4422dfe33b1991a685936084c1fda8c736fb97e25d54f1d1bf30278b6f0ce3c8a1907eeecd7bd1554076065d3824e2055265dfcbc0de2b899e1 SHA512 dae14a7eb6b09f5461c19bff83ca8ed6c21ae84d451b2c854794efb25b144b7edbf2a33479dc53e78aa646e5196e81219b4a1f393ff824db4508204a2d0301d1
-EBUILD mapserver-8.0.1.ebuild 7122 BLAKE2B 022512b51bdb041f14fa6477067e94d50b1862d01b15abb7365811b0589de7a84a08ce753bd25ef7b8beeeff8889174e18f1ccf867659b2a64c1734dd926f29b SHA512 d23b82e2e318d4e9ae9d275c9aec8995c27bde53cdc2162cb1312a7fd20d04b0c2b47d585f359f8a5ac5394b37cadd1cc3c0f0221a26c1e83c6456aeb8c10d40
+EBUILD mapserver-8.0.1.ebuild 4940 BLAKE2B 51f02e80b40a9b1ae677d45a6da1d90a68f2ba8bd82027565a302be26315aec3d5a845d0aa0678095561786e32a9c07072ac090eeab9f1572969f20c80ced54a SHA512 8908f0f4ceb4f0140e76b7d2a50c36792e8995cb9e1776ada5cd8b5cc4e0a9507ae520fc289df138381d01db532f391fa240f520fe36e2655f74d5d02c2f1b38
 MISC metadata.xml 497 BLAKE2B b0517aa597d42116849e9f7ecdbf2cb2b479f5c57c7f0fe413dab870555abe82ac5dc07c624cabf769bfd2332300f2860e40cfd1ed375bafa109a347b670232b SHA512 3d58797fb05f9c45359e9ac2302a2432e9b61d300f1c01b27ef562da860311e777b7675b0f162eb2c490cdea0440c9f7b9a3323a89feef01589385ec30a5b64d
diff --git a/sci-geosciences/mapserver/mapserver-8.0.1.ebuild b/sci-geosciences/mapserver/mapserver-8.0.1.ebuild
index c8bc5c5d9238..060fae52b9e2 100644
--- a/sci-geosciences/mapserver/mapserver-8.0.1.ebuild
+++ b/sci-geosciences/mapserver/mapserver-8.0.1.ebuild
@@ -3,19 +3,12 @@
 
 EAPI=7
 
-# Variables for the miscellaneous bindings we provide
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_NAME="php_mapscriptng"
-PHP_EXT_SKIP_PHPIZE="yes"
-PHP_EXT_SKIP_PATCHES="yes"
-
-USE_PHP="php7-4"
 PYTHON_COMPAT=( python3_{10..11} )
 
 WEBAPP_MANUAL_SLOT=yes
 WEBAPP_OPTIONAL=yes
 
-inherit cmake depend.apache perl-functions php-ext-source-r3 python-r1 webapp
+inherit cmake depend.apache perl-functions python-r1 webapp
 
 DESCRIPTION="Development environment for building spatially enabled webapps"
 HOMEPAGE="https://mapserver.org/"
@@ -26,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
 # NOTE: opengl removed for now as no support for it in upstream CMake
-IUSE="apache bidi cairo geos mysql oracle perl php postgis python"
+IUSE="apache bidi cairo geos mysql oracle perl postgis python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -37,7 +30,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 #
 # The eclasses used normally try to run test suites themselves,
 # or skip if nothing was found.
-# However, because of the php-ext-* eclass usage, this fails and would
+# However, because of the python-r1 eclass usage, this fails and would
 # cause errors running non-existent tests, so we have to restrict here.
 RESTRICT="test"
 
@@ -79,7 +72,6 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	perl? ( >=dev-lang/swig-4.0 )
-	php? ( >=dev-lang/swig-4.0 )
 	python? (
 		>=dev-lang/swig-4.0
 		>=dev-python/setuptools-44.1.0
@@ -96,7 +88,6 @@ pkg_setup() {
 src_prepare() {
 	cmake_src_prepare
 
-	use php && php-ext-source-r3_src_prepare
 	use python && python_copy_sources
 }
 
@@ -175,29 +166,6 @@ src_configure() {
 		python_foreach_impl cmake_src_configure
 		python_foreach_impl python_optimize
 	fi
-
-	if use php ; then
-		local slot=
-		for slot in $(php_get_slots) ; do
-			# Switch to the slot's build dir
-			php_init_slot_env "${slot}"
-
-			# Take a blank config each time
-			# Add in only *this* slot's PHP includes dir, etc
-			mycmakeargs=(
-				$(_generate_cmake_args)
-				"-DWITH_PHPNG=ON"
-				"-DPHP_CONFIG_EXECUTABLE=${PHPCONFIG}"
-				"-DPHP_INCLUDES=${PHPPREFIX}"
-			)
-
-			BUILD_DIR="${S}/php${slot}" cmake_src_configure
-
-			# Return to where we left off, in case we add more
-			# to this phase.
-			cd "${S}" || die
-		done
-	fi
 }
 
 src_compile() {
@@ -206,21 +174,6 @@ src_compile() {
 	if use python ; then
 		python_foreach_impl cmake_src_compile
 	fi
-
-	if use php ; then
-		local slot=
-		for slot in $(php_get_slots) ; do
-			# Switch to the slot's build dir
-			php_init_slot_env "${slot}"
-
-			# Force cmake to build in it
-			BUILD_DIR="${S}/php${slot}" cmake_src_compile
-
-			# Return to where we left off, in case we add more
-			# to this phase.
-			cd "${S}" || die
-		done
-	fi
 }
 
 src_install() {
@@ -232,19 +185,6 @@ src_install() {
 		python_foreach_impl python_optimize
 	fi
 
-	if use php ; then
-		php-ext-source-r3_createinifiles
-
-		local slot=
-		for slot in $(php_get_slots) ; do
-			php_init_slot_env "${slot}"
-
-			BUILD_DIR="${S}/php${slot}" cmake_src_install
-
-			cd "${S}" || die
-		done
-	fi
-
 	# Install this last because this build is the most "fully-featured"
 	cmake_src_install
 
@@ -255,31 +195,8 @@ src_install() {
 	fi
 }
 
-pkg_preinst() {
-	# We need to cache the value here of HAD_PHP because we want the
-	# original package version, not the result of us installing a new one
-	HAD_PHP=
-	has_version 'sci-geosciences/mapserver[php]' && HAD_PHP=1
-}
-
 pkg_postinst() {
 	use apache && webapp_pkg_postinst
-
-	# Let upgrading (from a pre-rewrite version) users know that the PHP module changed
-	local replacing_version=
-	for replacing_version in ${REPLACING_VERSIONS} ; do
-		if ver_test "7.6.0" -gt "${replacing_version}" ; then
-			if use php && [[ ${HAD_PHP} -eq 1 ]] ; then
-				elog "Note that MapServer has deprecated the old PHP extension"
-				elog "You can read more at: "
-				elog "URL: https://mapserver.org/MIGRATION_GUIDE.html#mapserver-7-2-to-7-4-migration"
-				elog "This may involve porting some of your PHP scripts to use the new module."
-			fi
-
-			# Only show the message once
-			break
-		fi
-	done
 }
 
 pkg_prerm() {
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index fbd0266c9920..27a656e22dfe 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/rosetta-db/Manifest b/sci-libs/rosetta-db/Manifest
deleted file mode 100644
index 860c267e25aa..000000000000
--- a/sci-libs/rosetta-db/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rosetta3.4_database.tgz 212443671 BLAKE2B 92aeb833bab050f8122dc9fdbff153cb27c4993bea4e55dddfd5a2628c7e5fd55ac5da3d8b132a2e3fe83e1a9b6b417ad361eef2afffa3792b2d15de31ddd051 SHA512 c057cabcc95e6ff2278517e04d0fe8c7968a5c29d17ceb7bc75ac6e655b0a798d4ca819b313616c69b6cc18252c12b9af083d9cab9d4e30dac4c32db2f058b81
-EBUILD rosetta-db-3.4.ebuild 715 BLAKE2B 7b6dcaa28a75b0b7b5699c220df8bbea913bcdb2da18134ffea4c4a31096cd72c0b3da3ccfa9f5a05254f7618d70583fa338ab9eef18f3818a5afc9ff631c974 SHA512 f844419f0de061d9d0afde22572be337e1a2746c551f130da5e6a5b28416054f951aa99696162bdac7bbe3d9108a9983379627c312ca2092c9b7fc9011eca6d9
-MISC metadata.xml 272 BLAKE2B 531e98b72776bbe9126811b70943add0f6f43141b01cb75b17ac2c8d1cfb6a9b349022fd411894d2b8eeb0612a73db10aed4ba71f9624bd6dbd172a05fca2c76 SHA512 04f5575703aaaa95e575460ae3de428d3da173b3b741ab52b4aad31e381fef78b325f49f99622ec26a65024437759ea013fc525bd63ee553003c71afcc40d10c
diff --git a/sci-libs/rosetta-db/metadata.xml b/sci-libs/rosetta-db/metadata.xml
deleted file mode 100644
index e490bcb8aa87..000000000000
--- a/sci-libs/rosetta-db/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>sci-chemistry@gentoo.org</email>
-    <name>Gentoo Chemistry Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/sci-libs/rosetta-db/rosetta-db-3.4.ebuild b/sci-libs/rosetta-db/rosetta-db-3.4.ebuild
deleted file mode 100644
index bc043d1e1ae7..000000000000
--- a/sci-libs/rosetta-db/rosetta-db-3.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vcs-clean
-
-MY_PN="${PN%-db}"
-MY_P="${MY_PN}${PV}_database"
-
-DESCRIPTION="Essential database for rosetta"
-HOMEPAGE="http://www.rosettacommons.org"
-SRC_URI="${MY_P}.tgz"
-
-LICENSE="rosetta"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="fetch binchecks strip"
-
-S="${WORKDIR}"/${MY_PN}_database
-
-pkg_nofetch() {
-	einfo "Go to ${HOMEPAGE} and get ${A}"
-	einfo "which must be placed into your DISTDIR directory."
-}
-
-src_install() {
-	esvn_clean
-	insinto /usr/share/${PN}
-	doins -r *
-
-	cat >> "${T}"/41rosetta-db <<- EOF
-	ROSETTA3_DB="${EPREFIX}/usr/share/${PN}"
-	EOF
-	doenvd "${T}"/41rosetta-db
-}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 7b8cc65f3467..f5c274964d92 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/eza/Manifest b/sys-apps/eza/Manifest
index 21aaece4a397..594c0032bcb4 100644
--- a/sys-apps/eza/Manifest
+++ b/sys-apps/eza/Manifest
@@ -2,6 +2,11 @@ DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf1
 DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST ansiterm-0.12.2.crate 26777 BLAKE2B 08dd1e95ce9c3bc3673dc92e2e6c61d6d9c125560717e2046a52786f5ab50c9619a7bedabee8991ca90c9e09f2b4c5ad2b7c8e67b874779ca989023ebc6bd56a SHA512 b9a37ea51a3ec4e9cef972a1480fb07f9e8626fd800dfe417e3ac615156310648b65f4d6665e0bb91ac6e1ef28b74c1f66d5cae66cfcfe4c1a3b74805cb1dbed
+DIST anstream-0.5.0.crate 19646 BLAKE2B 770dc99092e1c48ad5c1658e83abff3b8c9e0915e360048bfe0fe04faf61991e01e88ca4adca23533bf11fe078066e351778661128d69381756688341022f29d SHA512 8e285cc8f92708cf9482e7b4dc84dd891e5ec0bd8c57894c6bb368eede1127b7b903adb4c40b37287e3644535cc60c92662951c2c8fb5b92e10f49ff5374d359
+DIST anstyle-1.0.3.crate 13986 BLAKE2B 9e9fa894da78a6c0933c423524827ead33aa4e384e04771ccccaa179f1e8a6459a5094db7f61714457b919d2e713d09df4429b83793d807821bfdb226ff115a5 SHA512 f1ac506814e1ce1df537ea8a88ed75f3f897aa9e559ba7eb5a8acfd043641dada12953669153d1f719da28f935a9651a07b5ae1e351139f0f03b58a67bc28477
+DIST anstyle-parse-0.2.1.crate 24802 BLAKE2B 6304a56c6a9fbaf1bb4d1d177b2315684345dc9d71c35836f9544145364f8d6eb56e25c03076690c594ab7db5914501acb569f6c136952e59c93179ced527fb2 SHA512 5c8fc7d88ffc3a6e78340ffe0f3c2d72e865512030ade4509de9c673eba955c536bb1873dac11f6ba11cc8367fb30c67451ed65d19f81507c9e917c702bfd176
+DIST anstyle-query-1.0.0.crate 8620 BLAKE2B 2d296b5066fd6284a2410923215571e6df650c5ef892d6de7a7088a0996ca30608797feabc84f3c325ff4d07001dac80ac5067d2a9c9d15d9ba59a276b399f53 SHA512 2781be5c82293b7ae338ec5046fbeb130de9eb2dbf2e4dfaa73ca5233032e1e52c133e141b02f33d4bc36d996a0a3f680ac82d42d614a5305005f60547133c7a
+DIST anstyle-wincon-2.1.0.crate 11757 BLAKE2B b7c1071da1ab24accc33d7af70f09ace8edb2dcbb53936ed5ac13552c6082c0f16ce501f041d2c1792cee7dd9cc3877d29505e12a65022bec44285f13e1f422f SHA512 6c379c46f791b6b1367f3d6f3531dcd16589cc2e12f6f5ce52a3fa32d42e62b719d2277699d1bc8526099a6f791f2e7d5b1068e1295cbcd2997841f0eafc4eeb
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bitflags-2.4.0.crate 36954 BLAKE2B 1d6cfeb0a17dc53a6249a83c8c7ad7c102985ffcfd7f7f76506889684235e78fe489d23b5a5f9018f0bd526a38d6b1449784c62322fb01f4bb507c0af8bd545c SHA512 0c3d6667abea48811a792749702136ee3db97518b33bc4c7d35737505bf56315e0e5810deeea28b7a1b540ec0e21bd319ba0b3c5c4aef0ba8ed5499ffdfd9b0c
@@ -10,20 +15,37 @@ DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f3
 DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.27.crate 211340 BLAKE2B 94974f8a82525a1b27d964f98ef1d1d788cad446301cd0b0c0913bd7f0295514579d51d5871caa4ebcb9295b442700a1ac637a0a7d3f55ca707cb97c42654515 SHA512 19c86589c11905ca16d68e59b500717329d08a9a431bbb51eabc2e1b15d1ab8902188e05337b0ec6fccc0c268a073c4e280dbd6605e80d4d4fcb17a4fdc5d9f0
+DIST chrono-0.4.30.crate 212084 BLAKE2B 27d9ce4aae3ce0278f2c9f4883b6d3a123ae428a14c03f4fa0d90c077e827387df9b2221712e44bb47478de9207d908115d115df967585544dc0cd3aa239e225 SHA512 886f064e935220848f966ec2e1e3271849ed20235137836f31ae2aaa8408eaeb657b54b074bdf316914c95ffab9a8c7f53330046e761ef4bfe6ee958d1c7a598
+DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551
+DIST content_inspector-0.2.4.crate 11386 BLAKE2B 2393cf83b2dd338ded7f5acd695e05a4a08fa639a52a8042dd0692be5e959cd1cc670472e25ca696a151d161c821eb899b2a950c74f4cb5b880bc42bc53d1d57 SHA512 1acb8b4f12ce3479f5a60b7b6a0c05b86548591e488e7be529c4a2f9aaa60a76ed07e7ce1e557664d31ddd9964e7f73415ad667cd14ada919f61511bf486ed6f
 DIST core-foundation-sys-0.8.4.crate 17725 BLAKE2B 8afe47838dc91c8848c0d6a96a604149e5f0762228dbc10c17b85e4e9cd2c3928712bd0b28e1071f5fd6fd76d4ef972cb86c6c929246fb6e84577776933a8ac7 SHA512 15da472316d6decc213e4e5f08ecd22a108ebefe427b890741de4f9199614f19123e64329da76de5e8b4c9ff74ffc31738fd929acc1460fc757b4aa1fd3fdbb6
+DIST crossbeam-channel-0.5.8.crate 90455 BLAKE2B 017132056f1b40e55fbc7a09b75509d72b0a6123a0e5ea5d6104fe822f73b3ccce670d711d3b84b5ce743dcab5f10445297a6701b71213b77c0d56e2c3fd7160 SHA512 47677d6fe63050c51393e4a0537a3c65d7055c9eae118ebe60c5d716b4f47f23c2b1947b1e1b66bfb34a57c4db3a44631d323e996dd545565fe4f58c25863ff4
+DIST crossbeam-deque-0.8.3.crate 21746 BLAKE2B c24025c65d7c1c98e442af95491749dd4f777af0509636ed66886dcf656359ec50dc2a5e26327559c6659f6b355d2b0b992dafa691a36571c99637cb47372d0f SHA512 f3201c9afef7d2d119702696f7e5e7997a104b8f7d67c7adebd1cbed84d3a3415636ff674f1ccdfd95d0dc162384e46c6138c8203ede69577b0d5359a4b44672
+DIST crossbeam-epoch-0.9.15.crate 48553 BLAKE2B 23aa0532d3126e22efc779859478098e505b4ec895c643530a3f7e8dba0543df3d8ffcb6825b1d3869a4418e17d798d464b3e1bb51522435d50f53ac224e22c8 SHA512 d9292c059ef1d156da52950137b2b3ea5eab66c4cc2f763d02078d0b0106980839ebed2ae2aec53e026ee7b3ddc37c4b51370d925ada1ad13d9981934daa7bde
+DIST crossbeam-utils-0.8.16.crate 42508 BLAKE2B dfaf9e7cade2cb5a2de90dc622e58a69c5b28fe9f69d3cbb945431683cf48fb409565190e3414a815563afb12631d990476919890fc482ce6b5792fdc25536a7 SHA512 4b8d599a8b93015eea2fd404cdf1526fbb94662fffc7c64d2f0659aeef349e4ad682f61b2b85d075c7f3fbbc4d8106cd7caf6e65dae117ba982f31262df3f831
 DIST datetime-0.5.2.crate 113732 BLAKE2B e9461220ae45b67fd20b925f1c8e0b3b66d980340fc01d4a36fbba2007100d5d3904b3307eb2e5e75b84bb182dd702e9a274cfe7c5a6f382c053beb7131fdd32 SHA512 7578d839bf8d673d15f1caf84266c45c42bc1efaca9067a4ca22c25bc4ad14b7fd8eb73425f5178e188485872a20f1fe153665331d409302bb1cb4aab6cff623
+DIST dunce-1.0.4.crate 8034 BLAKE2B e1e7ffbcf1e3632036c03303ab46fc37b2b0a991598790b2dc65d7a61341a78bf555230ccded8fbb87d6288282af3ed2a8641212a0f1fab929bf99298e878b6b SHA512 f57d9c53c177bac8e10a4b56ae421c604085aef0f264b8d6871abb7e1ff713b55f396c5c5f24422763319c504c6ea6a774416af1c2ba23ba7b67b2282f6731f8
+DIST either-1.9.0.crate 16660 BLAKE2B ad61038bfacb16f678fff5dd9ccf8f345e1bef18bd7aa0aa9c99d44abf8428939362f32fc8dbb1b60ac56016e0096201071d0bf8c0431b660605d0dfa97da466 SHA512 4978d50842386f51e31a47ad037d5e491106a668bc701bb833e6ec3998afe3ebd80efddc47756b2f300f534b39b26fc01386dc878d3b02cc8c1fec6a474c2177
+DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
 DIST errno-0.3.3.crate 10543 BLAKE2B 958e9d12766533ae9e84a60b121794929b9b3b1a8111aca9a2e914beee5784b64c946e143cd8031335ac9cb51069e51dbc9a6b61073a2ccfd3ff60612a20b619 SHA512 9524db39d0c9be287e0d2aed3358a86e961b2868717037212a2e9dc408bc73198ab23196d7923a9ba7e0e9357276075148f582e0325ad36ae1b212a8c674173e
 DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916
 DIST eza-0.11.0.tar.gz 1215969 BLAKE2B cd9f8a2a1a58acb607c3988e23c1236c2d7098920bb457d303866d750b905dcc439b89381634337f1982bfc7b1ff57a007b7f51ff174cac0b77d299eb60a60fc SHA512 8e8aafb5d9eadd5a78caea945e08df16639191bc3119826a5b975062fe162ecf9e5afaf2180bfa6fc5d134a25502367f58dc1f40e21799a7da15bd07357f66ff
 DIST eza-0.11.1.tar.gz 1221586 BLAKE2B e642be77d3402e4b42235cf13767fcef7279bc232c3e0b62bd012026293faae4a6dcaacf19f565f5f4f46f8e412d8f47921f8e1c8192f4bd642d17b1b91e950d SHA512 1bbf7018e00c53981ed049d26ed5c814eeeac1c8ec7455e0f20b5f0492aa6ebcec3260bf7fdd9df49bb9136819c1fa3a1ac719ae0aec5226312416e941640d62
+DIST eza-0.12.0.tar.gz 1200971 BLAKE2B ab284c0758515e738fc102ceacd238ef7315627a6c9cb6a712b9ff107ebba7e282768a5ccfd73061aee54838dba194d89ba5b35850f1de78bd3f6aaab65efdb1 SHA512 5ff36af746f3051740ab96cd41fdf51a73a0e9e42f3874b52a684001c529db0bf97514de60bb5742e34984b5ca888a092465c375d4382ca1a84426f17d91fee5
+DIST fastrand-2.0.0.crate 14402 BLAKE2B 8bf830151ec616dbc25f216265722e39f8a2cd9ae036b0904b73775a30497368aaf9bb7f49890c330024c3d9b8084749c91f601b60b53bc8cef2da8b0aa71322 SHA512 9449dd52e4b722d5747f68f127843c0d1a402765c2b6186b9526f8ae23293cb1f6b50adcbf18a8ea768292642184cb0eb42b1801d20f6815397903f9977f3cbc
+DIST filetime-0.2.22.crate 15029 BLAKE2B 068f4a84388d04d900bc5518a94895985ecba9c618a47b6483cabc31abd267e37ce69d78c51703ec5745307800d96ac801f37ac9959c60283c3c3d6ccd349c0a SHA512 d40d8baeb57ec85bb9ccf76ff0f898915c4e6cf384020121b53f4a2a1ef2840af5b4c9e8e1ff177034273f4f7a6bf81d2dd7a02cf498b61ea31ceaa30b877067
 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
 DIST gethostname-0.4.3.crate 9336 BLAKE2B 12be5fdca0b6e3788cf3d67a4a80f283d240611b4fd37b6d1c37eb2503e4a7025b17bbb70adf421ac840d8f952434bdedf4691f31362780a267e21e8c4d3a006 SHA512 8c5dc404132f2ecf9bf82d8b89cbd698b4cb6d43141c47a60b95401da2e8c314347ab0a0ad5fba50cf98f01a621faa68293cb78f48977d3ddfe6e6f21926abf7
 DIST git2-0.18.0.crate 210978 BLAKE2B 41fba81bab32d0b31c93f1b579eae61cdb57b7900b8d8b3dd39a601f3ec72820d2106162e89c3e5300442ac450dedf556b2b53c17610dc899ab920cc43c6077d SHA512 de8179c0cb27abb6e870efa27a562728926ae862820a1b71e5c47d2c69e6dc75caf25c0706564a8a5d47c47a2ba0ae7a164d68e88c16260214cad6c672505c70
 DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
+DIST hashbrown-0.14.0.crate 116103 BLAKE2B 24bab03e8a8cb7623b92282c83bf8acaf0752c696ee1c010249e3ebb3646e7549d8d6d798b02c9d5b621afbebba7320f8a859d9a1af1523dbd46377b857dbb5f SHA512 f0fbdf81517f59a0b67f792a4097f1131d346b2b4cbda93590749cef7f9f1c9029e0e182f58c23b74d3028f7502c30b9593c1eb4da37f95388d74b14582b8959
 DIST hermit-abi-0.3.2.crate 13783 BLAKE2B 43089507a5ca0731a9e9a54fdc8f4dd5f807244797eba5bdcc072c2c2b3761481df65b8cc65900769777d9d21f8345b502cb1915ec36747160e87f179469a661 SHA512 22901ec8976a7c96e93c9e07a2c5d3db49d7af60ce60c7ee6f61c3cbe93190d1f285e737c1c8b2236d540ab14e5d92e42828ec05f1b212332a862baf2b1b57f6
+DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
+DIST humantime-serde-1.1.1.crate 7886 BLAKE2B 4c66a483276e0cc5f4bd82fd49cfa0ee40c8ceda753919cfb7a8c794d098e9e4e851643fbc42a209d6ab00c5c62d9edc81c3bb1f6da218a09eafc96da9b566f6 SHA512 0bd72554e700f89506d2d1c8191832aed0065ea02aacb99e27139a60c883d3dbabb1fc3d60f499f5aeb20bd155fdcf21dc671aec1ca68d4041bf98ddf324248d
 DIST iana-time-zone-0.1.57.crate 19785 BLAKE2B 2304a63e4d3a477125ed07fccd5a84832f775c4a0fbd60a995e6f1850aaf3f5047c6f70975c9f6334f96def12770d470677e1f536e9817f8ab1df8a312622cfe SHA512 79bc0fe559dce022cd3c15ffc3b6f870c14a40de6d5a61b4a5a6ad28fe7efce82a16ac5102073a3510f3ba683843475f7fb8a4029bbafbc1cc25e48b98ce2fe8
 DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
+DIST indexmap-2.0.0.crate 64038 BLAKE2B e7a1b2bbd790f1446f77262b5b0799c2a816a01295a9a4db66f10e6c0502f8970982fb808581472e840cc34dc70e7938b89408799ed0d91aa50d3dd0b4807995 SHA512 59bc19653436389e1408e21b0933e5ca6f9fe228f0f5fbe9a7e4fb461b9712ba82983cbf22c0581eaf7913298b9ef5842702946152b493c1dc651381d6bce1a3
 DIST io-lifetimes-1.0.11.crate 37346 BLAKE2B 7f278b7378a8569d3552c9b6d4be06d7908e05d77cdb964267f0b621ec4975a42fb6e48fc030a75ad5865681adf32ff747943ac559ab4ad73331a6611a1b10c6 SHA512 30c6e5ce6f5beabe0d7bee4f4522884d1316cf7d9b8d093ba0f952995997be3d0f10e1e77b9c20b7fe2b65429de0d2ec89bb35e939455795205206a3154ed544
 DIST jobserver-0.1.22.crate 21175 BLAKE2B dc0f20541fd14aa5c8b161cf36829a36e550ef414215417e25516ef1cf67cc1c7100cbe4ebcf8d2530e3245f8793a3ff11f407a0ec5d96385ecb6618e2de7a20 SHA512 ad3d180bb49fbaf51c9a2f40de0e2082947a0cb5bef95001bcc664e4c98f75a4c32a6c53f5eba90595e415b600aacae54d92c2f613dbeb8af94fa08b6d770d8b
 DIST js-sys-0.3.64.crate 80313 BLAKE2B 7cf5dcb2b9e0b63cb82771c9e98518a4cda70372c5aed07866a07d2aa51274622357e4b5a665499328f5a3c38f7c515303da50421bad4a496fbb658e2132325f SHA512 a4f389a4eb45c2122e7bcf365dccdce8fcf14b1b521b8b839746bba8783296e2f1b959d73bdd874743f49c61a24c4077dec52f63cc7d594cd42e9cd6ea9c2e64
@@ -32,16 +54,21 @@ DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e
 DIST libgit2-sys-0.16.1+1.7.1.crate 1773446 BLAKE2B 050b7832dd48c642c3a790481a296fe1b15bcfbddcffcb0f4792735bd135f6c499e5b6f90fe394ddd891c2c055af86041f0b0fcac26832975755a432dd0e44ac SHA512 746e80309af40af7f6d11a7d45721054a6b7f456e10af5b25ea5ddc3ae1f8d934196e9e3b9948f7d7b41b6d9dc45a660874029a39c1c3d67307daebae3f2cb69
 DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
 DIST linux-raw-sys-0.3.8.crate 1013776 BLAKE2B 375b29d2cc700e95d94ea8dc304cb711562952742f65c9664e33560a3da862aba74f2ad2ee66b1dface8cd5371ea9cbbc452ea953a6b6c656ade7d938b7d2ff2 SHA512 cb0e5c54870dacfa513ad05f7a84e9e90dc1a42f55685fe3e252fd25cffa4b875f1b65eaf4ad132ef0a19e6677c7763b360d71ff0060fe6ce5198f38b9956375
+DIST linux-raw-sys-0.4.7.crate 1350647 BLAKE2B 7489b530d59c2b1c32dfa77b260fa9892ec3ce9b15bbac90b0b7565806798d7580145321e0a2206d7a1f50b6cb7684dcd85f30a11dc330f071aa2f6042f941bc SHA512 df36f3f188767080f118aac32138233209a1f0cd11682425fc101cb054e138cf0582ad044d0f326a20ce517f425665ea1ad9ac5eda147712a994884101974d48
 DIST locale-0.2.2.crate 18910 BLAKE2B f34c69403d81c86c6b178f8f28271e39ddec59696d11eb17c40bdbbcfe9be697184237f2ee3fa4c7b703067cc8c6dbb999a60884f81378b394994c53426e11fc SHA512 ae542f8811405fac032029885a59d39c922da7c1b59e69f5e0d73047d05ed803475b3aa9b486cce47abfdac03f5892013b822e896794e6dd80329b4f105be28f
 DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST memchr-2.6.3.crate 94377 BLAKE2B 5f1603397d6703ddd9a1e68429cb6e9dae9021e14692c1e084f3b5c82d36645a1fa930c7a76b97df8e1919402fa7e1c621969ce85ce20c82b3087104afe18f25 SHA512 8d5e1425ea702a0950c95271dfd2e81610731496f77af0d683536b074a22922a7d7ec6da41577487d1d658e3b27257b7d1e142761b523e68760a2f5f24f049bc
+DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55
 DIST natord-1.0.9.crate 3866 BLAKE2B 8e8f576af50121e7571a1d919557ddc14a3c1511c12154a9cb74fa34cb5c2279406e1ae7ffb120242689e34d4f237d9548631f5a35f4f5d4369bafd8a728fcc6 SHA512 bf58eda54c759fecca1fd310bece370f26555bde1096081adc5bb1e9446a538f1652fb3049a52f898f4f62a2608805b72cb72dd52ff3fc9b88fe0a7c9071025a
+DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d
 DIST number_prefix-0.4.0.crate 6922 BLAKE2B 81bd3b588c788e6865104e5ce87119b5e0c5a526042963d52cd582ff23c2f8c9f32b4c445ef0397fc402b6d047e031d8e2c67ac97e191bde22e17662eec3a554 SHA512 a43b668d7314218b86ca7451daa9dfef71f6c9f6616bc34c12d94ae6030f182bcca9da83905cb46f3d49d0aa81385a787e92e4f3ae239658067adc249f8174df
 DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8
 DIST openssl-src-111.26.0+1.1.1u.crate 5110372 BLAKE2B 34b2641303b676e2254eb9a754812b40f9fd32f02e4f851b006b3d09ccc2f29e206b4f30f49f8f1bbb3de1ce3f01e4ff15791705e663eddc09c8cbd6b314f891 SHA512 b5f663e3a05a620d75d587c69cbdaf316f9c4243f013bc6e5f4be812e4bea1b67a2b01ccb4575d9b7242b9900e106eba71f732afcdba47f82c8bfa570d258b5d
 DIST openssl-sys-0.9.61.crate 52010 BLAKE2B 4746fdfffb1f0cf626ff0fe93e3057bafd8277c6469f577e37370010d5267b0f9bde8a91279e9f8d0ca0b93cad2231153ca07d667fb3b7c8feb637a04dbc352c SHA512 0ef36b2483163af083465ba9e84586ac0c2068285a8b3f1ad1e6a2831361722132d1d008791d969be669ab1131500416852813bb431307a484c1a277b5ab9abd
+DIST os_pipe-1.1.4.crate 11436 BLAKE2B 215f548a5b16854e156f785a1cc57ff16c241b50223c75159081017889cfe718d6dbdc6567dfc751d71eebda7476c95701c8ae88b1320a0cbba66a694b471d08 SHA512 8568008e30fdc47c1c89f7368654d26407fb6594cd89e2b85786c875d9dd99e77ed2bb84d281351072670e2dfe7a952d6251c6fb4d111ebe6a63cb34942b6aa3
 DIST pad-0.1.6.crate 4963 BLAKE2B 38e02652f89b3020e1b5161c73053c060eb83142869f297bc8d21f3a193106f1c3565116c7c3ffaa6a30da5ccc2db3c702c14a20b13eed13cf33a358aebece6f SHA512 712b402d76512dd074862c719ff3b066b4ec4e7c56f37cf3b9359ddf45cb21eba3bad55d4e26b6c61c5b982c5adecfdc6fccee7939004329b7b12c8ecb997132
 DIST partition-identity-0.3.0.crate 6711 BLAKE2B 4dbe9e11684099b4cce4e077eb0b8a7942ea166d7f7d094a76f9ef79e52bb03299f9ef52a5badfa5b168e3144dbfb446096ccd06d4b81cfaf7718dbca293901d SHA512 153843ea6c6a76fed350a24fad206304aa88f66755737c50b9f17bea3be434b7fe8940fdb8e31d43415accd4435c6b0c16f5ffcb5d5a1da72cdb8056c7b66bdb
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
@@ -55,11 +82,25 @@ DIST proc-mounts-0.3.0.crate 8363 BLAKE2B 928790cd65ae64cbc434e1bd6f1f8335d920c8
 DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
+DIST rayon-1.7.0.crate 169488 BLAKE2B 518f0eda1fcbd1b1b230587ea18cab0023a699e796c819bf35a6492b7edb051137446bfbc49aaab0a68aef8280c970ad14301a9f8f7461d537af119a65b33a38 SHA512 d999c811b701d0aa4e547234bdc20a7df56728e142c4aa882bae081b7b057e8c3a72f4a62fb35535e57501e8c2ba7ff072068b59d6b5374e9ca6bb66cc0984d3
+DIST rayon-core-1.11.0.crate 73118 BLAKE2B 313d65bb6e3a010569b317b32ac91c72e38282f4fcddbcb56ffa97de42d88c0d34f35f76b62e1ad60ee96b596aa681caf2071a8d5dfdca085fb1fbafb07c3ee4 SHA512 00ac782f49d688da90e823980e83b5ccd858f93769e2d801061fdef78728cff37d3a9fa4fd47a5cddb058f28f3289de349f8c8fdd94fa2f8c400d73bc4529800
 DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
+DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde
 DIST rustix-0.37.23.crate 328010 BLAKE2B 299ad4b521b1008b6e864e9e52e523e97319d4b976343dccfe9705273f92930bbf7ca21c3e243c90ff7424fe881b55f38a2840701ab75bdb381f31ca91b1d9ff SHA512 9dcc915b753b0ae9ea4d92d33f3a7c73e889ca0dc22abb95ec3d375e4188449d1bd6835c122598beb947fc8aaf884c59cc2cf55ab77f32480f5c17e789664988
+DIST rustix-0.38.13.crate 342118 BLAKE2B 9fb31bba5253870345abc513768b0b0deaf581212462e328edd7ebcaa028979454585502ea9b4c93b82701ad08d134b637066f81204b4bb2a374ed5747c36acf SHA512 66e3914746895222963ab80da0fcbbb8489cb74dd37913f57f8570258265a94657d7dea37c944ed20543012bcb474ada3c50650a194554ba74fab07c313aab93
+DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scoped_threadpool-0.1.9.crate 7800 BLAKE2B b6f887c1af054666ab7f717dfdafe5701bbc0a778169d885a1837202d4d215970af567ea620c6ef47db69fa664c6be65c782aa87d9efc1d9c8c280b6210e38f1 SHA512 df8034b347fb489735895d75e5489c264aea1b50f46a8dd512963df05cb9ba9274317b26aeca63b9b4edcf792e796659bad435ad3f3446cb397340e2bf0a5f33
+DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
+DIST serde-1.0.188.crate 76230 BLAKE2B 81e92adf17e3f2ce73c82e3069b8fd656211cfeb6755abd338b74d52f748f5bba6690abf5c83ea2a126fbd6187bc587b539f0ebcf621e928085876f28fbb9513 SHA512 7d42ce834bcd1034f8ccbcd6646cc93f8e189e344f29f4d7b0ab148ba11ce7848d0ab986dce7a0245fcd6893243f5768f7bc0ca9c24c75c53585ecc899d312d2
+DIST serde_derive-1.0.188.crate 55563 BLAKE2B 3b24044915a704d9d8a2cae6e6547ecffea7ee3fd4260ddb2bf7fa38b23fd7fc597b61ac28bf65b9f0d45e18ffd6bc7596f5a3d602cc79835697fb3f5440242f SHA512 fa9132a319f7829e6afad65289031be99255466d76270875d9d81f82f63e53592eaef5452d0df38da92e9d0b6f2b37e91026635fff4bf597b0ae662b71b5eff0
+DIST serde_spanned-0.6.3.crate 7737 BLAKE2B 957352cb24d5cb1173613a48de7e411d768c61a73dd57572530490be0569e133e7c8eb62ec34e542a17010871562a53e37b296386c54dee8ea61d175dd0b05e3 SHA512 5c4f4a861dba2af7f0ad0c585859f845a7ea6c0a8ff8b63985503c9da27f313ba15b904b0aa56a59043c44a87c75fd317b23006a3804d332b84855189e436610
+DIST shlex-1.2.0.crate 6584 BLAKE2B ac07c648d9affe62512edab307fe07436dce69b428570ba6455aaf21c178145b1026e35704f920fc177b334cf190f57e393e4dd9e522dd26d133f80fb2c15f47 SHA512 cf48c0c47aac44654a48047fed3568c30f53f19cd131615cabbc247dbdf1eb1b7540b0d188f341251b4876dd0d5fcc13792800f0160f7907e8d8fe9a5e75083f
+DIST similar-2.2.1.crate 51147 BLAKE2B c86005ff69a14980db2cb90b13ed908448a711f09d1ee20a109d1dab2cc5bd839274f3803082721f1d81003c9011efdadcd190f4cb46eb09b26e338107546f45 SHA512 9a353bfbe495bab83e401314bb97c6605fa6283af06e03bad50bc429388c7abf44bb9cc68db781ef2b786840eb444907f35b70b17343b2cb993800536b4e36a2
 DIST siphasher-0.3.11.crate 10442 BLAKE2B 771221614bbd56f609b9743da4352dc7a2cbd0f6257952fab0cd052e5e5b258a4c95a0461d6d1b579dec90b72d66a0e58e036899b3db8341ae753a421a4cd4d5 SHA512 601121bd41da896142dc6ccc74a6eec3ebee3e976857ab8b5d21e915fdc8bc6e979af66a489c406371fbbbfc7a13338cc4b3744aa981206e43c53998f3e1699b
+DIST snapbox-0.4.12.crate 40820 BLAKE2B 03b1efee4208bcc6a20a57b45eed57c7e5b6a620823a1e1a14ef06c626111b33e2a9c2ade1c8fe94eb7dcfc07fe311d459a00294326def29c42bb6b3295c2a5a SHA512 ce7f5599b020c3d9435988d883107d564072122a45b5916d30f0f5b3027ab194cd503074dece21e6c81895695163c1e4c7157a638f05fbb55db4325c339c83a9
+DIST snapbox-macros-0.3.5.crate 6327 BLAKE2B a00c75993f1f6a12c314c2fc591ad5849beb045043bff7e83205b0ed5affb67569a982ed3db37db5255b5954ff029767730397ceee50f1c0da2bc669f9da820e SHA512 c6f1ea372a192c2b718c6ae2b1d17ee8426a4ae9b38909afaabb4a06fb140076527a1ba702bdfc526c9179459f949aa1433e9f3bf051505b77151d2f95651a1f
 DIST syn-2.0.29.crate 241664 BLAKE2B 5b339433249d7ee17b032cc9ecb118169957d91f438619940aeba0003ab0015b01cc6afb00656b5492539a5396325ec16c37e33764b00d6f9b8dc6b5b5e6a9f0 SHA512 a6319ee743a7690c7858da8492ffb6a963d102beba07009e82b08082d33ac8e8ea2675bdfc3ac3684392b3bc3d7f2624983dc508dd8b8f1fb9a57ec8a5b82828
+DIST tempfile-3.8.0.crate 31720 BLAKE2B ac975555bb4957f91e7d5733ef737bf25c62a738096457afa05079ed038de5e7144cbfd0e28bacd3eeb832de611616fb39ec07866481205c1f5c1005b2869d31 SHA512 8bc8e954bc0c6af46cf6e77d70f93583baea39fce54b111f4bba51fe5d5e5c184753ae2a2ea68a882b6ba5a157a57aeffeecc3e3cae86d78d952f3aa025fdf7f
 DIST term_grid-0.1.7.crate 7353 BLAKE2B eb4d11b84995d8ca831c32c3b0c781244d7d97367aa6b877f1aaa21e6b10edad5a4597ab06d5c1b6a9cc00fbecd62fa3f28b9970119dec98c0eb5d0c74948b5f SHA512 12196d1f2579b6d593a7cdd34d74635b93fad710bcd682dd438143a9e814759346dc263dc8a65628b7ed8fc1dbcaa60fd9cec543d0cdae000cc5dc6fbb199bca
 DIST terminal_size-0.2.6.crate 10585 BLAKE2B 8696b9046c717eec8bf7246346af84a5d0cb740ac6e1335a4d8c20476628f4c0dd7c6106cde33513681466e9701d4b05d73f22a3bd2dfabc4d22045a69d31345 SHA512 95f38bc00f8c5e1a6913bb2a0a7c46d96e02a4f3234af1623ad3d7be41eae677e77f1b5d5d005d1e9d778fcc6c87196f67a51ab37caab5b4d299da79c85d06ed
 DIST thiserror-1.0.48.crate 18862 BLAKE2B b98d63646526e1ed0baf27a17faacee3d8be34421f6fb211d4e1909965a3a327440c0b97c4aba423f416c5a849a47a1d42623a6e64ae27d2236706dc9a30a783 SHA512 078427d19a28f59aaca27f508795cfb06c024b5a34dfc83360c3bec2b8f7abe474706a41fb68732998f154507921beb03dd033f0a6d1dcfcee03b1f2adb8a0b2
@@ -68,14 +109,21 @@ DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f
 DIST timeago-0.4.1.crate 15419 BLAKE2B 020e82e5af2178e8124208fd07fcd9b1395c1036f4ba96ee84a4580ff0d3bae847c1147c7470f3916c54a7f3cdcc0c62b965b24721d7f9f89c8bd8b0d9602fc3 SHA512 9a8c0f41dc81e0e88a533f01f4cb87c783770eaaca9bc9c1325fbdcf856f339a79449dda619df56a38ad6016f67ad4898fdb2ba4ab7feb477f75a345aabcd2c2
 DIST tinyvec-1.2.0.crate 41625 BLAKE2B d7ffe63aa2f076ecf57a2c8af3269abc7c811b7e19c3bb6ce4830f9d12a9942620a43786f4f578000d01883a9cc33105619e4357b29d64babb9d6313ad99bbd1 SHA512 eae5ef44a90995a3e7186e52c1d90447f677b9b6db2f4e120e5c32f2077f324f000a16474e347eae702b7fa2a487f3e5ff06baa2082f3904ecf404c27ceae74e
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
+DIST toml_datetime-0.6.3.crate 10770 BLAKE2B fc1754eb7c3a7073cfe41e5ccba152ff09891a8de8afe38991cf2dd7b93aacf07f1075fd24d7aa643238cf31e3df1fc3162335b2c475438178b4a4d8a2055471 SHA512 cabf5dce24ed3bf4674008743180a21e86286d999cdce79f934de48b1e1fe0f16a7f3d2498bf059acdb823b51bc01986faf47139f8100ae272e6bd19095cfa9b
+DIST toml_edit-0.19.15.crate 95324 BLAKE2B f989f96d571693ff81572af6c05a6f51b673e478f22d20a6b166c45909902ac80280ea92ec5c3567327df90100a47fb7504845fc39bbcff6756af6c1a89e2221 SHA512 46d6bd2fea957392ae0ad7e687dad7743b76ee8e8ec76c80d6374ea294d3d09b6f73df0a82c821b9ee3b5268987a4136aa825034309f3cbc1947dbd1af1505dc
+DIST trycmd-0.14.17.crate 33271 BLAKE2B a209221dd701124d3b180859f7d94a4844d2e159e9b194cf3013136f110e528adc526b452b242a78db839e2358909679eb253e5ef48e50b71de09cf45b2e2977 SHA512 2e7600d3318201aa742b1f8e9796a6ef5e3aec3c4df1aa5267c135c6507c088106ac6ef61957af0dfe6f6aaf577ea22555db711a6608908fb3ae96f51b81dc08
 DIST unicode-bidi-0.3.5.crate 33423 BLAKE2B 26434df7646ca6fc3b655ac2482c2be70700bd84fdd31d016f49b5276b23308d1f9258d40ff97a4090e3dd603d3a19f8fe45c13c5dcde6b00816dcee1695c7d3 SHA512 4541d84db17eef16da6ea59f1ff7103549ff338d6ffabef21e75fbfcfdb1a3fd0f8e8fe18abab7b6117e997cefeaa5e87fb01fed8fedbcd0657fc913743de8ad
 DIST unicode-ident-1.0.11.crate 42067 BLAKE2B 3c7cac3d2bf1cbf1cf04716a482f130123e8e6940f7a90a17bc62fca44ac0069688165538f5329b95a72f735b594cfb85e3250738393ffd1b53cb0cd95077d89 SHA512 9682bbee339fb987c9d0bb6a54406d37b28b5c3587372d406402e4341900fec97e3234cd03b5c98b90b6378fd533dc452cac3de90d3ade19c4b09657e4abf6df
 DIST unicode-normalization-0.1.17.crate 100345 BLAKE2B 2579748ab87f6d74ab8e845d88c1990e4ef32e46e38f9a1841e3381d257d973f2f8a9da359c8e3f11790a888acf81f548ed3b749a67bb3e95acf3b744dd063f3 SHA512 727b4844a4eb103375dff7d88d620e1fb581cbdf2523f07a5c1673ff333d772d48ffae7658bfe4816a5bb42de5f68a96e15be9341c540a0f746c2990eeccb3d6
 DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31 SHA512 9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b
 DIST url-2.2.1.crate 65434 BLAKE2B e9180c56afaf9dd781812b3650b28cee14a2330629e708bb8a67144f6c12e3781d07fae68166990bebaae60190a1a88dfa1d087d4982ed04d8cdfa59ae4a0d7e SHA512 f2065e68dd917cc174c222a44127ac10a59d25a87ccce6b88ac1e1e775856fd7d5931d728296db355117f94e71e12404fdd68a283545b543a2e00a659a6997ed
 DIST urlencoding-2.1.3.crate 6538 BLAKE2B 65777b0990aa6b3d27a47f36114da8622026ac8946b5ffb6e04172b666ec7244a55c250a7fb626472bb2b636eb32ee945599cee5ce7351c3cef2322366db15ff SHA512 035848d9243ed6a4528377b56edd7f8bcb5f824381b420dc8f5c4bfc3f1246655c54eaa7de0e4aaa7138e0b08fd796b9ace140ab919aed2d94f6952b577386ac
+DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
 DIST uzers-0.11.2.crate 22573 BLAKE2B 6f01d5cefd5f64c9d35a2ced6f32db32da06c483c1a3f0c1146b2aa7d7addc74f77cf9ce6da07ae33757fecab2d5d8539b75e27025c38fdbf11494ec5c06a73c SHA512 67755ad1fcc5c8b581e5d923fbc52ad2fd90930321a1ea407ee33f4c2c97d873f35bb5df44d27a3827de537d21f5ce43885d07ab6b2f8fbb6c5dd4bda0f09289
+DIST uzers-0.11.3.crate 22745 BLAKE2B 59a64624c1a59dff483e28f1b80499191c9a860dcb00e4f27c5c39942ba5a1ec6a4fbe98bb585fca079f4594a57fb24db41675e1aac87fb4873e6056ef13c98f SHA512 3a4eb2d2479550bb34319d2d3841f1e4a5b024dd85193ce127a90479b3d801880d9d3624caa265aaaf9908c7dea73fd7da5780c12c2984db3db04ce45668d97d
 DIST vcpkg-0.2.12.crate 15530 BLAKE2B 23ee1a34064f19b67232c417a11093f01624b1ddb6aa572ac67ec125dd3f784036e68b58078607e028028e7c7e787c40a158d99cf120b8b80fd8d18c18a07a74 SHA512 33076b42cc83fa614fde2cbcfe1bc5426c99fe3707c129e6c2b7aa16afe3bbf6ada027ac35cc70bc432df25e6a4f6086d251effceae373b6efc23c6a6fb2ff46
+DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
+DIST walkdir-2.4.0.crate 23550 BLAKE2B b4298c01cb38be0479b7ddfee627af01f889b6b6ff432e368bb67f65134c3958a4fe271a5a7dd61b19259ae88f5680e5ce8e12e50a872b05fcba68f59b7073ec SHA512 09e1bc852c01b452c95b26a369831a97bc5c9e0ada3111c73774570dd73bb5b9e4735317d5572304fb48dca44ce7b9f77bbd17c418b6b047b2ab17b8bb42d9d9
 DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
 DIST wasm-bindgen-0.2.87.crate 175052 BLAKE2B bf8cf4aa1786ac5c2ba76e80500b5c54313adf9690ef370e60b894401bd1b81416da7bb46b90c014412c96f30f995bd1e52cf7f3a6be1111aea40866e8178396 SHA512 0c3099155ef079d2b91d2d5b135243d687bf865cdd9ae9d97d8cc2eb4c9bf7439b66b28d5b1d7e95048e53be63ed4909b6b3f2427951348de25ca7abb7a03705
 DIST wasm-bindgen-backend-0.2.87.crate 26821 BLAKE2B e230aa256a1f681ab3ffd2c83c3f6a810c305bb79a5e1d806b8b2b9f54ef0babc83809f6153b9ca511faa4b122f80bd1cc9eb97e7ae3cb4cba9e2dc1c6bd0b51 SHA512 317ee2bdf85067cb7f4b4ed6ff475ff9e5063143e9b7c8a28572211c09025935815227c4afa8c92823ac92102562d4d34531aa4891d8c922048d37e27377ee94
@@ -84,6 +132,7 @@ DIST wasm-bindgen-macro-support-0.2.87.crate 20006 BLAKE2B d32dfc7231e4fbc226586
 DIST wasm-bindgen-shared-0.2.87.crate 7248 BLAKE2B 0393ce9452119fd5f92836a76b28d3a697f91fb09de39d1af0a2a83e81d48bd4a17f39b48f15ae97edca3e361d4f8fedae8de04173c4ba1711decc73f64000d5 SHA512 cb9ff537554f56fd07052ddc4adc904a57ee64e13298df1dfca58b361ce163c34640e7dd9ed301ec1375f335dfa424230e22638ea7569ceb34aeca4505f6c008
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST windows-0.48.0.crate 11864177 BLAKE2B 39c0e4f058f68a829ee08721818a0b04287af20dfe6e03a125b75566b4c8a58b56557d685600f1f9c215811154f9782f12368d42848445d54dcf9bfd6471349d SHA512 7c906f885fa0a730f1cb1ef4e62f5b602a49d44343febe1d38fcd4cbc28e0342766983796042585fe457aa229333558715b6270e378946faa8f398a7ecc2af8c
 DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed
@@ -95,7 +144,9 @@ DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1d
 DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74
 DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
+DIST winnow-0.5.15.crate 145621 BLAKE2B 039262561227641c2d8b996ebb59c79718de3f2b7dd8e369fc3e341f3458b1e0213f35c575d615e87d5f89aad639c7a258e4efb2c10f58c2cd6e120482702cc2 SHA512 42dce18906f41e45e6dd75ba01af6a94501317dee8b45f4c7340f7c9c94f8935afe2536cd9ad5a91eef6f3a6135cab0a451d67a35b5a0fd69130a90e6aa47603
 DIST zoneinfo_compiled-0.5.1.crate 8837 BLAKE2B 1d513b145a391ccb22d2110cce06dc1fc91e109d93cc7f2a056ceb5056a5a480b98ed3471cf8ff8fb8011f2d9c037b3bbd4f47dcedc0a56499e324ea5d7849da SHA512 4ad46983742ed37246f3ba5538fdf3a4dfc444ec635ffaa51d5daffa70c14e1876e703cd0a1f077e6b324e0d44d4b5e1e710b3543636fa9f33d509fa8bce333c
 EBUILD eza-0.11.0.ebuild 3141 BLAKE2B d57fba1139806caa5b421ebe2ecc56eedde12d16ca795245e8b2542791637dc1fafc0e66e406aef9490266e740515f03cdb00b64f5ca457e2a96564e4986f37d SHA512 70e5832a7aa8bfadf1a5f4244c949a9906802cb0350c056294db9de20c6f9ec5fbe030fc31590f0345875b334e02c4c03e27ba87ee0448f7f6ab6a157ad9d0dc
 EBUILD eza-0.11.1-r1.ebuild 3700 BLAKE2B c2df4132124564da9c9a5745bfbdc30411cf75bfd2bd475b5408788141f47c1c42b1e641a383d682ded30024f03f7f46e065fa8b610cda71faf6710c420428f7 SHA512 8143710b1fa9db2381a3248fe9213d1abb68e603e140f841a5663d5d48fbe19e2f0c96679c58e85ff2d865d007680745e7a71fd9f7a015bb6344f4d5ae91d261
+EBUILD eza-0.12.0.ebuild 4520 BLAKE2B 6090a977675e0e1ae64652e01a498a358e2c6411abe81289f418254f8601a6590bd9eb5f612e6f3babd26e7058d74e1a355bd643adb5913a8232d9622e35d9bf SHA512 ce45deb89af6cf394f1723a094261a4b952f7a2a0c3e79650a1ee6b9ce3564e122585a903abfdb3762a18aff3f1656257741dd08229701d5f1e1852383a2aff5
 MISC metadata.xml 495 BLAKE2B 306ca308e3132da0688cee3f358d239c0b5ab3014c01d8624344d3a68643741a3d4303c1199454589f7fbc3a22d80fcc8ac66377b02895a39c1b54e078aee787 SHA512 09872a6228f3f3884044a8d08970ca5933a2de28049b900f85a99c749b7710268f7981f7115b796dbff159c471af3a60a4326da4412e660206b9ecbb6d24d11e
diff --git a/sys-apps/eza/eza-0.12.0.ebuild b/sys-apps/eza/eza-0.12.0.ebuild
new file mode 100644
index 000000000000..a279086cd7a2
--- /dev/null
+++ b/sys-apps/eza/eza-0.12.0.ebuild
@@ -0,0 +1,209 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	ansiterm@0.12.2
+	anstream@0.5.0
+	anstyle-parse@0.2.1
+	anstyle-query@1.0.0
+	anstyle-wincon@2.1.0
+	anstyle@1.0.3
+	autocfg@1.1.0
+	bitflags@1.3.2
+	bitflags@2.4.0
+	bumpalo@3.13.0
+	byteorder@1.4.3
+	cc@1.0.79
+	cfg-if@1.0.0
+	chrono@0.4.30
+	colorchoice@1.0.0
+	content_inspector@0.2.4
+	core-foundation-sys@0.8.4
+	crossbeam-channel@0.5.8
+	crossbeam-deque@0.8.3
+	crossbeam-epoch@0.9.15
+	crossbeam-utils@0.8.16
+	datetime@0.5.2
+	dunce@1.0.4
+	either@1.9.0
+	equivalent@1.0.1
+	errno-dragonfly@0.1.2
+	errno@0.3.3
+	fastrand@2.0.0
+	filetime@0.2.22
+	form_urlencoded@1.0.1
+	gethostname@0.4.3
+	git2@0.18.0
+	glob@0.3.1
+	hashbrown@0.14.0
+	hermit-abi@0.3.2
+	humantime-serde@1.1.1
+	humantime@2.1.0
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.57
+	idna@0.2.3
+	indexmap@2.0.0
+	io-lifetimes@1.0.11
+	jobserver@0.1.22
+	js-sys@0.3.64
+	lazy_static@1.4.0
+	libc@0.2.147
+	libgit2-sys@0.16.1+1.7.1
+	libz-sys@1.1.2
+	linux-raw-sys@0.3.8
+	linux-raw-sys@0.4.7
+	locale@0.2.2
+	log@0.4.20
+	matches@0.1.8
+	memchr@2.6.3
+	memoffset@0.9.0
+	natord@1.0.9
+	normalize-line-endings@0.3.0
+	num-traits@0.2.14
+	num_cpus@1.16.0
+	number_prefix@0.4.0
+	once_cell@1.18.0
+	openssl-src@111.26.0+1.1.1u
+	openssl-sys@0.9.61
+	os_pipe@1.1.4
+	partition-identity@0.3.0
+	percent-encoding@2.1.0
+	phf@0.11.2
+	phf_generator@0.11.2
+	phf_macros@0.11.2
+	phf_shared@0.11.2
+	pkg-config@0.3.19
+	proc-macro2@1.0.66
+	proc-mounts@0.3.0
+	quote@1.0.33
+	rand@0.8.5
+	rand_core@0.6.4
+	rayon-core@1.11.0
+	rayon@1.7.0
+	redox_syscall@0.1.57
+	redox_syscall@0.3.5
+	rustix@0.37.23
+	rustix@0.38.13
+	same-file@1.0.6
+	scoped_threadpool@0.1.9
+	scopeguard@1.2.0
+	serde@1.0.188
+	serde_derive@1.0.188
+	serde_spanned@0.6.3
+	shlex@1.2.0
+	similar@2.2.1
+	siphasher@0.3.11
+	snapbox-macros@0.3.5
+	snapbox@0.4.12
+	syn@2.0.29
+	tempfile@3.8.0
+	term_grid@0.1.7
+	terminal_size@0.2.6
+	thiserror-impl@1.0.48
+	thiserror@1.0.48
+	timeago@0.4.1
+	tinyvec@1.2.0
+	tinyvec_macros@0.1.0
+	toml_datetime@0.6.3
+	toml_edit@0.19.15
+	trycmd@0.14.17
+	unicode-bidi@0.3.5
+	unicode-ident@1.0.11
+	unicode-normalization@0.1.17
+	unicode-width@0.1.10
+	url@2.2.1
+	urlencoding@2.1.3
+	utf8parse@0.2.1
+	uzers@0.11.3
+	vcpkg@0.2.12
+	wait-timeout@0.2.0
+	walkdir@2.4.0
+	wasm-bindgen-backend@0.2.87
+	wasm-bindgen-macro-support@0.2.87
+	wasm-bindgen-macro@0.2.87
+	wasm-bindgen-shared@0.2.87
+	wasm-bindgen@0.2.87
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.5
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-sys@0.48.0
+	windows-targets@0.48.5
+	windows@0.48.0
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_msvc@0.48.5
+	windows_i686_gnu@0.48.5
+	windows_i686_msvc@0.48.5
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_msvc@0.48.5
+	winnow@0.5.15
+	zoneinfo_compiled@0.5.1
+"
+
+inherit shell-completion cargo
+
+DESCRIPTION="A modern, maintained replacement for ls"
+HOMEPAGE="https://github.com/eza-community/eza"
+SRC_URI="https://github.com/eza-community/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 MIT Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+git man"
+
+DEPEND="git? ( dev-libs/libgit2:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=virtual/rust-1.65.0
+	man? ( virtual/pandoc )
+"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_prepare() {
+	default
+	if use man; then
+		mkdir -p contrib/man || die "failed to create man directory"
+		pandoc --standalone -f markdown -t man man/eza.1.md \
+			-o contrib/man/eza.1 || die "failed to create man page"
+		pandoc --standalone -f markdown -t man man/eza_colors.5.md \
+			-o contrib/man/eza_colors.5 || die "failed to create colors man page"
+		pandoc --standalone -f markdown -t man man/eza_colors-explanation.5.md \
+			-o contrib/man/eza_colors-explanation.5 || die "failed to create colors-explanation man page"
+	fi
+
+	# "source" files only, but cargo.eclass will attempt to install them.
+	rm -r man || die "failed to remove man directory from source"
+
+	sed -i -e 's/^strip = true$/strip = false/g' Cargo.toml || die "failed to disable stripping"
+}
+
+src_configure() {
+	local myfeatures=(
+		$(usev git)
+	)
+	export LIBGIT2_SYS_USE_PKG_CONFIG=1
+	export PKG_CONFIG_ALLOW_CROSS=1
+	cargo_src_configure --no-default-features
+}
+
+src_install() {
+	cargo_src_install
+
+	dobashcomp "completions/bash/${PN}"
+	dozshcomp "completions/zsh/_${PN}"
+	dofishcomp "completions/fish/${PN}.fish"
+
+	if use man; then
+		doman contrib/man/*
+	fi
+}
diff --git a/sys-apps/system-monitoring-center/Manifest b/sys-apps/system-monitoring-center/Manifest
index 582390f46123..f6ae7d4ee7b9 100644
--- a/sys-apps/system-monitoring-center/Manifest
+++ b/sys-apps/system-monitoring-center/Manifest
@@ -4,7 +4,7 @@ DIST system-monitoring-center-2.21.1.tar.gz 1505833 BLAKE2B a2270f20e745191eb72c
 DIST system-monitoring-center-2.21.2.tar.gz 1511509 BLAKE2B 44c573a83cc8eb3288543e5ab69c334d0d47dbc1fe05d64f6197a870f7df9c81cd3c57fb67c4219e04bd889554a057276af388e8374de15d02e83ec7ff487ae2 SHA512 95d7622079aa2fa89b1f7e98c886e2c215a204b6cc2b52d4e2892964350639004514fbbd1244df9c70acc7238308071b459997dacc7fa997aae840c9cc95e817
 EBUILD system-monitoring-center-2.18.3-r1.ebuild 1008 BLAKE2B 0cfc5f22af64d9e22282245ce947124448705bbf0a6785ba988cf394ad1b0af820f8ed878233bf88166b4a6eb14c347df6ff5375670f7795f1024f8cfb327e84 SHA512 2683a2a50ffcfedcc45af6f21b2527406047621f0a6ece52b1075e60a598f855277ab6fb66ac6af24a3fe26795f9b9ca443c5df581fc9165d180db82a5b9930d
 EBUILD system-monitoring-center-2.20.2.ebuild 1008 BLAKE2B 0cfc5f22af64d9e22282245ce947124448705bbf0a6785ba988cf394ad1b0af820f8ed878233bf88166b4a6eb14c347df6ff5375670f7795f1024f8cfb327e84 SHA512 2683a2a50ffcfedcc45af6f21b2527406047621f0a6ece52b1075e60a598f855277ab6fb66ac6af24a3fe26795f9b9ca443c5df581fc9165d180db82a5b9930d
-EBUILD system-monitoring-center-2.21.1.ebuild 1009 BLAKE2B 4be408efef2d904c8735400dd1e35005b58adffe05a81b1164f9bffa595b94ebb13370a0883e33da1ed6a59b2a4aa51d41d2a7d790c8129c943074aaa19ec85b SHA512 24ffa6417e55c025f127cc4fab700fe2d8f3e11c2555a0c27a0adebaf960533626886907f22ba9932f7768b17d7d16568d4cd04964b0c8bba08c9992b6ec2e2f
+EBUILD system-monitoring-center-2.21.1.ebuild 1008 BLAKE2B 0cfc5f22af64d9e22282245ce947124448705bbf0a6785ba988cf394ad1b0af820f8ed878233bf88166b4a6eb14c347df6ff5375670f7795f1024f8cfb327e84 SHA512 2683a2a50ffcfedcc45af6f21b2527406047621f0a6ece52b1075e60a598f855277ab6fb66ac6af24a3fe26795f9b9ca443c5df581fc9165d180db82a5b9930d
 EBUILD system-monitoring-center-2.21.2.ebuild 1009 BLAKE2B 4be408efef2d904c8735400dd1e35005b58adffe05a81b1164f9bffa595b94ebb13370a0883e33da1ed6a59b2a4aa51d41d2a7d790c8129c943074aaa19ec85b SHA512 24ffa6417e55c025f127cc4fab700fe2d8f3e11c2555a0c27a0adebaf960533626886907f22ba9932f7768b17d7d16568d4cd04964b0c8bba08c9992b6ec2e2f
 EBUILD system-monitoring-center-9999.ebuild 1009 BLAKE2B 4be408efef2d904c8735400dd1e35005b58adffe05a81b1164f9bffa595b94ebb13370a0883e33da1ed6a59b2a4aa51d41d2a7d790c8129c943074aaa19ec85b SHA512 24ffa6417e55c025f127cc4fab700fe2d8f3e11c2555a0c27a0adebaf960533626886907f22ba9932f7768b17d7d16568d4cd04964b0c8bba08c9992b6ec2e2f
 MISC metadata.xml 1342 BLAKE2B 2c160c0ee614f2badb06264876c618b6d652adfa42fa7eab484fb1ff367e7c8e849d25e7f6969e06623c4b58b2b062159600a0c8d5a778d1d238692816a1fa74 SHA512 8f8a6149401e3b32e967cc1f5c77a65cb607957d9375cc8d69741e95e627337bc4d8c59b4afd22ea6ff2e03e3ec31b519d7cf8aab6061d89d3d8b9bc2a2ecead
diff --git a/sys-apps/system-monitoring-center/system-monitoring-center-2.21.1.ebuild b/sys-apps/system-monitoring-center/system-monitoring-center-2.21.1.ebuild
index 0d57d2200134..da1003cb4f3f 100644
--- a/sys-apps/system-monitoring-center/system-monitoring-center-2.21.1.ebuild
+++ b/sys-apps/system-monitoring-center/system-monitoring-center-2.21.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://github.com/hakandundar34coding/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index a98d2d4ff820..92bee8069e67 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index c008431beb7c..f26c79f60d64 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,6 +1,6 @@
-DIST charliecloud-0.32.tar.gz 549184 BLAKE2B 5d574ccf2fb36b0acf4f436099ba8344b5d9058d5f79abb8d56082d86b2f9e7207052009b2d49ed50eaede7411796804944fbe11c0d7bcf21f2d62ba01b2c28f SHA512 c32362a219fbe7ec298ac314f58a17e0e6972a3436f66a0243a77c8c05007e6fea3ac8d4ddc15274737eacf3ba32601c0198fc5a39bccb4017d675a149366aee
 DIST charliecloud-0.33.tar.gz 559786 BLAKE2B 46e8a488af5a27e6b52ae41118cea663cd6c01f8a24566576dbdc7bac99bd94ac50c0559da07a204c2e68ed46edb8c5a5e0bd26986b5bc960901457af632e134 SHA512 d6854873bdfca5512c54ba28ff70721442241a00cbec6d67c9693e946c6925d030773382c8ba9fc3ebcdfd52da56580e6c4e3ad7080d51d9844ad6f216f15e70
-EBUILD charliecloud-0.32.ebuild 2417 BLAKE2B eb92fbf5ded6f827c9748263fa6d921254f7c9a2bf196ef7c69814e74e33032976d7ee5de2531f544f1d37fabacab5319aa0ea13c72cf463207c3bcba49801eb SHA512 15518863a6618c0145a08d832a180af4edac26c1cac45ae4153d27b4c4e7312927077541689f083e88ef5efaa370bce2349ddcd6f0c0df3c09f2643214865ca5
+DIST charliecloud-0.34.tar.gz 565976 BLAKE2B 0c86877bd3f17bf91d287f57b5e0844f7cb1777a499ea2bf67fb2cd5762f453239fe20afa6e4ba71acc98609c718028dd1e813a36aee881aa5c2cae79a65effd SHA512 5ede938a8015391758e0eef0b3661c12025cbac3e5153e2e5219fb4d50f8f78ac12076e4c3b658379a1521825372a0ed792a63210371cdbdad1e6631112e371d
 EBUILD charliecloud-0.33.ebuild 2417 BLAKE2B eb92fbf5ded6f827c9748263fa6d921254f7c9a2bf196ef7c69814e74e33032976d7ee5de2531f544f1d37fabacab5319aa0ea13c72cf463207c3bcba49801eb SHA512 15518863a6618c0145a08d832a180af4edac26c1cac45ae4153d27b4c4e7312927077541689f083e88ef5efaa370bce2349ddcd6f0c0df3c09f2643214865ca5
-EBUILD charliecloud-9999.ebuild 2417 BLAKE2B eb92fbf5ded6f827c9748263fa6d921254f7c9a2bf196ef7c69814e74e33032976d7ee5de2531f544f1d37fabacab5319aa0ea13c72cf463207c3bcba49801eb SHA512 15518863a6618c0145a08d832a180af4edac26c1cac45ae4153d27b4c4e7312927077541689f083e88ef5efaa370bce2349ddcd6f0c0df3c09f2643214865ca5
+EBUILD charliecloud-0.34.ebuild 2402 BLAKE2B 29e3a534faeefaedd283ff344701b1402da830e75bf85395b657ec4699bb4832c805e1945ca4c1eea280326a0d58006a4fe06aa6a61342d6515d46bf58a9470e SHA512 eb3f54a7accee804b2831f3e10a3ac415abcf95985ef58d778fca68cdeddc2d08752217cdba1422d610fdd770bca8c5d393331086d2f8a30f39ce06e55a04454
+EBUILD charliecloud-9999.ebuild 2402 BLAKE2B 29e3a534faeefaedd283ff344701b1402da830e75bf85395b657ec4699bb4832c805e1945ca4c1eea280326a0d58006a4fe06aa6a61342d6515d46bf58a9470e SHA512 eb3f54a7accee804b2831f3e10a3ac415abcf95985ef58d778fca68cdeddc2d08752217cdba1422d610fdd770bca8c5d393331086d2f8a30f39ce06e55a04454
 MISC metadata.xml 618 BLAKE2B 5f7dbfdb8a940a534ed97b4bd47b05a271d6454b0584ac29db1c2fb533044a2c6d48b8425399866abd8d2ebea1f41199ea4cf23af1c6f2646d4c35b5b4c104a4 SHA512 df1b817bbabc6b227c9a779677d345b9df259444b943b1ab58d55c860cd79ad8f9d4b382dc6c4de0c5daa955fd694990217a559e897a3b11f7e954c7b54d4678
diff --git a/sys-cluster/charliecloud/charliecloud-0.32.ebuild b/sys-cluster/charliecloud/charliecloud-0.34.ebuild
index 7e84cbf18286..22a7048b73de 100644
--- a/sys-cluster/charliecloud/charliecloud-0.32.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.34.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit autotools optfeature python-single-r1
 
@@ -54,8 +54,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local econf_args=()
-	econf_args+=(
+	local econf_args=(
 		$(use_enable doc html)
 		$(use_enable ch-image)
 		# Libdir is used as a libexec-style destination.
diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild
index 7e84cbf18286..22a7048b73de 100644
--- a/sys-cluster/charliecloud/charliecloud-9999.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit autotools optfeature python-single-r1
 
@@ -54,8 +54,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local econf_args=()
-	econf_args+=(
+	local econf_args=(
 		$(use_enable doc html)
 		$(use_enable ch-image)
 		# Libdir is used as a libexec-style destination.
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 60bd8a7492fc..c207e9c0c25a 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -6,10 +6,8 @@ AUX glusterfs.confd 129 BLAKE2B 17eeb707fe5ebeb335b0c64ce999268e5f5c6fb6d2ba4846
 AUX glusterfs.logrotate 611 BLAKE2B e79718d43b8123e8bcc63336977f972e58332536e0bccad84f3abb5e4afd87853d1c70ab689e2c454d94a8d74bb65122e7bf5a35150f60fb268c7757eea7b0d0 SHA512 568728fe77acecb686286b0be6c086fe3448d054d26da15c3846726a8f845ae963e6756c517b413a9eb4d6b646c61972887a35e89846d2d90d364b755e471791
 AUX glusterfs.vim 139 BLAKE2B 73fdcb49c0c252784718b461541d5483e118bf1b83f445a6ced3119600aa46c469291e19aa439e2c1e35ffc88c83a74977571d8ccfddf078f65c5c16a44ed3e0 SHA512 6ea3b56b71d7e206a57611dd68160b6b9242a19b5c927560f60881dc28d250f7958c50f788a7b9a41fb46010fdac2d67a8289b909ed1f05b793c900f37ccbfb7
 AUX glusterfsd-10.2.initd 3042 BLAKE2B 27b79e854164bc2e75a69936abad90f774c1372089bd3d6fc44feef6a6566be39ec6dfe76f26c479a8466b3f76995616aea59c38b092343484dabe20572df45e SHA512 101db0f73dee54703cfb7d196eb6e22f11e15a48f6a18507391caf6b129041f74740757d2cb22492229d5be962126b587c3fb69d688820120f3c0f3be9c58f44
-DIST glusterfs-10.2.tar.gz 8278598 BLAKE2B 48e70a244e34cc41a5befbe94635e945c95b87f26e5e1892b099d23a13c6fb70eefb2a66b247a564b03eeb0707ee480b50096b154b3ac5d2a13051e6371995b3 SHA512 290c701fbd3f100096ef26b589ee0714449fc620c35e62bcb5fe2fe8de5f64963b40d7d5fe1b97b274ba791fa45f4175305b6a112f184f6ce11a1e0dc9f7ea30
 DIST glusterfs-10.4.tar.gz 8293872 BLAKE2B 01f8764cc71b7bac2ee0419f3f1069ac1c85e26314828b47f348b9bf88ad0b8aa327be16ccfe9cf820aebb7dd9477a7840c721df4435c895be91fed0b1129b7c SHA512 06c563ab77a29145b1fac44f5a56a91539accb69ba736fe6297aa3f38b128e68ba4f7d0b49ac6eb56397a51950fb4de882ff60037e91c61ad13dd89a18139d82
 DIST glusterfs-11.0.tar.gz 8355706 BLAKE2B d0ee895b8ce5f506d9bc1f8b962a0f29b0379f086bf18cff0092938b7c2f7025afa2fccf54f58ac751a184a3b0e91a086df2d6496892f204373e070d7576a5d6 SHA512 075f0025a1892ebb28d45d0a4e8971656319582dd7bc2c8b19ea26cd08a789bb54f8bc9752839706cd0ee0ca54be74245230bc453a5d1e9e163af84f08937e69
-EBUILD glusterfs-10.2-r2.ebuild 5785 BLAKE2B ccea7cc47d33c2698836c327dfefd8b1ae6913369d33c060cb4a12960345c84ebc4341eb64b1cc17e8edf3b06c250350477fdc44c0c21b1c30529145bcedad62 SHA512 2bce6a9423bd21916afc524c18f17b1e24c13ce4d6726d30ea9eda377a329a262b5548211277962d16dc786741321d779a9f3d6cce9dae1f1c8309c17810d6e3
 EBUILD glusterfs-10.4.ebuild 5799 BLAKE2B 57288a885b112b004d9f1e5e97d4a727e11936f0946037790cfb03a91dfed03db7583ccee9eb1baa65429a79fbde27530fb1dad6f8d87dde6e62b1f08eaa6402 SHA512 3ac7c9d8f212c995e19d84afd86f946d2dccf76781e4a61a81e3271efa62e87fd42f23d18f9db04875cd1c8792e1c8418671020388974d10383b6ab82a73da0c
 EBUILD glusterfs-11.0-r1.ebuild 6055 BLAKE2B 24db51a91b799d41b276d701c29e47101947b867c20e8f9e288590ac524d1ff6918735620020e633990cc20c31ec2ddbf09b6ffd80fd1960ed424ec094126c34 SHA512 ed4ef3863a6da103726050a913bb1460cf2e2ef572cd84f7853f253f455316fbc2480fbde76db85336975f69dd16670c1a6af3abce9a6ad24e4c47ab15f730e1
 EBUILD glusterfs-11.0-r2.ebuild 6167 BLAKE2B 2361cb32409ed2405e11752f4919434b26397fb472f0501ef9dfd4358fdddb02590f76c6e757ac54af35f2fa1277faa46fc408b0184287d50eef9f488082dc20 SHA512 7afa248851ee976954831ae16565bf43b3418555c511d7805a1ed2297994fea0a89c5c975f5b1a2af072dca37a7dd21767c770f6b84ccf86b1d816ef130228fc
diff --git a/sys-cluster/glusterfs/glusterfs-10.2-r2.ebuild b/sys-cluster/glusterfs/glusterfs-10.2-r2.ebuild
deleted file mode 100644
index d54cb49d677f..000000000000
--- a/sys-cluster/glusterfs/glusterfs-10.2-r2.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit autotools elisp-common python-single-r1 tmpfiles systemd
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
-SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 LGPL-3+ )"
-SLOT="0/${PV%%.*}"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv x86"
-
-IUSE="debug emacs +fuse georeplication ipv6 +libtirpc rsyslog selinux static-libs tcmalloc test +uring xml"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	georeplication? ( xml )
-	ipv6? ( libtirpc )"
-
-# the tests must be run as root
-RESTRICT="test"
-
-# sys-apps/util-linux is required for libuuid
-RDEPEND="
-	acct-group/gluster
-	acct-user/gluster
-	dev-libs/libaio
-	dev-libs/openssl:=[-bindist(-)]
-	net-libs/rpcsvc-proto
-	dev-libs/userspace-rcu:=
-	sys-apps/util-linux
-	sys-libs/readline:=
-	${PYTHON_DEPS}
-
-	!elibc_glibc? ( sys-libs/argp-standalone )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	fuse? ( >=sys-fs/fuse-2.7.0:0 )
-	libtirpc? ( net-libs/libtirpc:= )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	selinux? ( sec-policy/selinux-glusterfs )
-	tcmalloc? ( dev-util/google-perftools )
-	uring? ( sys-libs/liburing:= )
-	xml? ( dev-libs/libxml2 )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/acl
-	test? ( >=dev-util/cmocka-1.0.1
-		app-benchmarks/dbench
-		dev-vcs/git
-		net-fs/nfs-utils
-		virtual/perl-Test-Harness
-		dev-libs/yajl
-		sys-fs/xfsprogs
-		sys-apps/attr )
-"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
-
-QA_PKGCONFIG_VERSION=7.10.2
-
-# Maintainer notes:
-# * The build system will always configure & build argp-standalone but it'll never use it
-#   if the argp.h header is found in the system. Which should be the case with
-#   glibc or if argp-standalone is installed.
-
-pkg_setup() {
-	python_setup "python3*"
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# build rpc-transport and xlators only once as shared libs
-	find rpc/rpc-transport xlators -name Makefile.am -exec \
-		sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' {} + || die
-
-	# fix execution permissions
-	chmod +x libglusterfs/src/gen-defaults.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-fusermount \
-		--disable-lto \
-		$(use_enable debug) \
-		$(use_enable fuse fuse-client) \
-		$(use_enable georeplication) \
-		$(use_enable static-libs static) \
-		$(use_enable test cmocka) \
-		$(use_enable uring linux-io-uring) \
-		$(use_enable xml xml-output) \
-		$(usex ipv6 --with-ipv6-default "") \
-		$(usex libtirpc "" --without-libtirpc) \
-		$(usex tcmalloc "" --without-tcmalloc) \
-		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
-		--localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
-	default
-	use emacs && elisp-compile extras/glusterfs-mode.el
-}
-
-src_test() {
-	./run-tests.sh || die
-}
-
-src_install() {
-	default
-
-	rm \
-		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
-		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
-		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
-
-	if use rsyslog ; then
-		insinto /etc/rsyslog.d
-		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
-	fi
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
-	insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
-
-	# insert some other tools which might be useful
-	insinto /usr/share/glusterfs/scripts
-	doins \
-		extras/backend-{cleanup,xattr-sanitize}.sh \
-		extras/clear_xattrs.sh \
-		extras/migrate-unify-to-distribute.sh
-
-	# correct permissions on installed scripts
-	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
-	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
-
-	newinitd "${FILESDIR}/glusterfsd-10.2.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-10.2-r2.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
-
-	systemd_dounit extras/systemd/{glusterd,glustereventsd,glusterfssharedstorage,gluster-ta-volume}.service
-
-	# QA
-	rm -r "${ED}/var/run/" || die
-	if ! use static-libs; then
-		find "${D}" -type f -name '*.la' -delete || die
-	fi
-
-	python_optimize "${ED}"
-}
-
-pkg_postinst() {
-	tmpfiles_process gluster.conf
-
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	echo
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	echo
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	echo
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-	echo
-	elog "If you are upgrading from a previous version of ${PN}, please read:"
-	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 2da40f8eea7f..301d42594bb9 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/rar2fs/Manifest b/sys-fs/rar2fs/Manifest
index a930a7c5382c..7655c8aa7b70 100644
--- a/sys-fs/rar2fs/Manifest
+++ b/sys-fs/rar2fs/Manifest
@@ -1,3 +1,5 @@
 DIST rar2fs-1.29.5.tar.gz 268706 BLAKE2B cdc88672976c99868dedb65d772d6ad76bad7b1891845d09f575701005ab58cf79b5b19cb5de79d81bf1ef6ea8a734cd9755e002b6bf141f4166fdb73a667e2e SHA512 78962d614d66eeb09c013212d8bd373907d8a55489d9bc544f43ba1f34989cd777bba38a6af5899fea0b01e4cfdc0ee18462776e2d4cc529e05d5c6d30a899bf
+DIST rar2fs-1.29.6.tar.gz 269026 BLAKE2B df2b33561898b8e23bd54481f275058442be7b8616d7107614f98e6cc478c400ad764fff35ccab29f4a907ba9ac2afbb58f3093976e5b191b1e844f28a64f6a0 SHA512 c046f51c7047c3d04c3e9d1b69c72c019c32c70f83776f8179b608e8c21a7a3edfd4229434285a4234fd65ad48ffd5cbae3b2fa2d285cecf1a84a3a30ab3c256
 EBUILD rar2fs-1.29.5.ebuild 869 BLAKE2B e6e70a39b962f002b111f63449a8fc44910cd71468f12a742f7149a1d635b5d0eb3db124f3eacedb11f896749d31793f4dc3aa37a8cf25cf3362a950f48f6f44 SHA512 31c3521e8a06b1132d54ce84fde7f068609d1b9d2192d890b3cdfbc4eba5ab021416d651e2392a3100c161e0b6583444423732d5ea03ab6b3d61c876780c0317
+EBUILD rar2fs-1.29.6.ebuild 809 BLAKE2B e8d1ba9c1759fa7436957b9f3b6083e49caee764c48ba0f74956d80c34ff10142667801f107fccaf1c19c85ac2538ffdb079a18ae0c37f0e38b5130214e8822d SHA512 dacb09b6ddfd49690e83329a0d15d77c52d79004bf98745ddce1a7a14f0512d1b4700ef68fb27829b47cb037c45c59852afb26c253560dcc4e6193aa61389e90
 MISC metadata.xml 481 BLAKE2B 83faebf349535faf97078ad47e15dba37cd2be7c43c04c9f5da63a73cd49bfe5e2cbb157dc9bdc0d30f35f85774af6e58020d8b6c8f3a625afbbaef02ddb757a SHA512 8f6c9473e99ed14c479ab89bc06b5dde87b9580909f5e11fdaa70fe07ffefd1edad783f93672b3df8bbf7ee8feec48034d644cd2a1e3b6da4727e980e986ad29
diff --git a/sys-fs/rar2fs/rar2fs-1.29.6.ebuild b/sys-fs/rar2fs/rar2fs-1.29.6.ebuild
new file mode 100644
index 000000000000..de854a230aa7
--- /dev/null
+++ b/sys-fs/rar2fs/rar2fs-1.29.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A FUSE based filesystem that can mount one or multiple RAR archive(s)"
+HOMEPAGE="https://hasse69.github.io/rar2fs/ https://github.com/hasse69/rar2fs"
+SRC_URI="https://github.com/hasse69/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+# Note that upstream unrar sometimes breaks ABI without updating the SONAME
+# version so try rebuilding rar2fs if it doesn't work following an unrar
+# upgrade.
+RDEPEND=">=app-arch/unrar-5:=
+	sys-fs/fuse:0"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	export USER_CFLAGS="${CFLAGS}"
+
+	econf \
+		--with-unrar="${ESYSROOT}"/usr/include/libunrar \
+		--disable-static-unrar \
+		$(use_enable debug)
+}
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index fe61041aa631..a6de05cf5028 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/httpd-php/Manifest b/virtual/httpd-php/Manifest
index 471c56223bfc..75a25dc5d054 100644
--- a/virtual/httpd-php/Manifest
+++ b/virtual/httpd-php/Manifest
@@ -1,4 +1,3 @@
-EBUILD httpd-php-7.4.ebuild 425 BLAKE2B 259e7a664b5cf5d23bf3e7f640b3e7fa8a3bac58cbb3b05d728281ecfdd0f896e2afd717046e17bc10b6650786aec1ae169a5f991c10d0de586190d7f882649c SHA512 f0f5ddd9a5897fba9d8d75c4d7c14dc3070e3e79824e58824827d8ef3380a39800b7622cd6449b6d20cfdf05fc65e755568772060135aecf78c02da92a099ea6
 EBUILD httpd-php-8.0.ebuild 425 BLAKE2B 259e7a664b5cf5d23bf3e7f640b3e7fa8a3bac58cbb3b05d728281ecfdd0f896e2afd717046e17bc10b6650786aec1ae169a5f991c10d0de586190d7f882649c SHA512 f0f5ddd9a5897fba9d8d75c4d7c14dc3070e3e79824e58824827d8ef3380a39800b7622cd6449b6d20cfdf05fc65e755568772060135aecf78c02da92a099ea6
 EBUILD httpd-php-8.1.ebuild 432 BLAKE2B cf4530b831758342f5ff8c5e4470bbf966b0f9e93e754f83112808f2825142a47f621b1f6013d4c3a856ae81de6b05dd23fd81f62966ebe62a9a9251aa12b459 SHA512 2814e9125f2106f28d556d75bd30b37fa07990bafb888fbc5a4c10d58c337e2ce563c8984cd869c41a89d1042170a75a2626f0938ce17290bee1ed46288dc80b
 EBUILD httpd-php-8.2.ebuild 439 BLAKE2B 73a8e9caf4732d8a76138d550cb788a80a73f43440df6fb01e8576910d4ca3164b57f58e3e69b5ecc5f31d734fe3ddfdb71833e7218b396d471ae6c15f10f397 SHA512 c3f0ae70fd988bb32ffa2ce8e79c43659342e42af276d20e9f9b49cd116d19468589bd81708111484aff0c7b97f3227909761a4d7c5275bfd9f9e660c8ca58f9
diff --git a/virtual/httpd-php/httpd-php-7.4.ebuild b/virtual/httpd-php/httpd-php-7.4.ebuild
deleted file mode 100644
index 9903c223ca7a..000000000000
--- a/virtual/httpd-php/httpd-php-7.4.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Virtual to provide PHP-enabled webservers"
-SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
-			  dev-lang/php:${SLOT}[apache2]
-			  dev-lang/php:${SLOT}[cgi] )"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 2509d3609ff1..eaae24d8f605 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 1e5b2c29f771..ec21ce301431 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -2,5 +2,5 @@ AUX htaccess 170 BLAKE2B bcdf354e630f2e2995a56b7f435da2cff2c39f85ee70f745d43ec3c
 AUX htaccess-dist 1639 BLAKE2B 52fea4574320fc4e56aa061e46f7ec978a6282996188f2d86b9eea4e8b4617c561f94621ea3cf334d4eae16d164c96ce419258da40e9644b951f5c4d828acf09 SHA512 8d05756eb04a61fc9a89b814d0cf9022feb57c3de10fa74cf1964bdba7910d25448109147facccd8447a4ff446cb7a0cf8d8134642061d23b03e0921b032fc76
 AUX postinstall-en.txt 1791 BLAKE2B 96a1f47933d402d7d33aa6cd54724d1f1e9fb717c3a031be6785c49f26d5bcc518388d838a5e68f3911495b51391367ac5777698a8e79e45b5160f99250745e5 SHA512 a7492810fad0c5ca6f3e724679ae753934b7a92f90663dc0e93608dca06d1a4b2ba04842e0755955b9b3e6ba63742a5b3c882d097c8c0e2df178d044f471c5b5
 DIST dokuwiki-2023-04-04a.tgz 4043928 BLAKE2B a18372b04bd10760236ec4f976a87fed800601a541ebb6aaa07b302c8462286da3094aa102194a101c59ceacde99d0c865f938b8eb732cf09e8e7f0b5f40ea8e SHA512 748af27b2d226437f87461522254fca5e65c7572fdc20e75259944b388e3888a85f61120d1c22c671d3a302ac6791e463a0d3418f2fcf23bf046116107b11ab8
-EBUILD dokuwiki-20230404a.ebuild 1879 BLAKE2B f000d838cc61b12aea18c0728dced258eab0b5bbe917655bce972b7eeee784839ea3afaf3c83890e932b36b6c757608f8a40bb7c49bbd8fcd0964b5612d8b575 SHA512 c600eb6d223cb13497cc2fb71d3027ea2b51a52305aac49baad167a82c640ea6facdc8b0caed735dca90a10b7d4a68b6aee47355d95df0b03f4df21cbcb6b1d1
+EBUILD dokuwiki-20230404a-r1.ebuild 1879 BLAKE2B 4e04f2279ba7f5dccd8013da9575a6f2939f5dd77e321e51d6bfb58a75ea9f8ff63c8205f3af36c2ad058363b266a8502d84eccd951e0a8917307ff3308dcc92 SHA512 ae94239a891453c1745d8352eeb9361d7f2c2af13414d48da66b136f171ea96b4de47e2b3f133c5cb280d5ed4496249c68cd364eff4d7f011bb3322479c9a161
 MISC metadata.xml 802 BLAKE2B a4dc7f053f175b1764efda3721a0cdfdb09d6e4311fd81f103bd4786185dada85accc52cb087aea8fddb957afc07efecca97202ed917f716875da028d1171577 SHA512 c3b1bb6f3d182dc08b08ec9a3407fa7e5eef31a82bdf63786e8488b9d67b3abab9c9b9e5ba4aed7e1a2da43356400eb4d6c825e9ed804c553c8a3b348efca10f
diff --git a/www-apps/dokuwiki/dokuwiki-20230404a.ebuild b/www-apps/dokuwiki/dokuwiki-20230404a-r1.ebuild
index c6d2a56a3fa0..9de0b60bb660 100644
--- a/www-apps/dokuwiki/dokuwiki-20230404a.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20230404a-r1.ebuild
@@ -28,7 +28,7 @@ IUSE="gd"
 
 DEPEND=""
 RDEPEND="
-	>=dev-lang/php-7.4[xml]
+	>=dev-lang/php-8.0[xml]
 	virtual/httpd-php:*
 	gd? ( ||
 		(
diff --git a/www-apps/icingadb-web/Manifest b/www-apps/icingadb-web/Manifest
index 694d7f0a518d..a3478d6eaf42 100644
--- a/www-apps/icingadb-web/Manifest
+++ b/www-apps/icingadb-web/Manifest
@@ -1,5 +1,5 @@
 DIST icingadb-web-1.0.1.tar.gz 2296075 BLAKE2B 08684f8f46e85843035a98716094d7a0b2d623fdc633beaa9cc49778fd495d1edbf99f003bceed155a081bbe9ecc90393910f0c28a854fbe435b9fe73a5066c9 SHA512 64423f67961c4d0677d4fd5da18c28b6b525a38885e7660f48120a65a9638c9a1dd0f4a2c3b58048ab2583a76716c5e99cf88010c8b5dfd823083346228055f0
 DIST icingadb-web-1.0.2.tar.gz 2296999 BLAKE2B f74badc90f992ffd506cf66296e3d38f2d9fb5e317f4ff497f3790bbdafec250378a661dddbd582510ab490b7eaf1e2cfeb69c078da8dbaa6e638e504d6d8e96 SHA512 a8349b94260ddde9aeeee65eaa05517f656c4a7649ae5c7c2584900ca982b05a63e8b0fcaa95154e0a01ca4269958b449434c894dcff6950ea447b1cda6977bc
-EBUILD icingadb-web-1.0.1.ebuild 664 BLAKE2B 4d6e5c74e8123ac049df2417195121ec7518554206456b470cb26621b5e99f6b9215acfee4a11926935dad00bc133abc902dd5a84c38281c2b807329ccc68451 SHA512 487bd91837ef9da365fb65b8df43ecbc6747e92ebe4b4fe7bd072d34353e5b931defd27e366a0dbff1d4a0be0ed3773da15d3c2093002ada8fda90481112c8b8
-EBUILD icingadb-web-1.0.2.ebuild 664 BLAKE2B 4d6e5c74e8123ac049df2417195121ec7518554206456b470cb26621b5e99f6b9215acfee4a11926935dad00bc133abc902dd5a84c38281c2b807329ccc68451 SHA512 487bd91837ef9da365fb65b8df43ecbc6747e92ebe4b4fe7bd072d34353e5b931defd27e366a0dbff1d4a0be0ed3773da15d3c2093002ada8fda90481112c8b8
+EBUILD icingadb-web-1.0.1-r1.ebuild 635 BLAKE2B 3c3e574c785f2687d56f051a610ea81e1aedd3ee9e74f729141d599026d4f09146083f59b317460af2da96a72af4f344adc5741999335a651fb00574bce5a680 SHA512 50b1545c4c847446e892374e0adb32f9128af8221ffff38b57a680b895c43224ecc62ca8853b1b8f5d9fdffa1c80993390081c64237cba3d93d6158a31ff65a3
+EBUILD icingadb-web-1.0.2-r1.ebuild 635 BLAKE2B 3c3e574c785f2687d56f051a610ea81e1aedd3ee9e74f729141d599026d4f09146083f59b317460af2da96a72af4f344adc5741999335a651fb00574bce5a680 SHA512 50b1545c4c847446e892374e0adb32f9128af8221ffff38b57a680b895c43224ecc62ca8853b1b8f5d9fdffa1c80993390081c64237cba3d93d6158a31ff65a3
 MISC metadata.xml 664 BLAKE2B 0b5781d631ca245e3c4bc8ce3ddc8cd417896f0183eff5fee9fa49606b1f76332d316888be4a4d5d6a2650beb03d81bad6d9c8ab5dad1c15fbafbdeff9f35f27 SHA512 f43f53e4747d4ece5fe4b55464c5fd1c86ac68ed0cadb1c32ba5e3726197c32064d96f4632920d4bf5dbf6fa039b0c0d0758e6129ac360ae4797d0c06770a204
diff --git a/www-apps/icingadb-web/icingadb-web-1.0.1.ebuild b/www-apps/icingadb-web/icingadb-web-1.0.1-r1.ebuild
index 56082291a598..7e199c809fb9 100644
--- a/www-apps/icingadb-web/icingadb-web-1.0.1.ebuild
+++ b/www-apps/icingadb-web/icingadb-web-1.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,6 @@ SLOT="0"
 
 RDEPEND="
 	|| (
-		dev-lang/php:7.4[curl,xml]
 		dev-lang/php:8.0[curl,xml]
 		dev-lang/php:8.1[curl,xml]
 		dev-lang/php:8.2[curl,xml]
diff --git a/www-apps/icingadb-web/icingadb-web-1.0.2.ebuild b/www-apps/icingadb-web/icingadb-web-1.0.2-r1.ebuild
index 56082291a598..7e199c809fb9 100644
--- a/www-apps/icingadb-web/icingadb-web-1.0.2.ebuild
+++ b/www-apps/icingadb-web/icingadb-web-1.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,6 @@ SLOT="0"
 
 RDEPEND="
 	|| (
-		dev-lang/php:7.4[curl,xml]
 		dev-lang/php:8.0[curl,xml]
 		dev-lang/php:8.1[curl,xml]
 		dev-lang/php:8.2[curl,xml]
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 26c72e499b48..9f3553b67409 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,4 +1,4 @@
 DIST icingaweb2-2.11.4.tar.gz 11381515 BLAKE2B e524d04fd027377685826e1e3ff4a73efb040f8736d35fa496cf190a69dc2e6fedd82f678d5994d66a450efaff77764fd6a9504823ba17897506ff3d923566d8 SHA512 3012e75c35f3070a5dfcb356ed499f247651c99b7f39faf1917ade4568f5ba15a2820ff63cab2583748cdb7d158f86b7b87bf8f4c934d3bd6526929dd57e1eae
-EBUILD icingaweb2-2.11.4.ebuild 2645 BLAKE2B 17c05eb8361ccfd1c778059af9d651d4c61f9e244eedd0efd82efca8724e9f7e2bd25ee74d05a3afc79c74fa92778ae61938055252a3a072489788fb8e8d01d4 SHA512 5e87b4772a98d70204d1fd317f9e961cf6b4c21784b90a192ce41ede64d2adf727949a69ffc80c83b43b3186e5f2024218e07f13a3c4975c3ef907afefadf661
-EBUILD icingaweb2-9999.ebuild 2647 BLAKE2B fa8e259a2c1acaba634189974ed0e4cffd1178d46e88ee33398b0df83d34b3f3ca829834a862960ea7be4af374cfb91a2f9c02e2a01f4de8f2a68500b75cc9ab SHA512 b134e2277cdb896f61a9459b0a07f02b0a7233b63810e95a4df15ee06432e1b4abc53cdc7efe93b3f5b41d939b6500bc8b0fd556db0c8695992846db27f2984d
+EBUILD icingaweb2-2.11.4-r1.ebuild 2437 BLAKE2B 87e8e5cc1c5683d1a79915030e9bd3f19fa9b9e8ace11bf886d7d5ad2949881b7155546dfcaa295afb9c0d512369798327d5184a9b6b21c6d66d24e0cd3315bd SHA512 cefa272a1f1f0fe8f561036ebf214ebc43035e999a6f4d728b19880714183128fe15186983eb0f95486060b61ecca0ac0aacff84a342ca2da9600da0245ea6fe
+EBUILD icingaweb2-9999.ebuild 2439 BLAKE2B f2133f8a710ac57cfa1461d2699aeb1346f70690f9155bf3db99248cef5a55cddb2b4945c35133fa0e29a624ee814c19ae286ab647abf11202a46c4fba3eea46 SHA512 7b92d046da4d6614a33b18106b4d7a5e76c8c8ee1be7e85d8035bfbde664a807a625b61f3759bd2c8969d41163f3b28ba599c8b717a1137058ea311a4997445b
 MISC metadata.xml 444 BLAKE2B bf24467286f442770ed78cb298cd0fc1d37786b06e85bbc4b20a8c750764e7a831828ebc9b7872772f0a286b12cb67491cb1f84f189cf00e2ec59a6b921e760f SHA512 55e57997695e09ad9cc8448030e8470a0e39a1cbc610f70e29c2a68a4f287e54cb816b0cd1ceec611112849ba97225a60560b67368fb3a6ed68a73a728d61d83
diff --git a/www-apps/icingaweb2/icingaweb2-2.11.4.ebuild b/www-apps/icingaweb2/icingaweb2-2.11.4-r1.ebuild
index 947ab19c3d4b..84a84021e342 100644
--- a/www-apps/icingaweb2/icingaweb2-2.11.4.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.11.4-r1.ebuild
@@ -28,8 +28,6 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
 		apache2-server? ( >=www-servers/apache-2.4.0 )
 		nginx? ( >=www-servers/nginx-1.7.0:* )
 		|| (
-			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 			dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 			dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 		)
diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-9999.ebuild
index 60f9756ef763..9103daa5bbe2 100644
--- a/www-apps/icingaweb2/icingaweb2-9999.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,8 +28,6 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
 		apache2-server? ( >=www-servers/apache-2.4.0 )
 		nginx? ( >=www-servers/nginx-1.7.0:* )
 		|| (
-			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 			dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 			dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 		)
diff --git a/www-apps/selfoss/Manifest b/www-apps/selfoss/Manifest
index 512cc3bb596c..b18be455be3a 100644
--- a/www-apps/selfoss/Manifest
+++ b/www-apps/selfoss/Manifest
@@ -1,5 +1,3 @@
-DIST selfoss-2.19.zip 5837647 BLAKE2B 0921d938a8c85c2d610fbbf371ab46c7b233d55e7db2531a7745f23920028878ac3f85c10d58bcd48da55e6efab367aa55889373260d8af36414747272f5a97e SHA512 d9b751e1d3725e4fc44353c579f6a8033c0802e0697627fd6e20adaf31a49f38ab485d6ea27bbcb645f48cc9de6db2bd451fe900f48f48e5e602171c2a71d634
 DIST selfoss-2.20-cdc7f3e.zip 4569979 BLAKE2B 5c8eb3307373cf5a7f35dd3ab68db9f84122752da2b78e29c99a61c75dc2e79b9c07b5eacf4461de56d55699b0a774217ebd218b5a0f4f2779d045c754cf2ad6 SHA512 1105c7c3b52d6d5bf6a1ef186e8fb3e0baf144ccd911541fd677d78ec2de110a899d53e04750fd27f0a8d791786b3925bf52bb0a45011b5c5e7f5b81443fe786
-EBUILD selfoss-2.19.ebuild 1064 BLAKE2B 1bbb978d80ab4c4867c4433b861a2b20638316d79002f709f4dd55c0a9703d3082c2c3ca9c4ab3b8f3f3f611d196822c820e28cd8e32f188b6eba4b06cf88a08 SHA512 37986d3a89d911b7b0b61fd8274f7fc1bfbcfd67f04e145951914b9640b19ac381c86d1dfa920eeb866ba62799418ff3810b39c32b0dfbb93c65d1fa9d1750c6
 EBUILD selfoss-2.20_pre20230730.ebuild 1087 BLAKE2B 489b0fcbddaa3ce83a89178a4ee6fa35aa8d85899fdca9ae8bdb24dbcbea05165ad8c4cb666c6d708c65217fac69d090aec5090e63e9a42eca0668e7ac2a8001 SHA512 938c563b395b6bf3381cdb314aaf7f09cafe94e52358fe676384bb9d0895c67eed6f10c36bf58bd2793238fcddd3d1991b0eb3210656aefc68dde2fc2efd0ef9
 MISC metadata.xml 400 BLAKE2B 7c8ad510115accefb3fa4acb672c34c82558293972b4e091767210c0ce4da79c82e9978f96fd595e51f22520f9e1b13b2d88d7288a44d55453602539b4083ae1 SHA512 1f3862d0e7001eca69d66c735890ad8ad495601c1b0f132bf91dc70cf72fc6a7391e3e45b73bed13029704bbc4dc53ed689c3d004d10860bac5f62b26132ca26
diff --git a/www-apps/selfoss/selfoss-2.19.ebuild b/www-apps/selfoss/selfoss-2.19.ebuild
deleted file mode 100644
index 42b67a167c1f..000000000000
--- a/www-apps/selfoss/selfoss-2.19.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit readme.gentoo-r1 webapp
-
-DESCRIPTION="The multipurpose rss reader, live stream, mashup, aggregation web application"
-HOMEPAGE="https://selfoss.aditu.de/"
-SRC_URI="https://github.com/SSilence/${PN}/releases/download/${PV}/${P}.zip"
-S="${WORKDIR}"/${PN}
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 arm arm64 ~x86"
-
-BDEPEND="app-arch/unzip"
-RDEPEND="
-	>=dev-lang/php-5.6.0[curl,gd]
-	<dev-lang/php-8
-	virtual/httpd-php
-	|| (
-		dev-db/mysql
-		dev-db/postgresql
-		dev-db/sqlite
-	)
-"
-
-DOC_CONTENTS="Default selfoss config is installed as defaults.ini,
-copy that config to config.ini and customize as you wish."
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/public
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 017c755dde63..4b9e857f5243 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 0fbf7433b5e4..373d157ca688 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -607,7 +607,7 @@ DIST firefox-117.0.1-zh-TW.xpi 601287 BLAKE2B e0d429281429671f6998b5a6bd119937c5
 DIST firefox-117.0.1.source.tar.xz 509601584 BLAKE2B c618942209f60550ef5bd3db4a3a150fbe8993d2a40ba9b1ece3e647e4fcdd82639569f354f87b488b47781d52d21a158a25906c88fbaf86ddb57b5973f8ace6 SHA512 1583b0ad3b3b17c59bfbfb3e416074766327d0b926ef4f6c6b1e3b2d7cf6a18dec592b7d17fab9493ba1506f3540a02277096d28616dd29b6e7b9e93905f2071
 DIST firefox-117.0.source.tar.xz 505712192 BLAKE2B 748e7ea88f493d449e52e94a268190f9beca671aebba057f7089897dee51d3e8d45c6f9721d38891c787b401cb6b32128d3b3b25073e17326c8fca80fe07d015 SHA512 4d2afa9bac9d0724fb3568f77a8103d75e90635802f47f2023127de07d70ff145fb0c19e6a4fd37bfe93a7bbb1ec506955c0d4fe3b07057561ebea82b8d6c8d2
 EBUILD firefox-102.15.0.ebuild 37115 BLAKE2B 4faa604c32aa8afdd09901b8df1b0e2ead85b23d2549ec29ae6afa87d82fcd358ad55c9a3553548ea4b74666e8e7842d6820971860acf91df2b7db9c64a600aa SHA512 dc290bc6527bd082cb3810ceb5d438db0f3a42cd267c8505ec72b3db1a5f6e501b1080224290367cdd37f5bd1ae6c342126db69cc66286732ad4deffe4b15359
-EBUILD firefox-102.15.1.ebuild 37118 BLAKE2B b4b1ae52123dbda679687f01e1655302c6595eb65a068ab8a362c4d4c6f7f5ed8cb4706bfb86259c83019c4460cf7e2eaea5c3a8ac6a6b692355ece065349dc9 SHA512 2feeeaf7cba5876a44598927717f75c2e5ec4b91e3d1b2ec0cf1f0f67591f099cc5e09a66835307abc0990b167b41f19f8604e22b6ce3b30cc4ce631677835df
+EBUILD firefox-102.15.1.ebuild 37116 BLAKE2B 5e83f2dc1ed3ce0c05f1fa715c22b6a53df8a881fb1335657423bae3869f9c52be51dea18c45557761c5abff3179ffeb645f02023e61232c075a4dc13582a072 SHA512 4e65326af2062477c1e92545b8a19c9f919bd64673c387821ec28f4e64f442184d23e9f24efa043790b0a0ca012ca5852aec787f3ff8ef9901e651eac4ad11bc
 EBUILD firefox-115.2.0.ebuild 40749 BLAKE2B 132c785d15d3a0f8549bca00ae4fea0aacadd17b7dc8950c01bc90c301565344d1c0a832797637aa1a20ee70be89e936e2d6ef77fa44db1cd14949f872c619b4 SHA512 65a8342a6941263ebed6101678ded9c12282e97693b7bb584a2be405e0541eb2a2e61b32db168da598f0cf016ee9cef032350b2bde957c68c303fd69ae4f440c
 EBUILD firefox-115.2.1.ebuild 40749 BLAKE2B 132c785d15d3a0f8549bca00ae4fea0aacadd17b7dc8950c01bc90c301565344d1c0a832797637aa1a20ee70be89e936e2d6ef77fa44db1cd14949f872c619b4 SHA512 65a8342a6941263ebed6101678ded9c12282e97693b7bb584a2be405e0541eb2a2e61b32db168da598f0cf016ee9cef032350b2bde957c68c303fd69ae4f440c
 EBUILD firefox-117.0.1.ebuild 43979 BLAKE2B 1192233496b2611ca6972b1cf65846b73fef5df7c90f6dba74ac4d10c668af5e80e09b8aa0188875ba3f7830765957076760993589dc970479305c599d0aa4f0 SHA512 408087909b79d644185de61f220949585909699662d5c44834b0544806153596335987dac008a632bc451325828c98343aa406d626a221aa6d1ed3cd181d056b
diff --git a/www-client/firefox/firefox-102.15.1.ebuild b/www-client/firefox/firefox-102.15.1.ebuild
index 19d46ff46be3..a4eaec85691e 100644
--- a/www-client/firefox/firefox-102.15.1.ebuild
+++ b/www-client/firefox/firefox-102.15.1.ebuild
@@ -57,7 +57,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="https://www.mozilla.com/firefox"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 
 SLOT="esr"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index dae9cc1bed5f..d287e2505222 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -3,6 +3,6 @@ DIST qutebrowser-2.5.4.tar.gz 6117674 BLAKE2B d8dedf57ac064ce1a3d2e4e854a0064dfe
 DIST qutebrowser-3.0.0.tar.gz 6030459 BLAKE2B 05e1f3c87fe572ec66d199b9c255178c7e7358321c44255b9191624fa4fede0525b16ff0740df5051390f4e3b2a2c3ee99d53fcf6c44279689f9ea0427df13ca SHA512 2aa361b418adad1e2c2dd068148215f3eaea29c70e00634fd1a2370d584ffa2a66b0a0e22623656fc5f634d35ba99a178c269a3accd25edf778b7e3077ceb373
 DIST qutebrowser-3.0.0.tar.gz.asc 659 BLAKE2B 19d736ede7cfb2ac4d3ebaea7f4f8a6da722e3eac0c1693d487ed16f2bc5a5cce13bbc69604cd7c34e266c345f3149f2f2250aba71555f3290cd63216adc0b98 SHA512 25c9cd3fa44f712b98ef3f8d1821f61d5f2b96d8bf108ff2277dc6609343237876124f7587cf906127b8d6161923bda0946c6ef75f3cbf6c401cf5d72b7a6ffd
 EBUILD qutebrowser-2.5.4-r1.ebuild 5229 BLAKE2B 02b2d82dc544051e1afbb0c22362745c39d4befd9443b1a873cb5979de492987cac707b2dedae594924f9402b3c362be5951e637df0f7471335c9b02d22c8fb9 SHA512 5a264abffe9861d288dd2a35765bf8f956e1af970880922cc7c1cf83e7a92f8b8f9e0afe190d196b78d777707aee57cc06eb538b5042aa7342fbe98fefc89731
-EBUILD qutebrowser-3.0.0.ebuild 6558 BLAKE2B fa86d61363838f9b3caac0e481f67b6ef06d8e1150e008bdbecfadaebc8a20cea2c7ee91e0b8ad7cfc62d80cc029db0530ab1eb5a1b6560483ca8e0a8e5954fb SHA512 9177fe85e28ec1a5f2c3611dfbc714467cb886f6968877eb04d66a2e1cd37b9e4cf7969436e59aa0f15bd9fe1ba25e3d03e5e24211ba2ad454e13f662588ef8c
+EBUILD qutebrowser-3.0.0.ebuild 6557 BLAKE2B 7b5ba76ff9d2f6315314830dd6e6b8b5610073936a2860619ee49a3a24168d72a55fe843c1fd6a308ebb53d45bd6ece9f952ce3b8da1c4a76ffad2cc89fe9904 SHA512 89e8d79190a8ba44dcc7470bdf6695848927b1dd3550b891a37aa74f5a4821b630c0db44cd08ad0234099e6f73d2635a8de290778911233efc73eff645dec285
 EBUILD qutebrowser-9999.ebuild 6558 BLAKE2B fa86d61363838f9b3caac0e481f67b6ef06d8e1150e008bdbecfadaebc8a20cea2c7ee91e0b8ad7cfc62d80cc029db0530ab1eb5a1b6560483ca8e0a8e5954fb SHA512 9177fe85e28ec1a5f2c3611dfbc714467cb886f6968877eb04d66a2e1cd37b9e4cf7969436e59aa0f15bd9fe1ba25e3d03e5e24211ba2ad454e13f662588ef8c
 MISC metadata.xml 1018 BLAKE2B 9d0c406995b2036671113b6513c3ed2fdb5021eae9d1dde5c186efeccdde6dae127857e3e5898f7809edcc27eca4b47f37965155ac0ff21bedb78e242421fd54 SHA512 2af79f18d31f9efe8df852f4bca132caf1d79fc06f6388959deb367470d4975af541a75c70831b549d944112bcd0bc7e11510a81bce4ef1391fbf1354425b769
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
index 788f4a608a3b..917250eb0675 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
@@ -18,7 +18,7 @@ else
 		verify-sig? ( https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc )
 	"
 	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/qutebrowser.gpg"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 1fb9bb583651..8859c23e535d 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 18fd97f342f7..42723d03a9f5 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -6,32 +6,23 @@ AUX tomcat-9.0.72-build.xml.patch 3794 BLAKE2B 886bf69f4c78f385249e02e1f91ed9106
 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed
 AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
-DIST apache-tomcat-10.1.11-src.tar.gz 6118924 BLAKE2B 0e97bafe7a0451c34d16f2c3ae37263d09746d3b240d0770970ccaaefa05d1a6e0687e17db5dd71ca6b305a6b9fdf2fd58e86f97bd07fd60ff239f5f262a5164 SHA512 5c722344bb5886fb33ef70f81d5e2500e6c8446b628cb118ee5fac710ee1d7f4cfbd134eac6955090cc0ba99518e3ddd18970c5f16793f51f089249959ec088f
-DIST apache-tomcat-10.1.11-src.tar.gz.asc 849 BLAKE2B 6427668fe4f93b1de322bafbefb9ef6ac47baca8d8cc56bddb267a35bd280792ce096971a032eacb04c0322d68c21af32b681d9ef9ba006c78dde489247429d0 SHA512 6895f874bf1265b2cab94594ff542d0b9760afaa70f1486b882b25593878470ab8a4d399cf5320bec9ae9d18f2a881f59072f0909345ddeb42d549ded460f791
 DIST apache-tomcat-10.1.12-src.tar.gz 6122423 BLAKE2B 6de2189e415aba38168ebf09493e96d5906a72e77cbb5af358144e510e6de9fcb342db83c64ac6827ec8e03ab7402e24648b3cfb1a5385153a85dec71d2c55a9 SHA512 f383a4f401c21cb1acd93b6446fd915ba41da9a67c2538d7177a90238adc3294d260f29ef2ebb72e300cb93b4a7a42090e1c3b478b5deea344eb3d19992a9fd7
 DIST apache-tomcat-10.1.12-src.tar.gz.asc 849 BLAKE2B 8f1f5cb35a24fe22999b0ba68b50e1fe4118b3a645d3c991c55161448356d505d6b953e40d70b4fd5e17d20e63f873d04388f315b96eb4fdc2025d1ed7b897a0 SHA512 1f3cbdf57e289013111726f14f868dad69f9c24faf375497408560e8b46ccf131a79095f097378ea2cdfcc802120a65d7a36e655ce62361bdb7511cb9cfa3c70
 DIST apache-tomcat-10.1.13-src.tar.gz 6123612 BLAKE2B 0ce1519ec19f7b69808653856474a0011fc76a46c903ecaf97085d91c3fe31676e3064c68600cd4222dd53e0033d24cbb11f82226b8dd086f88a88e910b3f6cd SHA512 e44e2dba618f70d9a39e976cc07d33fc9cbead2169e24d6ea2051c8db20601f63ee7bc657245869450c82cf0ceb272501066b77ae45265d19b7964f5ed0e85b1
 DIST apache-tomcat-10.1.13-src.tar.gz.asc 890 BLAKE2B 75ccd687749749e04ed479c57ed6d6f69b9dd6ccf0c215a7c08c15a18967a7c4529ab3d5a013954a6a13072c49d8a039763d3a73a6f0e472213d632877d4d6d7 SHA512 223efe5c1972b9f455ac76895ca7774fa17c1d80e14331342dc538229c12bea83e8c3f838be03a748f291ecf80dc99c72896f25aafccac868f42eb830c4add7f
-DIST apache-tomcat-8.5.91-src.tar.gz 6098592 BLAKE2B 026fb19cb938986401e95f5441c5a775c73bf31b5ca23c8be54d30a710fd9a5badd0ed9360598883ed641056594c3f471c21c834f79af3cdb4a879bb54402399 SHA512 f3a69630e3cd144c74ea3edce68f8e39bc67e734bf02822caf7c6e59a2e4db404a5c0bdf40a22614b6dd85bac3dc5821e6b74c56a1147655f602cdf39fb651f5
-DIST apache-tomcat-8.5.91-src.tar.gz.asc 849 BLAKE2B 9f5f347692101a93dedf7014dc9d5351dfee5b956247edeec87c29b33548ff9c78c55a6e426aac40626a616ffaa73dd7f01ee5a384d080845f86b13c92f1cd63 SHA512 3d4bce771c7f044338eaad0d7d959c360396be67e989938a5595dfc42d1f7cfe451fc00de9197cd1a20ac2fc50f8b7ad93ecee07fe50c097fdeabf8ae1b8bf3d
 DIST apache-tomcat-8.5.92-src.tar.gz 6104937 BLAKE2B 32027d52506b13bba1826cb966cbc431e39c3da9b0362467bdbed5be1ae6be35928b691cc806bae761297c323f3c3dfec6ca1d6041aecaad3d2ffaf0cd4a216e SHA512 d2f502c1cfe22a17ae4ec4007f7c3296d81210dd21628bf6e38707376670a1fcd4323d55ccda5d9bdd76d58b0829dd04a2956f3d99b01ca6731cf4d87db3963b
 DIST apache-tomcat-8.5.92-src.tar.gz.asc 849 BLAKE2B 90b66f037ffdaf8823ea29841a339c537ab71d6012318cb576e04d61f185a91e8a1313f9ba800445bdecda3769079364dc871d84740af6c12b4ed983678d24e1 SHA512 88ee2f4ded06597b13785096f4ef10b6784a2f6879889a3a517db29dc2461d39dd80306a1cd394d98f58bdca41d31bee639701cea17de8b0092d59f4de2ec01d
 DIST apache-tomcat-8.5.93-src.tar.gz 6106306 BLAKE2B ca9a05902b492696ca89db5017dd5c042a28c95b4138477049cd8ce2ded91c7814f2326c67718b83fd5e962c57666a1b2ab41d9b928c7d890ced9afbb13d9ce6 SHA512 655752367585e7aa4af7b9b1392edb2c6e40dbda739aa459d81929ab0376648b8731baa469acaa8886bc3c859f8c8485f6826e86f59c3ac2bc1d876d17c2ce9b
 DIST apache-tomcat-8.5.93-src.tar.gz.asc 890 BLAKE2B b3f64af8af6652657f76ff216e003a647bb278a8f5770babdc74f904a02bf21f91810d74d64efbbfc547282c39a14b72542dd97fad50630061207c75cd0b234e SHA512 7b3afd083bc353680df40daac2053a52afa0bd38a902f6acd54bfd27bd274597fd40206c7b8a053223dfaf344b02b416071f662c928e3d43715f4a4f106fad79
-DIST apache-tomcat-9.0.78-src.tar.gz 6266960 BLAKE2B 15bf31c4d4445d0f7b8f53ea23aedefaa0e5635c3dce7e6bc35d11f7bba0e8f5b00263c680287c0b0a4743317dbf8191c1759fbe1f899e1aa157d488c037276d SHA512 220bf46004c4cbad536a7040c979651ee49a13994cf83045369c1bfdc0a96c0172ddc8fd24ab76c9526591c50033d915dbd258939b24d22d660050dcb5abcad4
-DIST apache-tomcat-9.0.78-src.tar.gz.asc 833 BLAKE2B 2ee91e558dc0478b519a252e3c4b7101d5c96f5e95b06e29bc2be69b4f9828f35392633f870e1cbe45cd5f9215642d961e73be2ab501af287c64af7f8d370c15 SHA512 175c8c43f19ba82d658ac8a7c3496a335edfa7eafc12cf552ea40b8c6c1cd353d9af930091fc6a5069d75473ebebfac2a101e09925fb18119ed563945cf680c2
 DIST apache-tomcat-9.0.79-src.tar.gz 6272073 BLAKE2B d33c127660045e6b24f73b695042aff51a5ffb811d3c2ea97acf1f2c82f6a948710728b707d684f6ec91e787c7f6cb7d9c13c37afc0f96c0f23bda7fa605bd19 SHA512 dae963c0ab473810de750483a71e9ff6ecf762133d0b9ea2e14ec134a03de70eb9b04d3efbb61aad84e43ed930fcb4e07a53288cac11917b2e0c359f433e0dbe
 DIST apache-tomcat-9.0.79-src.tar.gz.asc 833 BLAKE2B e551a1b4e2b05020ab0122c6efb945036f83563e28c00fa015b0fe0ecdfbc5977dfcbcd9902b4a065e9ba9262d9351cc1cfdb25d0dbeb0207f2078e39095cc6e SHA512 92089b97a64d06bcc799d6927a657d30e4387a2025ae81c99d04dfa1647e34b6f492c4ad09a24dffd1a0045261bd3e933ef0f47365e749b93c367f735cbbd9a7
 DIST apache-tomcat-9.0.80-src.tar.gz 6272358 BLAKE2B 025e704d44e5c7576b1f96f01ab375e29771da2bb8539c88aa374afadfb15072070b2021766d8ed3b67a77b9d43782dd480f5d8ec4842bf942c5ed6e4f59dd72 SHA512 a2fb298c1fd2615e1a69371b5f84eb569e897faad3cbe17e3626460f5ce311085c120dd3f62c255fde87e6517915365ab52ada613776d45185b8e53624935114
 DIST apache-tomcat-9.0.80-src.tar.gz.asc 890 BLAKE2B c4620b61c1902c3a908aedffec22e215c72c43dc6844a32bc5de9ac13f39b5e09da7898150f6ec4f1af250d8c366280976f424e603a9a7d56f5fdfdbd773ab00 SHA512 019cbe91b7a6b34bbeaee3117b9fe620749845025d7a699179a1dd6acb9cb9169e5af506bbe515ddf0c66726832bb4c8cf9c0c5870f3f151879706309bab754f
 DIST biz.aQute.bnd-6.4.0.jar 16303123 BLAKE2B 73cdeb9e63c04b41db26f91efc3b01fdfd7c8796d6b1f556c77f90bcdbe048f374b5164b885689f3e62ca45b8ca8b97fce70e1fa13d807d2f76869155c8ba7f5 SHA512 b113177f97894b0ed5cfbc38f96c995d6425e981ec8c7b27d99044793ff77dd2450367ad9ee977f443fba349fe1d68fc26f3aaa737eba0a402abcf29716b2e85
-EBUILD tomcat-10.1.11.ebuild 5432 BLAKE2B d8468c032a279c8b1bd7f95d41c25a4c4e06e1a413b1ffecf32dc6fda76f4e91122b3f9e2426e4523d2f653430199c17fe503092c1e3b4269c1a527deb16f177 SHA512 9f907a70800df7da6be008ee8d4e8beb02e7c4f6595dbdec25aeac3298fce28143e71472b90278d36f4bb4704bab351d55274e9445884910b00ebb2ffbd8d83c
 EBUILD tomcat-10.1.12.ebuild 5432 BLAKE2B d8468c032a279c8b1bd7f95d41c25a4c4e06e1a413b1ffecf32dc6fda76f4e91122b3f9e2426e4523d2f653430199c17fe503092c1e3b4269c1a527deb16f177 SHA512 9f907a70800df7da6be008ee8d4e8beb02e7c4f6595dbdec25aeac3298fce28143e71472b90278d36f4bb4704bab351d55274e9445884910b00ebb2ffbd8d83c
 EBUILD tomcat-10.1.13.ebuild 5433 BLAKE2B aad79da428d6e624a93caf667c73b32e4a6d1482f1d782f80f80bb587a3902ee213836d40e1554eabda89b7f6fdd1bd11b4ad615cabf9c81eb5000b6c8bc2e37 SHA512 f62f86394de987790a1a070bf3856d05615f2f593726e3db82d70991d021bbcc168d345572637fb65211dbb3543b525d6ce30f8712e69048c49adaa41744adb3
-EBUILD tomcat-8.5.91.ebuild 4636 BLAKE2B 16d14d1b7ad61614010e6d3eb5cbf25f9545b8737d30422ad3ba140e40a686ae31ae091fc481f4d8835fd1cd71f44b9930c6cf41a561ba5121156088d6693f69 SHA512 9729f7813e53c57908b37d71d113df349880f1993ba6814f7470599960cfda8188d662d532c000338ed091ec3bf6bee7f5a4ae267cc7cd1cd232e800a0ff4bdb
 EBUILD tomcat-8.5.92.ebuild 4636 BLAKE2B 16d14d1b7ad61614010e6d3eb5cbf25f9545b8737d30422ad3ba140e40a686ae31ae091fc481f4d8835fd1cd71f44b9930c6cf41a561ba5121156088d6693f69 SHA512 9729f7813e53c57908b37d71d113df349880f1993ba6814f7470599960cfda8188d662d532c000338ed091ec3bf6bee7f5a4ae267cc7cd1cd232e800a0ff4bdb
 EBUILD tomcat-8.5.93.ebuild 4637 BLAKE2B 91241d2fb01b2f5b91d859870f86732b1793568278551f52311179ee553ac46eb5adf67ab3ac04badc3b8315129da77e1e64145cf888a8f98e7223ae11334e29 SHA512 dc0c128616263c1d2066053cac073c92db1573a093e6585b0b42c580a7768c670df07b03a9da1b01bf6fd76e1b1d24af981e586aece6a7e966f019d0fa9cf570
-EBUILD tomcat-9.0.78.ebuild 5281 BLAKE2B 1a23d6095043a3ce77410fa6e0d5e9aa4663502f504e5ba890e4c130f5f797b2e273c863e90c68c536616b378ea05fe44c0ecb509b0a6f3f8875638db93e23a2 SHA512 c90de086e2a96275379dc815de77f79dd1300ce5f98543865539c305ca15dc83844ced874501a9ba9ba53048302aa921b7bd4c643ad5061af72433e6858403ef
 EBUILD tomcat-9.0.79.ebuild 5281 BLAKE2B 1a23d6095043a3ce77410fa6e0d5e9aa4663502f504e5ba890e4c130f5f797b2e273c863e90c68c536616b378ea05fe44c0ecb509b0a6f3f8875638db93e23a2 SHA512 c90de086e2a96275379dc815de77f79dd1300ce5f98543865539c305ca15dc83844ced874501a9ba9ba53048302aa921b7bd4c643ad5061af72433e6858403ef
 EBUILD tomcat-9.0.80.ebuild 5282 BLAKE2B 4a2c928dfda87f667f4defa440d202f210a81c4ab361d62ecb22b40a24c0e825c5495de7ab15839e107c34a6ee7ace6b0a2a880c89f481ce83bcf81d791627e1 SHA512 4ebef803641515b9326443f3798478a0db830d30c4fa87d7c89d6776a0f4ced7368b20bd2e512b1bb967b64f16e7007c79201ab5358219cc57f997e3759e77e2
 MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9
diff --git a/www-servers/tomcat/tomcat-10.1.11.ebuild b/www-servers/tomcat/tomcat-10.1.11.ebuild
deleted file mode 100644
index 603e2c46e673..000000000000
--- a/www-servers/tomcat/tomcat-10.1.11.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix verify-sig
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar
-# See bugs #203080 and #676116
-BND_VERSION="6.4.0"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-
-DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
-	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="10.1"
-KEYWORDS="amd64 ~arm ~arm64 ~amd64-linux"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.26"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/jax-rpc-api:0
-	>=dev-java/jakartaee-migration-1.0.5:0
-	dev-java/wsdl4j:0"
-RDEPEND="${COMMON_DEP}
-	acct-group/tomcat
-	acct-user/tomcat
-	>=virtual/jre-11:*"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	dev-java/ant-core
-	>=virtual/jdk-11:*
-	test? (
-		dev-java/ant-junit:0
-		dev-java/easymock:3.2
-	)"
-
-BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
-
-PATCHES=( "${FILESDIR}/${PN}-10.1.6-build.xml.patch" )
-
-S=${WORKDIR}/${MY_P}
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BND_JAR="${BND_HOME}/${BND}"
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
-	fi
-
-	unpack ${MY_P}.tar.gz
-
-	mkdir -p "${BND_HOME}" || die "Failed to create dir"
-	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
-}
-
-src_prepare() {
-	default
-
-	find -name '*.jar' -type f -delete -print || die
-
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
-	java-ant-2_src_configure
-
-	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)"
-	LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
-	einfo "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "Please note that since version 10 the primary package for all implemented APIs"
-	ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
-	ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.91.ebuild b/www-servers/tomcat/tomcat-8.5.91.ebuild
deleted file mode 100644
index 265c9e364fe1..000000000000
--- a/www-servers/tomcat/tomcat-8.5.91.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix verify-sig
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz
-	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.15"
-
-# we don't use ~ for el and jsp because the same implementation
-# is also present in tomcat 9 and it would be impossible to install
-# both tomcat 8.5 and 9 at the same time
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}"
-RDEPEND="${COMMON_DEP}
-	acct-group/tomcat
-	acct-user/tomcat
-	>=virtual/jre-1.8:*"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	dev-java/ant-core
-	>=virtual/jdk-1.8:*
-	doc? (
-		dev-java/jax-rpc-api:0
-		dev-java/wsdl4j:0
-	)
-	test? (
-		>=dev-java/ant-junit-1.9:0
-		dev-java/easymock:3.2
-	)"
-
-BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
-
-PATCHES=( "${FILESDIR}/${PN}-8.5.86-build.xml.patch" )
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	find -name '*.jar' -type f -delete -print || die
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only jax-rpc-api):$(java-pkg_getjars --build-only wsdl4j)"
-	LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
-	einfo "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-9.0.78.ebuild b/www-servers/tomcat/tomcat-9.0.78.ebuild
deleted file mode 100644
index 6c17491db575..000000000000
--- a/www-servers/tomcat/tomcat-9.0.78.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix verify-sig
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar
-# See bugs #203080 and #676116
-BND_VERSION="6.4.0"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
-	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="9"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-# though it could work with 4.22 and upstream uses 4.20,
-# we still use 4.15 because 4.20+ is currently built with java 11
-# and it would force Tomcat to use at least java 11 too
-ECJ_SLOT="4.15"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/jax-rpc-api:0
-	dev-java/wsdl4j:0"
-RDEPEND="${COMMON_DEP}
-	acct-group/tomcat
-	acct-user/tomcat
-	>=virtual/jre-1.8:*"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	dev-java/ant-core
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/ant-junit
-		dev-java/easymock:3.2
-	)"
-
-BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
-	"${FILESDIR}/${PN}-9.0.72-build.xml.patch"
-)
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BND_JAR="${BND_HOME}/${BND}"
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
-	fi
-
-	unpack ${MY_P}.tar.gz
-
-	mkdir -p "${BND_HOME}" || die "Failed to create dir"
-	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
-}
-
-src_prepare() {
-	default
-
-	find -name '*.jar' -type f -delete -print || die
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
-	java-ant-2_src_configure
-
-	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)"
-	LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
-	einfo "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 24ecee9c7672..ea3275cfb91c 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -5,5 +5,5 @@ AUX uwsgi-2.0.21-python-unicode.patch 978 BLAKE2B 8014a39e6f29e38bb88cb5fe517c86
 AUX uwsgi.confd-r4 1849 BLAKE2B 80afdf7a5ebc520d887061aba9f7cd64b1bca06d3da478d8d1090a8b9cba973ac2d3dbcbc2ceb980415e98317bc55b07a9a7e6641fac593dc4dd5466bd8d67c9 SHA512 041d1bd694fad6f7c5e28944aab6d7ba53b3c7fc990ce6b7c2d97b9f3d6650c46dda8069e545c252a7400e1d825c8e46d7393a289757b1bd665e64241ca3789a
 AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886809da281b214e2110c76e2cf8826d8fd90aba01262a5edc7a941522ff59348972c5a4325c784b9b9 SHA512 81ed974fb2957e05c890cab29f5b5a75845e6b7de899d2695fb2fa5f49b4545daa437c81c8dc5c735b24a45655cf6320c9256bc8faa7e32ffd7a2d981922def5
 DIST uwsgi-2.0.21.tar.gz 808494 BLAKE2B 3c5fc3ce3a6a7f8f915bb302c0b775a75227f859dd2b141034e8b1aa5cb867b447ed532b3e8b537db80acc908fc26121b752e35ebc0bf9a542678843fd02ff54 SHA512 36a9c1b87a4c3d08482b9045d2227f56b006acb53f38ddf1b510880ae5fc24c0177a077338ec8af3ef0b8f8e220bc4fc7f8311dab8066e13cbcbb616f736c795
-EBUILD uwsgi-2.0.21.ebuild 11380 BLAKE2B 0d70736207d8b0dae2a24f919078e58c74f6b575842d6b29b786df7c5aeaaf559cd7c4d2d2e4edd9beaf9835cc3339974b5f1a32f1785f5c2fae5ac310cb93a7 SHA512 717330ff687c43d491773a8a5d90a6d0c1396d1bb3ac5c0722addf6a77a42b989f38db465f5a904f51f352f1ec1b9c43cc770e7b9a5b3fd33c7dc16d0a871a10
+EBUILD uwsgi-2.0.21.ebuild 11323 BLAKE2B 0e2d987d82e3f04a2bcad2a877c5d0cd0effc982a4af4475bb78b5745839a0c06475654d5f0e490e705660a002f64ac274a3a22c7e6b9f714ea24ad3394bbbee SHA512 21af658771a4b80d0e82277b7ebb3ce610c863d5b87843698859b817e5b7a1d2fa8ae27a79610aee26ec02e05c3c51dc796b1d829e2e4c617b011f4cbf635cf4
 MISC metadata.xml 1245 BLAKE2B 3254a0e0211101ad9c353f6247424bb44df9ddb56bb152414b9fac2b515fe163e5163d2119bc040da1676b4d941afedf4a331a19e4cdbf794a7816d012abd328 SHA512 4e3dc2b9c9d7386ed6f132da703af971789c73af567f5333faca65e3194567ead794a84c28b5382eadb149ae4dcc7847e07bc02e3d84391b3b6cccc11e08e232
diff --git a/www-servers/uwsgi/uwsgi-2.0.21.ebuild b/www-servers/uwsgi/uwsgi-2.0.21.ebuild
index 879759d49167..04579cdccd23 100644
--- a/www-servers/uwsgi/uwsgi-2.0.21.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.21.ebuild
@@ -15,7 +15,7 @@ USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 PHP_EXT_INI="no"
 PHP_EXT_NAME="dummy"
 PHP_EXT_OPTIONAL_USE="php"
-USE_PHP="php7-4 php8-0 php8-1 php8-2" # deps must be registered separately below
+USE_PHP="php8-0 php8-1 php8-2" # deps must be registered separately below
 
 POSTGRES_COMPAT=( 13 14 15 )
 
@@ -132,7 +132,6 @@ CDEPEND="
 	mono? ( dev-lang/mono:= )
 	perl? ( dev-lang/perl:= )
 	php? (
-		php_targets_php7-4? ( dev-lang/php:7.4[embed] )
 		php_targets_php8-0? ( dev-lang/php:8.0[embed] )
 		php_targets_php8-1? ( dev-lang/php:8.1[embed] )
 		php_targets_php8-2? ( dev-lang/php:8.2[embed] )