gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /dev-php
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
120 files changed, 572 insertions, 1885 deletions
diff --git a/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild b/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild
deleted file mode 100644
index db40dc234cb3..000000000000
--- a/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_PEAR_DOMAIN="pear.phpunit.de"
-PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
-PHP_PEAR_PKG_NAME="File_Iterator"
-inherit php-pear-r2
-
-DESCRIPTION="FilterIterator implementation that filters files based on a list of suffixes"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE=""
-HOMEPAGE="https://github.com/sebastianbergmann/php-file-iterator
-	https://phpunit.de"
-SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz"
-DOCS=( ChangeLog.markdown README.markdown )
diff --git a/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild b/dev-php/File_Iterator/File_Iterator-3.0.6.ebuild
index 9068f6072639..dfb734499d3e 100644
--- a/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild
+++ b/dev-php/File_Iterator/File_Iterator-3.0.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 MY_PN="php-file-iterator"
 
@@ -18,12 +18,12 @@ IUSE=""
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 RDEPEND="dev-php/fedora-autoloader
-	>=dev-lang/php-5.6:*"
+	>=dev-lang/php-7.3:*"
 
 src_install() {
 	insinto /usr/share/php/File/Iterator
 	doins -r src/*
-	doins "${FILESDIR}/autoload.php"
+	newins "${FILESDIR}/autoload-2.0.2.php" autoload.php
 }
 
 pkg_postinst() {
diff --git a/dev-php/File_Iterator/Manifest b/dev-php/File_Iterator/Manifest
index db1e2b51cce6..e1bd46f8635f 100644
--- a/dev-php/File_Iterator/Manifest
+++ b/dev-php/File_Iterator/Manifest
@@ -1,13 +1,9 @@
 AUX autoload-2.0.2.php 441 BLAKE2B a85d720cd6dc6e4ea769cd815b8be0e8a0208a532bc42eebcb34c73b037d74a99e5cc97777cf250a7656435a48bc0c91f6178c7d9868376992e43482ed579f5d SHA512 2bbdd8dc9df3ab847c736780be6cf878d0e5e912549ea64516c9efed2edc8f38841ddcf621727b4d464516f4cecc099752371b1b424adf7bb621de0e99405c6f
 AUX autoload.php 380 BLAKE2B c033c6550c454dcfffd86c122284a2bdbfc4c5e54087aa443f3f27857650eb42cc766e85c49792e0c8c33d6f60d7b1aa52881481ebf7c8b37751aeb037efc82b SHA512 0e36085e8e2bc4f6d0900392a35cba6a91940d31604bb7f6ce0275162d28b3e2d54084c0b6dc0d270f0d8812fbc9feff6bd43851701ff7419aa6b02be75cb466
-AUX channel.xml 804 BLAKE2B d6a965a41a220f07e3a0d206bc3359e2649b55d186e7975726c1b0ad344e063ca1fa98cde446078346384e946f6b31f9caaf49cf7c82b4568f697a1ba0d2e633 SHA512 44f5d66b967cff45b87795609e6dd14443a4ce5ae8f3430a281429ba21e834bc3feb7f539fb6cd8349017eb301054a33dfcd7062d58f9fd0c1c7cd1892580092
-DIST File_Iterator-1.3.4.tgz 5199 BLAKE2B 75da70ad638230dd231947e3af26c2570eff367328d2e541fb1228ba531c0f249c931a9185f977dce9e17846e1e9b8b1f9f8d21219291e637b2eaf7805dcf360 SHA512 7117e0e56a9bc533d9f93556366a8026d1e5a9a3894c05551adef6c1e6cd556c1ebf6b96bd98279cb92077b3d8f8d7b7e42f446b39895850e573d0ec511392be
 DIST File_Iterator-1.4.2.tar.gz 4141 BLAKE2B 4c8d9847fa198d444571acdf777020b76e87e09506038c7d7ce732b97c149149bcf22dc25d0af36f041b7930673b05f940df8211c29829e0fed2b3dcfae0ba05 SHA512 295943681853c858e3e1c336c030338c61a74169bd2a619da6fca8c43611e587c6f626fa92799d614bcb0a1f86bbb39895b20f2a389107cedb9660a7e792a243
-DIST File_Iterator-1.4.3.tar.gz 4140 BLAKE2B 89274c6f9b561dbc732d0b81f06b7c34d267ea31d1deb5977eaa16852d87442183221ed6789fd5e09b80ef96811df2ff8ef5da5c764703f5e7a2d5289f582527 SHA512 cea906d6028d9c2dbbb5486198adbecbca87f8b4dcbe12f72b9732ac29cf8eb868a23af7a5bcf2de55e0040a077ab55b016e773d5145f987f7e3f9671ad3ea28
 DIST File_Iterator-2.0.2.tar.gz 7239 BLAKE2B af2cc29d087bd597b10fd1d22a35c906deca70eb79bbcbb52ca3d8c408cbe8887233b69ba7f9c37fe639ff7d544d1109609a0b2e59c5f49bb286aee3e3f3f2d1 SHA512 2f1acee0358e03bd831d0228dfd2fc65848f7105e0dabb6cf81890d8549e3f39037a01bed2357316a27bb863955c1f51d56770c0ea733f5389d8e47f30050687
-EBUILD File_Iterator-1.3.4.ebuild 578 BLAKE2B 2e72923b3a63df3f4e039604c9dc5c5563bb853db1ac61cbac2ad677691eda566544e8c6fbca18871a1d4756926a2dfff6bb521f23d49a06c3af071d1560e135 SHA512 8498fda92508fc0ffb652b55618b6e57496546246cb4a4374f500aa7f2cf123af5dc3b43e018e4a2932bac606a6fca232c37408f374c161e15eb75564cdc4fa0
+DIST File_Iterator-3.0.6.tar.gz 5204 BLAKE2B 61123678e440f8aa68b2821e976bf615ea0e70157fc596fc566b7f28daae9419be8f75df13ec8e218200cdfecea146285995e6f1d3936a58593d6f64f38c0bdc SHA512 cc0faf12e443c9b9b6577dcc5b5f51184f0fecde010aadbcf47ce638d1d1135a5ba731221e8637791e94018458baed315112cd20fc86ded6485b59a7801f6d7d
 EBUILD File_Iterator-1.4.2.ebuild 853 BLAKE2B 96a0e61931c9f49d87fa8e0330c00ab15661775e16fea601d7c5516805be3db5eee12b781d394eb6b1839a31b8c3fb8792c7a5f19e21c7c50a2f24d47503af6e SHA512 cb3d3a4ad8f45a11b08edce5bf0b04505c595e0562c15e8d0230ee2e913d5eb09e0cdd09aafaae25aa16da5562090ad323a11088eef957ce0e0cb7a3738420db
-EBUILD File_Iterator-1.4.3.ebuild 859 BLAKE2B e193a99facde34aea54021bea273ecc017de599f1bae6d9e7d9ebcd20b5f62d48c39057512b589d93f201d33c7dd799ffa8fcf6e794d9a3fb7549f710c51c747 SHA512 418129ad6526f6f8d8e6fa141318bda75331cc4ea0dd9d7a0e4fbf2bbf19b6a59eaee4ed528df973ad306c8a6124a0dcc1fac43270c38561bfdb1278e2413d2e
 EBUILD File_Iterator-2.0.2-r1.ebuild 873 BLAKE2B 43b8b4e6849bda35cd749acdfa4e7d379ed47fb2b293a9bdb0137beedd47cfbd78cabaf22b30eb860ab882817c63ed750e40f3791bf394a0cd22a55b3d09aaa2 SHA512 4798ea266ab769077672a9aebb243113a9fdf2d8a77df1eb365da3e229855e44a8464261150f5aa9506ce3ac0103dd82d3f7696c77874fc9a985d6c5bac81850
-EBUILD File_Iterator-2.0.2.ebuild 859 BLAKE2B d8af9f3839dd9c376ad5104fc5f6921d4091955e8e6c25048dd77d891a87b630f37bf55935c518f9a219bdce3f94a1bc982a89de86b4ed930f580f1d7fe8fdcc SHA512 e4756380daf95c479eebc2a8ec43d4e3e60f1df8e32fb20573cc7a9442e101d198cadaaaf4c1d841c7e55dc7d51c14f5e589bb606423c9ffc5085763ef267907
+EBUILD File_Iterator-3.0.6.ebuild 879 BLAKE2B 4b448cebb9655949c71c06aab6b33678a5e06e7c1b7a56fe5f5bab8060430fd989fd8eeb85986688fd62f8d00e3665b28cc11f0605c3bcd869e15ebac2061729 SHA512 286b34f575ebf670a09f34036f9f12cae8a7ac055b93b554aa978573ab7a3ce9fea6ab7d2ed35a324462b76642c6024cf9f01fa375d8b022daece07f6485f260
 MISC metadata.xml 375 BLAKE2B 9773258a7b233624093c64e3f87a699de5474fbabe1db33687017e1377e84caf250b340c9cfd203f0d0b9398700c4d876be63f53175814451b9b882053e62b31 SHA512 9e81065b95a49ad20c9e277b7024e52a8fff3765dbacaf00e1c29e872a3818d8fd2b46b0ffbbae4f52091caf2b1f9581eb3629bb1ddc64ed816a1b3ab9d9fbec
diff --git a/dev-php/File_Iterator/files/channel.xml b/dev-php/File_Iterator/files/channel.xml
deleted file mode 100644
index 91bb6786f543..000000000000
--- a/dev-php/File_Iterator/files/channel.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
-    <name>pear.phpunit.de</name>
-    <summary>PHPUnit PEAR Channel</summary>
-    <suggestedalias>phpunit</suggestedalias>
-    <servers>
-        <primary>
-            <rest>
-                <baseurl type="REST1.0">http://pear.phpunit.de/rest/</baseurl>
-                <baseurl type="REST1.1">http://pear.phpunit.de/rest/</baseurl>
-                <baseurl type="REST1.2">http://pear.phpunit.de/rest/</baseurl>
-                <baseurl type="REST1.3">http://pear.phpunit.de/rest/</baseurl>
-            </rest>
-        </primary>
-    </servers>
-</channel>
-\ No newline at end of file
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 5b3bb9b7a7e6..220da5fb96dc 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Crypt_GPG/Manifest b/dev-php/PEAR-Crypt_GPG/Manifest
index 084f2600442b..80baef4a16b4 100644
--- a/dev-php/PEAR-Crypt_GPG/Manifest
+++ b/dev-php/PEAR-Crypt_GPG/Manifest
@@ -1,13 +1,6 @@
-AUX 1.6.4-fix-tests.patch 1357 BLAKE2B 604ed62dc9823491ccca6870586537cdc102f2c3b866f1913b78895603f9b4e60a18a3e7da13500c58131d0a4b6677fe6932e0ce469875cc01b8948657df603c SHA512 7fa341bb55c98ac2364834c90269ce7a44279f0d0612ae2b09994b94f2a6066f8ea55447f228fbf3d107d97fa3093002a2dd9abd87e16afcd2c7fc5e897f1a20
 AUX fix-unit-tests-with-new-gpg.patch 2090 BLAKE2B 7cc3b79bfd29244eec6e0152130d33d64ff99ddb4da9508affa9a06274d8b888d4e7ea38c2a8e090953b40533b19a5224f803d71199ece8dde70444959fba9eb SHA512 3b6b301d19cde1eebd411caf409dd11add712717a638f2b4d8567114cc065efdc899cb8244412da7b3438850a9bedfafe95e370705fd7439b312f4cb318f4124
 DIST Crypt_GPG-1.6.2.tgz 346709 BLAKE2B abced2fe8c909f06690c38884506ce03df4c5ef3ef460aafce65ea9405c6974f8af320fd5a07a7967b45421a9a67aa27026c28ef7eb1402ffefba527007a33ae SHA512 9d954d96b4e461c75f79ce9bc701d062e3f19671690228e6e0ce5265733ac1de9c06520f9f750348f3c37f01ccb79720574b2d2f371e69c8a25ae6e1bc18aabd
-DIST Crypt_GPG-1.6.3.tgz 346999 BLAKE2B 8402ef382a6393972a3fda7370fbd37dec19d0ebabb6b316d35783538dbc01746476977d7dc3da487876201cd678964d9572dc67a43911319b1b614004a3c909 SHA512 f1ad2560a43a1e8f5a33269bc4ae4067e19e5325fdbd8d2fc55f6cb8aad89258df45fbecedd93a21749f33024c819f07399580b1a4760f5740f26043109dc396
-DIST Crypt_GPG-1.6.4.tgz 346390 BLAKE2B 22e9e9d893f96bb3c3dc538b168a35366d2b699e92bf832370223879e90e8018cfd3b736e099807fdcc897b7569a40af66e72f011eaeb7400477053b7838409d SHA512 3eee39702abe97fc322e5976ebe8a7f7ba07bc950d22aa6636cadf38b0bd9c6c6316d7be35f21a8d0e8dfdb66a76db33121edb34736869d31ae89b03468cf470
-DIST Crypt_GPG-1.6.5.tgz 346966 BLAKE2B 5ca074b57c44d99159409b1c7ce0adcf672b59882f6f2dddf864df692243457ccd69c8018b5031dc6ab0ea0e88dba0586b8842992184be65c72100d3f34904c1 SHA512 86feeff3e698c8ce133b0481ca96a000f00801f52c128dc8cb4cfec37040494c1e7176138e9988ebf0e85206c5fe3b51f939b4d7ca6decc16a787be4f4e8f261
-DIST Crypt_GPG-1.6.6.tgz 343929 BLAKE2B 1cc5b01d5c44e614cc67e5f21298120aa44ff4b4efb933a8fdb64c02eb7f19c7299a7d53e7d032f9ab013b8d319798dec5732c382590bdb1da52998f30eab9b9 SHA512 38f721cf818972f835162b9e405efb55160276d759361e1f351645d585695f903445accf83f190f7f14f202e2bebe3c78b7ff2b8af2151c3d66bd6636f98859a
+DIST Crypt_GPG-1.6.7.tgz 343957 BLAKE2B c95346005fdd36bd97e2a0e6cd42c5a2898fb59f0a4a3d3b09bd99a409bd9c998b267ffd84ab28148e17c3f7e78e094393c3b077998b05dc2d7ddcb0ab81394b SHA512 dd629271ebbcb98df5d31313c1a6911b62964046c758e00b55377170653e9880d2edc7d0b953fd6ae441d74238c4a8e1008bf6a9195a19ff463bcc82665f14e8
 EBUILD PEAR-Crypt_GPG-1.6.2.ebuild 1174 BLAKE2B 763b350b56b5dbd7b114e36f28ea69f3f4290cf8a8278dc12d6276460ceb2ca63a19260e6a4db351928ba03352f80f43915e8aed6a84deca1d7677f37e21856c SHA512 60caa2cd7c97087a7ad80d995d1ab113913968652e1990d7df0113b97d7e0085b2a721c58c5bff581ae0291d4e7f3a5734bc7365b69edaa3a3f12b1edf0f6f85
-EBUILD PEAR-Crypt_GPG-1.6.3.ebuild 1120 BLAKE2B e91c8b18e150d98435b792ea12c84dfd171d63e7963b9b073156d1b4b49c86ce68734606211cc1340aa66ddba675456d153f3da4465f3c1c4d3b4df7949adf36 SHA512 7b8246c9ef8257bb14a3b4378b69d7dda5a022247c9f94162954be9b9f06a3173d67365387927f7a0a875b4882deaadcb5111e98b097f984739a9319dcc233a9
-EBUILD PEAR-Crypt_GPG-1.6.4.ebuild 1169 BLAKE2B 73f2ff2985933c651a3f039c421657c5639bdacf08ccb352b590a80c49b3070bfba44ab8cda1127aa330a9d6c410ba0ba4c949c7dace6ea38bd13c2f5a731f74 SHA512 909814a3e395b0b5a078d41c837da720304e24ad2340146eaefc704ea4698da5692542cad335129d791267a600ad21c4ed13302449d1d1bd18368b0e8ebe6c2d
-EBUILD PEAR-Crypt_GPG-1.6.5.ebuild 1210 BLAKE2B 188c89cfe4d6180083beb583402abb208b81337a5b70f9202d7f612667064b0306f8bea6f5ef38c9d85c86be6b6edc4fcd0f89351ee7d2af7fa74475ce01f765 SHA512 8b7c8fde04be38756222a8ad714181369af17829827777e17935cce12ac6e6c5bfa506357ccc5f155c56355edc051d9ec1dfefbbe3684eec0236225285eec96c
-EBUILD PEAR-Crypt_GPG-1.6.6.ebuild 1161 BLAKE2B ce8e94b493cdc971082007be2f317b888d9bb5d214212a85d260d412034553e0662b57b54b015d22e3f7bb8c513655671b3855e89446b1159d2010bdbae239ee SHA512 590ff32370ce986f96d0e48642960b4b3ec6130d55a677a3ede9751e22259f614692bb75609ca1183116767f30c8f81ed058384d3a5b1f2510cf9a767479fe5d
+EBUILD PEAR-Crypt_GPG-1.6.7.ebuild 1186 BLAKE2B ef5d606683e17f2b3de4f65475b3ee4a335a8b611d8e0832488e0274319e959f0dc52bf4c8923d753ef4f9d22a4c30653809f4114efe38e40324857db12b2e99 SHA512 0cfd23a459602da5e5d5a7b7615358e6425d6b3582dcd32b03718005163a4025af9701ec456704dcdeeafe0156769386a6a0505f270ff9917a0f123a54bb20db
 MISC metadata.xml 516 BLAKE2B 81fe21dff1eabdcc17fd25f7dc6445b1047fd92f150a075e193fc8f399e5af35c813752a6c5165805d0443e0e3862dceced142ad34e4dd0b5ba0f72a3617beef SHA512 10d8240e396c947c147ae289faedf0281e721f3ddc9603b4e7fdcc3e930302b539cb04ab532ad230ca7f573ed1bfcfe6e12d14fe6a737aa554aecc0a85e8ebaa
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild
deleted file mode 100644
index e0cea4ce1b04..000000000000
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/PEAR-/}"
-MY_PV="${PV/_/}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="PHP interface to the GNU Privacy Guard (GnuPG)"
-HOMEPAGE="https://pear.php.net/package/Crypt_GPG"
-SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-crypt/gnupg
-	dev-lang/php:*[posix,unicode]
-	dev-php/PEAR-Console_CommandLine
-	dev-php/PEAR-Exception"
-BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i "s|@bin-dir@|${EPREFIX}/usr/bin|" Crypt/GPG/Engine.php || die
-	sed -i "s|@package-name@|${MY_PN}|" Crypt/GPG/PinEntry.php || die
-	sed -i "s|@data-dir@|${EPREFIX}/usr/share|" Crypt/GPG/PinEntry.php || die
-}
-
-src_install() {
-	dodoc README.md
-	dobin scripts/crypt-gpg-pinentry
-
-	insinto "/usr/share/${MY_PN}"
-	doins -r data
-
-	insinto /usr/share/php
-	doins -r Crypt
-}
-
-src_test() {
-	phpunit tests/ || die "test suite failed"
-}
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.4.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.4.ebuild
deleted file mode 100644
index 720a949b0606..000000000000
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/PEAR-/}"
-MY_PV="${PV/_/}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="PHP interface to the GNU Privacy Guard (GnuPG)"
-HOMEPAGE="https://pear.php.net/package/Crypt_GPG"
-SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-crypt/gnupg
-	dev-lang/php:*[posix,unicode]
-	dev-php/PEAR-Console_CommandLine
-	dev-php/PEAR-Exception"
-BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-9 )"
-
-PATCHES=( "${FILESDIR}/1.6.4-fix-tests.patch" )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i "s|@bin-dir@|${EPREFIX}/usr/bin|" Crypt/GPG/Engine.php || die
-	sed -i "s|@package-name@|${MY_PN}|" Crypt/GPG/PinEntry.php || die
-	sed -i "s|@data-dir@|${EPREFIX}/usr/share|" Crypt/GPG/PinEntry.php || die
-}
-
-src_install() {
-	dodoc README.md
-	dobin scripts/crypt-gpg-pinentry
-
-	insinto "/usr/share/${MY_PN}"
-	doins -r data
-
-	insinto /usr/share/php
-	doins -r Crypt
-}
-
-src_test() {
-	phpunit tests/ || die "test suite failed"
-}
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.5.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.5.ebuild
deleted file mode 100644
index 2574cb9fb2d9..000000000000
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/PEAR-/}"
-MY_PV="${PV/_/}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="PHP interface to the GNU Privacy Guard (GnuPG)"
-HOMEPAGE="https://pear.php.net/package/Crypt_GPG"
-SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-crypt/gnupg
-	dev-lang/php:*[posix,unicode]
-	dev-php/PEAR-Console_CommandLine
-	dev-php/PEAR-Exception"
-BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-9 )"
-
-PATCHES=( "${FILESDIR}/1.6.4-fix-tests.patch" )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	sed -i "s|@bin-dir@|${EPREFIX}/usr/bin|" Crypt/GPG/Engine.php || die
-	sed -i "s|@package-name@|${MY_PN}|" Crypt/GPG/PinEntry.php || die
-	sed -i "s|@data-dir@|${EPREFIX}/usr/share|" Crypt/GPG/PinEntry.php || die
-}
-
-src_test() {
-	local -x GNUPGHOME="${HOME}"
-	phpunit --verbose tests/ || die "test suite failed"
-}
-
-src_install() {
-	dodoc README.md
-	dobin scripts/crypt-gpg-pinentry
-
-	insinto "/usr/share/${MY_PN}"
-	doins -r data
-
-	insinto /usr/share/php
-	doins -r Crypt
-}
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.6.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.7.ebuild
index 0315abb14ede..a3a112cc6615 100644
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.6.ebuild
+++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PN="${PN/PEAR-/}"
 MY_PV="${PV/_/}"
@@ -17,7 +17,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="app-crypt/gnupg
-	dev-lang/php:*[posix,unicode]
+	dev-lang/php:*[posix(-),unicode(-)]
 	dev-php/PEAR-Console_CommandLine
 	dev-php/PEAR-Exception"
 BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-9 )"
@@ -33,8 +33,8 @@ src_prepare() {
 }
 
 src_test() {
-	local -x GNUPGHOME="${HOME}"
-	phpunit --verbose tests/ || die "test suite failed"
+	local -x GNUPGHOME="${T}"
+	phpunit --verbose --do-not-cache-result tests/ || die "test suite failed"
 }
 
 src_install() {
diff --git a/dev-php/PEAR-Crypt_GPG/files/1.6.4-fix-tests.patch b/dev-php/PEAR-Crypt_GPG/files/1.6.4-fix-tests.patch
deleted file mode 100644
index e4fb835cc34f..000000000000
--- a/dev-php/PEAR-Crypt_GPG/files/1.6.4-fix-tests.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -uarN a/tests/ImportKeyTest.php b/tests/ImportKeyTest.php
---- a/tests/ImportKeyTest.php	2020-03-22 08:00:23.000000000 -0400
-+++ b/tests/ImportKeyTest.php	2021-02-02 14:45:16.561963089 -0500
-@@ -60,7 +60,7 @@
-     // set up
-     // {{{ setUp()
- 
--    public function setUp()
-+    public function setUp() :void
-     {
-         parent::setUp();
- 
-diff -uarN a/tests/KeyGeneratorTest.php b/tests/KeyGeneratorTest.php
---- a/tests/KeyGeneratorTest.php	2020-03-22 08:00:23.000000000 -0400
-+++ b/tests/KeyGeneratorTest.php	2021-02-02 14:42:07.117718685 -0500
-@@ -174,7 +174,7 @@
-     // }}}
-     // {{{ setUp()
- 
--    public function setUp()
-+    public function setUp() :void
-     {
-         parent::setUp();
-         $this->generator = new Crypt_GPG_KeyGenerator($this->getOptions());
-diff -uarN a/tests/TestCase.php b/tests/TestCase.php
---- a/tests/TestCase.php	2020-03-22 08:00:23.000000000 -0400
-+++ b/tests/TestCase.php	2021-02-02 14:42:36.978387716 -0500
-@@ -119,7 +119,7 @@
-     // set up
-     // {{{ setUp()
- 
--    public function setUp()
-+    public function setUp() :void
-     {
-         // load test configuration file if it exists
-         $configFilename = __DIR__ . '/config.php';
-@@ -567,7 +567,7 @@
-     // }}}
-     // {{{ tearDown()
- 
--    public function tearDown()
-+    public function tearDown() :void
-     {
-         unset($this->gpg);
- 
diff --git a/dev-php/PEAR-Mail_mimeDecode/Manifest b/dev-php/PEAR-Mail_mimeDecode/Manifest
index 8096d31ca3d6..90d12d5c3504 100644
--- a/dev-php/PEAR-Mail_mimeDecode/Manifest
+++ b/dev-php/PEAR-Mail_mimeDecode/Manifest
@@ -1,3 +1,5 @@
+AUX PEAR-Mail_mimeDecode-1.5.6-r3-php8_compat.patch 404 BLAKE2B 2bf9a4dd203f772988afcc74777e0bbdd2c945328846d83ff92d50982d51d8b10304deb9dc4105c0abdbcc26e10717cf41952f9131ae042b93db143711a64079 SHA512 4671c12d2579c72525c62aebfe2696e1af634340d02f8778e321a6eb01fa4866b922ccfa1dc60c40b5935a0c15654a05cebd5c85f211c9431bbf87c93a8523c7
 DIST Mail_mimeDecode-1.5.6.tgz 13258 BLAKE2B 7e027cf9bf2a450bde639f8c530f216cc8dfd9eab719829dedad029d98fc5c4806279d13ec3ffb5191ba23edf64ae658ca0ec8d83f116da3fafbd23d758a9f00 SHA512 fe46ff2542acd3b180981c7dae41a1979b2edb3bfa5ad716a1ff39a255c2c04d92a7d770ae6531e38f3b869173f576fba44410c8e03269510d71dce5fa345bd1
 EBUILD PEAR-Mail_mimeDecode-1.5.6-r2.ebuild 480 BLAKE2B 227f83adfd1585ab08f1b42dd86722d2bd428ebf320044654da037d98c1bd5b964b96086697555c0e4a721eedbfcec5f9b1d8b5ea0cb4cf3bbbfeb444c8e2427 SHA512 18ddcd6f6201484794d380533546fb352871f3d683bc7773c7665902e8a31d3ac7685aca5c27cb28edaacca2ec35462a2ad72252a89ae3aa1fdef3eb06ec258c
+EBUILD PEAR-Mail_mimeDecode-1.5.6-r3.ebuild 556 BLAKE2B 5832e3ed07c1c30d2a464be4b3cc84aad4663ec68d3803eb36845a7e2ae52c68b49edc3ba87044de9ff1b6cb27eae6200651966e0b2068b0e84299c8fd754527 SHA512 f926b88faf9e7d65d6e5ae8551632d2a611ca79f87f1aa25534a236864749ee57b6eca4996ce7b88eacdb1a6f111ab9c0eed38fbf5cff356b760dd8c576db8c9
 MISC metadata.xml 318 BLAKE2B 1c42fc40996e9cbf8eedbe0db55a4fc9df55e1b75fd67154199f009839ca1a291cefd40608024b7e7caae4a694d27468907c673d87d4b470fb5b61657ace2032 SHA512 19ff2178e9febd85c0642452b052421a203d335dedb58accae0e89996f81b1e2420164c06e558600cca86378850b45f8854c88d72166fd5407712b86eee411a7
diff --git a/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r3.ebuild b/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r3.ebuild
new file mode 100644
index 000000000000..56773b569a82
--- /dev/null
+++ b/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit php-pear-r2
+
+DESCRIPTION="Provides a class to decode mime messages (split from PEAR-Mail_Mime)"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-php/PEAR-Mail_Mime-1.5.2"
+DEPEND="test? ( ${RDEPEND} dev-php/PEAR-PEAR )"
+
+PATCHES=(
+	"${FILESDIR}/PEAR-Mail_mimeDecode-1.5.6-r3-php8_compat.patch"
+)
+
+src_test() {
+	pear run-tests tests || die
+}
diff --git a/dev-php/PEAR-Mail_mimeDecode/files/PEAR-Mail_mimeDecode-1.5.6-r3-php8_compat.patch b/dev-php/PEAR-Mail_mimeDecode/files/PEAR-Mail_mimeDecode-1.5.6-r3-php8_compat.patch
new file mode 100644
index 000000000000..e167af7f6a33
--- /dev/null
+++ b/dev-php/PEAR-Mail_mimeDecode/files/PEAR-Mail_mimeDecode-1.5.6-r3-php8_compat.patch
@@ -0,0 +1,12 @@
+https://pear.php.net/bugs/bug.php?id=23775
+--- a/Mail/mimeDecode.php
++++ b/Mail/mimeDecode.php
+@@ -834,7 +834,7 @@
+ 
+         // Replace encoded characters
+ 		 
+-        $cb = create_function('$matches',  ' return chr(hexdec($matches[0]));');
++        $cb = function($matches) { return chr(hexdec($matches[0])); };
+          
+         $input = preg_replace_callback( '/=([a-f0-9]{2})/i', $cb, $input);
+ 
diff --git a/dev-php/PEAR-Net_LDAP2/Manifest b/dev-php/PEAR-Net_LDAP2/Manifest
index 828f30d04be8..58a2962e013f 100644
--- a/dev-php/PEAR-Net_LDAP2/Manifest
+++ b/dev-php/PEAR-Net_LDAP2/Manifest
@@ -1,3 +1,3 @@
 DIST Net_LDAP2-2.2.0.tgz 97180 BLAKE2B d2af13f0723f0fe998ef6a1fdd83e664ff5dd16c04d793c4a0b9f233449f82cd16c3156b0f2fb47f26d693d423c9bf0f6fead695b898e89a9e16cae932cd5718 SHA512 9f2f80c31f8b05c032c3bf088e66de942a01eb8ad94037ac5a65d6c526e22ffd4efac053e07f85dcd2b729727cd0755339f8ed76aa5e77997488f27ce59637ca
-EBUILD PEAR-Net_LDAP2-2.2.0-r1.ebuild 749 BLAKE2B 58499e476862655c9a51e80a53e559736768853ec29227b4eed3077337fe938fd9719a56ed6a181b3cdb99ee7aa2d5cddbb508d7d0a8f674439261f95c852d90 SHA512 f886fa7888c791e26da066ea43d359463782b3fa260904beddb5842bbc982f373f571c4901db925897436a69d1e93dcfa1217748f5beb8778dff93ea96c53dc6
+EBUILD PEAR-Net_LDAP2-2.2.0-r1.ebuild 750 BLAKE2B 3871ae8fbafc5e0ea8e482bf228ae61abfa8465f40bdc356e893230254c94ecdeab7295dc5bc0bbec878e2ebd6e4094e868a1719b7d578af6b44871d81b939dd SHA512 c0bdd2f1f0e51896f9d6a40067c2df7c70447ea1cc4393bc56d25fdf308563cfcd0d8e9aa6522a8763fcce7543a411b2782aeb85f3b266509516963f6b5ef476
 MISC metadata.xml 312 BLAKE2B 06332504eb71caee96a50a1f0a391f3ba29ecbf3c553569bfb5bf4a1f6291ff89ad4b1be6a52f141d3b804613b6866f81af9bd96ce8cbedbf0f8106a567e291f SHA512 1b590997a30721ca08b94ceec0ee209c11403dbc03c6aaad2ffbfb3935d81f28834e44161285f81ffe37044fd392366a62117ea666238384b5f3f80e9099e5be
diff --git a/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild b/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild
index 60b4d96cea54..29466b60ce0c 100644
--- a/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild
+++ b/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MY_PN="${PN/PEAR-/}"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ppc64 sparc x86"
 DESCRIPTION="OO interface for searching and manipulating LDAP-entries"
 HOMEPAGE="https://pear.php.net/package/Net_LDAP2"
 SRC_URI="http://download.pear.php.net/package/${MY_PN}-${PV}.tgz"
diff --git a/dev-php/PHP_CodeCoverage/Manifest b/dev-php/PHP_CodeCoverage/Manifest
index 8783e8974fc0..645d2f593ccc 100644
--- a/dev-php/PHP_CodeCoverage/Manifest
+++ b/dev-php/PHP_CodeCoverage/Manifest
@@ -1,6 +1,3 @@
-AUX autoload-7.0.10.php 646 BLAKE2B 71515ed7d8eb3339e2756e8f1af7bba2e0f1cf1b0fc3e225518186dc676caa67cf03ab56188d21382765becae01f9ada57bde0b487f63bce9dcc6f6a4a7efd04 SHA512 c080167102a448c527fb5e185f87506ed225da1b36501cbfc0383af6233f63d7a031234eb21e28376def9004a339d392498ff2903c171dd80e4079d8dcb79c0b
-DIST PHP_CodeCoverage-7.0.10.tar.gz 237217 BLAKE2B bd2dc397c15a85ca020abf3d9a1dfb5f438020b577cded7942110dd8affa2d703ed40bf01ae68f38c6ae9383ba59bc9f7706af99596bce0b40cef6d2a7e92fb2 SHA512 37cda2d3687f62b5546372507954eeedd4da1c03fa9cab147b578d035046763799ca1535310ba458403094714060fe8f1327bed6951440392fee3df551be73b1
 DIST PHP_CodeCoverage-7.0.12.tar.gz 237382 BLAKE2B 3051e7e473506a66d7b4720083274f3b3a64b9f480bb1a95682608220d19be60810a899d974ea3189270c0751f8af058f2503ed83c61d92180cbb41708b07536 SHA512 b105672dc50952c3c606010389fd6fb8ebfcbb78d99d72f9a21a1eef045314b0803fdb689bba1314671d0eeab0e5ed00bf416b09ca45d291688f4c59748c2ed1
-EBUILD PHP_CodeCoverage-7.0.10-r1.ebuild 1951 BLAKE2B 3869286b1e8b8decac2ba671dfec87f6ddaeaef477dd71df4c2b8ac33a6b99681d347f8a6179f732b4a27d83e3ff29e9139b95e8ad91042eee0d2a0f05ac87c6 SHA512 b4aa6e448363d1a9a46a55e0b4e5c17ab542e0395ae8ff7236ef2dfc615912050f0b23a113fc7a02acbf691328ee4d6592f625a6bcc6575da7072c4e68910fbd
 EBUILD PHP_CodeCoverage-7.0.12.ebuild 2779 BLAKE2B 4da5a1db8e259e4bb4d81fafc27c301da2646c4357f37b3e8a83a7c569954b28db06f903e1216525f9ab8370e556addcdd8763e2133e24cbcf6870032a66c30a SHA512 6f5619a0a77154bb12fc0423b7cf5f103adcc248be5abae38206055a76258ba89cf7e67e576f027be027ce19c1776c858591a14ad31c9b83a5b3ddc33a171aaf
 MISC metadata.xml 364 BLAKE2B 14892188c3e699a7b695baba4c55b1ef3157466185e691df938f7d44ec00bb06ef59175695f770b8c7b9a19c5da89700a09f86dfc93def7dd0487e662d5722ec SHA512 2a3f526b3ad8fbcab6386ec83b452a68042278422c3ef402837f30132bed87da938a4f9415b45490c43f59a319fbc3e2a9bd63d9ddf7dd0a0264b89ea2d8f284
diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-r1.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-r1.ebuild
deleted file mode 100644
index ea217df911c2..000000000000
--- a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_PHP="php7-2 php7-3 php7-4"
-MY_PN="php-code-coverage"
-
-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"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-	>=dev-php/File_Iterator-2.0.2
-	<dev-php/File_Iterator-3.0
-	>=dev-php/Text_Template-1.2.1
-	<dev-php/Text_Template-2.0
-	>=dev-php/PHP_TokenStream-3.1.1
-	<dev-php/PHP_TokenStream-4.0
-	>=dev-php/sebastian-environment-4.2.2
-	<dev-php/sebastian-environment-5.0
-	>=dev-php/sebastian-version-2.0.1
-	<dev-php/sebastian-version-3.0
-	dev-php/sebastian-code-unit-reverse-lookup
-	<dev-php/sebastian-code-unit-reverse-lookup-2.0
-	>=dev-php/theseer-tokenizer-1.1.3
-	<dev-php/theseer-tokenizer-2.0
-	|| (
-		dev-lang/php:7.2[xml(-),xmlwriter(-)]
-		dev-lang/php:7.3[xml(-),xmlwriter(-)]
-		dev-lang/php:7.4[xml(-),xmlwriter(-)]
-	)"
-BDEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
-# Test currently do not work.  Cannot find TestCase.php
-RESTRICT="test"
-
-src_install() {
-	insinto /usr/share/php/PHP/CodeCoverage
-	doins -r src/*
-	newins "${FILESDIR}/autoload-7.0.10.php" autoload.php
-}
-
-src_test() {
-	mkdir vendor || die
-	cp "${FILESDIR}/autoload-7.0.10.php" vendor/autoload.php || die
-	sed -i 's~__DIR__~__DIR__."/../src"~' vendor/autoload.php || die
-	ln -s ../tests/TestCase.php src/TestCase.php || die
-	for target in ${USE_PHP//-/.} ; do
-		if [ -x /usr/bin/$target ] ; then
-			${target} /usr/bin/phpunit -c phpunit.xml || die
-		fi
-	done
-	rm src/TestCase.php || die
-}
-
-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/files/autoload-7.0.10.php b/dev-php/PHP_CodeCoverage/files/autoload-7.0.10.php
deleted file mode 100644
index 5d67fe9248a5..000000000000
--- a/dev-php/PHP_CodeCoverage/files/autoload-7.0.10.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/* Autoloader for dev-php/PHP_CodeCoverage */
-
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-    require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-}
-
-\Fedora\Autoloader\Autoload::addPsr4('SebastianBergmann\\CodeCoverage\\', __DIR__);
-
-\Fedora\Autoloader\Dependencies::required(array(
-	'/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',
-));
diff --git a/dev-php/Text_Template/Manifest b/dev-php/Text_Template/Manifest
index 49232b1c47c3..73f846aec2dd 100644
--- a/dev-php/Text_Template/Manifest
+++ b/dev-php/Text_Template/Manifest
@@ -1,7 +1,7 @@
+AUX autoload-2.0.4.php 575 BLAKE2B c6ce7e3258429ebd7e76fcf1450f5b91840f56b9f1018c8d453be8ee459a9dd4162a0a5ad29039372b20d572a62778edef3d7541bea13e7273018a7c0842babd SHA512 a243ccea1f5e9115d72f3a9c87da29a3ba088c0719a63c83c3e085e52194e457940a9ae2665350aa02c6401589172ecf030defe2cd4ba48012ddfca7ee514ef8
 AUX autoload.php 292 BLAKE2B 988a962d5ec1d1be315f5540d72161736bc4a527632e0645f10f206a390f51d905617de61ebea969c2d92d712499521c63be95f2eb932e871710c18edc84aa61 SHA512 944b43c989beaadfa72195e5ea3a2b6c06a996d74055afc1efcb0dc69b39df723e4e9b8bac3754fe33e499e88620882c642b5d38ce2b1940e17adca2b8ae670b
