gentoo resync : 20.10.2021

29 files changed, 508 insertions, 6 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 1d699b84321c..e02c5dae2c29 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PHP_CodeSniffer/Manifest b/dev-php/PHP_CodeSniffer/Manifest
index 5479320aad65..aeb0032354e7 100644
--- a/dev-php/PHP_CodeSniffer/Manifest
+++ b/dev-php/PHP_CodeSniffer/Manifest
@@ -2,8 +2,10 @@ DIST PHP_CodeSniffer-3.5.4.tgz 697668 BLAKE2B f5915bcb73c0db0d8dcab3eda5ab647268
 DIST PHP_CodeSniffer-3.5.6.tgz 706080 BLAKE2B 1d9d097e7c60f520973a0dff16e6b31c9e259599ded3f58ac6dda2f10419969b03c18d1ce7c38f19a0f3474b0d5cf4afc5abb889f820da0d5d9e8f0574a0a354 SHA512 392c162cc8cb8d8fe455990d7f358cc59f486d8083387dc3bf60af6ca7aa0e75b72ed337f624b08948d8060cc96bd2d03373b7508fb9179da6a4e6b83adf06a7
 DIST PHP_CodeSniffer-3.5.8.tgz 716472 BLAKE2B e56efedc07a9db63eb2f135d9fef69bf055cef09c23dd9cd1e0efeed865d559b428e9aec06393b1ec1f58d32add92b2773c3d9ce33377f2441de0145560045a8 SHA512 69ef3d86520f541f492c955bd8158664c78aac6ecd4550f2b996f59d882d91f1bec81da9bbd106edc35c4f1a4c260ef2d9a56ec257fc0b4044047b902403065e
 DIST PHP_CodeSniffer-3.6.0.tgz 762998 BLAKE2B f83626a2a64dbb5c7ae2545368f1efdf74d87630720efe7466d9adfd6591cbcc95f2b74a17f54a935377519c6d909ba17f4056fff6d8f3870cefe782f32675dd SHA512 09c98ac460c6dc70637d2f4d81a1e46bdf742ee14d0b56032e8dbcaf7a0ff03f3fdb1abdf8144f664a33298cf397c732ba62027bcee41f1f4f740d12fa29f6a8
+DIST PHP_CodeSniffer-3.6.1.tgz 773181 BLAKE2B a85a0008fe9788bb48723fdd6a62d646a70bb342099693299def9320ca12971c48d8bc698e001f3249e8bb94963735c57529fe2d3101d53ded5ffd0946e07d4f SHA512 4992a460494cf58e5731e10df216204842168465731c0d002b7913fbaa85370f01077f70c96b4390158fbcf52ee021650ab6f13609ea3133370b89f34c73343c
 EBUILD PHP_CodeSniffer-3.5.4.ebuild 1502 BLAKE2B 02a3242341c9006a02cbaacff2a5f4b4eb6cb0d9b680c8ba3102316503c7bfb0bcc7be7799fcf4134991010f94ced0cd15c7b8e468c84f707b2904fa64a8b57f SHA512 c3cc91615ce68a44868765c66a8b6f45bcf93e8ed79f74ba9909249797b79c18565baac9ee98a0b1941fdd0a081f568c6a64a47d1cc328346585e0896f909b19
 EBUILD PHP_CodeSniffer-3.5.6.ebuild 1445 BLAKE2B a7d29b2211a6db7ba565908923e1bfedf6cf4f97d0f64374a34237ff854f3c7a1f29182c41a1b1199ea6de8337092af01eefba5f760c211e8e8df21ec10f8f6f SHA512 2ba7d933623e6d552c1676ff2a8e3b8cd407be3e365921b24a0cbe56875883d951cda7d9afee7dee044403ca94de6ab2f592c18337e0af4ca16fa950b6b381f3
 EBUILD PHP_CodeSniffer-3.5.8.ebuild 1450 BLAKE2B cf406c2ceb6ee7cc5556cce50962e30cc185f62319d9407264077bffaa357bf9aeb4b5440a8edc85c2bc1496f654f1c8e734e81367b17fb4356e0571dcac90d6 SHA512 5a94e1232ddbc0ecdcce41f016a7167405b8b71c309a18833e429a66939f8dc6fb076842c40a0e407ec2927aa2a106d10ab0bd57bad8d3abeb3619666096d271
 EBUILD PHP_CodeSniffer-3.6.0.ebuild 1450 BLAKE2B cf406c2ceb6ee7cc5556cce50962e30cc185f62319d9407264077bffaa357bf9aeb4b5440a8edc85c2bc1496f654f1c8e734e81367b17fb4356e0571dcac90d6 SHA512 5a94e1232ddbc0ecdcce41f016a7167405b8b71c309a18833e429a66939f8dc6fb076842c40a0e407ec2927aa2a106d10ab0bd57bad8d3abeb3619666096d271
+EBUILD PHP_CodeSniffer-3.6.1.ebuild 1450 BLAKE2B 351eb4e4a1bc7472fd5a2d5176afaf3aea701a7aebc05dd3bed60e3787c69bfce16df7a547afd6496a4102e1d204015d6c780ba25b2f2602ae678b089bb320fc SHA512 d4f797a6b7b1e66111ec7de8e9b59e803a2c658d21979d2daf594a8546dedbc168a5ca75dc3dd4866fac313c1731a5aa9460c07eb65448666440768296eaa098
 MISC metadata.xml 330 BLAKE2B 0a4e2c0281604b3efe374d6992ed4db4f09de41485f4f809a0a24816f912e309b5ffa40b1944cabd02f62c249e33f61bf2a2090ca7c177642ae09c764a8247b3 SHA512 ff907fb6875c3b43e5dca7fa9a0799d66d0993c6232550053b61568abd541c12e6bfbfc6073bd238e77156b8e7029e4767a310793dc1ce5cbe6ceedd424b519b
diff --git a/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.6.1.ebuild b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.6.1.ebuild
new file mode 100644
index 000000000000..f15c9ff98ca6
--- /dev/null
+++ b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.6.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Detect violations of PHP code standards"
+HOMEPAGE="https://github.com/squizlabs/PHP_CodeSniffer"
+
+# The test suite isn't part of the Github tarball at the moment. Keep an
+# eye on https://github.com/squizlabs/PHP_CodeSniffer/issues/548
+SRC_URI="http://download.pear.php.net/package/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-lang/php:*[cli(-),tokenizer(-),xmlwriter(-)]"
+DEPEND="test? (
+		${RDEPEND}
+		<dev-php/phpunit-6
+	)"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_prepare() {
+	sed -i "s~@data_dir@~${EPREFIX}/usr/share/php/data~" src/Config.php || die
+	default
+}
+
+src_test() {
+	# The test suite will fail if date.timezone isn't set in php.ini.
+	phpunit -d date.timezone=UTC tests/AllTests.php \
+		|| die "test suite failed"
+}
+
+src_install() {
+	local MY_PN="PHP/CodeSniffer" script
+	# The PEAR eclass would install everything into the wrong location.
+	insinto "/usr/share/php/${MY_PN}"
+	doins -r src autoload.php
+
+	insinto "/usr/share/php/data/${MY_PN}"
+	doins CodeSniffer.conf.dist
+	# These load code via relative paths, so they have to be symlinked
+	# and not dobin'd.
+	exeinto "/usr/share/php/${MY_PN}/bin"
+	for script in phpcbf phpcs; do
+		doexe "bin/${script}"
+		dosym "../share/php/${MY_PN}/bin/${script}" "/usr/bin/${script}"
+	done
+
+	einstalldocs
+}
diff --git a/dev-php/ca-bundle/Manifest b/dev-php/ca-bundle/Manifest
index a5eb3f385976..5aa07865c53c 100644
--- a/dev-php/ca-bundle/Manifest
+++ b/dev-php/ca-bundle/Manifest
@@ -1,4 +1,6 @@
 AUX autoload.php 268 BLAKE2B 0b6618f45d1a4e03a317ea55b4af12c60c43f9eb98fe9b3cacc45e5cf505530cc4e332d5289365956abfb3eb882b3447d19919b5116d249d727b0c934f272eb3 SHA512 186ccfc3ae6669722d01948c266a9c0518e1da228095a880695b7de6502c9798203019622cc0c63e30fbf7abe94aa988b7c694bcc98522e04298aa90217b8ed8
 DIST ca-bundle-1.1.3.tar.gz 126613 BLAKE2B 6b1013c2544f8795a4d054c6807cc2a2c51d03547f0d404def311d7edde9891f27ca1a249bef90e10f129a85f0dea489e1fc933b4c5f3bd8213c3428dba588d2 SHA512 b3e1f6bc9196b6c70476a7b656fb3dc4d398cd033d223b436d50676f228b62b561075787df36b880b7b4eb7de677da19d3e597752f88f279279b8569cc865a5f