-AUX channel.xml 804 BLAKE2B d6a965a41a220f07e3a0d206bc3359e2649b55d186e7975726c1b0ad344e063ca1fa98cde446078346384e946f6b31f9caaf49cf7c82b4568f697a1ba0d2e633 SHA512 44f5d66b967cff45b87795609e6dd14443a4ce5ae8f3430a281429ba21e834bc3feb7f539fb6cd8349017eb301054a33dfcd7062d58f9fd0c1c7cd1892580092
-DIST Text_Template-1.1.1.tgz 3444 BLAKE2B 7b063aefa5d1cd8b8faf4f68c12552a50eac8d2bb0007ccde632c88325974c32734cbd76d922e0132acdf9e6cb157eb229bf7edcf2697d7f1cfc789b3f33529e SHA512 0eaf43ab8c0810f63d81ddaf62a5e81b2e244161fe79fe09bec05ef732ee07012a1c6c3711885a118cf38334131c57ac1d326e0a711eb3e6d3099c5475f80e7f
 DIST Text_Template-1.2.1.tar.gz 2561 BLAKE2B 24871781f622fbd35cc0f524a092eaed2de0988137a52f05a559e89bcdc9248807a677b164f5ef9a246848709d3bd3ae0c4cd5e738fe6cd42ff0a2ea8aba577c SHA512 d8277f24782d0897b26d2e4922c2658047c484cb86f477916d6ad6dad3e5150bfa0a1ad38c79463a3fde97702bc65edb207a481b6f6cd8346c5fcc33b4cff8ca
-EBUILD Text_Template-1.1.1.ebuild 504 BLAKE2B 80a2d58f15b1b3daa5a5b6a8064d4103cc9f249e20c05f1e9b9a8cf31ef7ceea72865446ac82d8f0aa3b82d7cc285980029dc6f55270cd2807a1cc6298e39b93 SHA512 1187b7899d014e0ecbcfb314f60f521c7206c9b306518b208ddd66b052975b6afb75086c112b0e55a645ac1c9f4ac26610f564b8698ab922d962e83aa7894474
+DIST Text_Template-2.0.4.tar.gz 3391 BLAKE2B 717547f81637272194cd93e881b51cf49f95aa4f9768cd836ad1867c5ede06991da91dc0915575c53eb0cf8a26f72cf9c2e77be4ffb755fd8d608df14e713820 SHA512 84a6b64f2ba8b89a461a44dd85b3706e210ca1bda90e7bb290ef9bd3c975378c114a44ab8442fc98994473df87d6d7e0d1a70f63878f815d3709224447a032d1
 EBUILD Text_Template-1.2.1.ebuild 755 BLAKE2B 18e71c7fe729cb72aed7c2dab880552978a1e49e0d12616af1504eb6efc1bfb51d70cd753799ecbb9b55da6d7aa2650f4dbc07143e3b6220c27806cb82245496 SHA512 5f37bc5850963eace43ba3d8c8f202af01953c21a1996585cfbee0a7d3d974d202ab3179757ac97db0a98e14a275f3d7d4438f94fb42fb96117700af97d74513
-MISC metadata.xml 340 BLAKE2B 6d800cedbdd3c5f86dd83973297a57b571e9d678adb28ad814bae714777d21301b1991a8ac37a6bc37ccec0d64da534969008e425267a4d8747457ee721a1cd0 SHA512 cbb4e55d0c6c0e4eae0c0486127988f7bd863d141c3cdc524b4af5d1f2c038679e31d1147adda811dec6af6ab14704ecdb489860f2e6a0a76465d82239edbda4
+EBUILD Text_Template-2.0.4.ebuild 781 BLAKE2B 19546f627a1c49a09c095a6dc2fc26c92d85946fc64ea2fc5028ae4e9debd03d8dd2aa16bef1eac0951c5b9cd36224c88c436d96214ffa4762a89933921f80c4 SHA512 71bffdb57e1dbc0624d25d8050c7d3138d68a51ef63280e18f1643cffd083373270423e9449d4c5bfc397aef7b5ce0ee2232b34cdcb27a4ac5d2aa9e85d59133
+MISC metadata.xml 364 BLAKE2B db1740f861d527b6552cd00605e6baeb75b0f1a25200ef865dc5ca843245b6f1e463cd7158fad69070da3b749871d0029d08709596ebb56bc6ab822a97caa73d SHA512 81617856470b1b23904e7fbc46d7c165b51da14608243caaf4c245d18fd67e0d2186f345ca85b5b1b3ef8e2a5a9f7a902aa62cc95529cef6beb9c0ac3de06d80
diff --git a/dev-php/Text_Template/Text_Template-1.1.1.ebuild b/dev-php/Text_Template/Text_Template-1.1.1.ebuild
deleted file mode 100644
index cd6dc26dbfbd..000000000000
--- a/dev-php/Text_Template/Text_Template-1.1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
-PHP_PEAR_DOMAIN="pear.phpunit.de"
-PHP_PEAR_PKG_NAME="Text_Template"
-
-inherit php-pear-r2
-
-HOMEPAGE="http://pear.phpunit.de"
-SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz"
-DESCRIPTION="Simple template engine"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE=""
-
-DEPEND=">=dev-php/pear-1.9.4"
-DOCS=( README.markdown ChangeLog.markdown )
diff --git a/dev-php/File_Iterator/File_Iterator-2.0.2.ebuild b/dev-php/Text_Template/Text_Template-2.0.4.ebuild
index 95a6e0b5b8e7..177a57dccee6 100644
--- a/dev-php/File_Iterator/File_Iterator-2.0.2.ebuild
+++ b/dev-php/Text_Template/Text_Template-2.0.4.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-MY_PN="php-file-iterator"
+MY_PN="php-text-template"
 
-DESCRIPTION="FilterIterator implementation that filters files based on criteria"
-HOMEPAGE="https://github.com/sebastianbergmann/php-file-iterator
-	https://phpunit.de"
+DESCRIPTION="A simple template engine"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
@@ -18,15 +17,15 @@ IUSE=""
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 RDEPEND="dev-php/fedora-autoloader
-	>=dev-lang/php-7.1:*"
+	>=dev-lang/php-7.3:*"
 
 src_install() {
-	insinto /usr/share/php/File/Iterator
+	insinto /usr/share/php/Text/Template
 	doins -r src/*
-	doins "${FILESDIR}/autoload.php"
+	newins "${FILESDIR}/autoload-2.0.4.php" autoload.php
 }
 
 pkg_postinst() {
-	ewarn "This library now loads via /usr/share/php/File/Iterator/autoload.php"
+	ewarn "This library now loads via /usr/share/php/Text/Template/autoload.php"
 	ewarn "Please update any scripts to require the autoloader"
 }
diff --git a/dev-php/Text_Template/files/autoload-2.0.4.php b/dev-php/Text_Template/files/autoload-2.0.4.php
new file mode 100644
index 000000000000..3ca8a33da12e
--- /dev/null
+++ b/dev-php/Text_Template/files/autoload-2.0.4.php
@@ -0,0 +1,16 @@
+<?php
+/* Autoloader for dev-php/Text_Template */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+    require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+    array(
+		'sebastianbergmann\\template' => '/Template.php',
+		'sebastianbergmann\\template\\exception' => '/exceptions/Exception.php',
+		'sebastianbergmann\\template\\invalidargumentexception' => '/exceptions/InvalidArgumentException.php',
+		'sebastianbergmann\\template\\runtimeexception' => '/exceptions/RuntimeException.php',
+    ),
+    __DIR__
+);
diff --git a/dev-php/Text_Template/files/channel.xml b/dev-php/Text_Template/files/channel.xml
deleted file mode 100644
index 91bb6786f543..000000000000
--- a/dev-php/Text_Template/files/channel.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
-    <name>pear.phpunit.de</name>
-    <summary>PHPUnit PEAR Channel</summary>
-    <suggestedalias>phpunit</suggestedalias>
-    <servers>
-        <primary>
-            <rest>
-                <baseurl type="REST1.0">http://pear.phpunit.de/rest/</baseurl>
-                <baseurl type="REST1.1">http://pear.phpunit.de/rest/</baseurl>
-                <baseurl type="REST1.2">http://pear.phpunit.de/rest/</baseurl>
-                <baseurl type="REST1.3">http://pear.phpunit.de/rest/</baseurl>
-            </rest>
-        </primary>
-    </servers>
-</channel>
-\ No newline at end of file
diff --git a/dev-php/Text_Template/metadata.xml b/dev-php/Text_Template/metadata.xml
index f96cbe73d4b7..37b21fe7db8e 100644
--- a/dev-php/Text_Template/metadata.xml
+++ b/dev-php/Text_Template/metadata.xml
@@ -5,6 +5,7 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">sebastianbergmann/php-text-template</remote-id>
 	</upstream>
diff --git a/dev-php/libvirt-php/Manifest b/dev-php/libvirt-php/Manifest
index bfcccf70b230..09b2d57f867b 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.4.tar.gz 780793 BLAKE2B 8bb4577c26cc0ef8f2a0ae813ade7f5fdea9a2a7d70c97cab1033fde21d9a1c27b8c2ad7a8284096e143e955202bb564767b4d7e1a4bb9e15993895adc119288 SHA512 b5b204549e6810668203d1df8404a5cb71f646ae7e01ea223c6e9b9eec9b1f6500cc5bb4559859959d821a213ff992f22a97e4b683da2c683be3732710943487
 DIST libvirt-php-0.5.5.tar.gz 761250 BLAKE2B 9899d2f0e5ea387333decce5071afc81d4160d54ef570dcbe04422dc3e93479ee57520f9bf33a0275ee86cd4b1c87e5a3f7d5118e0cd87658faed44d2ccd4807 SHA512 2ea263561a0bf5d155314e06dcf3c3b5c278640bc5edfa674cdd777cb6d0810bda0492c6cf77a02bc88fb6aa99b0ff1f0cbaeea87ff2e45bff9b5774a2507684