+DIST ca-bundle-1.2.11.tar.gz 124268 BLAKE2B 537128647522c00a8ab3d445bfcc27648c4257a9f9ed82d489e4a2324d3123db86c1eba311b723f1bfcb6271223c7c36ad43863b5fd7c3f18ce0c92e7e064555 SHA512 96cbeb00a6770ada746288e01359bf2865cf8bbf80bca64d666b6c18b7103185b18a4c343bd170495576d871b37c5b59f334124f827658b6065462f7946554ff
 EBUILD ca-bundle-1.1.3.ebuild 547 BLAKE2B bcaa79c70e881a68b414559da2ef8afbbdf9ccc620205df22f5c80a3f907e09d79f9d7eadf78eac9c77b6ac632536f37c8806f0c5da980da76658f5408088d8d SHA512 b88506a7800d36434b2a9c9f64ecdd4cecaea2f50ee88bb326a4f480da66b8f1e05d4b6bb8befbda22972c80b6981c28186ae12c19562102276de4bfea01b139
+EBUILD ca-bundle-1.2.11.ebuild 547 BLAKE2B 0dd394f704ac0922b8925caec28085e578c184d17af169b83ca06b314dac9ca11d16894c6a48ac85786185d2381c522e8abb6578870dc11d4bbf845e98cdd74d SHA512 b28e4fc2fddd4ca8c90337d47cfeedf54388fd0e409683083540304a382913df966341d3b1167c55c6320ce7ea272f0968f919640b1e38a25d19b7523c324610
 MISC metadata.xml 874 BLAKE2B 7a79033100c420d679ee1bfb5252c78830e946ae4576aca01e67f32bb663277112a16fccb73f24e6e62f60ec7605bda3c1ee0bfd3cee495522adb4d1aac0842a SHA512 b2f3c3c9771a18dfcb71441b061b664f958d86cd561db026ef5b0f50c29f5500956f877056bea19076d8dce75b82808c56dbc1db1ffc0a4497a89edffcef00a0
diff --git a/dev-php/ca-bundle/ca-bundle-1.2.11.ebuild b/dev-php/ca-bundle/ca-bundle-1.2.11.ebuild
new file mode 100644
index 000000000000..d430bcbd1dd5
--- /dev/null
+++ b/dev-php/ca-bundle/ca-bundle-1.2.11.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Find the system CA bundle or fall back to the Mozilla one"
+HOMEPAGE="https://github.com/composer/ca-bundle"
+SRC_URI="https://github.com/composer/ca-bundle/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	dev-lang/php:*
+	dev-php/fedora-autoloader"
+
+src_install() {
+	insinto /usr/share/php/Composer/CaBundle
+	doins src/CaBundle.php "${FILESDIR}/autoload.php"
+	dodoc README.md
+}
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index ec161bb7827f..076d112edfbf 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -9,7 +9,8 @@ DIST composer-2.1.3.tar.gz 514147 BLAKE2B 3abf64aceea5b95b72419b60fc74d23e42c652
 DIST composer-2.1.5.tar.gz 515243 BLAKE2B 078b14727aba1d6278e046e0a1a7b90edae6532ae5874093824db39bb10a0f663543944fe0bb17ddad3dbf40736eef1bb1a8049f5e4dd557f6f01e0d854c213b SHA512 cd4f166d3d1ca7edc8b473ac47775caca98dc2a8bc758b34e6fdd4669ffbe0aa71f900a366e40ff73f830aa602377a5ef3f40022006138e216f0127c75120b96
 DIST composer-2.1.6.tar.gz 517576 BLAKE2B 27a7c76d36a0c86110c2e39ba5977b7ea04bd10897dda4b563edad9cdf2b7e134d3545e5efa5eeb1518f1f0d5366c29de7fb1d6e9032b567195676de121bedbd SHA512 244d64c3c1eadb58ea945e8d448c3fdcf83a6bb3c09eede63c36a6e11f7b2131a797a9ca10c5447bf868ea3439681f9f9079933e26953b5387b7e0c3333480e2
 DIST composer-2.1.8.tar.gz 522462 BLAKE2B 12fb95088146e56568b05ad13ae7630b664337ca338d4cb3e8cc126bc90173a21da6f8e4d2cd883ad15a7b67670bae297a6e02518de3dbaf9d980a74afd6c60c SHA512 00816294a2837934a846a672d34ac830ae36b063d6ffb57d883f553b69cf205822d5d9994c3f6fa67e324ff9d47740bb1b843ad68cf911b220f411cc0b0fe1d2
-EBUILD composer-1.10.22.ebuild 1233 BLAKE2B 8ca659735c9256070bdf634a96eb790a23ef4a5f6e9bc1c4d488d2082d97d87a043b8becc944f9e33479516b40c29b2ddd93c7fe4219c1a3b143c333464b160d SHA512 5cf952c3bda93befd1a77ed5330905f3be8bddb254cdb3d52c6ea6c24eba0bfd32cb936fbbbe18e18dcdf1362b5e423b45f47346f1fd5e5192753c66f51e00e6
+DIST composer-2.1.9.tar.gz 523638 BLAKE2B fa5d9ce1d2bc65a8c92f9651f7b4fe4455d16d39798e79f43027f2617bd5d7245399f5a9bb772ff8fc64f055919836a5c575c7d0452657544495da547dbad447 SHA512 38377bde788443df234e2893efec90705dae0d4b7ee3b00f60c156e6471ba4c98c8ee64709ee1a06315702129dd716904f02439206a0a023ac2142359c6765cc
+EBUILD composer-1.10.22-r1.ebuild 1230 BLAKE2B b9ea51fc5272d0cf14c7ac39ab6b116237a8e6407438bd30f93cb19c2a49ba8eb5161ee7b68e94a307ad0aa05d7bec8b761793d71e0125acdef2a337f04beff4 SHA512 a779b007d2656daea61b3522cad20058a7cae19dc2b4588dbb349549906dc2874cebd42c711db487fd29578fead7a80cd7067210be2f3f134f792d6b388d5a66
 EBUILD composer-2.0.13.ebuild 2228 BLAKE2B f12244d8bada90f5ebd47e5c4d4b706c48153e6f56948103bf17e6ebd6fdbc44056e97ad67bd4fd423bcce9fba03584369c9025d3ed936f8ba1c1bca14a79b7a SHA512 8eee72c7edfd358f0dbb69c334d3df62dd3e0c1d74ac17ef49ca53655934ef5ae6e6c1a4d2263e766afcb0204eb72cd886ca9f1a0ad5e825d41a7eb38243d344
 EBUILD composer-2.0.14.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535ceb142e6bca6ded35413a5e8c42009850e902b49fe59418b69e76e5043f0d7f585a2a61888b98d9e82edf80a0b9 SHA512 e007b668692c68b321be874639cf77366d81172b1314e316f04e785e4ba9e065785d95509d24624eadab38ee8ce154ec0f5797438a7b7dfc59fc85dac092f5a6
 EBUILD composer-2.1.1.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535ceb142e6bca6ded35413a5e8c42009850e902b49fe59418b69e76e5043f0d7f585a2a61888b98d9e82edf80a0b9 SHA512 e007b668692c68b321be874639cf77366d81172b1314e316f04e785e4ba9e065785d95509d24624eadab38ee8ce154ec0f5797438a7b7dfc59fc85dac092f5a6
@@ -18,4 +19,5 @@ EBUILD composer-2.1.3.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535c
 EBUILD composer-2.1.5.ebuild 2228 BLAKE2B a0655fea3563734d657745a9fa9c8f785cf234d879033f43a4e98d333dfe51d011401db8fb7d16cad3191c86bb330ddaad759a3600c6dd8668bc4963c0adb253 SHA512 e5490a298b4a5ca5133ace4bf3ca317ea1b35b212b2574d0e8fd1dcc22226cdd32849f57c0a26f0be03586c602c9d3f4b70442bb1b9316984276aaaac120b635
 EBUILD composer-2.1.6.ebuild 2228 BLAKE2B a0655fea3563734d657745a9fa9c8f785cf234d879033f43a4e98d333dfe51d011401db8fb7d16cad3191c86bb330ddaad759a3600c6dd8668bc4963c0adb253 SHA512 e5490a298b4a5ca5133ace4bf3ca317ea1b35b212b2574d0e8fd1dcc22226cdd32849f57c0a26f0be03586c602c9d3f4b70442bb1b9316984276aaaac120b635
 EBUILD composer-2.1.8.ebuild 2228 BLAKE2B ebf3d7fe1a1d890650a861bc5a08878501e7a8994cd12c1e2b55e632293f7e004f28bd490ef40ecbd8268ab625ca56c4caa69791a36dd4549b5106dcf2923dd2 SHA512 62afde69ee98ab14cc9bbb90df16ca70927fa1cbbd0c69ceb3bc2a9bd237aa8a3eb96f2acfdc88244d2e5e5d7c9ee32776764cc4750f1619e7c4296ca57737b8