-EBUILD libvirt-php-0.5.4-r1.ebuild 1412 BLAKE2B 7787eae4d938017a3ceb98835d90a2124952fc89b6160a97a6756d48d59495aae5e91846a63dc47915ae7fcf4c4cc16557147abfa3a60171248543e5ec738a89 SHA512 48964a88b87317f4c0af513793266862e2a0476f2ad29857e34688321554c63d19017811c24af8431e4021dbbfaee8151c61996fce7eabea90165ea9b111b7dc
-EBUILD libvirt-php-0.5.5-r1.ebuild 1503 BLAKE2B 6a5e46742e68f5f39b9d048f363416c479a83ee8d28ea9f22b3402628c08d5e4dfad0dc7031e475bed834a66b885850f69ffd3fb27d3c538589a0ccb84220373 SHA512 f68900a360319de263359ed32eed3670bc4e3994eef470417d832607549da44d43cec7269f3198bce7af9bc91ffc5f94c0904c026b6436f4661bbbe8ee5da7d0
-EBUILD libvirt-php-9999.ebuild 1456 BLAKE2B 290b01dd35b344f164a34fbc650f18d77ffc4a81856e5f9725b39169c676ed3405e840b327ffa6ca4be1638e5e0ff2a7d32ec2bad9ba5ca213fae7d32c08139e SHA512 91567d8f0938c3f023a47f5f8d0b9c66c15314bdda2b7bde3b44a91ebbfcf76ddf5c0dc25f1c071fc484723697729d23a33913f72560a3cb0d85146841ac29aa
+DIST libvirt-php-0.5.5_p20211020.tar.bz2 359477 BLAKE2B f4be3cf138364997911b58b07e128e4b5c9e6f1520d876b51466a30cd2ade4035a06488e07b8be4cce65b1bc6585b768997214c9d0ba72cc51855b4fc0827ff4 SHA512 b935c910e8754000de45e88f5d5e61e2e95fbb1b007f0d747bf4cd3531ee9cb0ff5bc2ec6f561c79711df9b70e1c4cdaf2e046774341d29d3f2382d27ab8c494
+EBUILD libvirt-php-0.5.5-r1.ebuild 1475 BLAKE2B 32551b061e397285edf1ba9a2165cd459c673aa415c1b743ab7745982f5eda7c13f55b0bcf7f685408a6d813803acd321abbbc56431cb935b0788a796acb7a3e SHA512 90cf2a297540f06e2535b689fdb94ac116574049277bcb453d8ed0883cc59b428f5ce7fb6ed4d860efff129d41955a14763e9cd47be4e7c1a400944b63102e30
+EBUILD libvirt-php-0.5.5_p20211020.ebuild 1604 BLAKE2B 32e9dadddeb6346b1f4a55e3f40da5a40ff3b72e2ff7e69cdcb24bfc54e19bbb0fca499d9c4a2183dc6459411c601f64b5ec6ef60a12d5f3da35d159f6f8627d SHA512 12b8ab762ba5bb356b6ce489cd2afb2195c3a551fecfab0eace606ef10e66d729f0782ba61d3ae425154b4de7971017054381791874b13c907f72bcfde16eb47
+EBUILD libvirt-php-9999.ebuild 1463 BLAKE2B d482021104136ac237690ed9ffec6ffde66d54fd8adec41d3c2e6caf68ff0bcde507f6792d27ea6727eb6279d0dc7fc972a3021157872d5cff02ddb391649395 SHA512 8d982f4c805b5a485c6a12cbb1604d5c6a9041c1b594dc74c3577ea217b567325ec034673362bb46381793e8fb918d116ecb2095aa78d293f62120d7328ec57f
 MISC metadata.xml 372 BLAKE2B 2dd1ade6ec545cb0a2574dcc308dfa41608de5d7d666adf0bffd8d0441230ce835c78507e23d02b2f3b2b10d8dde130e64985156f2de322710f05078c6690034 SHA512 eabd4a207f5e76a04d6de32b3c4e4b103ac795d310559d3278b2f39dc251795de60f2ba8b07b8bd91d2785a2e1f2e10fec1cbfe734926005f0aee600bf0ebca5
diff --git a/dev-php/libvirt-php/libvirt-php-0.5.5-r1.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.5-r1.ebuild
index 093337c9e3c3..57415a26ee3c 100644
--- a/dev-php/libvirt-php/libvirt-php-0.5.5-r1.ebuild
+++ b/dev-php/libvirt-php/libvirt-php-0.5.5-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 PHP_EXT_NAME="libvirt-php"
 PHP_EXT_SKIP_PHPIZE="yes"
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php7-4"
 PHP_EXT_ECONF_ARGS=()
 
 inherit php-ext-source-r3 autotools flag-o-matic
diff --git a/dev-php/libvirt-php/libvirt-php-0.5.4-r1.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.5_p20211020.ebuild
index cc5be73d2db7..8e019aab4abe 100644
--- a/dev-php/libvirt-php/libvirt-php-0.5.4-r1.ebuild
+++ b/dev-php/libvirt-php/libvirt-php-0.5.5_p20211020.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 PHP_EXT_NAME="libvirt-php"
 PHP_EXT_SKIP_PHPIZE="yes"
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php7-4 php8-0 php8-1"
 PHP_EXT_ECONF_ARGS=()
+SNAPSHOT="23dde4ddc42fabee0b8c6625b80183b3cbe96a67"
 
 inherit php-ext-source-r3 autotools
 
 DESCRIPTION="PHP bindings for libvirt"
 HOMEPAGE="http://libvirt.org/php/"
-SRC_URI="http://libvirt.org/sources/php/${P}.tar.gz"
+SRC_URI="https://gitlab.com/libvirt/${PN}/-/archive/${SNAPSHOT}/${PN}-${SNAPSHOT}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS=""
 IUSE="doc"
 
 RDEPEND="app-emulation/libvirt
@@ -26,9 +27,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-text/xhtml1 )"
 
-RESTRICT="test"
-# ChangeLog and NEWS are empty files
-DOCS=( AUTHORS README )
+S="${WORKDIR}/${PN}-${SNAPSHOT}"
+PHP_EXT_S="${S}"
+
+DOCS=( ChangeLog NEWS README )
 # Remove the insane check for pecl-imagick which is only used in examples
 # and is not called upon in any build
 PATCHES=( "${FILESDIR}/remove-imagick-check.patch" )