+EBUILD composer-2.1.9.ebuild 2228 BLAKE2B ebf3d7fe1a1d890650a861bc5a08878501e7a8994cd12c1e2b55e632293f7e004f28bd490ef40ecbd8268ab625ca56c4caa69791a36dd4549b5106dcf2923dd2 SHA512 62afde69ee98ab14cc9bbb90df16ca70927fa1cbbd0c69ceb3bc2a9bd237aa8a3eb96f2acfdc88244d2e5e5d7c9ee32776764cc4750f1619e7c4296ca57737b8
 MISC metadata.xml 805 BLAKE2B bfbb9828e372e477d471698865c97fd36a9287e257b36fbd1d489cad92ad131a6b2d30910379b126d82d3f81b479854da7a50596b1b63e6982c0bc402caae574 SHA512 33cf199e2cc7fd8ddbd46d9782fb5a5e9e655f9fb8c607a68744f4165fc62edfce6bd324bf883d5d5b143963cc3ef986609e22d24809c190b508e814249fe99f
diff --git a/dev-php/composer/composer-1.10.22.ebuild b/dev-php/composer/composer-1.10.22-r1.ebuild
index d8c51c550e91..6d92252702fa 100644
--- a/dev-php/composer/composer-1.10.22.ebuild
+++ b/dev-php/composer/composer-1.10.22-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	>=dev-php/json-schema-5.2.10
 	>=dev-php/jsonlint-1.7.1
 	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
+	<dev-php/semver-3.0
 	>=dev-php/spdx-licenses-1.5.0
 	>=dev-php/symfony-console-2.8.48
 	>=dev-php/symfony-filesystem-2.8.48
diff --git a/dev-php/composer/composer-2.1.9.ebuild b/dev-php/composer/composer-2.1.9.ebuild
new file mode 100644
index 000000000000..1eb058b7a474
--- /dev/null
+++ b/dev-php/composer/composer-2.1.9.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.0
+	dev-php/fedora-autoloader
+	>=dev-php/jsonlint-1.4
+	>=dev-php/json-schema-5.2.11
+	>=dev-php/metadata-minifier-1.0
+	>=dev-php/phar-utils-1.0
+	>=dev-php/psr-log-1.0
+	>=dev-php/reactphp-promise-2.7
+	>=dev-php/semver-3.0
+	>=dev-php/spdx-licenses-1.2
+	>=dev-php/symfony-console-2.8.52
+	>=dev-php/symfony-filesystem-2.8.52
+	>=dev-php/symfony-finder-2.8.52
+	>=dev-php/symfony-process-2.8.52
+	>=dev-php/xdebug-handler-2"
+
+src_prepare() {
+	default
+
+	mkdir vendor || die
+
+	phpab \
+		--output vendor/autoload.php \
+		--template "${FILESDIR}"/autoload.php.tpl \
+		--basedir src \
+		src \
+		|| die
+
+	cat >> vendor/autoload.php <<EOF || die "failed to extend autoload.php"
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required([
+	'/usr/share/php/Composer/CaBundle/autoload.php',
+	'/usr/share/php/Composer/MetadataMinifier/autoload.php',
+	'/usr/share/php/Composer/Semver/autoload.php',
+	'/usr/share/php/Composer/Spdx/autoload.php',
+	'/usr/share/php/Composer/XdebugHandler/autoload.php',
+	'/usr/share/php/JsonSchema/autoload.php',
+	'/usr/share/php/Psr/Log/autoload.php',
+	'/usr/share/php/Seld/JsonLint/autoload.php',
+	'/usr/share/php/Seld/PharUtils/autoload.php',
+	'/usr/share/php/Symfony/Component/Console/autoload.php',
+	'/usr/share/php/Symfony/Component/Filesystem/autoload.php',
+	'/usr/share/php/Symfony/Component/Finder/autoload.php',
+	'/usr/share/php/Symfony/Component/Process/autoload.php',
+	'/usr/share/php/React/Promise/autoload.php'
+]);
+EOF
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+
+	# Composer expects the LICENSE file to be there, and the
+	# easiest thing to do is to give it what it wants.
+	doins -r LICENSE res src vendor
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
+}
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index 97ba125c64e8..f9de79a8e1c8 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,5 +1,7 @@
 DIST apcu-5.1.19.tgz 96583 BLAKE2B 330c08a4e557691d0b402111877b3caf56b211256db17cce52a76aeefce7237505eca4ecd71f3770ef3c405182a1604a92cc458cb9bca435b42370fe917e21a7 SHA512 45077e3bd0eac207539e2eafe21968c71f49b8c8920168dbafa87961b041f1d348b6bf1c130104744bc541e1f690854f0a29062e9520db81c04edeee3ef2ed99
 DIST apcu-5.1.20.tgz 96727 BLAKE2B b8223856e0aaa52f90dffa674bbd9b047caa8c91d81b637eafc2f59fbbfdfe0d6ce30e990a87cb4833e895fcfd944f7d57eb6f7356b3e2361d6be5a535bb3a63 SHA512 3e10b7e5dc7481b1250610ef83954875f427b9114d6b232bad9064fc33d8c8906bcc317f94a6cfc9f76c720fa06a44270d259cf2ceef6c1ec9dcadc49254ee1b
+DIST apcu-5.1.21.tgz 92516 BLAKE2B 32d73b89bde9ef4eb01c9ad766930e87300b86776c95929607a8aaefba5043e3a7947d064416ac083ff38876fdb41bb03dab1552ac000082e54f809269b4c925 SHA512 a6ffe8349760d27cde0d86017a59a68e9639bf385e606622d807094f4e5fb305bb25b9ce00077d0856f4d223d44329f7a6314c229b62c78d8e2b085593c92bb3
 EBUILD pecl-apcu-5.1.19.ebuild 1545 BLAKE2B 1c074393bafc9563524a1f1d72271032189adce78b462c698babe9014349db09553d642b5a0978a0600326010cb971f81b16f7be0a2d88cf6d063f86848d2019 SHA512 25fb01fd624396446e0842eeb45b1c29f9526b0f864f55983ce69075454dda61d7148c991552fc4272b3f7ae58a513b56083f31cbe7ca0a5d6f5a03524d99899
 EBUILD pecl-apcu-5.1.20.ebuild 1553 BLAKE2B 015a8869645b8b2d79cee0d91b2eff4df743de8525d88d20b03dc9ba6f40ec377bcf1123d505d61a46c407c170167b1ca7b79a21a767320d401c9492c846018e SHA512 40ddab32f53bf4c7f0fde674c4916e5e385a3cdf8bb760e7e0b25f4303d9de73cb6f882b8f8ae80e4af633d788d48daaed08166afc6da755f50b75976a46403e
+EBUILD pecl-apcu-5.1.21.ebuild 1560 BLAKE2B 1be86a20eb978a8906485287031f2376e285b6c8989a62b203ef1e88b2582964cf055ae87c768c4a22381a402f21244974b1218110f632242349a0fb13607b3b SHA512 e32d20058ebba152466f1964b866cd8012d4ef5846c5c4763f5fe33379ccc198412872fc5db8ba6ffb5f37136f15c2962a38f926ebbac061b1b0e5951b70d4a2
 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
new file mode 100644
index 000000000000..525f58c9e981
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.21.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="apcu"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( NOTICE README.md TECHNOTES.txt )
+
+USE_PHP="php7-2 php7-3 php7-4 php8-0 php8-1"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DESCRIPTION="Stripped down version of APC supporting only user cache"
+LICENSE="PHP-3.01"
+SLOT="7"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+	LUSE+="lock-${l} "
+done
+
+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
+		$(use_enable mmap apcu-mmap)
+		$(use_enable lock-spinlock apcu-spinlocks)
+	)
+	# Broken upstream autoconf test disables if present at all
+	use lock-pthreadrw || PHP_EXT_ECONF_ARGS+=( --disable-apcu-rwlocks )
+
+	php-ext-source-r3_src_configure
+}
+
+src_install() {
+	php-ext-pecl-r3_src_install
+
+	insinto /usr/share/php7/apcu
+	doins apc.php
+}
+
+pkg_postinst() {
+	elog "The apc.php file shipped with this release of pecl-apcu was"
+	elog "installed to ${EPREFIX}/usr/share/php7/apcu/."
+	elog
+	elog "If you depend on the apc_* functions,"
+	elog "please install dev-php/pecl-apcu_bc as this extension no longer"
+	elog "provides backwards compatibility."
+}
diff --git a/dev-php/pecl-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest
index aca67ff2d977..b06e5e9f9b87 100644
--- a/dev-php/pecl-mailparse/Manifest
+++ b/dev-php/pecl-mailparse/Manifest
@@ -1,3 +1,5 @@
 DIST mailparse-3.1.1.tgz 941192 BLAKE2B 00b5a506031cd03439e3d67172c17aeeb6af3b950694251f7654007642bf80fff3cda900fc97ba177b91ca970e47416132080793ce64d8038e7aecbf2fdaf6c0 SHA512 01ddb8d4d27a74c14f70b02b49322c60fc79affab374205fee91b9da21e5148e08dba024f6bc620e4f26c2c937675e09092c52ca69172d2f7797c3e2bf374bee