@@ -38,7 +40,7 @@ src_unpack() {
 
 	# create the default modules directory to be able
 	# to use the php-ext-source-r3 eclass to configure/build
-	ln -s src "${S}/modules"
+	ln -s src "${S}/modules" || die
 }
 
 src_prepare() {
@@ -67,3 +69,10 @@ src_install() {
 		dodoc -r docs/*
 	fi
 }
+
+src_test() {
+	for slot in $(php_get_slots); do
+		php_init_slot_env ${slot}
+		default
+	done
+}
diff --git a/dev-php/libvirt-php/libvirt-php-9999.ebuild b/dev-php/libvirt-php/libvirt-php-9999.ebuild
index 0d75a2ce62a7..df851fcfe3a0 100644
--- a/dev-php/libvirt-php/libvirt-php-9999.ebuild
+++ b/dev-php/libvirt-php/libvirt-php-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 PHP_EXT_NAME="libvirt-php"
 PHP_EXT_SKIP_PHPIZE="yes"
-USE_PHP="php7-3 php7-4"
+USE_PHP="php7-4 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 afea08292127..5737cd715129 100644
--- a/dev-php/maxmind-db-reader/Manifest
+++ b/dev-php/maxmind-db-reader/Manifest
@@ -1,5 +1,3 @@
-DIST MaxMind-DB-Reader-php-1.10.1.tar.gz 23083 BLAKE2B f6684b07a184c4db7feebd9bf6b9afdc34c3de3b62bed59b2d01e1751eb996442d769576fbaa48e2bfa0572e80b2e0491d16d1cd9d89d35ca329e6dc17f74765 SHA512 841a03cf043ee0557e2157daee50d7f73211f5e665436eca8be6067d5357205093e40bb0402248fd6881d0d330feac96b298ec18763b8cb7d6d6392d54c59265
-DIST MaxMind-DB-Reader-php-1.6.0.tar.gz 20898 BLAKE2B cf6922bbd5b2c76fcb9b7a97299f0a73232686bf8facce39355f8a4cc55e98a4d8e64a51eae8427b5f14d6905d4cd85956effa5299cc493bd63708cf52ab30d0 SHA512 e8c0ccf2cfcedf7527b4e3f858d2ed0e70add60692fff4a65f08e5cb885516b7c2a3ceaa3c21713369cd8ffca2b671d764063236de1d729cfc5173f7d5dd4607
-EBUILD maxmind-db-reader-1.10.1.ebuild 2218 BLAKE2B 53715ff00f7ecec725b560307356dc21fd4a129e4627395d2287b8d81bf9ac5d2c298bc677c05229c8fb12eaa4de5b6c4d18521457fdc176a1a6bdeb32258f85 SHA512 b0c330ccbd69d88f84629efa93d89400518d550a91b1e0b3dca55e9946d047943c7a3de023287a08e4e038d678d9577aa15269d1d448aa2918d9629078b97976
-EBUILD maxmind-db-reader-1.6.0.ebuild 2218 BLAKE2B dca404bcaa496d72cce3bd8055728bdf5f69a6028dd9afeb3c358affa5636a745e36afa42a2eb505c96781bbc0d00535c4df197b4deffb899161a03b76fcd131 SHA512 8243d5a307ac4d3be45dc60c064a9285fbeafb74b847f75152863d9c97393f41b3268c7eec89725beae525435abfaa94a540a3ec04272b92136698050e4b7b54
+DIST MaxMind-DB-Reader-php-1.11.0.tar.gz 23018 BLAKE2B 28e0ad3e8440a4bfad17292e71289224dc2a8deecaf510f887637760ed931a4d90e921f369bf6e37458e9a45212af82105a42925800577228797c47604b9135a SHA512 182c57d9d799b4303e7f5a6f5b47f64b953e216290b26f5891cfc9658dc030bc1f954c48a07777c71ebb9b8f34e4c275d2af794086d33c5bee8b3fe38c1ff56f
+EBUILD maxmind-db-reader-1.11.0.ebuild 2218 BLAKE2B 0cc8f1b9c498450b8050f31141a3368a5717793556ffba5ede64e0062640680734c8e031bd1ed18e6be4792ebdc3b88091e8e46347d9b9a001741db9ac0bdd4a SHA512 25b0968fdbdd1c9b60cd11121d25de7d30b971fe062a9884baf35d1e1a4308dac75cfce50a1d54aa5959f5c9c69d4b32cd2e185dc8dcc55976b0f996210784ce
 MISC metadata.xml 586 BLAKE2B 69b8c42dc80e3b164f2287e0c65732ad0d5bc53ab1062e651dd85e21d5fdfb6a1e9990cd4d78077f2dcf73e2c8689e7be6a34c11cfd3ed8690a41a8a737e6246 SHA512 5604ac300486eaeb0bfd52d5a95438843b031eef15162438374e6126ace92327a64cb692a549d301f245fd6622856e973c9dbde60d2dcd398c667a9f8fa1fd5b
diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.10.1.ebuild b/dev-php/maxmind-db-reader/maxmind-db-reader-1.11.0.ebuild
index 509cad6088ee..d1d1a6a98315 100644
--- a/dev-php/maxmind-db-reader/maxmind-db-reader-1.10.1.ebuild
+++ b/dev-php/maxmind-db-reader/maxmind-db-reader-1.11.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 MY_PN="MaxMind-DB-Reader-php"
 MY_P="${MY_PN}-${PV}"
@@ -10,7 +10,7 @@ PHP_EXT_S="${S}/ext"
 PHP_EXT_NAME="maxminddb"
 PHP_EXT_OPTIONAL_USE="extension"
 
-USE_PHP="php7-3 php7-4 php8-0"
+USE_PHP="php7-4 php8-0 php8-1"
 
 inherit php-ext-source-r3
 
diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.6.0.ebuild b/dev-php/maxmind-db-reader/maxmind-db-reader-1.6.0.ebuild
deleted file mode 100644
index aaa418f47bf0..000000000000
--- a/dev-php/maxmind-db-reader/maxmind-db-reader-1.6.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PN="MaxMind-DB-Reader-php"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-PHP_EXT_S="${S}/ext"
-PHP_EXT_NAME="maxminddb"
-PHP_EXT_OPTIONAL_USE="extension"
-
-USE_PHP="php7-2 php7-3 php7-4"
-
-inherit php-ext-source-r3
-
-DESCRIPTION="PHP reader for the MaxMind database format"
-HOMEPAGE="https://github.com/maxmind/MaxMind-DB-Reader-php"
-SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="extension test"
-RESTRICT="!test? ( test )"
-
-DEPEND="extension? ( dev-libs/libmaxminddb )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# We need to call eapply_user ourselves, because it may be skipped
-	# if either the "extension" USE flag is not set, or if the user's
-	# PHP_TARGETS is essentially empty. In the latter case, the eclass
-	# src_prepare does nothing. We only call the eclass phase conditionally
-	# because the correct version of e.g. "phpize" may not be there
-	# unless USE=extension is set.
-	if use extension ; then
-		php-ext-source-r3_src_prepare
-	else
-		default
-	fi
-}
-
-src_configure() {
-	# The eclass phase will try to run the ./configure script even if it
-	# doesn't exist (in contrast to the default src_configure), so we
-	# need to skip it if the eclass src_prepare (that creates said
-	# script) is not run.
-	use extension && php-ext-source-r3_src_configure
-}
-
-src_compile() {
-	# Avoids the same problem as in src_configure.
-	use extension && php-ext-source-r3_src_compile
-}
-
-src_install() {
-	dodoc CHANGELOG.md README.md
-	insinto /usr/share/php
-	doins -r src/MaxMind
-	insinto /usr/share/php/MaxMind/Db
-	doins autoload.php
-
-	use extension && php-ext-source-r3_src_install
-}
-
-src_test() {
-	# The PHP API has its own set of tests that isn't shipped with the
-	# release tarballs at the moment (github issues 55).
-	use extension && php-ext-source-r3_src_test
-}
-
-pkg_postinst() {
-	elog "${PN} has been installed in /usr/share/php/MaxMind/Db/."
-	elog "To use it in a script, require('MaxMind/Db/autoload.php'),"
-	elog "and then most of the examples in the documentation should"
-	elog "work without further modification."
-}
diff --git a/dev-php/nikic-php-parser/Manifest b/dev-php/nikic-php-parser/Manifest
new file mode 100644
index 000000000000..1004d8940641
--- /dev/null
+++ b/dev-php/nikic-php-parser/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 240 BLAKE2B d1e4a667c9cbcbe0caf269efe7336149099034dcd51d58107a0a9dfaf29876467fcd07a862fbe9e20efb290308bb36e0c7a3af8c35d9ce758bc20e2d84635bdd SHA512 6bf988748ce796b3fdbda6337c8975095378977b920f9c4716a3362b877bc2d2ce7738e74e087f7281c782d57baa9d16112d44b6b62a32f0e77f3e6707cf6dff
+DIST nikic-php-parser-4.13.2.tar.gz 153762 BLAKE2B 065c5c494f78c2369a6d5ed2613de768eb58d2984abf2c91fb924071dc89f0c1c660cf06c444670d925d4db050880faa916759587db809b2ea519f4b1f0556da SHA512 9097c05694f983c5cd80919ac81a1eb0052e4b63c4c5b680578c576b04f1637fcccf6d93b918725b0b650a2e331d3121c80bd3d3e4c09e7ceed42fd23af7735c
+EBUILD nikic-php-parser-4.13.2.ebuild 664 BLAKE2B 174138f7f29460fd51d476bdb383d53c49d4c9fa28a69d1cbb3a095e5bbe9e2b51be52c31f7eabcaa10e2556b87d7c01b44eac7bb2d052a25be44cef1e4e0d1c SHA512 2940916e780a201d6e74e8f6d7df1420d13288b8d7d2f72a0537cbb51bb1d81604e1116fc058dc6bfe17718eaa33e5ed3c1db11db148af2657134b6df908993c
+MISC metadata.xml 345 BLAKE2B b4750cc2dd771797fa80c5729e8a421b77b8bd2c6a5d122d93326d1e6b88ddf759774967929d038535c11d2247947df9c296c331c3d561dd1feeae06a35a7e3c SHA512 62f4f9366f54046820fa36ce526d264e8c259a155cf3e56613e987fcb4abd08ff7e990f91c44d86dd5fd1fa23c093210277748ea24f73696309ae1b95bf8f1ac
diff --git a/dev-php/nikic-php-parser/files/autoload.php b/dev-php/nikic-php-parser/files/autoload.php
new file mode 100644
index 000000000000..76352b3bf039
--- /dev/null
+++ b/dev-php/nikic-php-parser/files/autoload.php
@@ -0,0 +1,8 @@
+<?php
+/* Autoloader for dev-php/nikic-PHP-Parser */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+	require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+Fedora\Autoloader\Autoload::addPsr4('PhpParser\\', __DIR__);
diff --git a/dev-php/nikic-php-parser/metadata.xml b/dev-php/nikic-php-parser/metadata.xml
new file mode 100644
index 000000000000..24d84f3f64d5
--- /dev/null
+++ b/dev-php/nikic-php-parser/metadata.xml
@@ -0,0 +1,12 @@
+<?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">nikic/PHP-Parser</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-php/nikic-php-parser/nikic-php-parser-4.13.2.ebuild b/dev-php/nikic-php-parser/nikic-php-parser-4.13.2.ebuild
new file mode 100644
index 000000000000..17ac6a0df823
--- /dev/null
+++ b/dev-php/nikic-php-parser/nikic-php-parser-4.13.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="PHP-Parser"
+
+DESCRIPTION="PHP 5.2 to PHP 8.0 parser written in PHP"
+HOMEPAGE="https://github.com/nikic/PHP-Parser"
+SRC_URI="https://github.com/nikic/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+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.1:*[tokenizer(-)]"
+
+src_install() {
+	insinto /usr/share/php/nikic
+	doins -r lib/*
+	insinto /usr/share/php/nikic/PhpParser/
+	doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/pecl-amqp/Manifest b/dev-php/pecl-amqp/Manifest
index a0ab141937b7..027b8be20a0d 100644
--- a/dev-php/pecl-amqp/Manifest
+++ b/dev-php/pecl-amqp/Manifest
@@ -1,5 +1,3 @@
-DIST amqp-1.10.2.tgz 107350 BLAKE2B dd32873d5288ced2ef2c05e6b131f35c31a3514a98d5d3cb8784a989ca1d8637c5ddc7ffa2d73f5bfc2daa4fe718ecf1f08c7ceae64d2e613ef430d18161393b SHA512 a17176bcc02d35a9686d3ca120cca98d808b2a896733f41a28b5d29d43127a0a45b012bc6566de3604f41b8bcc453408a37a8254bcf47e940ebe12bb6f4d4265
 DIST amqp-1.11.0.tgz 108493 BLAKE2B 5d06ee39f9fef03652ee668695378e30df8c01c57c4ce724b2934bf0754d2a2a9c5998d599a34b2782b5395a5a4bcb69925f6d578ff160dfe7407e7916d468ba SHA512 0f0220fc2f1f9109640e096ab38a4bb06b2569a336b83f527d18dae2b8c21efaf383dade807ee5bb3dbf4447bc3548c15f38ac18155762fe7920ef8939bc0321
-EBUILD pecl-amqp-1.10.2.ebuild 557 BLAKE2B c32568d1c6a914a39b7e5840289057d6d8a2056350859a57549b109382afa8663145e60e5e06cc8672d9b5e47ec9b6a2b59276ca21e8fd8e74eec4a4c21dba2b SHA512 62a21d29c718ca3a092cfc888e24866a2c7c6edf19d49e49d6668239d28eb873babf0313e90a8692d8c54707e38ba8b546b0716fc582b263445eb07dccb1ed7e
 EBUILD pecl-amqp-1.11.0.ebuild 593 BLAKE2B 090e2ed46cc17976174c98db20077560224124c70b947c2430ea1406e2769cb4a3adae37873c98968a267441ec5231c217f9b4b5946f88b66118f214dae7d04e SHA512 72f9096e0d8c73a9f0fc8b64e5511c4b43cb1967f46025489b1a2b5cf36472ffdadf43d6b48464095e34fff749701eb1c9131928310b43f66e667a40a34a6012
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-amqp/pecl-amqp-1.10.2.ebuild b/dev-php/pecl-amqp/pecl-amqp-1.10.2.ebuild
deleted file mode 100644
index 8726588b40f0..000000000000
--- a/dev-php/pecl-amqp/pecl-amqp-1.10.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP Bindings for AMQP 0-9-1 compatible brokers"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE=""
-
-# Tests require running rabbitmq-server on localhost which requires epmd
-# which only accepts /var/run/epmd.pid as pidfile.
-RESTRICT="test"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND=">=net-libs/rabbitmq-c-0.5.2:=[ssl]"
-DEPEND="${RDEPEND}"
-PHP_EXT_ECONF_ARGS=()
diff --git a/dev-php/pecl-crack/Manifest b/dev-php/pecl-crack/Manifest
index 5d73f740af58..38079e867b86 100644
--- a/dev-php/pecl-crack/Manifest
+++ b/dev-php/pecl-crack/Manifest
@@ -3,6 +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-r7.ebuild 605 BLAKE2B f8d48c373151abe572512e8a038792350e611b8f638c96b31c64b310f70de5d8c127b9a75cdc870320aaba70d0b62fdac6de0cc958cc92f5b504a29f84e2bf48 SHA512 fe5adbc671be84f65232d1505b42e97616f612bfb56e8244827dce91f13fdc691180f5e17fa092023e750c46eb3ecb250922e8bd6447268129b4ebf51cce8830
-EBUILD pecl-crack-0.4-r8.ebuild 618 BLAKE2B 170e52d4d8eb8a83d8571b58c2e551fd579a16937965ab7aefc637600fadea48f934b8ba46ef465beee6979db08f47791deb6b5bc17b68b6b19a37091c1d829f SHA512 990f5c6f4eac01ceae47ab261cb6f0f8d5cfe2c1c905e7cd2125739fbba6265d3572389c6bf696099fc7342f4eb7fc65e0188bfabd98365c29d41692b6cc3cab
+EBUILD pecl-crack-0.4-r8.ebuild 614 BLAKE2B 6fe9d4dc18922440286545cfab30a922584c74eefe6cd322dd27b347cf0315a86088725b2acc9505421d66234439ef125f0425e257bfbf7252152a601556dd31 SHA512 6823e045591f75e128b5a0cf188fdc4b0a7565668692386a6fe949738e5ae26d737b7d9ea2a29c0c8e72be4f33a14799078e4af0c851133ee661c952ec206ee2
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild b/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild
deleted file mode 100644
index 9001623cd8a7..000000000000
--- a/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="crack"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_EXTRA_ECONF=""
-DOCS=( EXPERIMENTAL )
-
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="amd64 ppc ppc64 x86"
-
-DESCRIPTION="PHP interface to the cracklib libraries"
-LICENSE="PHP-3 CRACKLIB"
-SLOT="0"
-IUSE=""
-
-# Patch for http://pecl.php.net/bugs/bug.php?id=5765
-PATCHES=(
-	"${FILESDIR}/fix-php-5-4-support.patch"
-	"${FILESDIR}/fix-pecl-bug-5765.patch"
-	"${FILESDIR}/${PV}-php7.patch"
-)
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 def1519d1013..64bc70b7c29d 100644
--- a/dev-php/pecl-crack/pecl-crack-0.4-r8.ebuild
+++ b/dev-php/pecl-crack/pecl-crack-0.4-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ USE_PHP="php7-3 php7-4 php8-0"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 DESCRIPTION="PHP interface to the cracklib libraries"
 LICENSE="PHP-3 CRACKLIB"
diff --git a/dev-php/pecl-event/Manifest b/dev-php/pecl-event/Manifest
index edcbf169415b..b7dba4894afe 100644
--- a/dev-php/pecl-event/Manifest
+++ b/dev-php/pecl-event/Manifest
@@ -1,5 +1,5 @@
-DIST event-2.5.7.tgz 141451 BLAKE2B 6d5e87b0b4892b59e2dc37dde0ae8ecafd104fbaa90fcc4d2b7183d4e3ba2f8fa182ddee90d5ebaebeb826f3e02d760ae25ce5ca01582fec9dfa5cb05dc6f5c6 SHA512 8160c3df1f6faa4b3ee37b9212a7953e5c0cdc747228517d238ea638b2b441e4b64e9d8c91d3af6bd33f33486137e9da1c7cb45b8d8400b8ab46d1ae4c03590a
 DIST event-3.0.2r1.tgz 198176 BLAKE2B ca93fa75fc1210476bddfafb89f9fd7a9a9ed9b23023ce37c5b5fe94c782d3a95a3a9bee8263cca3329b96b848cb213de7fac73c6594a8fee0c7c299b5f44215 SHA512 b117119814763bffe1c2c44766a822f638cd0873eeede29aab139fceb09a09df264f0d7b7e882b21dd9a7e96f45d692b45193509c3f53e0f3b10feb59c1a4ae4
-EBUILD pecl-event-2.5.7.ebuild 1105 BLAKE2B defec4ca79b47d5537497093f04cdbd01c69d6b5f4a873cedadcb5e9dd888bccfcaec649192ae3745e77f263d585194431cee210ed6b726d9a4f636d9e4daa78 SHA512 e4ece44cc0fa80ad7a7601f90c3684cb03c8e1ce2112bc4699d6884458102790b2b60ef287fb443a7b4c1d58f05aa6f2840871fe0b089b32d108fc6b8d71f889
+DIST event-3.0.6.tgz 198565 BLAKE2B a8629572f63c3c342f5a137c5eaaf1af6d22d5df192cd37c36453d67db28ee030c7be13a26653a0de8e4984c24f9e633f7b0e757457aa668e2ce694d36b89cea SHA512 a7c7b062e44409d8d7525b3bb5ec80916dfcb5cdc53088a486ae940fa3a0a7944ec30727cd96d4e125187b8fa2e3a0fce6fc8981f803ad416a2cc040b78f93eb
 EBUILD pecl-event-3.0.2_p1.ebuild 1269 BLAKE2B 6cc6a5c70379094e4aa9f3df93d39de2d7030647ab2af89d22a9ebd1892771a8c021c86cc834e601136a58a9efd5501ae117eeaa0d120aead660ce3ef657493c SHA512 129d9062f5bac4c4ef9bce744ad82eb01d3ca892726ac1f02282a5dff3799f9d7174afcccac30c13dc687edd7ad5c17176216333e943edb80bdd0d67da1ed276
+EBUILD pecl-event-3.0.6.ebuild 983 BLAKE2B f60772efaa5b3b0faad931ee2d47d250f46d1f7d7ecfcd3bc0815b0f40caa277f12407cd8944a41be14bb0c4ea0681193a1bfcbd8cbfcc683026f2f495926ca7 SHA512 4b7e2ea4f2bb310dc61a843e475b86921cde29e21f104599e6849fe46795b4ade9f0d9f694640c3e00541404f233205579e32518cf61830ddcbd8044461539f8
 MISC metadata.xml 462 BLAKE2B 397d205a4e7427357ba567ce23219eb0dabfe1e80cd543603499d1172ab6e44070cadcda8adcdb506967595a02ac14212f900570f71507af6e5f1640bebadfe2 SHA512 a7dea9ba80d58b6ff4761c7446d349bc2fcd1562901568e05cffeb31bbff287d3fdbe7d0ee82af0d3cd91e76cc76cd992b6615cbca9ca8488a587918a2f057af
diff --git a/dev-php/pecl-event/pecl-event-2.5.7.ebuild b/dev-php/pecl-event/pecl-event-3.0.6.ebuild
index e8ea2c43cbde..81538e97dbb8 100644
--- a/dev-php/pecl-event/pecl-event-2.5.7.ebuild
+++ b/dev-php/pecl-event/pecl-event-3.0.6.ebuild
@@ -1,36 +1,33 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 PHP_EXT_NAME="event"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( README.md )
 
-USE_PHP="php7-2 php7-3 php7-4"
+USE_PHP="php7-4 php8-0 php8-1"
+PHP_EXT_NEEDED_USE="sockets(-)?"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="amd64 ~ia64 x86"
+KEYWORDS="~amd64 ~ia64 ~x86"
 LICENSE="PHP-3.01"
 
 DESCRIPTION="PHP wrapper for libevent2"
 SLOT="0"
+IUSE="debug examples +extra +sockets +ssl threads"
 
 DEPEND="
 	>=dev-libs/libevent-2.0.2
-	ssl? ( dev-libs/openssl:0= )
-	php_targets_php7-2? ( dev-lang/php:7.2[sockets?] )
-	php_targets_php7-3? ( dev-lang/php:7.3[sockets?] )
-	php_targets_php7-4? ( dev-lang/php:7.4[sockets?] )"
+	ssl? ( dev-libs/openssl:0= )"
 
 RDEPEND="
 	${DEPEND}
 	!dev-php/pecl-libevent"
 
-IUSE="debug examples +extra +sockets +ssl threads"
-
 src_configure() {
 	local PHP_EXT_ECONF_ARGS=(
 		--with-event-core
diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index 6af284b18f3f..083b60481dd3 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -1,6 +1,8 @@
 AUX 3.1.5-fix-tests.patch 1032 BLAKE2B 15b91b77b645ea298f2334df6d4a0b804735d38dca3067f1cac7fb8fdf30d5ccb4895cc431b5dd6cc0bd8b5be9983b48e157694bc437fc057aed0c9879480bc4 SHA512 1fd27bbae55a0e0ed12ca8422fc8969b9d69ae2c26d9b991648bc2cd7d39f6ede621e453aa12a6ec027c69791988f5db4117c32a31aab20836bdd565d7c62dc2
 DIST memcached-3.1.5.tgz 83015 BLAKE2B 80f5cbed8e34f867962792d95d242015690f64ab3b462e09813a11b8b86234b0b05b0f6a78f7c6184482b66ba8015064b37f77bbb816a3aee2edd0ce97ab0cbc SHA512 87d5fd079fcaad81139785d6766da71b23a1a0fe907d4b22f3a787af148a20412c11df11c4d98c165241658baf0d87c8a6b29de15db07a0f9d1fabc8aec8f0e9
+DIST memcached-3.2.0RC2.tgz 90731 BLAKE2B 69e163f7375c94d9e8f49890f169708e2286ed96b82f13b0a6fad092870f03c6aaba0ef3a23de8775575a1b135783a0e27404120a2bbeef9bdbc73735461b1a3 SHA512 056dec58734dc2171429d1b33a74be829f78ab993f0f1699d9f61b105d4252e35c4e05dbda9e045ed3364d82779c662c2f28c63cdac1b81027549335b5376845
 DIST pecl-memcached-3.1.5_p20210807.tar.gz 99221 BLAKE2B 7a6a92701d17ce2c108cda862d52cebbae38e993e4182fd23ce78ea1cbebbdba6d46a71258b7dd388ff38f2b7b04c94ca822954ff931111fd9bfc64d578a6f26 SHA512 3c124f969efcd3bcc513e3e347828ac6e0a5540379f7d3a83c306d65a02ece3c76f87e3db52153c5d2f2c03c5fafb646f6b3b33c0b1d5afbb71ffa22d2df6f90
 EBUILD pecl-memcached-3.1.5-r1.ebuild 1582 BLAKE2B 7cb8c180c14bf80a1e4447bfde1c1087f483c582b3f748c819b2e1d9393e5eb5c8a3ac7c4c0cd99d8dd62ecfd2eb302cf83224fdf7de370d21e9a2520b6990cf SHA512 b9aa92fafe9a68a647e3e76212b40c36b65ebcfed423d82a22fe3aad146149a1d915a895cf77c06830b9a0bb589d992d4470e640365f3beb7f46d5c5b3e70662
 EBUILD pecl-memcached-3.1.5_p20210807.ebuild 2650 BLAKE2B 06d94ad81a17dd31d9b1988907cb540385ce816bf2b649f6cb5b1b9aca9b986996d1b6375f7168d096b7435ead2a5bf1f54eeb1a82bc3cf3e244f3548148b758 SHA512 946d76c95f96ca6e0d4b416f4c5d145eff164144c7aa71be7a3e0bdb077e7c99fadff9ee20bd2cc9d23c4690a1954c55e98071bb2fa52068c5c78ad7c7e321c5
+EBUILD pecl-memcached-3.2.0_rc2.ebuild 1527 BLAKE2B 00b017f2620871b04c87b0da4d2754ab8680a071e9687899dbdda0229c7f137344b1d471750f8079ee9194267113e4107cc75cc72e35387683de358f4dc36f8f SHA512 300580410c2e5e07fca52c4d0c4035650e59e81bb0b31d6320fedbcb61da7cf8875c20cade2c8a4530fae570d6bfb4305247c85281a22d6209a68b1bb9f9a89f
 MISC metadata.xml 569 BLAKE2B 686b6c91f4d91fb82bd90b08af6627a8211e9676139417551e8a8425da410c15a77b79ff51760c2a16815c84c55c1e81ff462af17282ffa198db0829b20566c6 SHA512 8f3154fc7f3c9d1707b121ddc8d94d8d5570f7ca0cc93c0f732cda3ba6a756ed421a6facd96000ade0c22af9a78efbdd69ec118bd195c4c83fc523f2cd7e1cc7
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.2.0_rc2.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.2.0_rc2.ebuild
new file mode 100644
index 000000000000..09b3c0ce9508
--- /dev/null
+++ b/dev-php/pecl-memcached/pecl-memcached-3.2.0_rc2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 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"
+PHP_EXT_NEEDED_USE="json(+)?,session(-)?"
+MY_P="${PN/pecl-/}-${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Interface PHP with memcached via libmemcached library"
+LICENSE="PHP-3.01"
+SLOT="7"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="igbinary json sasl +session test"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND=">=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(-)?] )
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="${COMMON_DEPEND} test? ( net-misc/memcached )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS="--enable-memcached
+		$(use_enable session memcached-session)
+		$(use_enable sasl memcached-sasl)
+		$(use_enable json memcached-json)
+		$(use_enable igbinary memcached-igbinary)"
+
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	touch "${T}/memcached.pid" || die
+	local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 -U 11211 )
+	[[ ${EUID} == 0 ]] && memcached_opts+=( -u portage )
+	memcached "${memcached_opts[@]}" || die "Can't start memcached test server"
+
+	local exit_status
+	php-ext-source-r3_src_test
+	exit_status=$?
+
+	kill "$(<"${T}/memcached.pid")"
+	return ${exit_status}
+}
diff --git a/dev-php/pecl-mongodb/Manifest b/dev-php/pecl-mongodb/Manifest
index d5d1a7c1a96e..f4353a82f4d8 100644
--- a/dev-php/pecl-mongodb/Manifest
+++ b/dev-php/pecl-mongodb/Manifest
@@ -1,15 +1,3 @@
 DIST mongodb-1.10.0.tgz 1331177 BLAKE2B 8593392d50fce99059888e25d6400d2e7a35e93a1e4b74abf9b427ff43dbd2484380ecdbd7b7ce6abec643351a9c3bba572e2e0b551a88b18efbcf4c2b133767 SHA512 72527087dc3d1e1d48d6236592c1fbafa68354e2b8e070e85180d79ffcaa82740641450808a235bb711ded16ff65ec0cbd53fb66f0da18837351a3d402c3976f
-DIST mongodb-1.7.4.tgz 1223416 BLAKE2B 9db40284eb2b70e242f26c1661923c5f33de8ab1e33a7e816863b61fcbc49040204ca556b1f384cab958f9dc2cf4e49e97840b78bd520a4e374b83210a964e5d SHA512 6805ce1d0958e24e1edf3bc9698bc1f4a9d31c26250624fd35aebf7a7d310af30050e1974cd9571f989303fce4c5522e793a8cb41388397df66e8f5fe0a648f2
-DIST mongodb-1.7.5.tgz 1223892 BLAKE2B c30a217d1170c31be00259f4bb58cfea186947fa0bf1653de32e228a8eb8d3fb25b52d7a5a9e16f6b311418d977f7aa00bf96ca9d7e9ac9a8fa7b6fe05eace8f SHA512 f0565adc42659d4070e42122d02a8306f29d6d70fe0b5e9a92144df346a8c672aafdf36613435b9dc8d50db5e98c2359fdf97408c45439d4d447257b85e93122
-DIST mongodb-1.8.0.tgz 1292928 BLAKE2B 3bd9e5eb6b981010637b9e478928fa21268e1d1447f3ff345bfdb45c93637990e261c46b2ce09560cd4e284df73494dac210436cf700b588803e4ceffb8dc67c SHA512 7fd54dabde8df9533abd36d159c3da1c2b4606e7788b8a6d41faf83d0710b74885e8bfb4e1f4837a50248f3af1df2e7414b90f99227fc92c9084f779c7e68698
-DIST mongodb-1.8.1.tgz 1292453 BLAKE2B 25fe36b7d966a4dcf631764aeb93c09932cc0643e46fe5e594d9223a9d3f099b75211a813114c3e8cd4a1722da774b669ef968fdbb1d4877a81cf1f637890997 SHA512 a80682e3a90ead699a930185c3d10bc3a86b335b45891be6d41ef829fab6f2f2468adb5973735048fa98bb6aaa9c8568ba9f7df5709916d5b6f7676c77188d0c
-DIST mongodb-1.9.0.tgz 1300408 BLAKE2B 1cf6a43694e8113df8028c2663db8049421140d53124e6dcf8cb3e42daf961dc6a63cc930c765874eb1ccac13d419980d883e42ba33f3ea389b07ea006217432 SHA512 80ad3caddde045fe5e879167b2b4cfc27bdabf6d3667df4df73f33503c329b0d6bf4da6b287fe454301a9a390434eec19971059c6de8d4c9720a79fe7680366d
-DIST mongodb-1.9.1.tgz 1285984 BLAKE2B 7d3dd7635b97d142abdf0882d03f4b7a7b42b9720a8e790dae5d4cfcbee54a2f18d70641851baf9258e59ebe396336ae72956b9f6e09812f017850dbdcc3dd97 SHA512 e1ff9fba2268020862e917a38946a7f5f4cc5caf22b38e9ccf60b491cdee20f55b9643e8904cd934de48d31ca69b1c26dd86454f74572ce977669f908d4ffe51
 EBUILD pecl-mongodb-1.10.0.ebuild 1295 BLAKE2B 5e33ce53670fc4bf098e53f3408d702355d108291b0d41605f69d8894ffa0baee62574d3f89812a6f4cae24e77d0c56579a67652ffc6157b6208223a7c3b1d48 SHA512 70536cb7b0a21ae1a863c0679aa8547db16a6e80bcee9c818043907e57e136cc4ff0da565199d99ee9e8c77761f218ac845e4efd5c095e738ade2b24835ce2c0
-EBUILD pecl-mongodb-1.7.4.ebuild 1300 BLAKE2B e478faf0b45dd8ea97b1c80ebc809a09846d107de7b2332417ec8430631942173a48e8bc431d57692684dfcac49b3dff35fd56a021ec25673029e1b9e2c23ff9 SHA512 f1c9ed8e3e82a8025160f72c9e4ae54f268c74d807a7a6177cbdb3cc3339154630b9f72b7e525f7ccfa5a47ddf6689e4bd94653dbc73045daf0fcd81a73f6ee5
-EBUILD pecl-mongodb-1.7.5.ebuild 1302 BLAKE2B 8277a7c2a6a1431975e6f2f3e66d9478ace497d6c3ca56de7fcf80a9943858fb64607e1fe284766e768169bd8ba856c90acf7e19a5869bd5589ec44c3e9518dc SHA512 59d8252eb420f6f5f4cb76d6d86f79ea5076917b94cdac005915dae3837ea012e8d59f4db5e7447b86e34a468b32f6d90b43f44e1a28430be43a76d36cd69b60
-EBUILD pecl-mongodb-1.8.0.ebuild 1302 BLAKE2B fff7c8f4275a08a25c6b639c0492c21acf50a9a234db36664eb5a3d87dd30fd202c642a178d45d4c00f780fa416a0f2e03ce2ae9aee39895cd422fa6425e7d56 SHA512 f0d65b48091d508852d4a8134faf8ed59146469230ce22fbce0f9e040cf0f33bff9b01b98009d39c9ce1b76260f080685df327949d70b74484a4d1e4fd4dc012
-EBUILD pecl-mongodb-1.8.1.ebuild 1302 BLAKE2B fff7c8f4275a08a25c6b639c0492c21acf50a9a234db36664eb5a3d87dd30fd202c642a178d45d4c00f780fa416a0f2e03ce2ae9aee39895cd422fa6425e7d56 SHA512 f0d65b48091d508852d4a8134faf8ed59146469230ce22fbce0f9e040cf0f33bff9b01b98009d39c9ce1b76260f080685df327949d70b74484a4d1e4fd4dc012
-EBUILD pecl-mongodb-1.9.0.ebuild 1297 BLAKE2B 27482ce389b65cacaca7581e08244e6a210ab712229b677e2c629f670d3ba41a0248e5e69172eecbf4cce9f8ba9e6c2f0ce64f2f25daf27fb92a9efad4979d6e SHA512 f712c5f7b4ddbc3c9b98a6944727273c825fcf31b6bddfe3c00d8b33242cf57f9b454fc9fb805d9688b35c925864805ca7f903431795388f5016e777b621d7e5
-EBUILD pecl-mongodb-1.9.1.ebuild 1297 BLAKE2B 27482ce389b65cacaca7581e08244e6a210ab712229b677e2c629f670d3ba41a0248e5e69172eecbf4cce9f8ba9e6c2f0ce64f2f25daf27fb92a9efad4979d6e SHA512 f712c5f7b4ddbc3c9b98a6944727273c825fcf31b6bddfe3c00d8b33242cf57f9b454fc9fb805d9688b35c925864805ca7f903431795388f5016e777b621d7e5
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.7.4.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.7.4.ebuild
deleted file mode 100644
index efdcf0d60ca3..000000000000
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.7.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="mongodb"
-USE_PHP="php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="MongoDB database driver for PHP"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="sasl test"
-
-PHP_DEPEND="
-	php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] )
-	php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] )
-	php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] )"
-COMMON_DEPEND="${PHP_DEPEND}
-	>=dev-libs/libbson-1.16.2
-	>=dev-libs/mongo-c-driver-1.16.2[sasl?,ssl]
-	dev-libs/openssl:0=
-	sasl? ( dev-libs/cyrus-sasl )"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-db/mongodb )"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="${PHP_DEPEND}
-	virtual/pkgconfig"
-
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="x86? ( test )
-	!test? ( test )"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-mongodb
-		--with-libbson
-		--with-libmongoc
-		--with-mongodb-sasl=$(usex sasl)
-	)
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	local PORT=27017
-	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
-		--dbpath="${T}" --logpath="${T}/mongod.log" || die
-	php-ext-pecl-r3_src_test
-	kill $(<"${T}/mongod.lock")
-}
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.7.5.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.7.5.ebuild
deleted file mode 100644
index 5ebb9efa9f42..000000000000
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.7.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="mongodb"
-USE_PHP="php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="MongoDB database driver for PHP"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sasl test"
-
-PHP_DEPEND="
-	php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] )
-	php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] )
-	php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] )"
-COMMON_DEPEND="${PHP_DEPEND}
-	>=dev-libs/libbson-1.16.2
-	>=dev-libs/mongo-c-driver-1.16.2[sasl?,ssl]
-	dev-libs/openssl:0=
-	sasl? ( dev-libs/cyrus-sasl )"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-db/mongodb )"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="${PHP_DEPEND}
-	virtual/pkgconfig"
-
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="x86? ( test )
-	!test? ( test )"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-mongodb
-		--with-libbson
-		--with-libmongoc
-		--with-mongodb-sasl=$(usex sasl)
-	)
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	local PORT=27017
-	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
-		--dbpath="${T}" --logpath="${T}/mongod.log" || die
-	php-ext-pecl-r3_src_test
-	kill $(<"${T}/mongod.lock")
-}
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.8.0.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.8.0.ebuild
deleted file mode 100644
index 346f6f3dcb91..000000000000
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="mongodb"
-USE_PHP="php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="MongoDB database driver for PHP"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sasl test"
-
-PHP_DEPEND="
-	php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] )
-	php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] )
-	php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] )"
-COMMON_DEPEND="${PHP_DEPEND}
-	>=dev-libs/libbson-1.17.0
-	>=dev-libs/mongo-c-driver-1.17.0[sasl?,ssl]
-	dev-libs/openssl:0=
-	sasl? ( dev-libs/cyrus-sasl )"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-db/mongodb )"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="${PHP_DEPEND}
-	virtual/pkgconfig"
-
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="x86? ( test )
-	!test? ( test )"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-mongodb
-		--with-libbson
-		--with-libmongoc
-		--with-mongodb-sasl=$(usex sasl)
-	)
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	local PORT=27017
-	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
-		--dbpath="${T}" --logpath="${T}/mongod.log" || die
-	php-ext-pecl-r3_src_test
-	kill $(<"${T}/mongod.lock")
-}
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.8.1.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.8.1.ebuild
deleted file mode 100644
index 346f6f3dcb91..000000000000
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.8.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="mongodb"
-USE_PHP="php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="MongoDB database driver for PHP"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sasl test"
-
-PHP_DEPEND="
-	php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] )
-	php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] )
-	php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] )"
-COMMON_DEPEND="${PHP_DEPEND}
-	>=dev-libs/libbson-1.17.0
-	>=dev-libs/mongo-c-driver-1.17.0[sasl?,ssl]
-	dev-libs/openssl:0=
-	sasl? ( dev-libs/cyrus-sasl )"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-db/mongodb )"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="${PHP_DEPEND}
-	virtual/pkgconfig"
-
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="x86? ( test )
-	!test? ( test )"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-mongodb
-		--with-libbson
-		--with-libmongoc
-		--with-mongodb-sasl=$(usex sasl)
-	)
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	local PORT=27017
-	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
-		--dbpath="${T}" --logpath="${T}/mongod.log" || die
-	php-ext-pecl-r3_src_test
-	kill $(<"${T}/mongod.lock")
-}
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.9.0.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.9.0.ebuild
deleted file mode 100644
index c64402fea99a..000000000000
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.9.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="mongodb"
-USE_PHP="php7-3 php7-4 php8-0"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="MongoDB database driver for PHP"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sasl test"
-
-PHP_DEPEND="
-	php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] )
-	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.17.0
-	>=dev-libs/mongo-c-driver-1.17.0[sasl?,ssl]
-	dev-libs/openssl:0=
-	sasl? ( dev-libs/cyrus-sasl )"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-db/mongodb )"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="${PHP_DEPEND}
-	virtual/pkgconfig"
-
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="x86? ( test )
-	!test? ( test )"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-mongodb
-		--with-libbson
-		--with-libmongoc
-		--with-mongodb-sasl=$(usex sasl)
-	)
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	local PORT=27017
-	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
-		--dbpath="${T}" --logpath="${T}/mongod.log" || die
-	php-ext-pecl-r3_src_test
-	kill $(<"${T}/mongod.lock")
-}
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.9.1.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.9.1.ebuild
deleted file mode 100644
index c64402fea99a..000000000000
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.9.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="mongodb"
-USE_PHP="php7-3 php7-4 php8-0"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="MongoDB database driver for PHP"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sasl test"
-
-PHP_DEPEND="
-	php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] )
-	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.17.0
-	>=dev-libs/mongo-c-driver-1.17.0[sasl?,ssl]
-	dev-libs/openssl:0=
-	sasl? ( dev-libs/cyrus-sasl )"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-db/mongodb )"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="${PHP_DEPEND}
-	virtual/pkgconfig"
-
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="x86? ( test )
-	!test? ( test )"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-mongodb
-		--with-libbson
-		--with-libmongoc
-		--with-mongodb-sasl=$(usex sasl)
-	)
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	local PORT=27017
-	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
-		--dbpath="${T}" --logpath="${T}/mongod.log" || die
-	php-ext-pecl-r3_src_test
-	kill $(<"${T}/mongod.lock")
-}
diff --git a/dev-php/pecl-ncurses/Manifest b/dev-php/pecl-ncurses/Manifest
index 650673824335..e0eb15d978f1 100644
--- a/dev-php/pecl-ncurses/Manifest
+++ b/dev-php/pecl-ncurses/Manifest
@@ -1,5 +1,5 @@
 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 543 BLAKE2B 5091dd0de2295b7417c9a3ed64c0ca7eef88713a0a518a963ab324140cd2fb3081f27358c2238059b6c71449d9f36dafaf46ba880e75e4b8157b39ed5861921f SHA512 01a00314d028b5812219a34c9b0ea9a6efecf1d24d057d9a7cfd8d3cdec9b9700e0f0ae86052be852d24537fa24cdd90632d358400411b90146faf096f8dfec5
+EBUILD pecl-ncurses-1.0.2-r5.ebuild 522 BLAKE2B 82e66bafdfff0895234b693030631bc18d2967449e314b4ed0b1b0ebe3e2904f47d028f1a677615394cac02875f85a492122266cb53c2f7f8c2a0afcc301d3ea SHA512 d3768fd427065b0031432416862cacc9b7116fc7eaa74e042b2e5a1ecb86f6baf65f290fde60e84c62a1ed59beabacb88d655f36a8ae2cb539672b64cbf46c05
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
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
index 87adfe2ff31d..273b93d25b1c 100644
--- a/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r5.ebuild
+++ b/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-parallel/Manifest b/dev-php/pecl-parallel/Manifest
index dffc3026370a..c4024c4fc711 100644
--- a/dev-php/pecl-parallel/Manifest
+++ b/dev-php/pecl-parallel/Manifest
@@ -1,3 +1,4 @@
 DIST pecl-parallel-1.1.4.tgz 58783 BLAKE2B 942c767ff4838c13e70829d6ac6599cee3185afaf71e9dc430064835102d31a3e50b99694e1632be652c6a019934a13ba0f5139041bba39d486a20615478b910 SHA512 6693f01b0d43de5153aa0953f90580717e519cfbe8ca5b0ba6abd9cc681e0efe9d7c6fcc601da98f74b570b5810dffdbf5100bedc8ab86c1f4bc61d48955ae77
 EBUILD pecl-parallel-1.1.4.ebuild 556 BLAKE2B 261c1a02c6e8a5c083e080aabe25505b5732002c8114b106a9b35bbe26a91179cf623d19c087eca412fd80ac7c94cb0b038fb341d43287e781b4164d3ab48077 SHA512 ba5f1726fef372707fd7fdaa72ec88c5162810ba709fdf5ef77f56a301733293b728b29b2a7c8f3701b2c5c2c0529a66e5ff89c0eafca3335ed9bf812750817e
+EBUILD pecl-parallel-9999.ebuild 643 BLAKE2B 5492e573a78ec073781706138c1f144f992afc17f7c148c76b73b6de118b3c3c12e8d937d0a480981060196af92e22acb25fce21bf255206e547c43ba54e3375 SHA512 f4fa0aa82e87ab4a10a1da088203e0f855ec17bcafa41cb57b49a18a8c3f11d14d2f1a3f1c56552309dabf869f08050d989e62a42a71d5d86985a426ff21d960
 MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/dev-php/pecl-parallel/pecl-parallel-9999.ebuild b/dev-php/pecl-parallel/pecl-parallel-9999.ebuild
new file mode 100644
index 000000000000..f89155872481
--- /dev/null
+++ b/dev-php/pecl-parallel/pecl-parallel-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PHP_EXT_NAME="parallel"
+USE_PHP="php8-0 php8-1"
+PHP_EXT_NEEDED_USE="threads"
+PHP_EXT_ECONF_ARGS=()
+
+inherit php-ext-source-r3 git-r3
+
+DESCRIPTION="A succint parallel concurrency API for PHP"
+HOMEPAGE="https://pecl.php.net/package/parallel"
+EGIT_REPO_URI="https://github.com/krakjoe/parallel.git"
+
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+src_unpack() {
+	git-r3_src_unpack
+
+	# create the default modules directory to be able
+	# to use the php-ext-source-r3 eclass to configure/build
+	ln -s src "${S}/modules" || die
+}
diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest
index 831e12e14321..8809c2bc27db 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -2,8 +2,10 @@ DIST redis-5.3.2.tgz 266814 BLAKE2B 2be79d850e5958bcaf4fddcbdef0a402e62a522f260a
 DIST redis-5.3.3.tgz 266990 BLAKE2B b939e5a33b3013d1aeaa59f9a1ebbb4b4665d57abf87dc4e300273221d3390d14387cad318d69a56ab573861c1aef89ab7778d3f636adfc351b4fc330eba98d3 SHA512 a04a7d0aa3881b861a00c3f0a889b2f3fd135009293629ac55a74890196c0686e9766438f5255561105e30293f1a6a91ca987fd68e43f3ca436f6cc884e6a5df
 DIST redis-5.3.4.tgz 268154 BLAKE2B 17a3af10c09f302d46faa5122147e4882437f92e9440b3a580919382e48f2697ede453f11411de7c1a1114f94a2601ec5f905943f045c8d64e5fea7231ff96f5 SHA512 c1270235b18544e651411ddfb512d74b7229e3dc241b2dfcdf97f2e26cf60754afb7deaac17bc48202875b5caafae19f31a7b8da980fcba578df51b0c0860a95
 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.2.ebuild 1527 BLAKE2B 6121552e2c86d9b4e333c4ed9487553a24160dfee4d5f9155b9de65195146609983d13fb37258347645ac2144a005ca4630ac147bf6baf5adc54ce7e4254af7c SHA512 cf6f2b0e878b751b040a1ac4e3d99a275dda5a89ef5eb5996cd76613ff4f95bca7295371a0ba6f16f2b2712faa5ba4a881c7e1ff2e689e9bdf013e9f982adc73
 EBUILD pecl-redis-5.3.3.ebuild 1528 BLAKE2B e1fa05121c86d5d2e058f952ad5f90a4d1ccf4371778a56d0927d2c85e91afe6745a939ac9a6446398d8a07caa6d7504cd3297f30684677d171f26c906edb518 SHA512 825a353ae1233b53cb4ba54630f1eae5cf0a50138148eb43ed859821ca203f736bd9254eba1091044f1cdcfa8360417455e0f4842353c3d2c597fe76f593acf8
 EBUILD pecl-redis-5.3.4.ebuild 1501 BLAKE2B 5ead60f46fad23d281463117274b1b80eee85d9e47438cb15f8e63d2bd15e892fbef6e00db42016a181078af315797e5fc2791a06d1e7863d19098a55c27d178 SHA512 29ca7a425e42d7bd2d11b625be76c584690777b7121ad00b7c93a0525bbd35d3ab4be07880b57ab0886932740f3a6b339e37aa9fe8bca556c0e1ea05aa7e72cb
 EBUILD pecl-redis-5.3.6.ebuild 1531 BLAKE2B f1119234d43813c770c934fed2ff4dbfb993e96d6425bed351ebc9afe07a79ef38a4303dc45c004e6a842644dba03dee468f3031d55ac4001cab6fb7685382d4 SHA512 71165db2ebd7ceedaa97b92f01037ce6e279133a9563285e970b3133df480e909fdabc35e8c20849d2df37cacb8cf5b642055144ad082dcb2d3b045370723b91
+EBUILD pecl-redis-5.3.7.ebuild 1501 BLAKE2B 9bdbee0361e58c9d3a3b5be1a63e0c60bd5c41cb832c1bc8d1ccf599b1e9ed736fcada66308b0712843818f1518ca33cc86926f2e20fb939d38c36f89bcb03d6 SHA512 583062f9e022cee86d0488640ff6bacaeb7656c84418f5a8ec942b0232c549588302d57930b71e284c5361f27d531b141c17877ec7ffd5539ff7dd4b89d72885
 MISC metadata.xml 384 BLAKE2B 4a1a6b326526bb3f5b9d9d57158d6abbfe3c65b1cfc11980ce849d5f7278558ee0daf580aefc521939aae175cd8e2cb990e046fce8faf6774348b24fa6465ef8 SHA512 851e1fb9f6612105640028262a4821f0da5b1ee5949fdd99067e821ce1d22c41888ee53e102becc93c918a605c2b8dbb2d493cd7cad516530912fec652011364
diff --git a/dev-php/pecl-redis/pecl-redis-5.3.7.ebuild b/dev-php/pecl-redis/pecl-redis-5.3.7.ebuild
new file mode 100644
index 000000000000..2b26e3e0df6d
--- /dev/null
+++ b/dev-php/pecl-redis/pecl-redis-5.3.7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 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"
+PHP_EXT_NEEDED_USE="json(+)?,session(-)?"
+DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS )
+MY_P="${PN/pecl-/}-${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="PHP extension for interfacing with Redis"
+LICENSE="PHP-3.01"
+SLOT="0"
+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(-)?] )
+	lz4? ( app-arch/lz4:= )
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}
+	!dev-php/pecl-redis:7"
+
+# The test suite requires network access.
+RESTRICT=test
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-redis
+		--disable-redis-lzf
+		--disable-redis-msgpack
+		$(use_enable igbinary redis-igbinary)
+		$(use_enable json redis-json)
+		$(use_enable lz4 redis-lz4)
+		$(use_with lz4 liblz4)
+		$(use_enable session redis-session)
+		$(use_enable zstd redis-zstd)
+		$(use_with zstd libzstd)
+	)
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		# Run tests for Redis class
+		${PHPCLI} -d extension=modules/redis.so \
+				  tests/TestRedis.php \
+				  --class Redis \
+				  --host ${PECL_REDIS_HOST} || die 'test suite failed'
+	done
+}
diff --git a/dev-php/pecl-timezonedb/Manifest b/dev-php/pecl-timezonedb/Manifest
index 086c5a542595..902cdf78298a 100644
--- a/dev-php/pecl-timezonedb/Manifest
+++ b/dev-php/pecl-timezonedb/Manifest
@@ -1,5 +1,3 @@
-DIST timezonedb-2020.4.tgz 414667 BLAKE2B 1a219a090ae33a9f3eef76ab52e2bafd453a1f1161bbeeb53ee995d090f3fdd03c7a658a93ade72e3e1ae61df9d646eaef85dd4cacb5cea45c00adcfac8d6651 SHA512 d5c41c76b4b0b033464a4f086072d061504fc439c910c47a7077a0586b308cc37a4202ff9f418a39cee63534d55136d15a173bb94923160c0fa16bb33ac89a09
-DIST timezonedb-2021.1.tgz 415891 BLAKE2B c473f7d7556cae03263700300c09be75d3a827c4f80eaecd2683f706369d9e1a1a74379eba3fed720a51bba66da13ad330ea50720fe11f98fc5e495b6d406316 SHA512 53c53e061c1173e587b353da630272f2cbf9d223de7a49e6ce654b2c844da7afb641ef4a39ac4b17e0a56e86f23a4f4c448189e8c178e226ec0317f64c60c55a
-EBUILD pecl-timezonedb-2020.4.ebuild 450 BLAKE2B ce811112800741e818bfeb9d7275462e50e48dab938a11166e9a3a3f2afc3e10ab541d1308bb10590dfb5da819200076df33165c148432c8a82297f73cf7e467 SHA512 afb8a8dd9808a66dc0c97e86cfcb9814855e50845780533d394e9882a6b4bff578abaac660d1b58ac938d48b2d05872c0b593ba340dff04f97c97ab89f2685c2
-EBUILD pecl-timezonedb-2021.1.ebuild 450 BLAKE2B cc6e9f2f9528466780bdd5d356b9b3142107bf02f0f6af36fb2e3fbab7d2f43bc9e5d323cceb9aef5bbabae7e4fb35649f2db2ebc1292b907c19132e4c326f3c SHA512 f3f9d6da01f8b8cc385fab3ea89d4997a4eef7fb1a9a57dd3db841c341a77f844f1938e58b94c1db76b47659472c12d2f54f37adc0ee87756267cc1a201261a1
+DIST timezonedb-2021.5.tgz 631371 BLAKE2B fd9312a5a826a0f3ff469277151e68b2fd1dbaecdd345ebfe1c3cc8e847c0a925a8a22b4e7aa2eb9f18b9cd438cdab89ab3f889ad9cd384e13ec42700f6d17b7 SHA512 ac295df0dbc833e1b6d452df2fa0a316cc8df95abf6aaf809a87401256c891b9ba0e663dc300e5a0fdf1c0e3566b9eea580eff12ed4d2bcc4355b13eb5893d9e
+EBUILD pecl-timezonedb-2021.5.ebuild 450 BLAKE2B 3e2a2c3c86f83bdd16fb59ae49c394ab9e8b7e9f2ae0d353c73a55439c1d9abb9390bc6664f7b90865cc097ec7fb5e1b77f41c77578c38393440c4955283924a SHA512 3da8cc26f9ba4bae7c74a14f6cc920798ebad5a5cc6073ac5f06087063a1c7b1d71562a7b0b777eab4d2f6718a3f8380e9a597f8e5f239d691c41ec72a392f20
 MISC metadata.xml 636 BLAKE2B f684c89d246a7c39f73fb9751283ea88e4b592fe529bd5fdb999837a9dc9e97a74e99388ede65c3d6b6a2b237bc16bbf0342c4d62402da5d0a063a2129a15a15 SHA512 13c200867329ae46b6511726ab5846cafdda4d3a68cfd0da18d1e7aae64028e9ef68f2d587515bca027cd5cef96314dc84cf4f5f72f15933b8bb4732e01b228a
diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2021.1.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2021.1.ebuild
deleted file mode 100644
index 6e41e4f16b8a..000000000000
--- a/dev-php/pecl-timezonedb/pecl-timezonedb-2021.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="timezonedb"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php7-2 php7-3 php7-4 php8-0"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="Timezone Database to be used with PHP's date and time functions"
-LICENSE="PHP-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-PHP_EXT_ECONF_ARGS=""
diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2020.4.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2021.5.ebuild
index a390fa7584ed..d4426f45b015 100644
--- a/dev-php/pecl-timezonedb/pecl-timezonedb-2020.4.ebuild
+++ b/dev-php/pecl-timezonedb/pecl-timezonedb-2021.5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 PHP_EXT_NAME="timezonedb"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php7-2 php7-3 php7-4 php8-0"
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-translit/Manifest b/dev-php/pecl-translit/Manifest
index 366042d4d4ee..60b6e96935f4 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 660 BLAKE2B 832e82180a85e7995e41bd4f6ea6c647b8d2ddfc43e1108b30f6aef7c6e070a8c8ef349e9b0028f555df783b534a4c3195fa53e888e76e71c523f08ae780edd9 SHA512 0a820e3782cc17a636b7ff60ab81ae42a96d8386432f4a1350d5714cbeda34fac61fc8cadb5cb9c26c9058400a79ba3c1c7d8a9cac5b1a0a0e9195d728270d0c
+EBUILD pecl-translit-0.7.1.ebuild 653 BLAKE2B 7659eff79c5feea82e58758f7e2f0f6ab7b9ac4476968a3201a506408d413edeaece2ff41d0cf585c58c7fddea2082bb812d4eadd99261437d91b34e4087279e SHA512 c81a2bb46feab446f48656cd5dd12c36e4317d5bbcac127ec63559f30026e7c35dbd0b166f9acc72e721e2bf37c9c77c87e7574aeb96552633feb1057299e410
 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 5c7709ce8eff..5aef258fa8cf 100644
--- a/dev-php/pecl-translit/pecl-translit-0.7.1.ebuild
+++ b/dev-php/pecl-translit/pecl-translit-0.7.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 PHP_EXT_NAME="translit"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php7-2 php7-3 php7-4 php8-0"
+USE_PHP="php7-4 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 fa2ad18d4c48..4b3ca310fd7f 100644
--- a/dev-php/pecl-uploadprogress/Manifest
+++ b/dev-php/pecl-uploadprogress/Manifest
@@ -1,7 +1,3 @@
-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
+EBUILD pecl-uploadprogress-2.0.2.ebuild 670 BLAKE2B b3b6a18e60014cf65551c19786cc1da1aceda3c5d261ef1274d5badea28b188042d56463d52dd9658df8935cd01393449c7d6cec9df9469a8b9eb85ce6b1c793 SHA512 059534127bbf73894e80b3b869fcfea39a84686733e400350cafb6e2f0eff9782575cdf9e0abe07419ad1a2807d21a87fa132b44cf67a973089ebbbd607a052a
 MISC metadata.xml 709 BLAKE2B a3e91fd98c74c0f7b7286cd7d3070a495eab7c585f4d9981bedc90734665ba60d1db391a641aa9dfb60fcdb3c5748c9f65016ddf5cd9756c7e5caf021a65e3ff SHA512 eab0d79c1f912399fe60a673e6378f61cd5c4c0842d496c59fd300e2a037bfa1e0cbee0d9c330b81200c52944595d95fcc23c21c171172687330d21a8ff53a33
diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.1.3-r1.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.1.3-r1.ebuild
deleted file mode 100644
index dabf3dddf33b..000000000000
--- a/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_PHP="php7-2 php7-3 php7-4"
-
-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-2? ( dev-lang/php:7.2[apache2] )
-	php_targets_php7-3? ( dev-lang/php:7.3[apache2] )
-	php_targets_php7-4? ( dev-lang/php:7.4[apache2] )
-"
diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.1.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.1.ebuild
deleted file mode 100644
index 6bc6174856b0..000000000000
--- a/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/pecl-uploadprogress/pecl-uploadprogress-2.0.2.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2.ebuild
index 6bc6174856b0..99572c452134 100644
--- a/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2.ebuild
+++ b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-USE_PHP="php7-3 php7-4 php8-0"
+USE_PHP="php7-4 php8-0 php8-1"
 PHP_EXT_SAPIS="apache2 fpm"
 
 inherit php-ext-pecl-r3
@@ -15,7 +15,7 @@ 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(-)] ) )
+	php_targets_php8-1? ( || ( dev-lang/php:8.1[apache2(-),fileinfo(-)] dev-lang/php:8.1[fileinfo(-),fpm(-)] ) )
 "
diff --git a/dev-php/pecl-uuid/Manifest b/dev-php/pecl-uuid/Manifest
index 625a42bc9e5b..6e937ed3524b 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 422 BLAKE2B b745ddc981d571b499cad800b794fed79ee210bab02c80141f4940e658dacac3afee537f0f74e5f8fe361257e263636a0cf77a2058f28296ac534851600804b1 SHA512 cea2e6da940717e2b24c5562f69b4a8458610a2194453ff7a25b971166da18a0b7fab815e8df84853eb5cb6ae505e89d89e8f56d2f1eab0a159fe12d86cb223e
+EBUILD pecl-uuid-1.2.0.ebuild 415 BLAKE2B 803ad0910ffa359488ecb83d5130b7bef6e1eb52e889b891bdbf79625291465b6815a689051c067b65409504ecebe45786c04539a6a9b10838b4e10f4d3f201e SHA512 5efde1456f6349cbbf1971ff14c9bcd519928245db5b06307d20e8eba5782318f65a1d1e47f2fccb409283170db9926ebe2cf86e8dc15e1e1b0b92b92ab25ca4
 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 65d0a5fb0ec5..d4c12dad5ad6 100644
--- a/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild
+++ b/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 PHP_EXT_NAME="uuid"
 PHP_EXT_INIT="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( CREDITS )
 
-USE_PHP="php7-2 php7-3 php7-4 php8-0"
+USE_PHP="php7-4 php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-yaml/Manifest b/dev-php/pecl-yaml/Manifest
index 395f3723a2b6..f169a2a6fbea 100644
--- a/dev-php/pecl-yaml/Manifest
+++ b/dev-php/pecl-yaml/Manifest
@@ -1,5 +1,5 @@
-DIST yaml-2.2.0.tgz 40716 BLAKE2B ef8e4082cf7aa3c6996d878f04b57438fc5fa4eb6672617685b3fd3ba535581329e8bb8d6b0644b97b2d64e951aea2d46d4e702acf02ac283d8e2b43fc82acba SHA512 3af6a0f2bcbab7d0ea21b81c2914a8c65393156b5a974448645ca079edbd616b5f46564e5f55a83d556f8e3fc38573a869f79c9eb3c2449e1c3d410ae32a6fb5
 DIST yaml-2.2.1.tgz 40977 BLAKE2B 110f77058ac2b1c26dcfb7df024bb37ee58c902fc2fe6ff1ba14d981a17591d6cfda157c79d8d991e8edda95818978b83a98ba7b873367788a64f6c1abd78196 SHA512 b171ca9ca108dc093fb0dda3bc9de821fdd8ddcf79d386baba02f367e331f42e6500f26e73577864cd5f8d12f8c9bfe01962fb8d1bb56fa26d6f0a1208ac5441
-EBUILD pecl-yaml-2.2.0.ebuild 584 BLAKE2B 07a25c1be754baa755974d6a67b9b3d61f68843c53d5163a27c9316cbb9db1fea898a195d8578e2430b23176f4ddcd1177876192e18e8626a703556143498627 SHA512 e02b296383d02fb208a1fe38fca466b89f69609aaa49e8ade198d4ce47408f84797fa543e2404a5b29f2b4914e5b59686a23aac265fbbefb1c4bdd132536d1c8
+DIST yaml-2.2.2.tgz 41063 BLAKE2B 9fc85be5cb1eb86bc052b86d6292601babee0eb6fa790c0f5a77b307c2bd5a7a6ff66ea9efa21fa958a3c4f415f1850525454566b5a4303182d12a778fb2ed93 SHA512 4c1d3012623154b8d74908fb319a637d7bff178d02d0732d1a3d19d24df2c612d62948eb7dcd9ead9fd31f2da7af0cec54657b8cce128968a04079dd0002117d
 EBUILD pecl-yaml-2.2.1.ebuild 577 BLAKE2B 8f6ee8dfc9cca36543541586217e56c9f6784c88f27bb3d1d77acf76e9c21b5df7ac427b3304d6964665118f10c19aa14ea2509666639ed2c39f75bee4eae6bd SHA512 806b7da09702f802d48447a9dd5f9af7f354b65a10507720b222cd4f22c38156efd50ade7bb19fe4d7e63cfcb490aba5c274c5ae8a7ed44eb57a60ab589f333d
+EBUILD pecl-yaml-2.2.2.ebuild 411 BLAKE2B c5a6e38a96ff2262c3823572e43871845975356b8daa61491fbbfb354caa68f97a8b84ea11c067a9cbe0b2aada2ad6ff6c7dac78e12c3678608624953ce5f64f SHA512 455ec11379b0fcf9996db95183c8aef6e2f12128773b011ef059c382fabca639b163f2a868c9fa006d841b6e5b4e01f68501a3a28e4192b2e94b18f07dddd8d6
 MISC metadata.xml 239 BLAKE2B c25c5a46bb59def6d564473a743d1c351a5fbeea2168a71478952bc219392c40f6e86a6e510589d9b70b834f58967a8d647f4cf2f1d4de1e37e2828f70035b44 SHA512 6f0cde14a96ea085b4d2e48538a956d62dbb4ee847096cebed5ad02e35f0f183a22aa19282ed4f59bf8f6d6ef935e6c7def3f7a5b4b24ee227601b6f8974e781
diff --git a/dev-php/pecl-yaml/pecl-yaml-2.2.0.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.2.2.ebuild
index 9a2570bbf2c0..8f9139b326f2 100644
--- a/dev-php/pecl-yaml/pecl-yaml-2.2.0.ebuild
+++ b/dev-php/pecl-yaml/pecl-yaml-2.2.2.ebuild
@@ -1,29 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-MY_PV="${PV/_rc/RC}"
-PHP_EXT_PECL_FILENAME="yaml-${MY_PV}.tgz"
 PHP_EXT_NAME="yaml"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS README )
-
-USE_PHP="php7-2 php7-3 php7-4 php8-0"
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
-S="${WORKDIR}/yaml-${MY_PV}"
-PHP_EXT_S="${S}"
-
-KEYWORDS="~amd64 ~arm64 ~x86"
-
 DESCRIPTION="YAML 1.1 (YAML Ain't Markup Language) serialization for PHP"
+
 LICENSE="MIT"
 SLOT="7"
-IUSE=""
+KEYWORDS="~amd64 ~arm64 ~x86"
 
-DEPEND=">=dev-libs/libyaml-0.1.0"
+DEPEND="dev-libs/libyaml"
 RDEPEND="${DEPEND}"
-PHP_EXT_ECONF_ARGS=()
diff --git a/dev-php/realpath_turbo/Manifest b/dev-php/realpath_turbo/Manifest
index f13548a200f2..565d44770eb8 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 629 BLAKE2B da38cc8a470d61ea0ad89b9b41a40b0f1df2b725cae92e89da23c8ba58f48c053ed848f2ed2a8a07fd4e0d1b1a1b7301dc58072cc7bb304625819e03949ca4f9 SHA512 7122ac6c6d42d60caecd725eb4bff1a0a3e604eaf3058df75f0db1fa8b03240aad515b659fb58b3d2049036e6857ede5520a1e2fbda99d536c1df7a62ba6ac4d
+EBUILD realpath_turbo-2.0.0.ebuild 615 BLAKE2B 35a53070abc947a61d75db41ee8c5a12273a2fe16654d135db481c800eecdc884c1b4ac91636934d8e7a724f3041077b77dc186bb93753f87a3815e042335dac SHA512 a427fa96a0d660edf88fe0f3fa39ea18014086656aeb650c2b22076b8bead6008c7107a909f02368ae5e4f2d02cab77cc8452860d3bc6216decfc5be10903a7e
 MISC metadata.xml 454 BLAKE2B 95c3536425469724ba0aeb362e5d49fc1994c33fdd09f9ea76a388c901d08cc03bebc6f4e8132b9b2323025c82de7bdbfe91fa229ebbc0437f13f6f4d155dde9 SHA512 4b2c00ec4d3d4ab5b5a48a25be4c8a37c1cd30fb695822de41ec7df519e150f082c401b7dbaac63eaed509d6f4711dd94cc56a61ee13a76cc538c1ce22ff8bfd
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 fdda0e07336f..8e01888cdfe4 100644
--- a/dev-php/realpath_turbo/realpath_turbo-2.0.0.ebuild
+++ b/dev-php/realpath_turbo/realpath_turbo-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ PHP_EXT_NAME="realpath_turbo"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-4 php8-0 php8-1"
 
 inherit php-ext-source-r3
 
diff --git a/dev-php/sebastian-complexity/Manifest b/dev-php/sebastian-complexity/Manifest
new file mode 100644
index 000000000000..5739dbe4c7c4
--- /dev/null
+++ b/dev-php/sebastian-complexity/Manifest
@@ -0,0 +1,4 @@
+AUX autoload-2.0.2.php 999 BLAKE2B f2911660d2a7bc493eb51c09fbf2dad9c50e4eaf68646f9305bc9cdd7f9da73784f85958d0824a7702f45faa1e4c4d85ccb489ed8664424cbf2760a1c4bb7bc3 SHA512 60717d6899d262a5386a0f2d55cb9e05f3d1fac35fc7c1c582a1a515bad1000d8055338f5cddb218e93f85d781a730b839de38e63cf81f654280300a974c3cf0
+DIST sebastian-complexity-2.0.2.tar.gz 4979 BLAKE2B f742e0f3057d7d24963236e2b32841cd6d8fb9b14870e2bfbe1d84cb737008428c9e00db28f5c2f42a61877a4282b3dbd5935c9a3ea4cf93401691c43bab40df SHA512 04773cfac3622eca3d859e9180f8eb5582e3a4124837b2e2cb536b052eeac6fe19dbae81ddbdcc88405de0ff0b202140609e7a5eb435af54faac4b1262c780e7
+EBUILD sebastian-complexity-2.0.2.ebuild 696 BLAKE2B a7b38b2b572d5a3e9d7395d83a85c8ae59f1bec5a64f1154a99704dfeb6e66fafe8eea95204b2f3eee6bca71fdff030eade02bc80e3ccce01ad8a0cf18aa35fe SHA512 90387cbcf10f0e759dbe506891f27d41a9ddc2cfab2d97530299c872b89f0a276fd4808fa181011182a48b29c0cfaa960fb07c6217b8c3a751594adb9e296b2f
+MISC metadata.xml 357 BLAKE2B e4c24d19e2932df1116131191dac6c68aed9dc4f099671ea0dc335d06a0eea00c70af4ccd2af292681da3733792191d2e2f76de13861ea28f7c7eb2779b2e6b2 SHA512 f83043dddb170e90d53870e17ef1285fa9f73c894282599e728e84db5d73a2d7cd7f702be00ba5ec613be73f2da351d4d9a64833e3ccc79292ea143c60bd0e48
diff --git a/dev-php/sebastian-complexity/files/autoload-2.0.2.php b/dev-php/sebastian-complexity/files/autoload-2.0.2.php
new file mode 100644
index 000000000000..07eb31b7ee93
--- /dev/null
+++ b/dev-php/sebastian-complexity/files/autoload-2.0.2.php
@@ -0,0 +1,20 @@
+<?php
+/* Autoloader for dev-php/sebastian-complexity */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+	require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+	[
+		'sebastianbergmann\complexity\calculator' => '/Calculator.php',
+		'sebastianbergmann\complexity\complexity' => '/Complexity/Complexity.php',
+		'sebastianbergmann\complexity\complexitycollection' => '/Complexity/ComplexityCollection.php',
+		'sebastianbergmann\complexity\complexitycollectioniterator' => '/Complexity/ComplexityCollectionIterator.php',
+		'sebastianbergmann\complexity\complexitycalculatingvisitor' => '/Visitor/ComplexityCalculatingVisitor.php',
+		'sebastianbergmann\complexity\cyclomaticcomplexitycalculatingvisitor' => '/Visitor/CyclomaticComplexityCalculatingVisitor.php',
+		'sebastianbergmann\complexity\exception' => '/Exception/Exception.php',
+		'sebastianbergmann\complexity\runtimeexception' => '/Exception/RuntimeException.php',
+	],
+	__DIR__
+);
diff --git a/dev-php/sebastian-complexity/metadata.xml b/dev-php/sebastian-complexity/metadata.xml
new file mode 100644
index 000000000000..3f4b99635ae6
--- /dev/null
+++ b/dev-php/sebastian-complexity/metadata.xml
@@ -0,0 +1,12 @@
+<?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/complexity</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-php/sebastian-complexity/sebastian-complexity-2.0.2.ebuild b/dev-php/sebastian-complexity/sebastian-complexity-2.0.2.ebuild
new file mode 100644
index 000000000000..21c42e69830b
--- /dev/null
+++ b/dev-php/sebastian-complexity/sebastian-complexity-2.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN/sebastian-//}"
+
+DESCRIPTION="Library for calculating the complexity of PHP code units"
+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/nikic-php-parser
+	>=dev-lang/php-7.3:*"
+
+src_install() {
+	insinto /usr/share/php/SebastianBergmann/Complexity
+	doins -r src/*
+	newins "${FILESDIR}/autoload-2.0.2.php" autoload.php
+}
diff --git a/dev-php/sebastian-environment/Manifest b/dev-php/sebastian-environment/Manifest
index 8eba9a2f68fb..7ef2e03bf24a 100644
--- a/dev-php/sebastian-environment/Manifest
+++ b/dev-php/sebastian-environment/Manifest
@@ -1,7 +1,6 @@
 AUX autoload-4.2.3.php 444 BLAKE2B 607f48a38674187ea4c2e57e4877630df0268bca0057469382a3837e0134b299c97eb71370826e8170dabcf19894fc16742e9ac5d49ba6daa0e7e3fde8de95c4 SHA512 19cfd81d54b4e9a7c5258fb809f740b9061c88108597422b4b54f94eae5e3775ceeb8ecf6850d51f2736838b027d5b9b791f388efb73e055db8d680985608e6e
-AUX autoload.php 372 BLAKE2B 3d2843946daf17f3c367b04f1b5295ac67bdff8e1a409537f895eb7ed06a946ca3bc52647e8454d398b574ca948588951b29156d553b0a5f4b741b9dc828c708 SHA512 7fc348367571b5c7409635ec61c2b06f7fea3b640998f93eca87423529ecc4c933cfb5b033152081dd42817e9861d2fdfddcfb5f0d08d51ccf60d5c12f56a76d
-DIST sebastian-environment-2.0.0.tar.gz 5607 BLAKE2B 3c34c6e61d9a0bdc5df8083331390935bd513d735a1509890a9af05be8b5a718bbb1d5826ab0cb80da2ee5c4cd436b22ef4ccb50c7b4e1c11d361a78b51621c3 SHA512 cf91f0a5f057007f318c5d6b11f8a1345b8df35d513c6291c5b725f0874ed301a64d1097c3fac1e6b32533caa96b3f78ac415d99b9b6ef63dc4a303b90d49c88
 DIST sebastian-environment-4.2.3.tar.gz 9622 BLAKE2B d90b181c3aae7c4ea8e172e5b7f897f8a93bf1edbeca19cc8a7a6f10963730ece1f267fed325a6734b1677b75cc8f5b84a5aa55be383a40b1ec2aa7a603bc668 SHA512 871a15297196b21364000d72afa73c2319e741a284c5446443ae3cacd8ce1a07b1ea3b1d8b6b1a88356fb261d093b889508cea63706341413b15f23348f77e80
-EBUILD sebastian-environment-2.0.0.ebuild 653 BLAKE2B 33caebb73f94e98c40beef6956f31a9c4f4d404adb2b204feb0e458af606fd2ae6ebd84b937cdafb23a6d8a2d0f2a03432c5141afcf2bb71007c6519b7549a61 SHA512 aab4ef44eaae4d69145908a49cb68e18416232a365eeb66f764016a93375f6e66b7946e1a268326e5385ec8e25411617864dc3111b5d8de5fe0971d1e749c35a
+DIST sebastian-environment-5.1.3.tar.gz 6766 BLAKE2B b19be2ce9b9d514ed5ce7203f2bb0b06c90d36b42dac5f210cbc9d1a764d727aefd6b18fbd291b82516c8902aa3b895e5563eab4113ad977bbc7aa8e63a69068 SHA512 f11826a65ed758e1fe94e6c53293660406ea93f45c107b78053134d695580cb0507786c6d527fef8e7d52ab8df0b4ad9acb2c4a6c758c3a165658a5c3d138d65
 EBUILD sebastian-environment-4.2.3.ebuild 673 BLAKE2B 883d349290faffc20acf6849ccb97af8b3fe9cc1498786019347a5d640cba2143b43133cdc07f3145dde12301d441ca8d4eae05ce4b5c83ccc53149d65b9939d SHA512 013d69d39da8d260cf7d8a344781d0aa84ede6d77ecd1fce6f4cd071e5cb7c73c78ff38f34be04c24c60bb1cb01f2d2be7abe6437e30cd59bcf63a660abccfe2
+EBUILD sebastian-environment-5.1.3.ebuild 679 BLAKE2B 3926e29e4e056c8c4ad508e9e061ab41aec39c1fd54a9a29d880fd77d6f58b5ef869d13d799c7da2539f396cbef0e4172aa6b2d995a8129bbe47de7fde08e45d SHA512 3b8897a7c35002a5eab798a190c3aa56324b476bb1d28a3c17f3b08215a2f0518bbce1f69a39507a2c83753a37b69008fa7a3d9ac25cdd8a15a7d058e7cfeba1
 MISC metadata.xml 358 BLAKE2B a2af757272d762601412f059ff7fed90e044042eeac8b23d3cefe729886551c9f5e02aaaf620b5768b00a673cd66a3c369e3f17f11474bfaf8247115e8f28164 SHA512 6943efb85e0c1b5bc569b5892f77f54d9870226230966da1b40b4558493f719e8397d04b751e52d5ffe371bc4ce09289674954769f41838a8772af745bd316c1
diff --git a/dev-php/sebastian-environment/files/autoload.php b/dev-php/sebastian-environment/files/autoload.php
deleted file mode 100644
index 3abd16ee357b..000000000000
--- a/dev-php/sebastian-environment/files/autoload.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/* Autoloader for dev-php/sebastian-environment */
-
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-	require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-}
-
-\Fedora\Autoloader\Autoload::addClassMap(
-	array(
-		'sebastianbergmann\environment\console' => '/Console.php',
-		'sebastianbergmann\environment\runtime' => '/Runtime.php',
-	),
-	__DIR__
-);
diff --git a/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild b/dev-php/sebastian-environment/sebastian-environment-5.1.3.ebuild
index cbe1d4def8ed..3eea9930d2f8 100644
--- a/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild
+++ b/dev-php/sebastian-environment/sebastian-environment-5.1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 MY_PN="${PN/sebastian-//}"
 
@@ -11,16 +11,16 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+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:*"
+	>=dev-lang/php-7.3:*"
 
 src_install() {
 	insinto /usr/share/php/SebastianBergmann/Environment
 	doins -r src/*
-	doins "${FILESDIR}/autoload.php"
+	newins "${FILESDIR}/autoload-4.2.3.php" autoload.php
 }
diff --git a/dev-php/sebastian-lines-of-code/Manifest b/dev-php/sebastian-lines-of-code/Manifest
new file mode 100644
index 000000000000..926b1a97dd5a
--- /dev/null
+++ b/dev-php/sebastian-lines-of-code/Manifest
@@ -0,0 +1,4 @@
+AUX autoload-1.0.3.php 830 BLAKE2B 10c59c49279e959a9e49162f39fc62afd80d5a89477a1301dd6fda2c98ba2a3d1288d79dbe1460e713b7e9c4afbd02b97b7ebd739ccc77782d30b187a23c2112 SHA512 72758672913e13829141486007fc5efe09d6416254d7fca624f8fccdf6c019c788a7d356c8ec17cec4e6a28e5451cb55714c01b8f906b0def35f567ceedbe26f
+DIST sebastian-lines-of-code-1.0.3.tar.gz 4438 BLAKE2B 1142dabe91907fdcb469fe223ba292b8444f093c6dfa5d4a428357db59635aa760ccda5b8f077def130eeba3365f5d0f50fad465300ba8028edd9d46f99defbc SHA512 09812716a68586cad8304fd14ee4957de68fff6cfabf9982a126ba19d1990a4822962ccbb384170082b18f0ab081d5beeec06c633f4c374f21718a616a054dfd
+EBUILD sebastian-lines-of-code-1.0.3.ebuild 698 BLAKE2B 05112b94a477f357f11d38c41a487212b44772bb0df269b639a41139fba5f5092f0b6cab001760514959f5caec636cf4922ad9ec1a4773d7e731c4ff65261215 SHA512 1093f66b2cf19448c3a2c96c1818c920c256c90d98236b1f1d7bed74176257be93b7d5ff79b8961fdda1539cbb13f0972f3e64f19ff8e2df39c3aec1ee319b9d
+MISC metadata.xml 360 BLAKE2B 6f0ff122f96e6a200a631fe44a21dfa2010380ba06b8c270620b4a74f67549de7f3d0ea0ee8be87bf6ba06009cb8b95e95989e3d5733ce1d12afdecdfa1035e8 SHA512 f5856d1f20938a755cb386d87bf08e62e95ed64d26263fbf503094a742ef36897d662f12b04eae8488e925ad33893c4b24f9717c79945789b6e32962fd638982
diff --git a/dev-php/sebastian-lines-of-code/files/autoload-1.0.3.php b/dev-php/sebastian-lines-of-code/files/autoload-1.0.3.php
new file mode 100644
index 000000000000..5c824ac8c0ac
--- /dev/null
+++ b/dev-php/sebastian-lines-of-code/files/autoload-1.0.3.php
@@ -0,0 +1,19 @@
+<?php
+/* Autoloader for dev-php/sebastian-linesofcode */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+	require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+	[
+		'sebastianbergmann\linesofcode\linesofcode' => '/LinesOfCode.php',
+		'sebastianbergmann\linesofcode\linecountingvisitor' => '/LineCountingVisitor.php',
+		'sebastianbergmann\linesofcode\counter' => '/Counter.php',
+		'sebastianbergmann\linesofcode\exception' => '/Exception/Exception.php',
+		'sebastianbergmann\linesofcode\illogicalvaluesexception' => '/Exception/IllogicalValuesException.php',
+		'sebastianbergmann\linesofcode\negativevalueexception' => '/Exception/NegativeValueException.php',
+		'sebastianbergmann\linesofcode\runtimeexception' => '/Exception/RuntimeException.php',
+	],
+	__DIR__
+);
diff --git a/dev-php/sebastian-lines-of-code/metadata.xml b/dev-php/sebastian-lines-of-code/metadata.xml
new file mode 100644
index 000000000000..233d89157577
--- /dev/null
+++ b/dev-php/sebastian-lines-of-code/metadata.xml
@@ -0,0 +1,12 @@
+<?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/lines-of-code</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-php/sebastian-lines-of-code/sebastian-lines-of-code-1.0.3.ebuild b/dev-php/sebastian-lines-of-code/sebastian-lines-of-code-1.0.3.ebuild
new file mode 100644
index 000000000000..2d708710a6d3
--- /dev/null
+++ b/dev-php/sebastian-lines-of-code/sebastian-lines-of-code-1.0.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN/sebastian-//}"
+
+DESCRIPTION="Library for counting the lines of code in PHP source code"
+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/nikic-php-parser
+	>=dev-lang/php-7.3:*"
+
+src_install() {
+	insinto /usr/share/php/SebastianBergmann/LinesOfCode
+	doins -r src/*
+	newins "${FILESDIR}/autoload-1.0.3.php" autoload.php
+}
diff --git a/dev-php/sebastian-version/Manifest b/dev-php/sebastian-version/Manifest
index 75714a6f07c3..7de1162c67d7 100644
--- a/dev-php/sebastian-version/Manifest
+++ b/dev-php/sebastian-version/Manifest
@@ -1,4 +1,6 @@
 AUX autoload.php 305 BLAKE2B fd6d3f90f1a7b421f68876765e7a5646c291bd7a72b06a6827c1472f5a772cfd4afb23a597ba63dbce0cb2dd999d2ea43b61c9d8e559ffa5ae4a7c3669f9dc9a SHA512 8a3e0a151a2d6b33e168907a3e30778104d2f33ece499b9f6836be807a16bad4f234fddeaae61f56a69f085b3e7e5e4434297e2557b36b62c8e124ba041cb5e1
 DIST sebastian-version-2.0.1.tar.gz 3581 BLAKE2B c6da754aa5ef6f46309d52f7d36a30a1d1b9b847aa90d62481633e0c290fe58554772d4016aa90f79b153b0e3df377269f7dbf007dc7049226899ef9bc2aa868 SHA512 12a813ff08996f8a6e53069ea297fb00f5fc9b58ce463b4008791cadc19575539bdb17acbf1f2fa67b18ce5a9207c9acd47183d520b60d6a188569f513d8a661
+DIST sebastian-version-3.0.2.tar.gz 3316 BLAKE2B ecf9bd1e6ad471271410863ac4ce1066cfe13467bc324d4313f829c0bffe765ac07af514f096bc008c95c2e981821f2c8f905646d5194d61cc5c800f173fd345 SHA512 4dba99c14827ef2a402af1faa09c42e55dd16440c0d26fa97927f1c211e779a0d7f6ca005d87fbb76a081bf116d2a7fc3f5296481c908a1eeece162e4aad084d
 EBUILD sebastian-version-2.0.1.ebuild 688 BLAKE2B 4bd34673ceca41597ef71f039eefc0e45685bccc31306137f207f5469bd55d2e215757ff815b596b5b5af6328a5223561ddc84669d87dfc37afbaec2a9355fd8 SHA512 d3b1d42fa10b2a0dda8eb5dce073f76b92e515eb9ea0d35e6fa1c5e868884190df9b31a11b5ee3c9190e304636a57cbc77fef0d588a4976a4fcf978a2b55c652
-MISC metadata.xml 330 BLAKE2B f7178f82074342be842d7d973009e99b62ab1adb20c5144934edf82cf8c65d2c397e8f4d8180f867fbf3ae48ab4dd6f885f8dc9be5089bfe25484ffb62fed447 SHA512 1d29ad18cebcc5e2c3eb1eaa9c908de7ed6724d2822df4282dafd66c3c217cafb0873849e24e6513772c90d648347ab9094e0d6703bc5fe687282335909ad274
+EBUILD sebastian-version-3.0.2.ebuild 694 BLAKE2B 6d004db7e309a8afe175cc288b177c0689b851a122436bc575b4ea3099b7efa4d43b9369266de48f4c6fce449c13d32ccd4386f00d19f270ba4e7f2c047a17ff SHA512 9e8318e32ac72f998b2dd26fac2f765ee9bde98339a16bb4eebb6211e6c1423e8f028b213a0be195c7255a8d13288a27cddc22517fe220c168e59de4bd932773
+MISC metadata.xml 354 BLAKE2B 5c8277e7a7ad7dacd263368cee683687b6f3c02c5ca49776d41466e178854e43a071195eea89888790e3011eade29a6019e6254d246fd04fcc02b625b02c7f4f SHA512 02fed9ec530c21fa123b3ceb4486b250a0f97489e33746696eb722e26b08a5c1f9198bd80d0b1c1c7c3db447c0083c5c96257a8924335096e968be70a6d963cc
diff --git a/dev-php/sebastian-version/metadata.xml b/dev-php/sebastian-version/metadata.xml
index c011bd4225b5..ec74c535c743 100644
--- a/dev-php/sebastian-version/metadata.xml
+++ b/dev-php/sebastian-version/metadata.xml
@@ -5,6 +5,7 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">sebastianbergmann/version</remote-id>
 	</upstream>
diff --git a/dev-php/sebastian-version/sebastian-version-3.0.2.ebuild b/dev-php/sebastian-version/sebastian-version-3.0.2.ebuild
new file mode 100644
index 000000000000..3aa79ccb40b3
--- /dev/null
+++ b/dev-php/sebastian-version/sebastian-version-3.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="version"
+
+DESCRIPTION="Helps with managing the version number of Git-hosted PHP projects"
+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.3:*"
+
+src_install() {
+	insinto /usr/share/php/SebastianBergmann
+	doins src/Version.php
+	insinto /usr/share/php/SebastianBergmann/Version
+	doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/smarty/Manifest b/dev-php/smarty/Manifest
index 01516091c15d..40eee2fae326 100644
--- a/dev-php/smarty/Manifest
+++ b/dev-php/smarty/Manifest
@@ -1,6 +1,4 @@
 DIST manual-en.3.1.14.zip 408414 BLAKE2B 03d4e7a386eb3bd5b19e5c555ec34b86812838a5b5fac8ec0ab9701fba89a5867714da57d950f68224a89bbe2267c18d638ee850681860de309c74bbfb3d0a0b SHA512 d384e3856b45ed3f992f3732a5465120abe9fb947cdf13ff67a9c4264f72987d24885ee61cd7309b728e64cdfe4f34c3e7f757096d35de56d962f3b78def9e58
-DIST smarty-3.1.39.tar.gz 264604 BLAKE2B ab5e8e052fd83e38a99725f03dcc4a206848c153b0584c12de1c605d9a9a5b47d23c29bd8a5179e53cf73921c89632ee2c4e9921002f41a4de97c6dc2e7d91a1 SHA512 84566bdefd83784c5b22ea4c21405261010a03e07839b15f6e1837aeb93ae12ae724a31648627b5f8794659e2fcd6cbbcd633be8d290dd1744e45e87fbe60fd2
-DIST smarty-4.0.3.tar.gz 358999 BLAKE2B 13866ff2da1d99672337815eb264b3941a51ef4b26079995790a1759e7a1acd1e6c724af25eae5eec18f992f1a1f08564746867d5c715df9755a8899cd96c641 SHA512 9a3cf224b38e4e0fd55d2242f4b09531ae44f581979b64754fea1bab4f540b49c0222e9a43622d87d3d82e68c6d8aaca31bb34dc0b1b691ed413de6af06e69cb
-EBUILD smarty-3.1.39.ebuild 1332 BLAKE2B 6223fcc88515195b121844c10598bfa3759d28943cc06c4295a2fdbd50f422d19e1bfd7dc720a93a0859eccf935acdc6331954a6f08163ef10bde05a59edf5de SHA512 ffa1e8578375016ed486ca4a81585acdacb96e82bf42fa52dd7950759cc31582ad67de1a4143c31d55a975f6baae877bba164a414e5fb7ed315601b4cb823f72
-EBUILD smarty-4.0.3.ebuild 1349 BLAKE2B 21a788ae2556328e15ff8153fb71e385ad2eca62126d87abd9f121f416a6d46646f1c211ffa876c4fa475265db8653033bb606ca3f786359125e4660f601e997 SHA512 7e1db2a808be9b30b9e7af27ce643b02406e3ce59eee3d0385b06b1b5127a2284e48c56909f4723093039d268f8a7027567f0779068b0d18d873f3211f24bff3
+DIST smarty-4.0.4.tar.gz 359012 BLAKE2B 84f34ff1e00f81de8961e252a14a7d813180b789820ace363c7a64f05d57c874d1f77068aed43d1d4cfc9aed0b348625e85e75a30ae3f1dab7a15c92f6ed9ab5 SHA512 1eef2585b415905e4a67328ab56ae473e5121b8f3a50f0d3aa3c60ab331eda9137744c92dcf2fcc674a6ec68eb714aa60468d1b56a436a94778be242fbd0b377
+EBUILD smarty-4.0.4.ebuild 1344 BLAKE2B 80344cc79df6ab8d1afcf0dedf442cebbb23bd3d14e2e3aaaff58de681fd1d444e1887448e1c72f65e2a22bb101ccfc3f56ec1a1b499c79d19e5534bef1d3a32 SHA512 47bfdd8491f4eb1ac7c46670c91539a20a880af791eefab712c9230ba9b27b8ac8193098967b90441bd497fbf41242b963fb98b22c756477e764f4dfb26e105a
 MISC metadata.xml 742 BLAKE2B 2e882a2cd16715923bd3b93e032b2680fe07853bc0a1a03a62690f57a0254373611e5dd323dec285ac3d051dfdfd167f114c68ad4ca2caa916a76262d71e4725 SHA512 3589fb45084564c669e97fdebab3964ced2500dea7a53dd452961e71a3a2d5070cb71467dc3489a4a2474858ebf8f4d05d8b01728382e08215752b535b6a3681
diff --git a/dev-php/smarty/smarty-3.1.39.ebuild b/dev-php/smarty/smarty-3.1.39.ebuild
deleted file mode 100644
index e78d49468259..000000000000
--- a/dev-php/smarty/smarty-3.1.39.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DOC_PV="3.1.14"
-
-DESCRIPTION="A template engine for PHP"
-HOMEPAGE="https://www.smarty.net/"
-SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( https://www.smarty.net/files/docs/manual-en.${DOC_PV}.zip )"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="doc"
-
-BDEPEND="doc? ( app-arch/unzip )"
-
-# PHP unicode support is detected at runtime, and the cached templates
-# that smarty generates depend on it. If, later on, PHP is reinstalled
-# without unicode support, all of the previously-generated cached
-# templates will begin to throw 500 errrors for missing mb_foo
-# functions. See bug #532618.
-RDEPEND="dev-lang/php:*[unicode]"
-
-src_install() {
-	insinto "/usr/share/php/${PN}"
-	doins -r libs/*
-
-	local DOCS=( *.txt README README.md )
-	local HTML_DOCS
-	use doc && HTML_DOCS="${WORKDIR}/manual-en/"*
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "${PN} has been installed in /usr/share/php/${PN}/."
-	elog
-	elog 'To use it in your scripts, include the Smarty.class.php file'
-	elog "from the \"${PN}\" directory; for example,"
-	elog
-	elog "  require('${PN}/Smarty.class.php');"
-	elog
-	elog 'After that, the Smarty class will be available to you.'
-}
diff --git a/dev-php/smarty/smarty-4.0.3.ebuild b/dev-php/smarty/smarty-4.0.4.ebuild
index b8594fc0e25c..ec9685432afe 100644
--- a/dev-php/smarty/smarty-4.0.3.ebuild
+++ b/dev-php/smarty/smarty-4.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc"
 
 BDEPEND="doc? ( app-arch/unzip )"
diff --git a/dev-php/swoole-async/Manifest b/dev-php/swoole-async/Manifest
index 9360dcb68916..9d94d3c67075 100644
--- a/dev-php/swoole-async/Manifest
+++ b/dev-php/swoole-async/Manifest
@@ -1,5 +1,3 @@
-DIST swoole-async-4.4.12.tar.gz 417674 BLAKE2B 77a96f53b1b159b558eb4759fe172e4a3b8f2648cd9f49252d89508eb56b4d342b178fa3c84d6a425c300a286063b4d32a05d09a3da4f3769be4c25a9800783c SHA512 adfb761803e5ec93c30aa2a4bbc312a2f43287a54cd237c0a87237dfcbfe1e6daa3d57ec2cdf15720202aa9a7830ed67ab2efdf2f7dd81989c3693e91bc22143
 DIST swoole-async-4.4.16.tar.gz 419094 BLAKE2B 7b93a0d2eb8a9597a68871783c60746c832b2eb1dce89a0f82ca6df2ee20151f910ad4f8ebb6a453bea3b7c2cc274266614f147b34c21a089ff9cc4ca0f73d1c SHA512 cf4bfc3c86740e343774b2cddc0ef2386f522e7929c160bc10d47ebe0b8f8d63dbcc82e70b7f3f30e7f7c102ebd42b02cddf4c3e1a0289f0e45147ddbd9aa546
-EBUILD swoole-async-4.4.12-r1.ebuild 1216 BLAKE2B 70a272e3491417a22a33fd4a80c25839962ae76b10e39ad664000c184fd1b04eda181f11b66abf3bd6ab9f88b4da2d34df7e1ec71be217d3793309c521d2f4c4 SHA512 14513fdf8efcd3543ee92d311129edea2c2d80e18a9ecd3fbacd1c0c3e188cf2c6f1dec23e2a60989a349cdd91542875424de6e6d4ddef1cf6d3bcee4733a060
-EBUILD swoole-async-4.4.16-r1.ebuild 1216 BLAKE2B 70a272e3491417a22a33fd4a80c25839962ae76b10e39ad664000c184fd1b04eda181f11b66abf3bd6ab9f88b4da2d34df7e1ec71be217d3793309c521d2f4c4 SHA512 14513fdf8efcd3543ee92d311129edea2c2d80e18a9ecd3fbacd1c0c3e188cf2c6f1dec23e2a60989a349cdd91542875424de6e6d4ddef1cf6d3bcee4733a060
+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/swoole-async-4.4.12-r1.ebuild b/dev-php/swoole-async/swoole-async-4.4.12-r1.ebuild
deleted file mode 100644
index aa4fbdf97a3a..000000000000
--- a/dev-php/swoole-async/swoole-async-4.4.12-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="swoole_async"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_SAPIS="cli"
-DOCS=( README.md )
-
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-SRC_URI="https://github.com/swoole/ext-async/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/ext-async-${PV}"
-PHP_EXT_S="${S}"
-
-HOMEPAGE="https://www.swoole.co.uk"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="An extension of Swoole, including the async callback style API"
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests will require pre-configured endpoint
-RESTRICT="test"
-
-# This will only compile with the same version of dev-php/swoole
-DEPEND="~dev-php/swoole-${PV}[php_targets_php7-1(-)?,php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?]"
-
-RDEPEND="${DEPEND}"
-
-IUSE="debug"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-swoole_async
-		$(use_enable debug)
-	)
-
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		[[ -f tests/template.phpt ]] && rm tests/template.phpt
-		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
-	done
-}
diff --git a/dev-php/swoole-async/swoole-async-4.4.16-r1.ebuild b/dev-php/swoole-async/swoole-async-4.4.16-r1.ebuild
index aa4fbdf97a3a..7e3dc9689a29 100644
--- a/dev-php/swoole-async/swoole-async-4.4.16-r1.ebuild
+++ b/dev-php/swoole-async/swoole-async-4.4.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -9,7 +9,7 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_SAPIS="cli"
 DOCS=( README.md )
 
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-4"
 
 inherit php-ext-pecl-r3
 
@@ -27,7 +27,7 @@ SLOT="0"
 RESTRICT="test"
 
 # This will only compile with the same version of dev-php/swoole
-DEPEND="~dev-php/swoole-${PV}[php_targets_php7-1(-)?,php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?]"
+DEPEND="~dev-php/swoole-${PV}[php_targets_php7-4(-)?]"
 
 RDEPEND="${DEPEND}"
 
diff --git a/dev-php/swoole/Manifest b/dev-php/swoole/Manifest
index a92d30a83123..0b2571a41751 100644
--- a/dev-php/swoole/Manifest
+++ b/dev-php/swoole/Manifest
@@ -1,15 +1,7 @@
-DIST swoole-4.2.13.tgz 1305634 BLAKE2B bb30180f7ca7b024a2aab8aff1149f6b19035315c9518dfc9e9e2e02acde09aa4cd09fbe146aefd39fc09c25af68347a5c188ca8a21677926b1adea5b549858b SHA512 f2438ce761766d20a24279a2d6f2094c718324585b1d396344f64e8a4facc1cc025a3afb2deff3b1accd5266763bdaa0a2b15e831ea4b9bdb107c83b0046636d
-DIST swoole-4.4.12.tgz 1436554 BLAKE2B cc9e64e108aa9b393265708a6922f53824c2e9941c0f47f4f6aacf93239829381cdf4625af8f30e2ca8ceb1663047c6be8b2d7808dbc29d27100135288f7ac85 SHA512 8899bb048b85c048903c80fe1af045ea4f82a25b3b4fd9995d51c8a2ab144306f9f5651276776e3f6a29c83322fb0aeee2822d131247070fe9e2e87b26f2e0e9
-DIST swoole-4.4.14.tgz 1440095 BLAKE2B 8a893604a84f750b95bb63a3c6ce9869a80a700b58e744e0da588dcdb88b9d9ae8fa5b73548cc182e255d7fe4e49139c3da9bcec40a54af94c35d355ee4cbfe0 SHA512 73b598069d38dcc3201a31fdd93c1bcf0ce31ab5399bade8c31f6decae25ef6e9c0aefe0412409158c1dd0fe502751c8e669e0a34561cb1b36448366708572c6
-DIST swoole-4.4.15.tgz 1454897 BLAKE2B 38f804e5f2f41ba2bc32ac2e6fd7be3e03f7a361487d7dad41bdc2ee3f2489d41824f60a841de1e3dea0cbf105d11dc1b5c2225ae49a02155604bc09c990ed61 SHA512 5ad797b38a20cfa17b0aa1fc5ab4f6446b84debb38babc05630e07833895401c778f1c6cf9eb32d7204b02c0e170ba6e613f356a054baa29ac511c19ce59620f
 DIST swoole-4.4.16.tgz 1457270 BLAKE2B 4b65270aa1014ea68cadae8eb021d37498dc3fe0bf2d681c95bf7113928138bc26ab73f3be91185eb5ecebcb4940906814913c7908c87592aafd33fbc1820bf7 SHA512 7be4705967ed6b7a955f679f8c39585d34dc8c87ba608ac3ae2b0fc3cae9513d9639c8e9aac4278ce85acc215b500044626aab9b2aac725c9ffaef72dfb02dd7
-DIST swoole-4.4.19.tgz 1469420 BLAKE2B 0240b5fbd6a4625d426d0c960859b8215122fff10be9e70823eb32f196d3ec075a952dc133258b04c323439de982079f5acbab9039958c457aa18f1687118ce3 SHA512 be4671da9fdbf65daf6364e5eaca9b25fd3557bec848a04b636ace48c896d4dbf08f6e877d6166571aa966732a70037bf2d4ba2f302696dd2b1371e2de993106
 DIST swoole-4.5.9.tgz 1552445 BLAKE2B 602ce65f7b59a3c199d7718aeb941d1ebde7d59096335992c2278f7e330f7b48554a8418cc4014f6fcf47af92d315368a16c572055b1fd9575608c2559ed3107 SHA512 9154a2874480218aa3c8935979267efb92a3d5a4f1ba7dc071bf4c2b169d69e31a6ad7412785d00543dc5827ce2d6c5999b6cabea2089818f3f57acc26bcb31f
-EBUILD swoole-4.2.13.ebuild 1736 BLAKE2B db2e93920c5401e954aa99fa141dd99638e3332ac3ae7fa101f83d88f60da62f4c798826322cb2358a25770bd78968cc405c242204ee6f824d9dda9b973cd331 SHA512 f5f08fd2d4322971352698c0498e898ba8d4e4bc09f114a575eff79705a4435b4a48edc0045cdb75b811cc890e21dd3498696eccbef6ea17b8751c08896188be
-EBUILD swoole-4.4.12.ebuild 1817 BLAKE2B f422e201d77443e94d1448d6fc4402b7e6ed6449ee0c1efa748894289c740b7bda327cade26abe4306f71c5affeff8dc886c8eef8af2bbb3fe89381ca9093713 SHA512 c22f4597075a8b856ebe31917451586c1b3f6f687bb2a47c35cc3e5d83d0b427d02cfb81cd9ae2cfe89d282b682897896bb69fddf54f5da97ef291d5af057aed
-EBUILD swoole-4.4.14.ebuild 1817 BLAKE2B f422e201d77443e94d1448d6fc4402b7e6ed6449ee0c1efa748894289c740b7bda327cade26abe4306f71c5affeff8dc886c8eef8af2bbb3fe89381ca9093713 SHA512 c22f4597075a8b856ebe31917451586c1b3f6f687bb2a47c35cc3e5d83d0b427d02cfb81cd9ae2cfe89d282b682897896bb69fddf54f5da97ef291d5af057aed
-EBUILD swoole-4.4.15.ebuild 1817 BLAKE2B f422e201d77443e94d1448d6fc4402b7e6ed6449ee0c1efa748894289c740b7bda327cade26abe4306f71c5affeff8dc886c8eef8af2bbb3fe89381ca9093713 SHA512 c22f4597075a8b856ebe31917451586c1b3f6f687bb2a47c35cc3e5d83d0b427d02cfb81cd9ae2cfe89d282b682897896bb69fddf54f5da97ef291d5af057aed
-EBUILD swoole-4.4.16.ebuild 1817 BLAKE2B f422e201d77443e94d1448d6fc4402b7e6ed6449ee0c1efa748894289c740b7bda327cade26abe4306f71c5affeff8dc886c8eef8af2bbb3fe89381ca9093713 SHA512 c22f4597075a8b856ebe31917451586c1b3f6f687bb2a47c35cc3e5d83d0b427d02cfb81cd9ae2cfe89d282b682897896bb69fddf54f5da97ef291d5af057aed
-EBUILD swoole-4.4.19.ebuild 1817 BLAKE2B f422e201d77443e94d1448d6fc4402b7e6ed6449ee0c1efa748894289c740b7bda327cade26abe4306f71c5affeff8dc886c8eef8af2bbb3fe89381ca9093713 SHA512 c22f4597075a8b856ebe31917451586c1b3f6f687bb2a47c35cc3e5d83d0b427d02cfb81cd9ae2cfe89d282b682897896bb69fddf54f5da97ef291d5af057aed
-EBUILD swoole-4.5.9.ebuild 1559 BLAKE2B 8a6b91445f759407469793624f8d5fdbd86544b5fb79960bed2a90739f927c3f608332c6a0b807172811ff4dee311eded719bb26cd32ff612640a65ebd9d0c97 SHA512 99cbcc90b6212ee554ed01cc45ed0f6a5577a7e7cb119a49ca090d089c0e61845e27e60e666d0aba66ab2e8d5cd27e829101d324a1a735c8d241c61acab2fefa
-MISC metadata.xml 345 BLAKE2B 93874c9becdbcfbe4122294d05ab36bcc6de890f50b8dcaae013fdaafeb4576b571afc5803ba489443fea2cfd056eb3c425903556082fb66e5ab785d088e7f7c SHA512 d964074fe23255867bf0e40491d427c0c052c94882c928cdbbe2a2ef2b36a6f73733767ef5c46356369aa17f9ebd0f3be106a549adf621bf0a4bc63c8d6cb3d1
+DIST swoole-4.8.7.tgz 1851160 BLAKE2B 3e5c9d664f1897b7bd490a1e9dbc4c3c03117a18ae58586efe534c617578a7af5be779e6ca44a5bf2f782abc2eb57bc21e3dc4e3445c3299918bc189547dc75c SHA512 36f36aface71435233aaa8c81e023b813c6175d3ed00a9de20acb690b58b464d99670c3b96f247ab1147f95e099d44785d60d5f1e36f519ccfeb09b3bddba264
+EBUILD swoole-4.4.16.ebuild 1448 BLAKE2B 007138c93d0ce40e40f1b6a6b216475c4b12444a85f133d3904e19ef660941b1fab7bc85709a59bda427aca0e4378b9ee90796609e64b3696575a005257aaa34 SHA512 a7b819b601aa7b0df7b1cbe784a81c773d2e6eadddc0095a7350f60ab6399a2e22b59cdef2e8a1d6bf9cb7de64b622152620e8311d95d1a5b0f041b12a08c97b
+EBUILD swoole-4.5.9.ebuild 1558 BLAKE2B bd0ae9804f9988de63bd1ac01842d2ff736012a7602e6633d4439b2c061d479b0963c0e850ad96ebee9dd349e6028d006791eebc708d2650d238aef0a16645ce SHA512 73641d783c50c2ad69b35d67547292d343147ae4f085f0788906ce7fa7a8220a8244d757b03ba28ddf16cf8c8e79ab99cc2c65899b4ebba233dd39d100bf7b8c
+EBUILD swoole-4.8.7.ebuild 1653 BLAKE2B 62e4580753fcd6e82a85b583e02a454335affe49c4bc74c4c9695d243cdce9ec83d373af1ef3518ab36bb5ada8b3e76dee3c44d3fc67837e9faba5d169217292 SHA512 2ccdae316979ecc919c4bcda526fa06abe4b7416e062ba9c71b046a286fd16486796e0ca8bcec61608ad2c90a2692b4dbb0de065aace5e41a5e5a4b95f827200
+MISC metadata.xml 425 BLAKE2B e22c1dc7ced96324ae0be299115d702664cb05e990c299b25dd8d558c7ab8e2ceb93a7bb5ebe5fbcb6c8a29e971208024ac5e4c6f78708c7f255d7e99a01ae19 SHA512 02c341989d04d303904279e74aa2692c61b7e92402cd825ea68bbd67212e213d589bd67412da5314972b6e9f299b6e7eed0e6c7739c165a7718342cb1a60a0d6
diff --git a/dev-php/swoole/metadata.xml b/dev-php/swoole/metadata.xml
index a64ace0fb389..fa5b5ed25cfb 100644
--- a/dev-php/swoole/metadata.xml
+++ b/dev-php/swoole/metadata.xml
@@ -8,4 +8,7 @@
 <use>
 <flag name="http2">Add support for HTTP/2 protocol via <pkg>net-libs/nghttp2</pkg></flag>
 </use>
+<upstream>
+  <remote-id type="github">swoole/swoole-src</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-php/swoole/swoole-4.2.13.ebuild b/dev-php/swoole/swoole-4.2.13.ebuild
deleted file mode 100644
index 5f7e9c4b7df3..000000000000
--- a/dev-php/swoole/swoole-4.2.13.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="swoole"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_SAPIS="cli"
-DOCS=( README.md )
-
-USE_PHP="php7-1 php7-2 php7-3"
-
-inherit php-ext-pecl-r3
-
-HOMEPAGE="https://www.swoole.co.uk"
-KEYWORDS="amd64 ~x86"
-
-DESCRIPTION="Event-driven asynchronous & concurrent & coroutine networking engine"
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests can hang.  Disable until this no longer happens
-RESTRICT="test"
-
-DEPEND="
-	dev-libs/libaio
-	dev-libs/boost:0=
-	dev-libs/libpcre
-	http2? ( net-libs/nghttp2:0= )
-	ssl? ( dev-libs/openssl:0= )
-	php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] )
-	php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] )
-	php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] )
-	mysql? (
-		php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] )
-		php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] )
-		php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] )
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-IUSE="debug http2 mysql sockets ssl"
-
-src_configure() {
-	# PostgreSQL disabled due to Gentoo's slot system
-	# JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-swoole
-		--disable-coroutine-postgresql
-		$(use_enable debug)
-		$(use_enable http2)
-		$(use_enable mysql mysqlnd)
-		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${ESYSROOT}/usr")
-		$(use_enable sockets)
-	)
-
-	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/swoole-4.4.12.ebuild b/dev-php/swoole/swoole-4.4.12.ebuild
deleted file mode 100644
index 4d978ebbd611..000000000000
--- a/dev-php/swoole/swoole-4.4.12.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="swoole"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_SAPIS="cli"
-DOCS=( README.md )
-
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-HOMEPAGE="https://www.swoole.co.uk"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Event-driven asynchronous & concurrent & coroutine networking engine"
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests can hang.  Disable until this no longer happens
-RESTRICT="test"
-
-DEPEND="
-	app-arch/brotli:0=
-	dev-libs/libaio
-	dev-libs/boost:0=
-	dev-libs/libpcre
-	sys-libs/zlib:0=
-	http2? ( net-libs/nghttp2:0= )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] )
-	php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] )
-	php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] )
-	php_targets_php7-4? ( dev-lang/php:7.4[cli,sockets?] )
-	mysql? (
-		php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] )
-		php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] )
-		php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] )
-		php_targets_php7-4? ( dev-lang/php:7.4[mysql,mysqli(+)] )
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-IUSE="debug http2 mysql sockets ssl"
-
-src_configure() {
-	# JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-swoole
-		$(use_enable debug)
-		$(use_enable http2)
-		$(use_enable mysql mysqlnd)
-		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${ESYSROOT}/usr")
-		$(use_enable sockets)
-	)
-
-	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/swoole-4.4.15.ebuild b/dev-php/swoole/swoole-4.4.15.ebuild
deleted file mode 100644
index 4d978ebbd611..000000000000
--- a/dev-php/swoole/swoole-4.4.15.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="swoole"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_SAPIS="cli"
-DOCS=( README.md )
-
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-HOMEPAGE="https://www.swoole.co.uk"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Event-driven asynchronous & concurrent & coroutine networking engine"
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests can hang.  Disable until this no longer happens
-RESTRICT="test"
-
-DEPEND="
-	app-arch/brotli:0=
-	dev-libs/libaio
-	dev-libs/boost:0=
-	dev-libs/libpcre
-	sys-libs/zlib:0=
-	http2? ( net-libs/nghttp2:0= )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] )
-	php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] )
-	php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] )
-	php_targets_php7-4? ( dev-lang/php:7.4[cli,sockets?] )
-	mysql? (
-		php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] )
-		php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] )
-		php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] )
-		php_targets_php7-4? ( dev-lang/php:7.4[mysql,mysqli(+)] )
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-IUSE="debug http2 mysql sockets ssl"
-
-src_configure() {
-	# JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-swoole
-		$(use_enable debug)
-		$(use_enable http2)
-		$(use_enable mysql mysqlnd)
-		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${ESYSROOT}/usr")
-		$(use_enable sockets)
-	)
-
-	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/swoole-4.4.16.ebuild b/dev-php/swoole/swoole-4.4.16.ebuild
index 4d978ebbd611..ae1a5e1862af 100644
--- a/dev-php/swoole/swoole-4.4.16.ebuild
+++ b/dev-php/swoole/swoole-4.4.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -9,7 +9,7 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_SAPIS="cli"
 DOCS=( README.md )
 
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-4"
 
 inherit php-ext-pecl-r3
 
@@ -32,14 +32,8 @@ DEPEND="
 	ssl? (
 		dev-libs/openssl:0=
 	)
-	php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] )
-	php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] )
-	php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] )
 	php_targets_php7-4? ( dev-lang/php:7.4[cli,sockets?] )
 	mysql? (
-		php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] )
-		php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] )
-		php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] )
 		php_targets_php7-4? ( dev-lang/php:7.4[mysql,mysqli(+)] )
 	)
 "
diff --git a/dev-php/swoole/swoole-4.4.19.ebuild b/dev-php/swoole/swoole-4.4.19.ebuild
deleted file mode 100644
index 4d978ebbd611..000000000000
--- a/dev-php/swoole/swoole-4.4.19.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="swoole"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_SAPIS="cli"
-DOCS=( README.md )
-
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-HOMEPAGE="https://www.swoole.co.uk"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Event-driven asynchronous & concurrent & coroutine networking engine"
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests can hang.  Disable until this no longer happens
-RESTRICT="test"
-
-DEPEND="
-	app-arch/brotli:0=
-	dev-libs/libaio
-	dev-libs/boost:0=
-	dev-libs/libpcre
-	sys-libs/zlib:0=
-	http2? ( net-libs/nghttp2:0= )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] )
-	php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] )
-	php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] )
-	php_targets_php7-4? ( dev-lang/php:7.4[cli,sockets?] )
-	mysql? (
-		php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] )
-		php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] )
-		php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] )
-		php_targets_php7-4? ( dev-lang/php:7.4[mysql,mysqli(+)] )
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-IUSE="debug http2 mysql sockets ssl"
-
-src_configure() {
-	# JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-swoole
-		$(use_enable debug)
-		$(use_enable http2)
-		$(use_enable mysql mysqlnd)
-		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${ESYSROOT}/usr")
-		$(use_enable sockets)
-	)
-
-	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/swoole-4.5.9.ebuild b/dev-php/swoole/swoole-4.5.9.ebuild
index 5d5171051808..5c0345cb8a3e 100644
--- a/dev-php/swoole/swoole-4.5.9.ebuild
+++ b/dev-php/swoole/swoole-4.5.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -15,7 +15,7 @@ USE_PHP="php7-2 php7-3 php7-4 php8-0"
 inherit php-ext-pecl-r3
 
 HOMEPAGE="https://www.swoole.co.uk"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DESCRIPTION="Event-driven asynchronous & concurrent & coroutine networking engine"
 LICENSE="Apache-2.0"
diff --git a/dev-php/swoole/swoole-4.4.14.ebuild b/dev-php/swoole/swoole-4.8.7.ebuild
index 4d978ebbd611..74dd612ea9a3 100644
--- a/dev-php/swoole/swoole-4.4.14.ebuild
+++ b/dev-php/swoole/swoole-4.8.7.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 PHP_EXT_NAME="swoole"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_SAPIS="cli"
+PHP_EXT_NEEDED_USE="cli,sockets?"
 DOCS=( README.md )
 
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-4 php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
@@ -19,28 +20,20 @@ KEYWORDS="~amd64 ~x86"
 DESCRIPTION="Event-driven asynchronous & concurrent & coroutine networking engine"
 LICENSE="Apache-2.0"
 SLOT="0"
-# Tests can hang.  Disable until this no longer happens
+# Tests require network access for composer libraries under tests/include/lib/vendor
 RESTRICT="test"
 
 DEPEND="
 	app-arch/brotli:0=
-	dev-libs/libaio
-	dev-libs/boost:0=
 	dev-libs/libpcre
 	sys-libs/zlib:0=
-	http2? ( net-libs/nghttp2:0= )
 	ssl? (
 		dev-libs/openssl:0=
 	)
-	php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] )
-	php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] )
-	php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] )
-	php_targets_php7-4? ( dev-lang/php:7.4[cli,sockets?] )
 	mysql? (
-		php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] )
-		php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] )
-		php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] )
 		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(+)] )
 	)
 "
 
@@ -64,10 +57,14 @@ src_configure() {
 }
 
 src_test() {
+	ulimit -n 16384 > /dev/null 2>&1
 	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
+		cd tests || die
+		if has_version ">=dev-php/xdebug-3" ; then
+			sed -i 's/xdebug.default_enable=0/xdebug.mode=off/' run-tests || die
+		fi
+		PHPT=1 "${PHPCLI}" -d "memory_limit=1024m" ./run-tests swoole_* || die
 	done
 }
diff --git a/dev-php/theseer-tokenizer/Manifest b/dev-php/theseer-tokenizer/Manifest
index e0f1afacf6bc..2dbbe8dfcfec 100644
--- a/dev-php/theseer-tokenizer/Manifest
+++ b/dev-php/theseer-tokenizer/Manifest
@@ -1,10 +1,5 @@
-AUX autoload.php 740 BLAKE2B 1776060d0cbd86a165e293cf24ba31c7c6eef748f7d34681d110f1f99f62909f6619f4917743a995c2c9f2edc5de99b5762d3997d09f14c66a6bfe3569f5e17a SHA512 23ec36f9afc24a4df46a866376db86727127351a1c6d9c16f864804ff31fe64c0c0c8a8306fb1a91fce0dd165cbf5fb02cbe545b4f00dc96bcff2dcce7a82b7c
-DIST theseer-tokenizer-1.1.0.tar.gz 10163 BLAKE2B b2360f901d60f784db2045912707a8e293a55967d60d4e72168a1c4b0c9a2d5bdb739fbed9bfec02075476e7bf6762eb1cc7e36870b84fcc341b609527579ca2 SHA512 8b500565dc0d6c8513db3aa72a7ee1fa04510a712ce9b0977feccddc6b2dae53825e39182d43508e196f326776115789e81697116418f6f9f63d08f0c05d0543
-DIST theseer-tokenizer-1.1.3.tar.gz 10553 BLAKE2B 4bed1623abe110cec432a97fbd28752618420a188b450c935c77b5771d6986be9a51c8f100fd81a89d892b0c1e2b46b0124e3c35e3cbe2138eee2d520c74933a SHA512 e29fd41b311bac8021f4c0593d79a9c1bde4b6ccf4774e94d27a0e8a97bac3844109f9312c4aab6e239365630394b602b56a084c291dc13fb439dc8ac22944e3
 DIST theseer-tokenizer-1.2.0.tar.gz 7156 BLAKE2B 61474e3ebed5262b4d250f0057fbe68df6b2b2d6026cba28efbfc35c865bc9491e3b3f7871591a7aa52383c3bb748cf5dfb95f36d680bdbb9755b585b5b8f4f8 SHA512 e0deeffc151a1831cc7226037c75b534aa0d28d9639de45a1f0a6f5865d3df3cfbd7225e075b094603d512b0beb449e91205f40366ef1c7c865c8994e0710ff7
 DIST theseer-tokenizer-1.2.1.tar.gz 7537 BLAKE2B 204b39ca71cb6e99696c8bda19e5319e83302cd9fd4689343d3864ec81996d433ea8cfa2578abec2bef440271a1abe3169c3c871fd931c1ab73705cb7c36e4eb SHA512 7c7382f8f2e96984862d187fffb08b020cac8c0a0d93b58f9b1a244a46f8fcbfbe1c18d005acce8f8e1ef9aec2b9be99b7f2312e28f54a66f5a97ee263ed5239
-EBUILD theseer-tokenizer-1.1.0.ebuild 834 BLAKE2B 79ca12311b476cf6528502bfb4302b7e4d65a96c20e9c5c18494bb52d898181099730d78dbffaa6d0e2060c993b85c2629c84269c1e9629df396058c5f2b80ce SHA512 9cb0686954506ccdc4ce6a2e972bf54c482e260205700e521085609872c88f7d59fc966077a1ba062d621502a2f59d5048f2af2279ef08061f7b42a19df655e2
-EBUILD theseer-tokenizer-1.1.3.ebuild 834 BLAKE2B 02ed175c1a5d4c8395b1d049125316dc19a1b87404ca27950869a0ea7e98972bee58ea656f386341f6d623627c797722e69861f59dc96c280296423cbdfb3ac2 SHA512 9b5fff439ac870a1cb80cab1bd048207616bd810e627e4c8c1ab72080565888e12b626d670292d68574a814444a6e299c4feaf073aef1b6e4df0407e9656c95d
 EBUILD theseer-tokenizer-1.2.0.ebuild 805 BLAKE2B aed1ac6e06ed8cef37bb091daca130d9d7f2bf9e64a78bde0b9c1b539fc869283e8c3ded87944747e23ab9fba7cac64af226f514f26dadc18a7de2d520e96133 SHA512 87ba6d245b5a0f1451dec4cfd3cc164e2505cb8816a813043d89362f1d13236d453616d22978d443cd82f5a08e7b5fc7ace69badfd24fa0a43054e7fb8c0fe10
 EBUILD theseer-tokenizer-1.2.1.ebuild 811 BLAKE2B ccc407ce7c2edba8b65763d5906867d9dd515b9f51d26ed7338a56147b6cdc449739c9734a51cf1d906ac359880fc244f7b444abac5822e6b435c3818da7e672 SHA512 0fe156bc4c7527d9029b3f31cb6f7853b52d25e1af0a68d6be93beef7a8cd7ce726834ac0190e842e7f962f7b3d4ff6e70afadeb33a58070bf40f7fb033786b5
 MISC metadata.xml 346 BLAKE2B 93494c634a8fc4d07f9b501f453e7977bca1df161785c30752981fea823613909a3a2952ca674804f030f01bb9e0ece42d705b2157ac3d68c2b03a052dd17b76 SHA512 75fc30c988f41657d863283070ec1838d68fcd45c910d78d34765316266c6df4a46acbec0ffe02a7c352b8f7a9af50f9f5401c5aa05c32575cf02ed2fba69ad2
diff --git a/dev-php/theseer-tokenizer/files/autoload.php b/dev-php/theseer-tokenizer/files/autoload.php
deleted file mode 100644
index 67f5bd3506e0..000000000000
--- a/dev-php/theseer-tokenizer/files/autoload.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/* Autoloader for dev-php/theseer-tokenizer */
-
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-	require_once 'Fedora/Autoloader/autoload.php';
-}
-
-\Fedora\Autoloader\Autoload::addClassMap(
-   [
-		'theseer\\tokenizer\\exception' => '/Exception.php',
-		'theseer\\tokenizer\\namespaceuri' => '/NamespaceUri.php',
-		'theseer\\tokenizer\\namespaceuriexception' => '/NamespaceUriException.php',
-		'theseer\\tokenizer\\token' => '/Token.php',
-		'theseer\\tokenizer\\tokencollection' => '/TokenCollection.php',
-		'theseer\\tokenizer\\tokencollectionexception' => '/TokenCollectionException.php',
-		'theseer\\tokenizer\\tokenizer' => '/Tokenizer.php',
-		'theseer\\tokenizer\\xmlserializer' => '/XMLSerializer.php',
-	],
-	__DIR__
-);
diff --git a/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild b/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild
deleted file mode 100644
index f55bd6c3895a..000000000000
--- a/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Convert tokenized PHP source code into XML and other formats"
-HOMEPAGE="https://github.com/theseer/tokenizer"
-SRC_URI="https://github.com/theseer/tokenizer/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 )"
-
-S="${WORKDIR}/tokenizer-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-	>=dev-lang/php-7.0:*[tokenizer,xmlwriter]"
-
-DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
-
-src_prepare() {
-	cp "${FILESDIR}/autoload.php" src/ || die
-	default
-}
-
-src_install() {
-	insinto /usr/share/php/TheSeer/Tokenizer
-	doins src/*.php
-	dodoc README.md
-}
-
-src_test() {
-	phpunit || die "Unit testing failed!"
-}
diff --git a/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.3.ebuild b/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.3.ebuild
deleted file mode 100644
index 88e27eb644ac..000000000000
--- a/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Convert tokenized PHP source code into XML and other formats"
-HOMEPAGE="https://github.com/theseer/tokenizer"
-SRC_URI="https://github.com/theseer/tokenizer/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 )"
-
-S="${WORKDIR}/tokenizer-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-	>=dev-lang/php-7.0:*[tokenizer,xmlwriter]"
-
-DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
-
-src_prepare() {
-	cp "${FILESDIR}/autoload.php" src/ || die
-	default
-}
-
-src_install() {
-	insinto /usr/share/php/TheSeer/Tokenizer
-	doins src/*.php
-	dodoc README.md
-}
-
-src_test() {
-	phpunit || die "Unit testing failed!"
-}
diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest
index c3c21c8703d0..775d282483a1 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -1,15 +1,6 @@
-AUX 2.6.0-xdebug.ini 1623 BLAKE2B 6d8c3352dc55778e29cce92794ae36421a6e696244e3c7e1dd4e98d2ff0a6c86ce91e4e4ff2749cd58135e838ff61e2cad5bca8879caf9928d82e2f4bf17af80 SHA512 fe715f986fc5fbc0b92f8d708281feb5b9f6e0a054537ad7883c11acd035d0ddfc20812d64b35a616e0e8048b6332a097a0103329e2c96221571eeecbaaa963f
 AUX 3.0-xdebug.ini 1207 BLAKE2B 5ebcd3d89e1f49ea67c517d9fe6f552b82341e47cc1d46f033731ba5d9bf901404e41f29a48a073d2da0645082b2938ab4734334a57f578461abce38cbc2f05d SHA512 40ccbbdee2f7c29fd3b5db963918835bddd3b6d76b4a6e15fd3f2127ffd72d0cc17ef33947b07da23b0d912b940dd5434b717c095ac3ad35985f0d3ecd111e79
-DIST xdebug-2.9.6.tar.gz 436208 BLAKE2B 00cfb42c41bfb44f285b97779d6ba625641fc34494465e9e791ab5458c6a608e432df0ad45c561df2f8c9aba04ab34b3a98bb5e6bfb92ace39a3ad4145f3514a SHA512 13ed07a1489ba7bc0b4e85bf56306c733e7894cea8cb442649635196606b12d92e5618ab2485e7cde4aaee2ac6752993aecd933c24fd64b5113ef619339403d2
-DIST xdebug-2.9.8.tar.gz 438295 BLAKE2B 8645052faceb354817ddb448f46af5b849507d31255b43ac59bcef4ece7837ef835ae2ad624ed8a95f8f98d552ef0e7195a4ade7df9176bc300d855a0156f405 SHA512 c431d51a0d9c5ac1c7fc529c2819db480cbfff6f65c35c3c0dbef4e78427aa28ede164f397f92c409e58e386a6be34ecd2ded0ee35e01df1cbf92a49fd2f2aab
-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
+DIST xdebug-3.1.3.tar.gz 470305 BLAKE2B abc799f966c20ba868d57e707ebc35e1f2d4ef5567bcd373ae5ae2ada58fbd4a4a807cfdf520cb883f08bc5296f219d190865462eab7d11ff2cb8c12a33b671b SHA512 cd2e85ce37f5122bcaa8300061be3b244bf9a58060e4e7286b3b52e9ab592f9a8ad43b62d53f13c7be878bb8662ff7aba187b73040bea79a3244df3d6b59e27b
+EBUILD xdebug-3.1.1.ebuild 1542 BLAKE2B 2914474496f6ba6a1ed2bf99e648cba05e3b85f979aa5c2a6188fa2fe26e18bdd52ba2a2274155f1e5cfdc9b06662598b619e2d6485d6b1fefea06cd429e6c65 SHA512 0703b8d75e17ef21295f64ca681cfed2c545e98293793d2da75f6a47ed10719158f3ac88ae5c809404d0561b20c95f814887e024c34f8792c9de17e8da2e3cb8
+EBUILD xdebug-3.1.3.ebuild 1546 BLAKE2B 2788885758e5cdd516620d5f6af2d123fbaa0aeb8400b024570c4974544b84ab392e269e6cf3b1ff58fb7d3bc043e8eb20f64fb952910f22d9d3bb0f74a3d1bf SHA512 31bbd85506e95264b6dd5c188952cf3701e2f6b1996eae1ad322c3c3f25bdbbd40bded272928ee96177dc721e99f16897b266119c7e68a8730b2729a89697ddf
+MISC metadata.xml 318 BLAKE2B 3b475c99c023007f79d0a677e7ed0b977622befdb5b70003253548b748ec16e796bfacd7585b14ad97693002a61ed4136668723a05ef59901d04300fab13a04c SHA512 a00cf5299b46138af793fe348350bb9a19d5c1710fe531cac7fbc8f0d8b9a3147df7374e7bc0f1d1122d3b5e992c482e921c2482b5fde0d7642b542b65428cbb
diff --git a/dev-php/xdebug/files/2.6.0-xdebug.ini b/dev-php/xdebug/files/2.6.0-xdebug.ini
deleted file mode 100644
index e37ada0ef8fe..000000000000
--- a/dev-php/xdebug/files/2.6.0-xdebug.ini
+++ /dev/null
@@ -1,54 +0,0 @@
-;xdebug.auto_trace = 0
-;xdebug.cli_color = 0
-;xdebug.collect_assignments = 0
-;xdebug.collect_includes = 1
-;xdebug.collect_params = 0
-;xdebug.collect_return = 0
-;xdebug.collect_vars = 0
-;xdebug.coverage_enable = 1
-xdebug.default_enable = 0
-;xdebug.dump.* = Empty
-;xdebug.dump_globals = 1
-;xdebug.dump_once = 1
-;xdebug.dump_undefined = 0
-;xdebug.extended_info = 1
-;xdebug.file_link_format = 
-;xdebug.force_display_errors = 0
-;xdebug.force_error_reporting = 0
-;xdebug.halt_level = 0
-;xdebug.idekey = *complex*
-;xdebug.manual_url = http://www.php.net
-;xdebug.max_nesting_level = 256
-;xdebug.max_stack_frames = -1
-;xdebug.overload_var_dump = 2
-;xdebug.profiler_aggregate = 0
-;xdebug.profiler_append = 0
-;xdebug.profiler_enable = 0
-;xdebug.profiler_enable_trigger = 0
-;xdebug.profiler_enable_trigger_value = ""
-;xdebug.profiler_output_dir = /tmp
-;xdebug.profiler_output_name = cachegrind.out.%p
-;xdebug.remote_addr_header = ""
-;xdebug.remote_autostart = 0
-;xdebug.remote_connect_back = 0
-;xdebug.remote_cookie_expire_time = 3600
-;xdebug.remote_enable = 0
-;xdebug.remote_handler = dbgp
-;xdebug.remote_host = localhost
-;xdebug.remote_log = 
-;xdebug.remote_mode = req
-;xdebug.remote_port = 9000
-;xdebug.scream = 0
-;xdebug.show_error_trace = 0
-;xdebug.show_exception_trace = 0
-;xdebug.show_local_vars = 0
-;xdebug.show_mem_delta = 0
-;xdebug.trace_enable_trigger = 0
-;xdebug.trace_enable_trigger_value = ""
-;xdebug.trace_format = 0
-;xdebug.trace_options = 0
-;xdebug.trace_output_dir = /tmp
-;xdebug.trace_output_name = trace.%c
-;xdebug.var_display_max_children = 128
-;xdebug.var_display_max_data = 512
-;xdebug.var_display_max_depth = 3
diff --git a/dev-php/xdebug/metadata.xml b/dev-php/xdebug/metadata.xml
index 222c77f3742a..8bdfa70e6be3 100644
--- a/dev-php/xdebug/metadata.xml
+++ b/dev-php/xdebug/metadata.xml
@@ -5,4 +5,7 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">xdebug/xdebug</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-php/xdebug/xdebug-2.9.6.ebuild b/dev-php/xdebug/xdebug-2.9.6.ebuild
deleted file mode 100644
index e721f2c63e7b..000000000000
--- a/dev-php/xdebug/xdebug-2.9.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 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="2.6.0-xdebug.ini"
-
-USE_PHP="php7-2 php7-3 php7-4"
-
-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}
-		~dev-php/xdebug-client-${PV}"
-DOCS=( README.rst CREDITS )
-PHP_EXT_ECONF_ARGS=()
-
-pkg_postinst() {
-	ewarn "We have set xdebug.default_enable to 0 (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.default_enable to 1. Alternatively you can"
-	ewarn "call xdebug_enable() in your code."
-}
diff --git a/dev-php/xdebug/xdebug-2.9.8.ebuild b/dev-php/xdebug/xdebug-2.9.8.ebuild
deleted file mode 100644
index 2edd756ef66e..000000000000
--- a/dev-php/xdebug/xdebug-2.9.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 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="2.6.0-xdebug.ini"
-
-USE_PHP="php7-2 php7-3 php7-4"
-
-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}
-		~dev-php/xdebug-client-${PV}"
-DOCS=( README.rst CREDITS )
-PHP_EXT_ECONF_ARGS=()
-
-pkg_postinst() {
-	ewarn "We have set xdebug.default_enable to 0 (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.default_enable to 1. Alternatively you can"
-	ewarn "call xdebug_enable() in your code."
-}
diff --git a/dev-php/xdebug/xdebug-3.0.2-r1.ebuild b/dev-php/xdebug/xdebug-3.0.2-r1.ebuild
deleted file mode 100644
index c4a24b3dd8dc..000000000000
--- a/dev-php/xdebug/xdebug-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-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"
-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/xdebug/xdebug-3.0.4.ebuild b/dev-php/xdebug/xdebug-3.0.4.ebuild
deleted file mode 100644
index c4a24b3dd8dc..000000000000
--- a/dev-php/xdebug/xdebug-3.0.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-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"
-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/xdebug/xdebug-3.1.1.ebuild b/dev-php/xdebug/xdebug-3.1.1.ebuild
index 00bf4b8a058b..5e6b98736460 100644
--- a/dev-php/xdebug/xdebug-3.1.1.ebuild
+++ b/dev-php/xdebug/xdebug-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 inherit php-ext-source-r3
 
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 
 DESCRIPTION="A PHP debugging and profiling extension"
 HOMEPAGE="https://xdebug.org/"
diff --git a/dev-php/xdebug/xdebug-3.0.3.ebuild b/dev-php/xdebug/xdebug-3.1.3.ebuild
index c4a24b3dd8dc..43fe02c18eb5 100644
--- a/dev-php/xdebug/xdebug-3.0.3.ebuild
+++ b/dev-php/xdebug/xdebug-3.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="yes"
 PHP_EXT_INIFILE="3.0-xdebug.ini"
 
-USE_PHP="php7-3 php7-4 php8-0"
+USE_PHP="php7-3 php7-4 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 6add44540cb0..c308f69c9ef9 100644
--- a/dev-php/xhprof/Manifest
+++ b/dev-php/xhprof/Manifest
@@ -1,7 +1,3 @@
-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
+EBUILD xhprof-2.3.5.ebuild 376 BLAKE2B ec6f0e8106c7cfcaf5bc450a03510549b95d06c13334796392373a48d936b5d7c8fcaee698492cd0c3e95260d35168384711d6587e1344b70fe549433c5d15bb SHA512 b5c8daa2f962106fd0c4ffc8a0b97ea8d06c5efc23db1c80e46309f90cbced554318212e8678a0392095712e812d19f6e49a4a365ecd97d499c667959c87c5da
+MISC metadata.xml 320 BLAKE2B fcc5d80e127f6834fe5d8e9b15648e129c894914079784416d269553112e790d1b0f4d25f9c3d5a46b55ca569a35c122d84189d4f5fe4f9ff2e500fb37c53104 SHA512 975a3563e5575c13fefa0e01ec3dd44f7135195c66ba157c7766069cd21de332ee361db730032d2c88be60ea00bb4b52dba1ba1c95a24e6de8126ab320f77c14
diff --git a/dev-php/xhprof/metadata.xml b/dev-php/xhprof/metadata.xml
index c38027a68715..6ab75789ddb5 100644
--- a/dev-php/xhprof/metadata.xml
+++ b/dev-php/xhprof/metadata.xml
@@ -6,6 +6,6 @@
 		<name>PHP</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">phacility/xhprof</remote-id>
+		<remote-id type="github">longxinH/xhprof</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-php/xhprof/xhprof-2.1.4.ebuild b/dev-php/xhprof/xhprof-2.1.4.ebuild
deleted file mode 100644
index 6d7187add699..000000000000
--- a/dev-php/xhprof/xhprof-2.1.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_S="${S}/extension"
-PHP_EXT_ECONF_ARGS=""
-USE_PHP="php7-2 php7-3 php7-4"
-
-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/xhprof/xhprof-2.2.3.ebuild b/dev-php/xhprof/xhprof-2.2.3.ebuild
deleted file mode 100644
index 1d609078c8c4..000000000000
--- a/dev-php/xhprof/xhprof-2.2.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_S="${S}/extension"
-PHP_EXT_ECONF_ARGS=""
-USE_PHP="php7-2 php7-3 php7-4 php8-0"
-
-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/xhprof/xhprof-2.3.5.ebuild b/dev-php/xhprof/xhprof-2.3.5.ebuild
index e7f6bda6ad82..e1655ad5829f 100644
--- a/dev-php/xhprof/xhprof-2.3.5.ebuild
+++ b/dev-php/xhprof/xhprof-2.3.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
+USE_PHP="php7-4 php8-0 php8-1"
 
 inherit php-ext-pecl-r3
author	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /dev-php
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)