+DIST mailparse-3.1.2.tgz 941292 BLAKE2B 855d0b6d34664f090ee3fc6aaa7a260651b9e98b1237c29f66c151ff2b6d8dbbd8cad2757e202fad5a2d0a339fca1e37464a5bcfe7f12b9b1dee975f4330aa1f SHA512 f60671b2bbe09c858a5d9d27fb8ac314d98d0635eeaa682a28171f85bc71d1c9c3ab92c6931883a42619e96bfe96fdf1b43b570c5c2bc1d2b243b541fb533d24
 EBUILD pecl-mailparse-3.1.1.ebuild 492 BLAKE2B a0beb3508e7d216b889015a393d4ce5f11bceb65910306e3bf1bae303c06e18a9b0f8fdf568877a032e1518f1c8274b2695c083ac4b4cc7fa60946537a6be558 SHA512 3b585bd494f72d10fcf2a4e0be4418d531ca6d02a2ebc98bdb4710e49d6251b7f5cfb2bdf946a0b3c329b8ce9f65de8c28b5d6d2023ef24272e6b0f5f8fa5680
+EBUILD pecl-mailparse-3.1.2.ebuild 503 BLAKE2B 2fe64e994a64c33c54360b5a497e3ae01c6370edfe5196d322530078063f10ad9281c534822233c1eab9937e7340fa34fbe8fff52bf45a0ba91e93a2909d019c SHA512 e91d4d842b2136c60927a4f60f4f2295b46bf93a9f710238368baacfdd32dc1864e1f6d27ba4312e1da8cb1f7327a2988128bf3cb6328c9732e037c3de65b771
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.1.2.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.1.2.ebuild
new file mode 100644
index 000000000000..29f9a2bfeb51
--- /dev/null
+++ b/dev-php/pecl-mailparse/pecl-mailparse-3.1.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WANT_AUTOMAKE="none"
+PHP_EXT_NAME="mailparse"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=""
+USE_PHP="php7-2 php7-3 php7-4 php8-0 php8-1"
+PHP_EXT_NEEDED_USE="unicode"
+DOCS=( README.md )
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME compliant messages"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE=""
diff --git a/dev-php/pecl-rrd/Manifest b/dev-php/pecl-rrd/Manifest
index b8b96af75161..a93711bf09b4 100644
--- a/dev-php/pecl-rrd/Manifest
+++ b/dev-php/pecl-rrd/Manifest
@@ -1,5 +1,7 @@
 AUX 2.0.1/0001-arginfo.patch 2714 BLAKE2B 23b597baafd80f10abd922d096b94968b54bb4d3b5682242ad66f85d85dd3ab984d9e3623cd03a4f8c38a8798887ceba62e33c177d3ce8c0ebaf6e3cae99a149 SHA512 01ff4826777e30048dd9db3b9589017a39da6e038a113fdc772e1023c85527af146ee5ad7f79cc91976f7991e1b182e20537df38e94ac28307fc26a6708bb290
 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 553 BLAKE2B b7a7c2030a7a8ee0ef20603d94be73a293144ef08b9026fcb365f2a3eca9d9050389cf042b379dadeddb65d62c777b89b4f30f15d3a7db119c37cf981448f052 SHA512 d01b856299b59636fa5a116a94b0a76497a74aadac7bae2149c881880d346dcce02f0dfe8c5f67f74c72602d05adeb0d08dd40c52496a10c4161bf4c41db7dde
+EBUILD pecl-rrd-2.0.3.ebuild 554 BLAKE2B 0ff61efc2b073ece3fb882de4cc85826ffb2c362e92096f48893dcd114f47d2a099f0b914ae7d496875d8967baf5041c23d89b881c6c67a73941016705c772b6 SHA512 76812bf1a131567ed88f68504227249d528c240c2936a6d394465f19b0ecb1944364150972ffe0cf99134299be3c4ffeb5f0dc4dd2b3b670579ccbc1c80518cf
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild
new file mode 100644
index 000000000000..034811552435
--- /dev/null
+++ b/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="RRDtool bindings for PHP"
+LICENSE="BSD"
+SLOT="7"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-analyzer/rrdtool[graph(-)]"
+RDEPEND="${DEPEND}"
+
+#PATCHES=( "${FILESDIR}/${PV}" )
+PHP_EXT_ECONF_ARGS=()
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		# Prepare test data
+		emake -C tests/data all
+		NO_INTERACTION="yes" emake test
+	done
+}
diff --git a/dev-php/pecl-uploadprogress/Manifest b/dev-php/pecl-uploadprogress/Manifest
index fd3b8669855e..fa2ad18d4c48 100644
--- a/dev-php/pecl-uploadprogress/Manifest
+++ b/dev-php/pecl-uploadprogress/Manifest
@@ -1,5 +1,7 @@
 DIST uploadprogress-1.1.3.tgz 14798 BLAKE2B 5edda3e8672bb0e0829d100284240fcceac26be695386225a18446c742f59edfd906a9ae2f17b594816d3cddea02eb648db01a3352d7f8bd764ad2f6b2e03628 SHA512 2202f419be852a71eadae47eaa83909a032e5a6bbe4ce17ae5d45ea4e9f6d9c9edceb2111630d1f0e277b531d463accf540288ecbcca9bf154fe01754f225686
 DIST uploadprogress-2.0.1.tgz 19459 BLAKE2B 10143285da73a2fe1854c68d5f20ac6543695ccdf47835ff16f39b69e357e2ca32d2560ca1ced9238c6d21fb29379817b8a682d6aa24bf8c83b563127d2745a9 SHA512 81c846ea6e87c7c0621c22ee903b0937d533285bd0e3195de85803321260d4562e4c598332591afc7e985da57ed9422e37ed1c2927090474ddb7ec27314f1ae0
+DIST uploadprogress-2.0.2.tgz 19969 BLAKE2B 148cac83b00eb6b4f23861a04829280346957cdfc5bdbe94d687d0efb5da97b5f48162c59b07e0830a67350c7a2aa9a3085a4575f07b32016b01845301f04843 SHA512 b9ee5a09c3de78d58abd34da2d25d7b0cad38416309a9a69192f07e0c3fe2259de261bb3dee571e64e042753f861738ebcd67fa7fafeb595ec32ed3034c773cd
 EBUILD pecl-uploadprogress-1.1.3-r1.ebuild 465 BLAKE2B 106c1056a3e4351751eb813c6b15f859c66c2b32ee285ac5d6e8fa256418ec7a4bbfa4d4d1793e6998f9ad7d862e36e23ffc3d95965370e7b7e47ef821cff822 SHA512 11ce4c9bde42e1357f11cc2f9fa5e8bf405944ea755c8f09ceb8a3898440c5381b89374ea63298842113bc90ef1837c72bd7fde2f874f46060c2870d67a24a7f
 EBUILD pecl-uploadprogress-2.0.1.ebuild 670 BLAKE2B d75e0c1f4b813f6ea285b9f9faa92d777a6beb7b9b7626fc0f359a5f1b119715e58e8da7db97095a482cc89afb1da4aa994d84ed182018788ea6aa3f51c8d79c SHA512 2fe1826005d5f2958268ab2e3346f30d08fed1b1aba9760a1a8bf0777220a66e36b2b4a7a938e46e44640030782a76dcf668f3eeabc2c3624c98189a4df7716f
+EBUILD pecl-uploadprogress-2.0.2.ebuild 670 BLAKE2B d75e0c1f4b813f6ea285b9f9faa92d777a6beb7b9b7626fc0f359a5f1b119715e58e8da7db97095a482cc89afb1da4aa994d84ed182018788ea6aa3f51c8d79c SHA512 2fe1826005d5f2958268ab2e3346f30d08fed1b1aba9760a1a8bf0777220a66e36b2b4a7a938e46e44640030782a76dcf668f3eeabc2c3624c98189a4df7716f
 MISC metadata.xml 709 BLAKE2B a3e91fd98c74c0f7b7286cd7d3070a495eab7c585f4d9981bedc90734665ba60d1db391a641aa9dfb60fcdb3c5748c9f65016ddf5cd9756c7e5caf021a65e3ff SHA512 eab0d79c1f912399fe60a673e6378f61cd5c4c0842d496c59fd300e2a037bfa1e0cbee0d9c330b81200c52944595d95fcc23c21c171172687330d21a8ff53a33
diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2.ebuild
new file mode 100644
index 000000000000..6bc6174856b0
--- /dev/null
+++ b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_PHP="php7-3 php7-4 php8-0"
+PHP_EXT_SAPIS="apache2 fpm"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="An extension to track progress of a file upload"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	php_targets_php7-3? ( || ( dev-lang/php:7.3[apache2(-),fileinfo(-)] dev-lang/php:7.3[fileinfo(-),fpm(-)] ) )
+	php_targets_php7-4? ( || ( dev-lang/php:7.4[apache2(-),fileinfo(-)] dev-lang/php:7.4[fileinfo(-),fpm(-)] ) )
+	php_targets_php8-0? ( || ( dev-lang/php:8.0[apache2(-),fileinfo(-)] dev-lang/php:8.0[fileinfo(-),fpm(-)] ) )
+"
diff --git a/dev-php/phar-io-manifest/Manifest b/dev-php/phar-io-manifest/Manifest
index badfca2dc34f..33973a501c80 100644
--- a/dev-php/phar-io-manifest/Manifest
+++ b/dev-php/phar-io-manifest/Manifest
@@ -1,6 +1,8 @@
 AUX autoload.php 3913 BLAKE2B a3c8a3b75e2b150157892bc8ea168e7c60e5cef95cdee1279579a4b1efd4a4647bb5ec22f272575342d8945674fce048b1a091cd48977cdc77a975668c3a0849 SHA512 d43f3a726eb79ee88e674ac0ec3fb4d175ac0041b96638e4d2a40a47720ebd3a983cd36dd943fff9c0220dda68549361628636e94f595b0601d6eddf2b937fe6
 DIST phar-io-manifest-1.0.3.tar.gz 21903 BLAKE2B 48fb8858ea6c89415e78da399e2d3b6660e1857958094bf5e6c42465cfc32e34122ec1ab6e413f36f48e288ef40af7b85f93c80e6a2cfa547a166557de04ec97 SHA512 f8f9a6d4b761b739ec24a9f94ae5d4ac74f7276621675e3f3c7c3085aa7662c73cc703b1c86531d327199cf42074bb19446c14f78a3c8a888b1d236dc59bed94
 DIST phar-io-manifest-2.0.1.tar.gz 10146 BLAKE2B dad3a04bf63c53c2cf4c715eb752ca57458f936a0872db481e81452b9efc8f10bb3903248cb834c8e25eb88987b68545903e1f68876e284597f54ceef755dfe8 SHA512 5c9772a5a48f17abab3806bbb8f9c07a2f26f3231385fb7dd7dcdc390f925f0f7de2d07d8b0bb4e966de86c3262bb4900cf81c1bf897fb38425aa8d644c74e95
+DIST phar-io-manifest-2.0.3.tar.gz 10249 BLAKE2B 3463a52fac2d0392b9c4a40089b536b0aebdbfe51154dbeab093da386085ead91eb95cdd133eb4464bde3a616b13c5a5772af2d97edfc585b0fa1128ef2a5166 SHA512 c0c646f0770e66909377f5f4b6b755ecfc070c44ac83d58c3ad07d79aa4481092e7c702e62d0ee65b036dd5de8ba45356d85717a733f141248e41f77d54bbe86
 EBUILD phar-io-manifest-1.0.3.ebuild 707 BLAKE2B 43809d8fc3bbd0e6e6937d7fee43c7d33f7ce71a08b215c7008c05a9a02addba0f598eec5136a227a433b8c45ed68ac7be58831586b1cbd52abf41ecd7edd414 SHA512 95db205b5928a1272f816f1fd8ccaf4baf1457b4b6e9e5c9138aaed5533e05cf4b8272dd641ac7e35dd13a35ea223ac8ccb4a47a8fa9cbdb0950c5b0f936f1e9
 EBUILD phar-io-manifest-2.0.1.ebuild 1079 BLAKE2B 47e9c7aa48dee6219ec90f6b106e9518d553c5cfdd4a3a6d5151738ba82c7af6b01ebd659ab2543e94f474902deaa3ea281ecf69c1b0bfd17a1b1f42582cbdb3 SHA512 6938c953c8e02aad408e0faa33aee945339ecc7ffc2b80c245f04a9f867ed96a0c2839fe21be5bdf6aa40287446b08a5e8150a8eb2bc9ad4561e7042123058c8
+EBUILD phar-io-manifest-2.0.3.ebuild 1079 BLAKE2B 47e9c7aa48dee6219ec90f6b106e9518d553c5cfdd4a3a6d5151738ba82c7af6b01ebd659ab2543e94f474902deaa3ea281ecf69c1b0bfd17a1b1f42582cbdb3 SHA512 6938c953c8e02aad408e0faa33aee945339ecc7ffc2b80c245f04a9f867ed96a0c2839fe21be5bdf6aa40287446b08a5e8150a8eb2bc9ad4561e7042123058c8
 MISC metadata.xml 345 BLAKE2B f315866d0a0e6298a4146c625af4a71200a697f0504fe83240a092c1998a09c86c20a7d842ecc790e35ea1048f7676d7ccd00c0bd9d563ee2fa6e9d0fdd9404c SHA512 2768f65be97aa86fd10c3a8541fc6d43262bceb632d9ba194d3e6deb0da217321c11a1063a1aa7206c42d7e12ea105f39974d5fa31f9d93975aa903a6adcd661
diff --git a/dev-php/phar-io-manifest/phar-io-manifest-2.0.3.ebuild b/dev-php/phar-io-manifest/phar-io-manifest-2.0.3.ebuild
new file mode 100644
index 000000000000..25f65d07e8d4
--- /dev/null
+++ b/dev-php/phar-io-manifest/phar-io-manifest-2.0.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Reading phar.io manifest information from a PHP Archive (PHAR)"
+HOMEPAGE="https://github.com/phar-io/manifest"
+SRC_URI="https://github.com/phar-io/manifest/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="examples"
+
+CDEPEND="dev-php/fedora-autoloader
+	>=dev-php/phar-io-version-3.0.1
+	>=dev-lang/php-7.2:*[phar,xml(-),xmlwriter(-)]"
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/manifest-${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/PharIo/Version/autoload.php'
+]);
+EOF
+}
+
+src_install() {
+	insinto /usr/share/php/PharIo/Manifest
+	doins -r src/*
+	dodoc README.md
+	use examples && dodoc -r examples
+}
diff --git a/dev-php/phpspec-prophecy/Manifest b/dev-php/phpspec-prophecy/Manifest
index cb2cc5391635..12e183537379 100644
--- a/dev-php/phpspec-prophecy/Manifest
+++ b/dev-php/phpspec-prophecy/Manifest
@@ -4,6 +4,7 @@ DIST phpspec-prophecy-1.10.0.tar.gz 38663 BLAKE2B 44a292eb24cbef36217c108cc09497
 DIST phpspec-prophecy-1.10.1.tar.gz 38707 BLAKE2B 1eaa3fe0043b0d03341778679683cd388d2cdcc3c386ee5801f22dce453fbc3c276023f1b9dc6f26ee332948f59081e09d0944948feff1a6332195523570e4c9 SHA512 f42d115969894b0c1f4887a2154fe310ddd3c7d5a49abbed3c3cb6ffa86d83b1458b9323203e68a7389f5df3c95b3a25037bed41cb8f3b5e824d45102579b9ca
 DIST phpspec-prophecy-1.10.3.tar.gz 38838 BLAKE2B 05150e31bcb5896768878672a2523499470541409796b6f4f0de2b8b8686cfa097b6a745e467ed3c9693b0498712d04f6f0e1ba0d19e2fa3677ab9f6423608de SHA512 ada5ecf157bcc5979a86c76448f72c8a890f7db4496327ecf2b7b723bdfe901dd53b0225f8ee3ae7cbc38d08933c863224c9661466428fb47da9bfebdb86627c
 DIST phpspec-prophecy-1.13.0.tar.gz 40362 BLAKE2B e99001cfe9fb20cea12b5e109ef36ba087f99ae1bcc922af853eff1bf2d0986017b9b7be03a280de05726480ad75c9d8ee34a27c54b78e22bade9534a75e5c34 SHA512 5d7befb615805243f9602fe78c230c0938186d01c62cc5b90aa279713ba3b653629e91d96acd4e8bb1dc25cded81526934d189ef3f4ef38f75cba04877ccdf70
+DIST phpspec-prophecy-1.14.0.tar.gz 40801 BLAKE2B 8968be07cbc02f76c515c8c6a27e69662e1aa697e5d502329a946a677903b59fc63347b2535b84ebf4e1d59cf6085fa10151ed9caea9f3b50c1897eaeb178636 SHA512 777137784a2235ae638d1b6b42bb67b2fa6eadb2c05e83097e90604aee5e0d7bc4100924fadf8f2e5ccbe09be6d4edf4fb63606f2be4a9c805dc4480d88747ef
 DIST phpspec-prophecy-1.7.0.tar.gz 60338 BLAKE2B 8171120d8407f2e554150d5e3ea1972c54d4e2ce0e6698763f0b3c7e1645340ce22404da7844fed8412579c46f372852b4553c6d8a65c8094ef3065b0dbbd80c SHA512 e8efb3882d869f10fe39dff7c2185e1ec6f044c794fd6a5785e1c1c69c71b91dc3997f61bd2566d3243dde0becce568beba9a18fa0fd152e6ce74ca43a9a0fb0
 DIST phpspec-prophecy-1.8.0.tar.gz 37907 BLAKE2B 4bdd55d7fc14604c9fade23c60bf51f4c03accc182d7c5ad445dc6212a1e41b1bf392fe8f4a29768ecfcb2af479c0db3e29d5787d12e1f3222b032ba7e64dbc8 SHA512 992673f7cd148cf0b8752bbad614bbe34175a761cd4bf8849625794b505342d1bd918212a0f1463d94513f9e805d3dd127ba129d6622bcda29ea2b5c57a5582f
 DIST phpspec-prophecy-1.9.0.tar.gz 38262 BLAKE2B 1642d38afa368be504da73c0bcf34921fe167dff5665651af23142f33979a35d8d10112e3d1c5b1b38448b92b4741ebda2c183dca10473dce833090a603f95f6 SHA512 d0ba1840ca84cf4b0642083858326c593086f35ba3a6d83746956efbe5d538910efc01655eaa14b4e2b7e17e7bd19cd2494cdfad0dd5bdfb43cdee2402a55b05
@@ -11,6 +12,7 @@ EBUILD phpspec-prophecy-1.10.0.ebuild 830 BLAKE2B e9972a363e07fe83f00a282b6c8f14
 EBUILD phpspec-prophecy-1.10.1.ebuild 830 BLAKE2B e9972a363e07fe83f00a282b6c8f1404fcf7d8418c43cab20f72cd4a6b36880fa62e04149b2d82a657feb95719fffd31e58ea40508ab5be27ea10c2df7074f75 SHA512 3e381d989326b6f55ce31738eb4227dab625e1a8c9ddbbb236251ced16f68e103247a47f1ccca89730af2110f164009d5b1468247f0895ba270347d8d8b2d730
 EBUILD phpspec-prophecy-1.10.3-r1.ebuild 825 BLAKE2B 27f538a59e3ff75941022ac9cdc5379bb4b81de9836101a589b7959169951006f1008d4f91a05f7488fc9284f50923c899b41a92e345e897659d4f89a7888a22 SHA512 1ff815f691616b65111c52ef681d075c1ff32e52f0b3baa60ea37ce1bdf50d6e739650e60dccdf0cca1c67fb5cf41e7bf89c17b29c56fee20d3f6199a6b4b68f
 EBUILD phpspec-prophecy-1.13.0.ebuild 840 BLAKE2B 7e0b8b27bfc7aeca65d505faea4731e99dc028c1cc1b36c4a81a654a8e3b2a2885c6083ae874432ebdaab9c2984b56945b59d124b43fd3b97c2d55904ba1b6e6 SHA512 1faecf25ca73b71150d6b713542617ab7a1ff041c87ff3cbca08266439409ce9230ae31746e7f6ffe71f886ab9c205016e985532a44af8eb0d4dfccf1d1f2804
+EBUILD phpspec-prophecy-1.14.0.ebuild 840 BLAKE2B 7e0b8b27bfc7aeca65d505faea4731e99dc028c1cc1b36c4a81a654a8e3b2a2885c6083ae874432ebdaab9c2984b56945b59d124b43fd3b97c2d55904ba1b6e6 SHA512 1faecf25ca73b71150d6b713542617ab7a1ff041c87ff3cbca08266439409ce9230ae31746e7f6ffe71f886ab9c205016e985532a44af8eb0d4dfccf1d1f2804
 EBUILD phpspec-prophecy-1.7.0.ebuild 802 BLAKE2B abfc5f92049c4e71dd79579a4645b161e727f02056baf5117ba6f3a1eb711acca5ab7be3f28bba542451eb9e22d88c6957641f64f66538200341a923f02178b9 SHA512 3fae447e08178a76ef01975982121c5cb487116c3c4e5d92722c0c89bfb73b4df06148a4c5a79f9dfb6acc3a3793c08896128f06be721e2d7feb626e86c3a071
 EBUILD phpspec-prophecy-1.8.0.ebuild 809 BLAKE2B 26753f262d4b9005ef9e5ee2fc0888687023aad9cb7608d22e713270755ee1214f46ae2535e04d2627e10c534b0aacbc1b904f48c6740fa678d2900c9978cd47 SHA512 9484b2eb57540008f72f7b653c6b953ba706ca83b87e041df7f476ed3529fbfbe8c5b8d15fb8b27d7917116c6060df75aa2307bb36756e7c3e5f6013d59bd705
 EBUILD phpspec-prophecy-1.9.0.ebuild 809 BLAKE2B 26753f262d4b9005ef9e5ee2fc0888687023aad9cb7608d22e713270755ee1214f46ae2535e04d2627e10c534b0aacbc1b904f48c6740fa678d2900c9978cd47 SHA512 9484b2eb57540008f72f7b653c6b953ba706ca83b87e041df7f476ed3529fbfbe8c5b8d15fb8b27d7917116c6060df75aa2307bb36756e7c3e5f6013d59bd705
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.14.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.14.0.ebuild
new file mode 100644
index 000000000000..92ee8e7fe54c
--- /dev/null
+++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.14.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN="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/theseer-Autoload/Manifest b/dev-php/theseer-Autoload/Manifest
index ad9469b97b09..8f4654893d00 100644
--- a/dev-php/theseer-Autoload/Manifest
+++ b/dev-php/theseer-Autoload/Manifest
@@ -4,6 +4,6 @@ AUX fedora2.php.tpl 241 BLAKE2B c7e7dce85f2b7c2f33f9760e7f4c0440fff18ad9679045a7
 AUX theseer-Autoload-1.26.0-autoload.php.patch 273 BLAKE2B 02ef287623dded15446172c54344be51bca15723f9de69aee7c75b4b2b6c1c4fef3d1d3df84bcf2da892c9708e5c5916933648e4cf4421ff62580af594ce9007 SHA512 8f8e6d278b2596dee872c14bc794a21d012f29a2e2cf0b56669796e97ceabbb0efade766492b247817f7c6f77b85a12d1d583717914016501b4007659f813abe
 DIST theseer-Autoload-1.26.0.tar.gz 43119 BLAKE2B 7b2413bc2fb281472cee03010c175aae1c8304ab0629c31f09e11497bd6f46d58bae8625da610f5a513b19fc8aafc45c35be7271ba13188466f576e7b4a7392f SHA512 c8fcb3ad39c140517d695c44e6dea3797ea0135ff64246478e55cbf167e4b9fbb3e5027732c201f66b404039a313952c7125f13fdeb1cd96633dbccfdda6f143
 DIST theseer-Autoload-1.26.3.tar.gz 43810 BLAKE2B b2d7fe33b9663a3c324656abe63e4ae89533b773007362b546cb9401de0a8fd8f0c00f8f385c4a45c39be675d062cf5dd5a739972fc12611331065f244515d63 SHA512 00a6fbf86cc0f5958c5d0d049af0370ef510fe21a05d7dcbeb1b0771f979ea6638f5db74d913c56b10d9212a68b5d918cdfefec241b1383faf0e97b4305895bd
-EBUILD theseer-Autoload-1.26.0-r1.ebuild 1874 BLAKE2B 3714b3b8bff2f1c0b9398bdc99a2ad428c0eff559cebc36ec9c9ee61aa6428fd6d3b06b74478dfbc694a2079cd0fc790bb1202a8cfe8bf932fe56851edef5ae5 SHA512 b418754870a0e68f22c7f05644331c6303b065a183342867a6acbcd0ce5abfdc75045d443dce98e31af9b3bd5ac80ad2ffe4aaaea8f4fbe126583bf1c13a16b1
-EBUILD theseer-Autoload-1.26.3.ebuild 1879 BLAKE2B e7adeb66bc17cde88c77079cba0290cefea5b74b4b211b38e846d934e22af6e3d2c16607b7b7920951da3807d61672d499386608c08d2e2fc5d3389a3024ff1c SHA512 f75e4189a179a9238dbc36035e08fbff7935aaa6fdbc7797e769fedfd18b5da8af9052b51160207b3d6fab18071c6f4f129676c4ade5b839b050ce28eb49dc9d
+EBUILD theseer-Autoload-1.26.0-r2.ebuild 1899 BLAKE2B 86b2bc050608453b82a255fe266c1ea4ae11320fa524bd0fbe7f0bfe96f06d0d277601485ab440f329f504366ccd78cd86605b63dd524512fa96cd81a60df2b0 SHA512 2995417228ae2b27c38c27b3c84fa0b99b822d9314f55e8c0931ff8239d1dfaca1752e78d23427a50878df9e2ab7658c6b65e064a5bd16df152f63c1f8fc069d
+EBUILD theseer-Autoload-1.26.3-r1.ebuild 1904 BLAKE2B 1bb125f2c6ccaec288fb2ca3becd3b774260c8ac94b112893e25ed22fa8867f4ccddbf8ef1eaf9db92ec2623957fa73ae3c92d95360b276ba971b0cb68ad629c SHA512 d1e12bccf23695a7f2573ae3475291cb46998117322249df88544643f8d36e8ca3bc1e3fc23de66be3655d79cd1d01145cd61ff7e046419f3db6f569434e08be
 MISC metadata.xml 345 BLAKE2B e2e404685b07fc6ab5b46ec994c6ebc2abc49478222497f1597694155a82cd95a9178a7d413c19116811fc867b8374559ccf6e8a40d66b8084e487fa5fa66bc4 SHA512 78871e1e73ac6750b628955d2a006663def9b50e79faedc98f1dd4c557d3f16d866278de861ebe727c1f080e510730b909fd0db0948f374401abed7065f44358
diff --git a/dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r1.ebuild b/dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r2.ebuild
index 0a9d2dbf7b22..e93e6a8a10b0 100644
--- a/dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r1.ebuild
+++ b/dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r2.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-CDEPEND="dev-lang/php:*[cli]
+CDEPEND="dev-lang/php:*[cli,fileinfo(-),tokenizer(-)]
 	>=dev-php/theseer-DirectoryScanner-1.3
 	<dev-php/theseer-DirectoryScanner-2
 	>=dev-php/zetacomponents-Base-1.8
diff --git a/dev-php/theseer-Autoload/theseer-Autoload-1.26.3.ebuild b/dev-php/theseer-Autoload/theseer-Autoload-1.26.3-r1.ebuild
index f8aad573f6e7..9726fe6bcc73 100644
--- a/dev-php/theseer-Autoload/theseer-Autoload-1.26.3.ebuild
+++ b/dev-php/theseer-Autoload/theseer-Autoload-1.26.3-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-CDEPEND="dev-lang/php:*[cli]
+CDEPEND="dev-lang/php:*[cli,fileinfo(-),tokenizer(-)]
 	>=dev-php/theseer-DirectoryScanner-1.3
 	<dev-php/theseer-DirectoryScanner-2
 	>=dev-php/zetacomponents-Base-1.8
diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest
index b38cc36d541b..c3c21c8703d0 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -5,9 +5,11 @@ DIST xdebug-2.9.8.tar.gz 438295 BLAKE2B 8645052faceb354817ddb448f46af5b849507d31
 DIST xdebug-3.0.2.tar.gz 435761 BLAKE2B 0476d29b3a960d83fd0818098a3d076f48f4d67057a2b6ec79571b011a9f364b18d3319771ad18e7145aa0f0f45fab7ed13d814b863731abe1721aafa8b59408 SHA512 723e00885a49a5626870cc4cb0f7fd49a3173c8d4e9b4022009430fdeaa1b152828de18e6e7fa709be8bb11989c89dc2d9940de9cc3d592174b5dafbc3d2c52d
 DIST xdebug-3.0.3.tar.gz 437261 BLAKE2B 7ccfa8acbbe8b40eb086c9d4f47d363ec52850f5b0b91480bebfa416d7b88edf20deb6ee5fb5514dd1885f7a5b77c4b18caecf958d7dcf463c44c259d0fe2b89 SHA512 2ea5c6e2d6481aeeb5b2d8e39f5c5686d9b7480aea0c159f3da6e830700594b24129c1c4242ff8413b52aa2ed0ea872bf72a17fe23facb69c1cae75a917bde5d
 DIST xdebug-3.0.4.tar.gz 438559 BLAKE2B 0b4dc4a014f2459691bf43bb76d70a4080a6191b5f6cf4998751e73cdfcbecb7a6274e6f398476a2c68d014ddb25662e08e45b68fbc73c9b38c79c94b0682124 SHA512 f7f935903adb18f0920c919c3e5c923b70667dd82772bef7ae73fe40441ad1cb73f030aa206046720d4bfcf8b33f56d454cbb5f65dbdc275b7c1fd1907ff4ddb
+DIST xdebug-3.1.1.tar.gz 468120 BLAKE2B 038774612158c2c9b406e29dd70e2a3e182ce121bc92036eeb3362be0ba513a223cb2da41bdfe914d6861ae9d94ff33c5301cc23725ee771f47876c8095ae0b8 SHA512 b91bca3bac184723b3f6dc0c5db012f2ec0895ed55cd4ff83f73d35462b9cea654476c848f7d61559a4bd8661ce335fc71a45a7cab1165f4197d265e31eccc71
 EBUILD xdebug-2.9.6.ebuild 1194 BLAKE2B 3bc713d7a87b093287f00a41372c72c0245d7a8db887c90110eb047df2a1511d0aa313623c289839668fbc8d79e9a53be4d90ef3de02e8a0b087dcecfd1d066b SHA512 ca1870abca6bf2f68ee42cbd81db5eb65cf91d2fde533f1dd7eb14b5067f830b134716115629270d415e8ec5d0a0653a175a40f36c6f37a3a9ea9e6ad1c8215d
 EBUILD xdebug-2.9.8.ebuild 1198 BLAKE2B c248c825f3437ff09276529712c5baac9d2e8067842cdab6c62779939c9accc53d18e5bd6b650a6a7df98b3fff633686d89a276e001fce3fee45e35d77353d33 SHA512 ea107d25c3d47c2f1b8f62a689d7d796ef7c76b7301f991f3162770a5a4cd9232e392234e9c21342a1aac3a4d2bf3aaa912d58df132ca09ed60d9a1da59fd7f3
 EBUILD xdebug-3.0.2-r1.ebuild 1539 BLAKE2B af6fa2bcce4eb467ce2d27f32d30ab0c6b064869d4dc2ba1409fd6d40fc0cbcf0cffe4679b174f93eb8a0ac657d518ae14f0acd66830d3d9c9996c6d8976ebf3 SHA512 7ba76f4089b5955252daa240ba838340d2d7eefa6223380d7b8df5d4af0e3a38732908517e520da516b63fc68b46d0f845b71d788c617435d575099b9201e2ea
 EBUILD xdebug-3.0.3.ebuild 1539 BLAKE2B af6fa2bcce4eb467ce2d27f32d30ab0c6b064869d4dc2ba1409fd6d40fc0cbcf0cffe4679b174f93eb8a0ac657d518ae14f0acd66830d3d9c9996c6d8976ebf3 SHA512 7ba76f4089b5955252daa240ba838340d2d7eefa6223380d7b8df5d4af0e3a38732908517e520da516b63fc68b46d0f845b71d788c617435d575099b9201e2ea
 EBUILD xdebug-3.0.4.ebuild 1539 BLAKE2B af6fa2bcce4eb467ce2d27f32d30ab0c6b064869d4dc2ba1409fd6d40fc0cbcf0cffe4679b174f93eb8a0ac657d518ae14f0acd66830d3d9c9996c6d8976ebf3 SHA512 7ba76f4089b5955252daa240ba838340d2d7eefa6223380d7b8df5d4af0e3a38732908517e520da516b63fc68b46d0f845b71d788c617435d575099b9201e2ea
+EBUILD xdebug-3.1.1.ebuild 1546 BLAKE2B d56bc1642335887588ce55e0fe95bc3dce1ca6855cc35358013dac6044c99b27748d4d7e01aa3f537abac424064b7479fed7c73268e5aeba384d6ad277d31915 SHA512 7ddf2d464b82f101f482802f4c2e1e1f37b8ad5598107ae74b790681f4522e32b91cf37b4ee562eac4f0e43c94491138d10f60b468cdc550e1e9495a8ac822a1
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/xdebug/xdebug-3.1.1.ebuild b/dev-php/xdebug/xdebug-3.1.1.ebuild
new file mode 100644
index 000000000000..00bf4b8a058b
--- /dev/null
+++ b/dev-php/xdebug/xdebug-3.1.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PHP_EXT_NAME="xdebug"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="yes"
+PHP_EXT_INIFILE="3.0-xdebug.ini"
+
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
+PHP_EXT_NEEDED_USE="-threads(-)"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="A PHP debugging and profiling extension"
+HOMEPAGE="https://xdebug.org/"
+# Using tarball from GitHub for tests
+#SRC_URI="https://pecl.php.net/get/${PN}-${MY_PV}.tgz"
+SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE=""
+
+# Tests are known to fail
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+DOCS=( README.rst CREDITS )
+PHP_EXT_ECONF_ARGS=()
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		TEST_PHP_EXECUTABLE="${PHPCLI}" \
+		TEST_PHP_CGI_EXECUTABLE="${PHPCGI}" \
+		TEST_PHPDBG_EXECUTABLE="${PHPCLI}dbg" \
+		 "${PHPCLI}" run-xdebug-tests.php
+	done
+}
+
+pkg_postinst() {
+	ewarn "We have set xdebug.mode to off, as xdebug can be"
+	ewarn "installed as a dependency, and not all users will want xdebug to be"
+	ewarn "enabled by default. If you want to enable it, you should edit the"
+	ewarn "ini file and set xdebug.mode to one or more modes e.g. develop,debug,trace"
+	elog ""
+	elog "The 3.0 major release changes many options."
+	elog "Review https://xdebug.org/docs/upgrade_guide for differences from 2.x"
+}
diff --git a/dev-php/xhprof/Manifest b/dev-php/xhprof/Manifest
index b3976bfe7df5..6add44540cb0 100644
--- a/dev-php/xhprof/Manifest
+++ b/dev-php/xhprof/Manifest
@@ -1,5 +1,7 @@
 DIST xhprof-2.1.4.tgz 841444 BLAKE2B 33be85d55f2636af5664aeb017ccaab6ad03962d44b3143c0eb9d9f9cc0fa74048fbca6beae89d02ed47db8ffe1ea77df1f6a41aa62fbc90fea2c52c467a422d SHA512 8777d29c16bce9e7698cf37c7dd631e951a018fa63ab5a4ab0df8e7621643e7fb905cd9bc189b238d76e32408a43f522bbab455caab6b89f7b6c26590b2733a3
 DIST xhprof-2.2.3.tgz 842543 BLAKE2B 5940a5ed8edc334ae2dc09d4621ed7fb4b8b56de6f07dc49e4a84ced33689f242f11ac89dced670f7b54d35fe8c9840fea09e55340174c399fae263760ca35ac SHA512 000468a7fa2a0af25004f0ffd59a8ab111a5cfa4cff275291fcbc54d3283fbf4a904b4aaeb38c2a8c7c81924bc31d9328ccf9fb7de24e20c224e014ed942efaf
+DIST xhprof-2.3.5.tgz 842658 BLAKE2B 4392b521e8b4c10dc745bbd670c351231680e753251b1d1e3c7048e17fa5a88a6c79da39f3c50b8642ca0c1a5b9658e4dafe6ed4af3dc97c71265f021438fda9 SHA512 50ae6fb8d63ac8354b7887daecd1882f33e616cd1ef165b54d51f26fa93d2827f621e89d0d583979c453af5d66a83ddcbf0eb2d462df74ebb422294e601268f4
 EBUILD xhprof-2.1.4.ebuild 376 BLAKE2B f682e1a892a38da3f476f6175a2c2224d7b0e03a1350de4e782a6159b828fe791fd66e6c30a9f1fa957062c6d6fcca06d16017823786ae7ff221f60ad3a3ac07 SHA512 8798ba51484b6aa0cbbd977305155f67697788334e2b13939141e83c79f59c1149a80ac510be3177f5fa15f4de20141e856b8cf4cc8e7667a9ef2aa1900200f6
 EBUILD xhprof-2.2.3.ebuild 383 BLAKE2B dab9fe1621ed7d9acff750e74013a49f69e4b93189c1fa91f644e946d5c17d17ac9bda5f5f2071b7e230a8ad16734e55c19dfdff29214453792ca30d365257dc SHA512 d22827c910a517930484fdc00f64dfdc97b26cae1e0930dc1e4de20c8e64b41dfe661386b219e8c58f8b6125f26227f63e6ab9ffbe9be0ce8adc5e28570af865
+EBUILD xhprof-2.3.5.ebuild 390 BLAKE2B a1fa3102cfd3d13e831173903006a769d2f74bad91293107c16b4667f9f406f65b7b968d9379f56778d77b706c6370f7f5127e051f4443d1676340b58034a17c SHA512 ec44c3114389a063e10d6ce8fddc1c9357866a7bd7ad312008bc552ca55a81e336f3b31db291a42b18bcc5d6d941bc308a5d6262a81979c2f77b9c28319f591e
 MISC metadata.xml 321 BLAKE2B bd5867e37a58414df4f5990d3e88fb87819319e401eb37630e181195417e90b43a4c793fa49b76c280783991b4293431cc9d9aa1d10314df21f33015b63f0d6d SHA512 8abd9b96fd0731bb2b70817539c1785ed4c4fc34f03b8f4f5822bd4e75a68d4b4bdbdd9bb0eb54bc0d9ef616edd01f80b3c1f2954d1f096baf2b66255136e25f
diff --git a/dev-php/xhprof/xhprof-2.3.5.ebuild b/dev-php/xhprof/xhprof-2.3.5.ebuild
new file mode 100644
index 000000000000..e7f6bda6ad82
--- /dev/null
+++ b/dev-php/xhprof/xhprof-2.3.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_S="${S}/extension"
+PHP_EXT_ECONF_ARGS=""
+USE_PHP="php7-2 php7-3 php7-4 php8-0 php8-1"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://pecl.php.net/package/xhprof"
+DESCRIPTION="A Hierarchical Profiler for PHP"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
diff --git a/dev-php/zetacomponents-Base/Manifest b/dev-php/zetacomponents-Base/Manifest
index 9c4b927859e4..8cc328b7b06b 100644
--- a/dev-php/zetacomponents-Base/Manifest
+++ b/dev-php/zetacomponents-Base/Manifest
@@ -1,4 +1,6 @@
 AUX autoload.php 2999 BLAKE2B 7e178de212e6f26e621509ced47998bdf501df0a7ece33f98b943c5bfcc4ca32a886e0a09cb83975f83148a29736be50298281f302094f6fb32c91a695c97d76 SHA512 70f2f358fffd4b9d7a9af07badf2e000974ddbde9230797ef4cc955a73326c665e947278ebf3967d81b93c97805293ab230aea7aa3bb98a56d7a3c34cf20be94
 DIST zetacomponents-Base-1.9.1.tar.gz 252350 BLAKE2B cc0d82a107fc1190b57b03ce3a594d9ffa5b3a2627cf30d7d31a1018005a8400917cf7bbd1dfeb23f46d118ae56083e147d148b3bbdba5dfea8fde0a8bcf0c46 SHA512 dd56f123c8ed3b8c0116b878120ba7763e402b8364ba404305a9ab483b1c5a341df994517f160c8a959005ab9b75a5a7af74d08b367daa3fd8f852ba4ede5e05
+DIST zetacomponents-Base-1.9.3.tar.gz 253144 BLAKE2B 5e8e5188e67d06da2a4ed0d9cd1df86d15740390109f98028a71cf0aa0cbfaab1a47007095faf7ba8c7fd9b6bb3daae7b3d6fae76cae8b82751b3d67b3680614 SHA512 5718095cbfe657c08b9adf71e4cada49e2edf8518601e235070ac8fb8fc5793bc4ba8a0cb1a4202210fc23884960d06f502288a94cd624c96a53e2fcf395d492
 EBUILD zetacomponents-Base-1.9.1.ebuild 591 BLAKE2B 46742e05fa84bad59fd2634b0c96a646f129a35c7977d4ab8c69269e395106fef81efde3805216364d807a464dd6c5fd4b5e04cb21e77f1ebd2f9801aaa04245 SHA512 b0122d1d9418b572176cf818e4fd41668b54300bc9db66305d4dbe0d5036cd2fbb2c3c7355ae9f862717c4cf3cbdcabc2faeef98fa66c88e4e0a460ae7dfbe58
+EBUILD zetacomponents-Base-1.9.3.ebuild 597 BLAKE2B c3d480e9e300fc01fb19bfe98e72bca9212090956898dad5ca96cf7220e68d3ecb073c907480e5d08aee748c96320129b6c43734e3aa81863f263cc19d378d2e SHA512 8992ed2a572611c301d5442bab26f2bd6e6ec7fec996af4bb8a6a3a78fe7302b4f3108890ef8cc1225787125d582afafe5d51cc080b358a2491335a0fbb12508
 MISC metadata.xml 348 BLAKE2B 602880b1ca0ed2350af0df820eb034e3e731295c6a35fbf111ea4ca7506b93f581560c866a157c977c4202f0ebd35afd0809fc7add1455d6614bc2f7d37d3f03 SHA512 ae024be08f42891568ebf15f3369bd2578a4a1a53d1419cf321b56413bbdbb1efa754baf5c027ffdaa3f2da00e872f1d665777d2624a33a64546719b63232e6e
diff --git a/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.3.ebuild b/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.3.ebuild
new file mode 100644
index 000000000000..03ece24351ac
--- /dev/null
+++ b/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="Base"
+
+DESCRIPTION="Base package for any Zeta component"
+HOMEPAGE="https://github.com/zetacomponents/Base"
+SRC_URI="https://github.com/zetacomponents/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="dev-lang/php:*"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	insinto /usr/share/php/ezc/${MY_PN}
+	doins -r src/*
+	doins "${FILESDIR}"/autoload.php
+
+	einstalldocs
+}