gentoo resync : 22.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
commit: abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree: eca3dd248b73b92013cba00a0fcc1edf2696e19a /dev-php
parent: 24fd814c326e282c4321965c31f341dad77e270d (diff)
99 files changed, 1546 insertions, 1985 deletions
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 42ac02e574d8..40be36ae2e2d 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Archive_Tar/Manifest b/dev-php/PEAR-Archive_Tar/Manifest
index 91497d0284f4..5adae8eff1bf 100644
--- a/dev-php/PEAR-Archive_Tar/Manifest
+++ b/dev-php/PEAR-Archive_Tar/Manifest
@@ -1,3 +1,3 @@
-DIST Archive_Tar-1.4.11.tgz 21556 BLAKE2B f7e450f4581400159099dba023192ec4026da8867c675119001085651c20315523a58180e0ccd4528e3b1764e222945055702e0fd8e42bb5976b891230351f29 SHA512 a67ff191eb1d814094fc752b58b5d4b4d3db0fd2476fce403f8e5cac49a35fd1219167817dc84d6f957af87d326435aef000e2e0b16357a0d051ab407b76d2cc
-EBUILD PEAR-Archive_Tar-1.4.11.ebuild 748 BLAKE2B a6fddee5de1a3398f806853cb7f076c4f37184faae350cec0a8dc4e96b22727e63d9ae7a1a9479f8dbd916b4d4e7b720ba9999baf73ffb9ee6f705ae49aca73b SHA512 85ec995f26fbbf20a3e30b11c9e9c618da30c7d6dc3c8111107c1fc3105af2e80470a2c6a81c0b51488125a09fc13a583b1ec127db9f186890bc69d763478c56
+DIST Archive_Tar-1.4.12.tgz 21665 BLAKE2B fc4d2d5128bfc02da5f7e2465834e2ff14554188ede7899856f200935a850c35bb74e6fcca5c4c4ae641a575725a3edba2878376a587304f133c8f16e1ee9336 SHA512 9f2e6ca4628ba4ec95a324c4a706b2d01d2323b5e5e77f1cc7425784d1a35d139b1604bffca10af8b04c4cc875cb6b1f40715a00208cd042aba37f089a586497
+EBUILD PEAR-Archive_Tar-1.4.12.ebuild 1339 BLAKE2B 6bb49ee44218b20678ad9910601ec45594912b0b6daf7adc0e7331a289fc8846514ddc66b2664461629ca50d480d5d840f461c7ad48c60683a9952ae121d4815 SHA512 a9c556741d824c935e9e1a4007ec6270b7da65f32032d03335353f8fb3676eca9b2404be01444c01d5456eb903c3a7df22d09bc22eb70ccfaead4a5bca6746df
 MISC metadata.xml 337 BLAKE2B def75fcf8f3291007347252cd8885def7980837bf24cef97f5709ff0166792bb6597d2d0395425e897a8a0afee7fc5436ecfd745e66e4b9147f76f93cb92f923 SHA512 c77cfe795995f88c94b790ac8900e1366e2d4b4adf12f5d18284687145bd37177052ee6f39bf66fe97d8f254366b83019ba51632e15cbfdf7c93d7f08d8f48e7
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.11.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.12.ebuild
index ef91adf2eadf..09a18646d8e6 100644
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.11.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,4 +28,23 @@ src_install() {
 	doins -r Archive
 
 	dodoc docs/*
+
+	insinto /usr/share/php/.packagexml
+	newins "${WORKDIR}/package.xml" "${MY_P}.xml"
+}
+
+pkg_postinst() {
+	# It is not critical to complete so only warn on failure
+	if [[ -f "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" && \
+		-x "${EROOT}/usr/bin/peardev" ]] ; then
+		"${EROOT}/usr/bin/peardev" install -nrO --force \
+			"${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \
+			|| ewarn "Failed to insert package into local PEAR database"
+	fi
+}
+
+pkg_postrm() {
+	if [[ -x "${EROOT}/usr/bin/peardev" ]]; then
+		"${EROOT}/usr/bin/peardev" uninstall -nrO "pear.php.net/${MY_PN}"
+	fi
 }
diff --git a/dev-php/PEAR-Console_Getopt/Manifest b/dev-php/PEAR-Console_Getopt/Manifest
index 45ec5195c855..a97cfa82727e 100644
--- a/dev-php/PEAR-Console_Getopt/Manifest
+++ b/dev-php/PEAR-Console_Getopt/Manifest
@@ -1,5 +1,3 @@
-DIST Console_Getopt-1.4.1.tgz 5580 BLAKE2B 514d44cfd2bb7c8bcda49df2b6ba4dafc77184557f58f52c02c6a136e335639e65b7c10f5659dad9d7a87e946d60947121cb5f35a72b6d29fbb3efa3e535283b SHA512 cbf12a72b33424935f019b17ae8fa55289eae77d3845dcfcbbc1c47b71111992d2c0eb837b0f262ce644809c3cc06ad0c2bb04aa1b6ec89a1e3122f327114dbd
 DIST Console_Getopt-1.4.3.tgz 5789 BLAKE2B 641432105696e93160fd6a3ade4ee8c1bd7780cc502668266485d8c747fc8ceb97ce70ebdab8f61a739a4bf8267bfc936f0c9fd51b408add680a2288d49e0412 SHA512 7803e063576e9dac6833064b5a1479d22ca31c2a8ef8036ae530271e4e824fedb94e54d63266be8929f90f8df745b3ada7185dc98319b331f8dc5e9cac5445a0
-EBUILD PEAR-Console_Getopt-1.4.1-r1.ebuild 548 BLAKE2B b69cf4aab47c7c4083eee15fe0133d1c1cc70854432b6c53a7e6ee2e5e64b0aaea94085e4e5f68abc8ad092c28d50128328f8f52518227b66709d68723d5c08e SHA512 7e033b9bbea15b74c63534a06b4f95f69ea480d6bcd2492bb1f5031b4ac9388fbb86e32f68ac99de2325b9ec61c0d39e7ef7c484104597699019427e970d1bfb
-EBUILD PEAR-Console_Getopt-1.4.3.ebuild 554 BLAKE2B 81a1384897e6df1e2a40b39e7c9f4819e81df1160e2a56e6133560953d505d710ae0f4e4240d0db0d628f7cd49e379404e31fd1a28cc3148bccd509e187af9f2 SHA512 3dbeec4c4b1422be54d4a96ee16e868ed1674ad074f5bc0ce84b3a60786dd6c09f3cb5e399c757f21eab21099d5585f56ecb37e945fcaeb9f60496064744b974
-MISC metadata.xml 316 BLAKE2B 680f79e848a7196c2ab95b0be749c99b71dffeb3cfe501c57d8e6d84f0108e09e8e4e3d307e2db82ab7f65aeb4b3824bc801c29d7d0d8be14bb899c3557ccd65 SHA512 8103a2aac5f04ccca0accc1b5dcfc11ee2c59992ea7364e87cf1208fda18f58ac48c833413db682993464912087df6bae19419b153fdf335ea56a1ae406c5994
+EBUILD PEAR-Console_Getopt-1.4.3.ebuild 548 BLAKE2B afbe66b217bb3d1f7640062d00696031e76fa5d773b5ca6d700cf23561691079393470020948f77ab43b551272454c2ef22f32df397d940d9ae68d69acd6fc25 SHA512 2e2ee068dfa653b2566abead099f4defb2e14c63fc67af5337133c95bf2686716f860a7ff7119f0b6aa751fa27e2d8401da5b3a489a19f05f29bdee571739f08
+MISC metadata.xml 340 BLAKE2B fe575cb0d8dc7e485c8c11d404e5bacadaac137df2c781bb4253ca90215b8523a02e7cf94aad34bb1677c0fe9c80f803dd6fd2303f4c178df01175e6ab795403 SHA512 802e236f3189cd0c7b36c5224ddb131a9d0413c6a2359cf4f6416a2b654da4fcb85be63bd13f4d232fce1fa9ee64d303c600c9941e78843f4a3fa93743c7c3bf
diff --git a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
deleted file mode 100644
index 70263d63bc9b..000000000000
--- a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Command-line option parser"
-HOMEPAGE="https://pear.php.net/package/Console_Getopt"
-SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/php:*"
-PDEPEND="dev-php/PEAR-PEAR"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/php
-	doins -r Console
-}
diff --git a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.3.ebuild b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.3.ebuild
index 1f5d8be072f4..382f3c45799a 100644
--- a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.3.ebuild
+++ b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Console_Getopt"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="BSD-2"
 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=""
 
 DEPEND=""
diff --git a/dev-php/PEAR-Console_Getopt/metadata.xml b/dev-php/PEAR-Console_Getopt/metadata.xml
index c8c9c843b99e..1f65fc978455 100644
--- a/dev-php/PEAR-Console_Getopt/metadata.xml
+++ b/dev-php/PEAR-Console_Getopt/metadata.xml
@@ -8,4 +8,5 @@
 	<upstream>
 		<remote-id type="pear">Console_Getopt</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index ffd7d5c4b059..5083b776f742 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,11 +1,5 @@
 AUX gentoo-libtool-mismatch-fix-v2.patch 510 BLAKE2B 59571998b848501efcdd4c304dc48e4950560f2f4d08add530d078787519b1c33dd511e92914208342011bd727e0fca12974b92a46b6a6bc9a66cbca061c9495 SHA512 03848aa6447c2969715e872481e17f7a6dbe7df9e42a13305fdbcfaf09505de40ed6d91c9c93f11a944adc94389472f04eac2b656f08dbdd9d1c3a1d07946ff4
 AUX pear.conf-r2 379 BLAKE2B fe57574f4e4ce095f7ddd9bc26606181a86e67f6c8e6dad57a713e187175b711d50d90c346759d430c32da0a740e7f79cffc7ccedc3b719d04dcd1792a9309f6 SHA512 81e4c95ccfd1a50d30d6e9db90fa099f3dd098bf4fa2c023f5369d0e96a197da91d2572ff3785bcfc83dba82abeca3932431083b5aa2aed155336697764666be
 DIST PEAR-1.10.12.tgz 293220 BLAKE2B fb25123852a60e4bd2c041d1fb58174b3053b24ff8ec19b44efe02aee041bbed102b14b270dc1c9764150eea7c85862ad78adefdc1d789540da18ec0f3aeae68 SHA512 1ce478800a150d7906f8aa4fa4371d3d190fa2af44691c9aa193babfe76f1b031b493f48df15b93e93dd5518a6d62ba6a7d5b1799b62d5a968f7a84f3677b971
-DIST PEAR-1.10.6.tgz 291529 BLAKE2B 7a75c89df2b34b368564e745a727292e5c5ee3a145995c15d338901b235664d0a783ca0efc9cd1d321cc2c496e88395db376ce7bbd6ccbf55d484d7f1021cd2b SHA512 ccd436a2cb9d30b434a78483432c51a8fa5b3e96e79ca3b28131b8dcd37bbae0b782efd762eb92dc40db24d3f61025c64ec5d29aed10fd80a6b28c224c4f1e2a
-DIST PEAR-1.10.7.tgz 291786 BLAKE2B 7e760c2782832fab2a35f86e2f9072058d622918cdc2b61b7066d2f17787488d228186948e96e602bb412b76b806004642e7ba83db00950a822996869dae9cd4 SHA512 ebe93cff5546ad3a80d3d1c0284e34a46ec8dbdb7d015a11350231244baca75a57596e446c1386bc40650525f59c04617e73b1071a0fe77210dc5979edb5151f
-DIST PEAR-1.10.9.tgz 291931 BLAKE2B b9120d9b643be926e80aac33aafd0f22cacca11c10b857d99b6d51a7315467ad18d79246ab2752b962de92957fe14fc65e1d01570eb73b562b0e6e030dfb7162 SHA512 072d2eda510c05649f8d1481665bdd42efa060e6098b4b0d0353c95cf79d342ec601dd36dab3e6583b612582d2f03672a7b5de1518e3a0e8fd190ea698a17e60
-EBUILD PEAR-PEAR-1.10.12.ebuild 5903 BLAKE2B 24f94b9ff80e5abf6b8a05c026acf0ddf03398bc0666dd55d869c719f596622197f802d7acbc9e452b6132e2580ad781e97033bf406716f797148501784a8c72 SHA512 cc01f6a19308f3b956a8fade169aad5e5f9c688648aa361521ee6781da0385680dfa9dd1d33e0579720022eea0ef54211e74af3809bec9827c7e965e3c382840
-EBUILD PEAR-PEAR-1.10.6.ebuild 5884 BLAKE2B d31c75f4a6572057cbd43cc4ce7845cfb789540808c36a03ccbaffc88c83b3e18499d901a6312fa082d7891dd1c1e33dc3382d8548ac34a1a049ff881694e055 SHA512 ef4be103e2dcda41ff4c32db0db243eed73f710a01a98b08ff01b77766f7f7f984b814a33c92ebec99c15c07daa3d32c778720877e50fc51ab3f70142419539a
-EBUILD PEAR-PEAR-1.10.7.ebuild 5894 BLAKE2B 4da9142dd31318085b21a46fc4df5d44c63a7abbbf2383b4cbf886bcf5395c0c00d81d1f432597106a3411b972d38dfae70be16046aa09a9c3b2528500b4b87e SHA512 8cf842e92854497a1f565813d713cc03e0a62a3a8f01fb41ccf140e82736cd8d2ab8ed50c915095b4dedb13c88c2bb4c1bcbb22366cd37828c0923ed8dc85998
-EBUILD PEAR-PEAR-1.10.9.ebuild 5894 BLAKE2B 4da9142dd31318085b21a46fc4df5d44c63a7abbbf2383b4cbf886bcf5395c0c00d81d1f432597106a3411b972d38dfae70be16046aa09a9c3b2528500b4b87e SHA512 8cf842e92854497a1f565813d713cc03e0a62a3a8f01fb41ccf140e82736cd8d2ab8ed50c915095b4dedb13c88c2bb4c1bcbb22366cd37828c0923ed8dc85998
-MISC metadata.xml 306 BLAKE2B fdddffeab9925e2296436f14f6224e0cbdbe2d386e863de68a555cf8b1e5434409af998a4b73c9380d2118db0a021401b23034895038e31559e0de0919a8c597 SHA512 2e46d7a6fcadfed2ff7be17a5f0a82b5cbf6184b50384f868a6ad8821746badfe126279ef9c114ef9d9a42374931193dba4b84483d437797636b95e6e97247fa
+EBUILD PEAR-PEAR-1.10.12.ebuild 5897 BLAKE2B f5c9c8e98b23638cec1579a8ab8966b5abb287f105ecfc6d794cf50646dedfb657f4ef4b54315d815ed2feb1627edbcd89ef5bf3c8e6362f3c4f4431a23500a3 SHA512 263a6f2e3035d2f738e4633c9e0078389c6ce3ffb3760e9e215c9a933e73a00730ec3cb842672599d80fe6b90919c622f2c012b6fa4d4bcb18d4f78d608909aa
+MISC metadata.xml 330 BLAKE2B b29bdd083977a57f2ebab61b7d1642dce8f373a863d94c6b5e3f0440b74c304de8943d6bebee811fd4262eecfd3289bf0284db2073013afeabf7481f62c5c73a SHA512 71e2b7db5ab5c40629d27f2f3e2cff54da4bea771eb48f9cbd8f76784b42a347ccf8551cf0949866ba1a8c47c5af9d0dfd30757fca13d839ecd9afcee83d59de
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.12.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.12.ebuild
index eda65ff33c79..fe194d02e2c5 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.12.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ DESCRIPTION="PEAR Base System"
 HOMEPAGE="https://pear.php.net/package/PEAR"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild
deleted file mode 100644
index 1b52326be86b..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PEAR Base System"
-HOMEPAGE="https://pear.php.net/package/PEAR"
-SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/php:*[cli,xml,zlib]
-	>=dev-php/PEAR-Archive_Tar-1.4.0
-	>=dev-php/PEAR-Console_Getopt-1.4.1
-	dev-php/PEAR-Exception
-	>=dev-php/PEAR-Structures_Graph-1.1.0
-	>=dev-php/PEAR-XML_Util-1.3.0"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/gentoo-libtool-mismatch-fix-v2.patch" )
-
-pkg_setup() {
-	[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
-	[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
-	[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp"
-
-	elog
-	elog "cache_dir is set to: ${PEAR_CACHEDIR}"
-	elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
-	elog "temp_dir is set to: ${PEAR_TEMPDIR}"
-	elog
-	elog "If you want to change the above values, you need to set"
-	elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
-	elog "accordingly in /etc/portage/make.conf and re-emerge ${PN}."
-	elog
-}
-
-src_prepare() {
-	default
-	# Exception.php is part of dev-php/PEAR-Exception.
-	rm PEAR/Exception.php || die "failed to remove PEAR/Exception.php"
-}
-
-src_install() {
-	insinto /usr/share/php
-	doins -r PEAR/
-	doins -r OS/
-	doins PEAR.php System.php
-	doins scripts/pearcmd.php
-	doins scripts/peclcmd.php
-
-	newbin scripts/pear.sh pear
-	newbin scripts/peardev.sh peardev
-	newbin scripts/pecl.sh pecl
-
-	# adjust some scripts for current version
-	[[ -z "${PEAR}" ]] && PEAR="${PV}"
-	for i in pearcmd.php peclcmd.php ; do
-		sed "s:@pear_version@:${PEAR}:g" -i "${D}/usr/share/php/${i}" \
-			|| die "failed to sed pear_version"
-	done
-
-	for i in pear peardev pecl ; do
-		sed "s:@bin_dir@:${EPREFIX}/usr/bin:g" -i "${D}/usr/bin/${i}" \
-			|| die "failed to sed @bin_dir@ in ${i}"
-		sed "s:@php_dir@:${EPREFIX}/usr/share/php:g" -i "${D}/usr/bin/${i}" \
-			|| die "failed to sed @php_dir@ in ${i}"
-	done
-
-	sed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" \
-		-i "${D}/usr/bin/pear" \
-		|| die "failed to set PHP ini values in pear executable"
-
-	sed "s:@package_version@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/Command/Package.php" \
-		|| die "failed to sed @package_version@"
-
-	sed "s:@PEAR-VER@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/Dependency2.php" \
-		|| die "failed to sed @PEAR-VER@ in Dependency2.php"
-
-	sed "s:@PEAR-VER@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/PackageFile/Parser/v1.php" \
-		|| die "failed to sed @PEAR-VER@ in v1.php"
-
-	sed "s:@PEAR-VER@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/PackageFile/Parser/v2.php" \
-		|| die "failed to sed @PEAR-VER@ in v2.php"
-
-	# finalize install
-	insinto /etc
-	newins "${FILESDIR}"/pear.conf-r2 pear.conf
-
-	sed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed PHPCLILEN in pear.conf"
-
-	sed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed CACHEDIRLEN in pear.conf"
-
-	sed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed DOWNLOADDIRLEN in pear.conf"
-
-	sed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed TEMPDIRLEN in pear.conf"
-
-	# Change the paths for eprefix!
-	sed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the docs path (prefix) in pear.conf"
-
-	sed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the data path (prefix) in pear.conf"
-
-	sed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the tests path (prefix) in pear.conf"
-
-	sed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the PHP include path (prefix) in pear.conf"
-
-	sed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the bin path (prefix) in pear.conf"
-
-	[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}"
-	keepdir "${PEAR_CACHEDIR#${EPREFIX}}"
-	diropts -m1777
-	keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}"
-
-	insinto /usr/share/php/.packagexml
-	newins "${WORKDIR}/package.xml" "${MY_P}.xml"
-}
-
-pkg_config() {
-	# Update PEAR/PECL channels as needed, add new ones to the list if needed
-	elog "Updating PEAR/PECL channels"
-	local pearchans="pear.php.net pecl.php.net pear.symfony-project.com"
-
-	for chan in ${pearchans} ; do
-		# The first command may fail if, for example, the channels have
-		# already been initialized.
-		pear channel-discover ${chan}
-		pear channel-update ${chan} || die "failed to update channels: ${chan}"
-	done
-}
-
-pkg_postinst() {
-	pear clear-cache || die "failed to clear PEAR cache"
-
-	elog "Run 'emerge --config =${PF}' to automatically update the PEAR/PECL channels while online."
-
-	# Register the package from the package.xml file
-	# It is not critical to complete so only warn on failure
-	if [[ -f "${EROOT}usr/share/php/.packagexml/${MY_P}.xml" ]] ; then
-		"${EROOT}usr/bin/peardev" install -nrO --force \
-			"${EROOT}usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \
-			|| ewarn "Failed to insert package into local PEAR database"
-	fi
-}
-
-pkg_prerm() {
-	# Uninstall known dependency
-	"${EROOT}usr/bin/peardev" uninstall -nrO "pear.php.net/PEAR"
-}
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild
deleted file mode 100644
index 62984cee2a85..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild
+++ /dev/null
@@ -1,177 +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_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PEAR Base System"
-HOMEPAGE="https://pear.php.net/package/PEAR"
-SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/php:*[cli,xml,zlib]
-	>=dev-php/PEAR-Archive_Tar-1.4.0
-	>=dev-php/PEAR-Console_Getopt-1.4.1
-	dev-php/PEAR-Exception
-	>=dev-php/PEAR-Structures_Graph-1.1.0
-	>=dev-php/PEAR-XML_Util-1.3.0"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/gentoo-libtool-mismatch-fix-v2.patch" )
-
-pkg_setup() {
-	[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
-	[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
-	[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp"
-
-	elog
-	elog "cache_dir is set to: ${PEAR_CACHEDIR}"
-	elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
-	elog "temp_dir is set to: ${PEAR_TEMPDIR}"
-	elog
-	elog "If you want to change the above values, you need to set"
-	elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
-	elog "accordingly in /etc/portage/make.conf and re-emerge ${PN}."
-	elog
-}
-
-src_prepare() {
-	default
-	# Exception.php is part of dev-php/PEAR-Exception.
-	rm PEAR/Exception.php || die "failed to remove PEAR/Exception.php"
-}
-
-src_install() {
-	insinto /usr/share/php
-	doins -r PEAR/
-	doins -r OS/
-	doins PEAR.php System.php
-	doins scripts/pearcmd.php
-	doins scripts/peclcmd.php
-
-	newbin scripts/pear.sh pear
-	newbin scripts/peardev.sh peardev
-	newbin scripts/pecl.sh pecl
-
-	# adjust some scripts for current version
-	[[ -z "${PEAR}" ]] && PEAR="${PV}"
-	for i in pearcmd.php peclcmd.php ; do
-		sed "s:@pear_version@:${PEAR}:g" -i "${D}/usr/share/php/${i}" \
-			|| die "failed to sed pear_version"
-	done
-
-	for i in pear peardev pecl ; do
-		sed "s:@bin_dir@:${EPREFIX}/usr/bin:g" -i "${D}/usr/bin/${i}" \
-			|| die "failed to sed @bin_dir@ in ${i}"
-		sed "s:@php_dir@:${EPREFIX}/usr/share/php:g" -i "${D}/usr/bin/${i}" \
-			|| die "failed to sed @php_dir@ in ${i}"
-	done
-
-	sed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" \
-		-i "${D}/usr/bin/pear" \
-		|| die "failed to set PHP ini values in pear executable"
-
-	sed "s:@package_version@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/Command/Package.php" \
-		|| die "failed to sed @package_version@"
-
-	sed "s:@PEAR-VER@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/Dependency2.php" \
-		|| die "failed to sed @PEAR-VER@ in Dependency2.php"
-
-	sed "s:@PEAR-VER@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/PackageFile/Parser/v1.php" \
-		|| die "failed to sed @PEAR-VER@ in v1.php"
-
-	sed "s:@PEAR-VER@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/PackageFile/Parser/v2.php" \
-		|| die "failed to sed @PEAR-VER@ in v2.php"
-
-	# finalize install
-	insinto /etc
-	newins "${FILESDIR}"/pear.conf-r2 pear.conf
-
-	sed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed PHPCLILEN in pear.conf"
-
-	sed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed CACHEDIRLEN in pear.conf"
-
-	sed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed DOWNLOADDIRLEN in pear.conf"
-
-	sed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed TEMPDIRLEN in pear.conf"
-
-	# Change the paths for eprefix!
-	sed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the docs path (prefix) in pear.conf"
-
-	sed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the data path (prefix) in pear.conf"
-
-	sed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the tests path (prefix) in pear.conf"
-
-	sed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the PHP include path (prefix) in pear.conf"
-
-	sed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the bin path (prefix) in pear.conf"
-
-	[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}"
-	keepdir "${PEAR_CACHEDIR#${EPREFIX}}"
-	diropts -m1777
-	keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}"
-
-	insinto /usr/share/php/.packagexml
-	newins "${WORKDIR}/package.xml" "${MY_P}.xml"
-}
-
-pkg_config() {
-	# Update PEAR/PECL channels as needed, add new ones to the list if needed
-	elog "Updating PEAR/PECL channels"
-	local pearchans="pear.php.net pecl.php.net pear.symfony-project.com"
-
-	for chan in ${pearchans} ; do
-		# The first command may fail if, for example, the channels have
-		# already been initialized.
-		pear channel-discover ${chan}
-		pear channel-update ${chan} || die "failed to update channels: ${chan}"
-	done
-}
-
-pkg_postinst() {
-	pear clear-cache || die "failed to clear PEAR cache"
-
-	elog "Run 'emerge --config =${PF}' to automatically update the PEAR/PECL channels while online."
-
-	# Register the package from the package.xml file
-	# It is not critical to complete so only warn on failure
-	if [[ -f "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" ]] ; then
-		"${EROOT}/usr/bin/peardev" install -nrO --force \
-			"${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \
-			|| ewarn "Failed to insert package into local PEAR database"
-	fi
-}
-
-pkg_prerm() {
-	# Uninstall known dependency
-	"${EROOT}/usr/bin/peardev" uninstall -nrO "pear.php.net/PEAR"
-}
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild
deleted file mode 100644
index 62984cee2a85..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild
+++ /dev/null
@@ -1,177 +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_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PEAR Base System"
-HOMEPAGE="https://pear.php.net/package/PEAR"
-SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/php:*[cli,xml,zlib]
-	>=dev-php/PEAR-Archive_Tar-1.4.0
-	>=dev-php/PEAR-Console_Getopt-1.4.1
-	dev-php/PEAR-Exception
-	>=dev-php/PEAR-Structures_Graph-1.1.0
-	>=dev-php/PEAR-XML_Util-1.3.0"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/gentoo-libtool-mismatch-fix-v2.patch" )
-
-pkg_setup() {
-	[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
-	[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
-	[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp"
-
-	elog
-	elog "cache_dir is set to: ${PEAR_CACHEDIR}"
-	elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
-	elog "temp_dir is set to: ${PEAR_TEMPDIR}"
-	elog
-	elog "If you want to change the above values, you need to set"
-	elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
-	elog "accordingly in /etc/portage/make.conf and re-emerge ${PN}."
-	elog
-}
-
-src_prepare() {
-	default
-	# Exception.php is part of dev-php/PEAR-Exception.
-	rm PEAR/Exception.php || die "failed to remove PEAR/Exception.php"
-}
-
-src_install() {
-	insinto /usr/share/php
-	doins -r PEAR/
-	doins -r OS/
-	doins PEAR.php System.php
-	doins scripts/pearcmd.php
-	doins scripts/peclcmd.php
-
-	newbin scripts/pear.sh pear
-	newbin scripts/peardev.sh peardev
-	newbin scripts/pecl.sh pecl
-
-	# adjust some scripts for current version
-	[[ -z "${PEAR}" ]] && PEAR="${PV}"
-	for i in pearcmd.php peclcmd.php ; do
-		sed "s:@pear_version@:${PEAR}:g" -i "${D}/usr/share/php/${i}" \
-			|| die "failed to sed pear_version"
-	done
-
-	for i in pear peardev pecl ; do
-		sed "s:@bin_dir@:${EPREFIX}/usr/bin:g" -i "${D}/usr/bin/${i}" \
-			|| die "failed to sed @bin_dir@ in ${i}"
-		sed "s:@php_dir@:${EPREFIX}/usr/share/php:g" -i "${D}/usr/bin/${i}" \
-			|| die "failed to sed @php_dir@ in ${i}"
-	done
-
-	sed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" \
-		-i "${D}/usr/bin/pear" \
-		|| die "failed to set PHP ini values in pear executable"
-
-	sed "s:@package_version@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/Command/Package.php" \
-		|| die "failed to sed @package_version@"
-
-	sed "s:@PEAR-VER@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/Dependency2.php" \
-		|| die "failed to sed @PEAR-VER@ in Dependency2.php"
-
-	sed "s:@PEAR-VER@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/PackageFile/Parser/v1.php" \
-		|| die "failed to sed @PEAR-VER@ in v1.php"
-
-	sed "s:@PEAR-VER@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/PackageFile/Parser/v2.php" \
-		|| die "failed to sed @PEAR-VER@ in v2.php"
-
-	# finalize install
-	insinto /etc
-	newins "${FILESDIR}"/pear.conf-r2 pear.conf
-
-	sed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed PHPCLILEN in pear.conf"
-
-	sed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed CACHEDIRLEN in pear.conf"
-
-	sed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed DOWNLOADDIRLEN in pear.conf"
-
-	sed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed TEMPDIRLEN in pear.conf"
-
-	# Change the paths for eprefix!
-	sed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the docs path (prefix) in pear.conf"
-
-	sed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the data path (prefix) in pear.conf"
-
-	sed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the tests path (prefix) in pear.conf"
-
-	sed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the PHP include path (prefix) in pear.conf"
-
-	sed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the bin path (prefix) in pear.conf"
-
-	[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}"
-	keepdir "${PEAR_CACHEDIR#${EPREFIX}}"
-	diropts -m1777
-	keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}"
-
-	insinto /usr/share/php/.packagexml
-	newins "${WORKDIR}/package.xml" "${MY_P}.xml"
-}
-
-pkg_config() {
-	# Update PEAR/PECL channels as needed, add new ones to the list if needed
-	elog "Updating PEAR/PECL channels"
-	local pearchans="pear.php.net pecl.php.net pear.symfony-project.com"
-
-	for chan in ${pearchans} ; do
-		# The first command may fail if, for example, the channels have
-		# already been initialized.
-		pear channel-discover ${chan}
-		pear channel-update ${chan} || die "failed to update channels: ${chan}"
-	done
-}
-
-pkg_postinst() {
-	pear clear-cache || die "failed to clear PEAR cache"
-
-	elog "Run 'emerge --config =${PF}' to automatically update the PEAR/PECL channels while online."
-
-	# Register the package from the package.xml file
-	# It is not critical to complete so only warn on failure
-	if [[ -f "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" ]] ; then
-		"${EROOT}/usr/bin/peardev" install -nrO --force \
-			"${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \
-			|| ewarn "Failed to insert package into local PEAR database"
-	fi
-}
-
-pkg_prerm() {
-	# Uninstall known dependency
-	"${EROOT}/usr/bin/peardev" uninstall -nrO "pear.php.net/PEAR"
-}
diff --git a/dev-php/PEAR-PEAR/metadata.xml b/dev-php/PEAR-PEAR/metadata.xml
index 6470e34fb93a..ad42cd86df78 100644
--- a/dev-php/PEAR-PEAR/metadata.xml
+++ b/dev-php/PEAR-PEAR/metadata.xml
@@ -8,4 +8,5 @@
 	<upstream>
 		<remote-id type="pear">PEAR</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-php/PEAR-XML_Util/Manifest b/dev-php/PEAR-XML_Util/Manifest
index 0afe25cb519d..97b4070d84ed 100644
--- a/dev-php/PEAR-XML_Util/Manifest
+++ b/dev-php/PEAR-XML_Util/Manifest
@@ -1,9 +1,3 @@
-DIST XML_Util-1.4.2.tgz 18993 BLAKE2B b2667aed3b3ec75dd8fca1625c6fa3d03a7662c24ce0fce69cb983f42fc3f45bc0bf27bdee7353c1d29fe0eabc181f2cbd415883575f5d6cf7163097c10f6d9c SHA512 e0a328f92cdcd09277238e14d68b73cba319ab9b4e9c50ab102b43f73c889599f5933415dc228bd1feb56a48c1527e0e9a86999ee2209b2d84131691aee74cbe
-DIST XML_Util-1.4.3.tgz 18842 BLAKE2B 1cd0065b84e07a8cbc7f4d44c10362d40e71254b4964b3aa3d4d11cad5cb7e5bce780f926c69cc4fc871ac3c28d8239a428c145389950b4d6f6e626b6215dfc9 SHA512 c21a7cef90743e124c4bc8e0453b634de8f6a6b0aac060acc1a17f481a2eb8757d322b05c69151280b7651cea927b2c64b7d49b9fd815dcdc606d0472d967310
-DIST XML_Util-1.4.4.tgz 19069 BLAKE2B bd809d8a3250e5d08793f6d6ae50ebdbd0e95e46b667edf7176ac125b902cee8334bc6abe85704a945a508cba6a2146e5bbcb6039a40316ea8d2b1b30590d139 SHA512 3c2ae4492e76729da561398a43416cd540284297b497d2c1526515c00ba2918b9d520b580e21111cf9f9e133d473289cc9c896bc28ddd0c64a849ee66f897e42
 DIST XML_Util-1.4.5.tgz 19191 BLAKE2B 2097e91bc6ed46e4af5713fe6e3f764b401f14ff1e06c0f96af68476db5e8cf2b463c0a9bed3eecd5e22c24108394fe1f622e4986888af131ee9a3c260f8c652 SHA512 dd373c15ea8057e1a31953a10d75a4821bb9ad63d55ec5ccdbe17c114895ac9b9a57871d50f9f83bca7e3920b461417aa09063cb06051834996d4a8aebfa84c9
-EBUILD PEAR-XML_Util-1.4.2.ebuild 645 BLAKE2B 7f869b8de2861d20e660202bd90a7812ff32f5afb5836862051cd6d22412ad2efc23ba1b4d71950c1c27b0e81f0d847a1771bca6665290204478174a61ad56ea SHA512 e08afdfdc724ffbd982c4d5f9d39b8e7880cfcaed8c64c1725640f6080fd01f2125486cb6548024a00e7353a7a9c9b3512db74f09c241d1d3eec582a26045624
-EBUILD PEAR-XML_Util-1.4.3.ebuild 653 BLAKE2B 3c6d1e9fa538c15bb9e0759c8deafed0b3d089bcccd36f92480984792c2147c4b9b9bc260e1d396f9d61af07e246fb6fa294f20c05b5d6f918a40279bd6e7f5e SHA512 2c3498f89487c86f1a4d95c30a7fcbf8a6ffee8d749faf7fe63dae599935fe667c8c69c3f777c4948ed3680a4a3169bc883e41aa3b54f33d8ac9c411c211750c
-EBUILD PEAR-XML_Util-1.4.4.ebuild 653 BLAKE2B 3c6d1e9fa538c15bb9e0759c8deafed0b3d089bcccd36f92480984792c2147c4b9b9bc260e1d396f9d61af07e246fb6fa294f20c05b5d6f918a40279bd6e7f5e SHA512 2c3498f89487c86f1a4d95c30a7fcbf8a6ffee8d749faf7fe63dae599935fe667c8c69c3f777c4948ed3680a4a3169bc883e41aa3b54f33d8ac9c411c211750c
-EBUILD PEAR-XML_Util-1.4.5.ebuild 1421 BLAKE2B 2ce6898138b09d2c6878364ea5bef969f050ad2aa45500f7b90484c6cb3ef554e9100d4e675d4c4b76a6d054b0f609ccfc9c6be2b9d85b0051dc7c756c0f5fbe SHA512 eb12bec09bb0471d0638d375a3b6bfabe647b384f6868ada93e0b212d3e90850b8bcc7ed158338e669f1a8d76c242576a4f0058f2b875a8c82fd9cd9af6a2b6d
-MISC metadata.xml 310 BLAKE2B d264a3ec20fb493c77b95f1225895c3a77d0abbe96f7c5240b804b785211d9aa0b2b26e1efd39e2592d96fd6f2ba42568e97428f944ee6952e101d577bb3e99b SHA512 a0726d245546336d0efa22151520fc51461ec1bdb31f2a4012ffcd5fd94858168f621aa903e489e44c43023c8d1a2b3f8aa05d995975b1abf7332e7cf3eed5e8
+EBUILD PEAR-XML_Util-1.4.5.ebuild 1415 BLAKE2B 7f99e3c2a8a52e44ebfa8283c28d0708a46996fab68b04e2210426be00c4ca693c4bc93d89fd3e0ac549bafb50c4b3e6d0057c8e2e6cb401590df276f802efdf SHA512 248ae91dbc817d250980ac2b57ab668ece07f251d00357ddd13c6399d1854029dde0db41ab51105d85d7d1562d950f775cb1b42480c7b2e7b671d5fb3cd72000
+MISC metadata.xml 334 BLAKE2B e7bc092b37aa8aae5406599bd9797ec8abfde3e732d90a536e6bd88302fa0c79cf9cdf1271e126b7f42514b8ad72cd676f1eef190cd8579313f5927740ec37cd SHA512 0115a361bfda0dad26a05963a0356f44c744509b2bff5d559d7b932bedd3fb966de015d867c5ce0212bbcccc5f550295e7b4f452dde2d87db46ef6e950496536
diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild
deleted file mode 100644
index 3676080b9fd6..000000000000
--- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="XML utility class"
-HOMEPAGE="https://pear.php.net/package/XML_Util"
-SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="examples"
-
-# PCRE is needed for a few calls to preg_replace and preg_match.
-RDEPEND="dev-lang/php:*[pcre(+)]"
-PDEPEND="dev-php/PEAR-PEAR"
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/php
-	doins -r XML
-
-	use examples && dodoc -r examples
-}
diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.3.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.3.ebuild
deleted file mode 100644
index 1c013e52239f..000000000000
--- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="XML utility class"
-HOMEPAGE="https://pear.php.net/package/XML_Util"
-SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="examples"
-
-# PCRE is needed for a few calls to preg_replace and preg_match.
-RDEPEND="dev-lang/php:*[pcre(+)]"
-PDEPEND="dev-php/PEAR-PEAR"
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/php
-	doins -r XML
-
-	use examples && dodoc -r examples
-}
diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.4.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.4.ebuild
deleted file mode 100644
index 1c013e52239f..000000000000
--- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="XML utility class"
-HOMEPAGE="https://pear.php.net/package/XML_Util"
-SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="examples"
-
-# PCRE is needed for a few calls to preg_replace and preg_match.
-RDEPEND="dev-lang/php:*[pcre(+)]"
-PDEPEND="dev-php/PEAR-PEAR"
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/php
-	doins -r XML
-
-	use examples && dodoc -r examples
-}
diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.5.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.5.ebuild
index 90d887a6d2d0..ebef85243b86 100644
--- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.5.ebuild
+++ b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/XML_Util"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 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="examples"
 
 # PCRE is needed for a few calls to preg_replace and preg_match.
diff --git a/dev-php/PEAR-XML_Util/metadata.xml b/dev-php/PEAR-XML_Util/metadata.xml
index 8e8d4acf2172..4a974d8a4708 100644
--- a/dev-php/PEAR-XML_Util/metadata.xml
+++ b/dev-php/PEAR-XML_Util/metadata.xml
@@ -8,4 +8,5 @@
 	<upstream>
 		<remote-id type="pear">XML_Util</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-php/jsonlint/Manifest b/dev-php/jsonlint/Manifest
index 8e8b09a25626..288690ac6652 100644
--- a/dev-php/jsonlint/Manifest
+++ b/dev-php/jsonlint/Manifest
@@ -1,8 +1,4 @@
 AUX autoload.php 262 BLAKE2B 0394eabe0e8bc08b09cc637e514aa49dee2b83b9c424f0d767a67f75024a86a20bbe63d30fce00cb17b69ee3bd6c74cf310e16a004720fb25aad1e1c65ba82b9 SHA512 476263a08ab0137aed1bb71446f1a66a618247f9095b138b958464f4f47faf775f4bb2ecbe87efa34ff56fb386351e3a3de0dafdf7367c461f0db0717ae5d46e
-DIST jsonlint-1.7.1.tar.gz 11813 BLAKE2B ed1a1404cf77d526a5dce15d0a3f36c5ff8c691e3d2560b6b5e309108d6f0072988b292fd1410b48bfad4ba528abd854204c38bf36f5196c7d8beb468716a5db SHA512 dd8380d02591997a129dc8f25f3b2f7c2f00c1d280bdce6551079b564b54b4828beb929bd9a7c608be6429754eb1c33d2d655a0f87b8f671ccf26ee2ae46095d
-DIST jsonlint-1.7.2.tar.gz 11915 BLAKE2B 4fb1bb526c64ad2db442bca4c2c609e7d589ed84c372291a7bb71edcf63d246be821d78fe246b1660444f99fe9dd3408f01841fc9d687654d2bcc45dc9337c91 SHA512 ac5a135b1940799b07c31c2b05b0c782d0409dbf93e93013f1cb69f8423d1913b93c18988f1a03781da4c29d28de35eee6a76a2f18c81cd049696f779045cafb
 DIST jsonlint-1.8.2.tar.gz 13729 BLAKE2B 80cbe2e1dc6bcbc0d75d04f34a36deb8b53ebd78bc4dcff0dd1195549ae2eaa02360b642d91c6a848cba9a3f502ed0618937c149663d6d0c9c7ad0f33897b7c1 SHA512 675ae7bf6cddd83bb2fab60f4c2ac4a8b4bf0068e630f266511a1805682cadefc9a44006623448364ceb73c5e211739787643d9196794349b992cca4d5fc737c
-EBUILD jsonlint-1.7.1.ebuild 875 BLAKE2B 1b764c3a4e90e84131dda4b4a6a33a0c6ae64767102610725f21808000b369bdf0b54ce78126dfefed89abbd7cf8fefef5e120ddeb399a5cdcca36ae3480130b SHA512 aff41e22bc041b38e70e8e17a734d1b0a627aa74c553c073ed1f0f256711ddf449ab5938b9cdbb5f18561e402263f32a02d78056eb6a57129ea9d3b774659f8c
-EBUILD jsonlint-1.7.2.ebuild 875 BLAKE2B 1b764c3a4e90e84131dda4b4a6a33a0c6ae64767102610725f21808000b369bdf0b54ce78126dfefed89abbd7cf8fefef5e120ddeb399a5cdcca36ae3480130b SHA512 aff41e22bc041b38e70e8e17a734d1b0a627aa74c553c073ed1f0f256711ddf449ab5938b9cdbb5f18561e402263f32a02d78056eb6a57129ea9d3b774659f8c
 EBUILD jsonlint-1.8.2.ebuild 887 BLAKE2B 0743d13b44a4a5b8c203fbed8c0080abe564f59e1b5951339b588c2e33df9c356e1622b8c2104abdf89bbb78d09f47fdce25508809b121abc3517f6da6fee994 SHA512 086309631776a66ee68a796c0dc791722374637bd06d971e92aeeb401b5b302dc9e04708004c1067fe4dc698838aaf853a405c297805de19fcc7bc46a37b88cd
 MISC metadata.xml 554 BLAKE2B d3e5440418af5ffa8bcf2188f4733fdea1f0b352482b36611f97e3574dc8046dcaa492961d9934215656ce954e7a20506f5208df1c09f052fd7cf06f83538c9a SHA512 78495ee38c55d98dd9368ea8f185d4c0a19f98b49da20aa9721c975d4df4279fe4df842fe55e351ebf1280569172be0877705266d2cfb90e0c52f3374506595e
diff --git a/dev-php/jsonlint/jsonlint-1.7.1.ebuild b/dev-php/jsonlint/jsonlint-1.7.1.ebuild
deleted file mode 100644
index 4085b18b49f7..000000000000
--- a/dev-php/jsonlint/jsonlint-1.7.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="JSON Lint for PHP"
-HOMEPAGE="https://github.com/Seldaek/jsonlint"
-SRC_URI="https://github.com/Seldaek/jsonlint/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-php/phpunit )"
-
-src_prepare() {
-	default
-	if use test; then
-		cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
-		sed -i -e "s:__DIR__:'${S}/src/Seld/JsonLint':" "${S}"/autoload-test.php || die
-	fi
-}
-
-src_install() {
-	insinto "/usr/share/php/Seld/JsonLint"
-	doins -r src/Seld/JsonLint/. "${FILESDIR}"/autoload.php
-	dodoc README.md
-}
-
-src_test() {
-	phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
-}
diff --git a/dev-php/jsonlint/jsonlint-1.7.2.ebuild b/dev-php/jsonlint/jsonlint-1.7.2.ebuild
deleted file mode 100644
index 4085b18b49f7..000000000000
--- a/dev-php/jsonlint/jsonlint-1.7.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="JSON Lint for PHP"
-HOMEPAGE="https://github.com/Seldaek/jsonlint"
-SRC_URI="https://github.com/Seldaek/jsonlint/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-php/phpunit )"
-
-src_prepare() {
-	default
-	if use test; then
-		cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
-		sed -i -e "s:__DIR__:'${S}/src/Seld/JsonLint':" "${S}"/autoload-test.php || die
-	fi
-}
-
-src_install() {
-	insinto "/usr/share/php/Seld/JsonLint"
-	doins -r src/Seld/JsonLint/. "${FILESDIR}"/autoload.php
-	dodoc README.md
-}
-
-src_test() {
-	phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
-}
diff --git a/dev-php/libvirt-php/Manifest b/dev-php/libvirt-php/Manifest
index 07dcc532c998..22a313ee4762 100644
--- a/dev-php/libvirt-php/Manifest
+++ b/dev-php/libvirt-php/Manifest
@@ -3,5 +3,5 @@ DIST libvirt-php-0.5.4.tar.gz 780793 BLAKE2B 8bb4577c26cc0ef8f2a0ae813ade7f5fdea
 DIST libvirt-php-0.5.5.tar.gz 761250 BLAKE2B 9899d2f0e5ea387333decce5071afc81d4160d54ef570dcbe04422dc3e93479ee57520f9bf33a0275ee86cd4b1c87e5a3f7d5118e0cd87658faed44d2ccd4807 SHA512 2ea263561a0bf5d155314e06dcf3c3b5c278640bc5edfa674cdd777cb6d0810bda0492c6cf77a02bc88fb6aa99b0ff1f0cbaeea87ff2e45bff9b5774a2507684
 EBUILD libvirt-php-0.5.4.ebuild 1430 BLAKE2B 03a918a8f68b1a6cdbb0b5947497c6af1c8d94de78bd92c6444e57acd7b47a48c6faf4e4d4e0e6737659c8b5276c378fae8d710537031f0c9a3b620fece3de8e SHA512 73025d7466fc468dc74154ead58ddd8149e4c8d0dd8358512a565ddddfe873e16ba066ce943a4a8e383e15f90a6700242ab9ee4e73fc82d828e9667fc154bb01
 EBUILD libvirt-php-0.5.5.ebuild 1430 BLAKE2B 3b67883bd430be157aa60101906eff0301a3bc85dfbbd09aef164706623e14c647f15f68d33b55fd5e2e055246b1665c8fd5c0b552570c1c6ff68bbe42909f93 SHA512 6d3952fd5f0bef9fa8149c5997f55c65ed1c42226c576c049e80518c15cb08fd0b267de0b4f64c2e1e65b681c7371a9cc4f8c7931c205c17e029612cc54dedd3
-EBUILD libvirt-php-9999.ebuild 1417 BLAKE2B 86dbb2400e9b92fb10b36e812bb7be272ea075d80c2710d9a00566a679ee736b6893803965cd8751fb08fec2b14862b68aabf7dcb4508931cae7d276930aafd1 SHA512 4a1ace4769f1402462b91d27bba97544876eab8d8c9d516c40aed331bf11dc9a1cfe9c77770335a935e0c7638aff221440d849d82711bdb1c1f5ae66f0bb3afb
+EBUILD libvirt-php-9999.ebuild 1474 BLAKE2B 8d3ec9a0bae7ee4f3af1e26985417d074a45c95e46ed9fc79df54f8433f12b5b6be6f5f36fc665ce4e78dd2a8eac0bf4865622601d6aa249bc6ac3b61796db63 SHA512 373f79c2c63638eb7464c8bb63d4d6ad4fa8ecb853921fae5e321b77d27fef23bbfa7508b1b22cce43807fc2a2c6c264c6b6c834275f871e854dba71b8683a4f
 MISC metadata.xml 371 BLAKE2B a19266222702c53095b36860a4be3dcacd9808273258ec4819f23fd792226d7c3b667e169c69b91419defd64569fc4c9f2e8bf9fb69361fb68bfb5945467a897 SHA512 0d2df32d913253928112d928dbccbb42b19bb62e6d76334966f87fc6df8378a2cda0b057df17bd565976006da61c9fd3a30425b153852c8389557fe85dd3115b
diff --git a/dev-php/libvirt-php/libvirt-php-9999.ebuild b/dev-php/libvirt-php/libvirt-php-9999.ebuild
index 2963ecd32d73..395c151a9cef 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-2019 Gentoo Authors
+# Copyright 1999-2021 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-3 php7-4"
 PHP_EXT_ECONF_ARGS=()
 
 inherit php-ext-source-r3 git-r3 autotools
@@ -26,7 +26,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-text/xhtml1 )"
 
-RESTRICT="test"
 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
@@ -63,3 +62,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/maxmind-db-reader/Manifest b/dev-php/maxmind-db-reader/Manifest
index a64477068a59..f23b8724e443 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.4.1.tar.gz 19667 BLAKE2B b397eb1bb7fa00c3382c7ee7c019c401d390c88d9bccd7742873445e95cb87d780ac17affe5cd1ec98e6f60d16660784dc5fdb188f8e4d2956df816397a9c251 SHA512 2407f3d1af10830078c9f5ba93ee74761084b06e630242eff0f707b98bdb78e6e87dabc999c36b29780ba9c8c38aec0225700005b66d95b3707bdc06875c6dd5
 DIST MaxMind-DB-Reader-php-1.6.0.tar.gz 20898 BLAKE2B cf6922bbd5b2c76fcb9b7a97299f0a73232686bf8facce39355f8a4cc55e98a4d8e64a51eae8427b5f14d6905d4cd85956effa5299cc493bd63708cf52ab30d0 SHA512 e8c0ccf2cfcedf7527b4e3f858d2ed0e70add60692fff4a65f08e5cb885516b7c2a3ceaa3c21713369cd8ffca2b671d764063236de1d729cfc5173f7d5dd4607
-EBUILD maxmind-db-reader-1.4.1.ebuild 2225 BLAKE2B 3281f8568667326e0c8a1c87e63a0f637fd275c4eeea540982d9c1a5f9a0095ce1eb55889deb6ae643d4b2e3bc5a997b59ba7108e1d2b86065ac8c9b5cb5fc51 SHA512 340b443f5205ec325f72fe24d8e8eb77869c2f890967ae6f1f7036a402dd10b6b2620ab1f11a46fff7dba9cc919d8b27298fc27d81bbce59bfd9aacce80cfb18
 EBUILD maxmind-db-reader-1.6.0.ebuild 2218 BLAKE2B dca404bcaa496d72cce3bd8055728bdf5f69a6028dd9afeb3c358affa5636a745e36afa42a2eb505c96781bbc0d00535c4df197b4deffb899161a03b76fcd131 SHA512 8243d5a307ac4d3be45dc60c064a9285fbeafb74b847f75152863d9c97393f41b3268c7eec89725beae525435abfaa94a540a3ec04272b92136698050e4b7b54
 MISC metadata.xml 585 BLAKE2B 0b6a50c15e2fe822a2a3cb52b7fec01677d4fd8601f9b3d0fbdaffedb951edda038d721bf4fb10ed49c3e87823115069be53495630ed2472c982084256c9d1eb SHA512 ec754283b76dde98c10ae1bbd0c11e24e53162d4829e3d32ca9c32b9dbfdef4df0494ba2fccdc0ba1c05c9aa58086c5064124daff69db00372915c530089b2e9
diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild b/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild
deleted file mode 100644
index ebefd8c16abb..000000000000
--- a/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.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="php5-6 php7-1 php7-2 php7-3"
-
-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/pear/Manifest b/dev-php/pear/Manifest
index 059444bbee1e..20f53d2df164 100644
--- a/dev-php/pear/Manifest
+++ b/dev-php/pear/Manifest
@@ -1,3 +1,2 @@
-EBUILD pear-1.10.1-r1.ebuild 365 BLAKE2B d33fe32db60471f38b3765396dd7543211cc10fc634fd16cc605d387296fda60f9ec82eb4b5cebffad297d3c0f16110ecd967fa7863dd17c55b4d00089ad536f SHA512 9b2b864f22a77f65262d443b6c55de2ee74ad711d42529c2f88a8cacc890f5a4d666006d755721fd46e82444b7e775b5ec72713251756348391f6414631d8139
-EBUILD pear-1.10.3.ebuild 371 BLAKE2B 73ea3f6c9bf928cec15f5b28d6ce39201acdcec788819ec931287116528196ffc706201c704b7fc5483bde5a1aa934f008699123c0fa4c5298c834bcdf8a4fc2 SHA512 63cc94b09215a1dd5a386f91487672c9af1dcd710726deb2ce492a4800fd59acbda63611f946436e47a3f8051d01c7480f85bc642a8fdd45e3eb7f3810279d20
-MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
+EBUILD pear-1.10.3.ebuild 365 BLAKE2B d3ca042ece47b6bc3e8fb06a74a29b89c4ccd55219fd21bcebed0d605a8c62460d778a473c950e146193f50fad93fe8670530ef4798a458e4a1aac40d5d82077 SHA512 b8e152dc543c41be84fe21a0c97edba0331779d9183250cba77041dde4edfc5ad34b2e9ecccc1adbc678465946cd74ca6eb135d8bf6fc50a75f10b0d5ff3b6da
+MISC metadata.xml 263 BLAKE2B de78c41a2ebe4d6e5038e6b9be2d8e800fa80e39d676fbffca95933d68753894a4f47076b6ac50edcbb83aa226f3b99ad6eea5b30bdc5c5437639d53eea15960 SHA512 cecb43b424b81649923caa892ed79506d1c873e38372dffa9f86c2aadd8a6845f94ea979b3004164eb55a85f622df223f5ab4b0fc91e21982272d1a56d2b6108
diff --git a/dev-php/pear/metadata.xml b/dev-php/pear/metadata.xml
index b86acf66c756..eba2ca288cb5 100644
--- a/dev-php/pear/metadata.xml
+++ b/dev-php/pear/metadata.xml
@@ -5,4 +5,5 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-php/pear/pear-1.10.1-r1.ebuild b/dev-php/pear/pear-1.10.1-r1.ebuild
deleted file mode 100644
index 1f8d2b20214f..000000000000
--- a/dev-php/pear/pear-1.10.1-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-
-DESCRIPTION="PEAR - PHP Extension and Application Repository"
-HOMEPAGE="https://pear.php.net/"
-SRC_URI=""
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-php/PEAR-PEAR-${PVR}"
diff --git a/dev-php/pear/pear-1.10.3.ebuild b/dev-php/pear/pear-1.10.3.ebuild
index 321c226df4b6..b6581c586165 100644
--- a/dev-php/pear/pear-1.10.3.ebuild
+++ b/dev-php/pear/pear-1.10.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 DESCRIPTION="PEAR - PHP Extension and Application Repository"
 HOMEPAGE="https://pear.php.net/"
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index 7a4e199380cb..bba922f65c95 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,5 +1,5 @@
 DIST apcu-5.1.18.tgz 94668 BLAKE2B c88af867a5f0f3feb550b4b93b83451d972d8f9c2281af8b000b45cb42e2d005f82fe626da8665e0490c79bc378cf9ee5c9a0136d0b490a1155a885bb56fe4f2 SHA512 5e9c5b4540be7abdf2f473d2f8955d8708934a1d6e05cb2c99154cc7ba8a2bbf9afde51769e20f46ef278efd6f60b9172e0864c31e0976b9d3096a337035e7a9
 DIST apcu-5.1.19.tgz 96583 BLAKE2B 330c08a4e557691d0b402111877b3caf56b211256db17cce52a76aeefce7237505eca4ecd71f3770ef3c405182a1604a92cc458cb9bca435b42370fe917e21a7 SHA512 45077e3bd0eac207539e2eafe21968c71f49b8c8920168dbafa87961b041f1d348b6bf1c130104744bc541e1f690854f0a29062e9520db81c04edeee3ef2ed99
 EBUILD pecl-apcu-5.1.18.ebuild 1545 BLAKE2B a10003e1378a8f18df700d56ff24ae436da3d0c5024156ee57b9ba2469c99e0a499ab989e64f68409c7d175cdfca16366dcd6fa764b14297e9fec4e8082ccf2f SHA512 a9591492b4f53e90bc29a3cb6c666096732437d7eccbc0843191992a67e1a2aca4a1969a5dba3598d2e40c4451b0b837062ab81cb30c2f4cf763127e440a1854
-EBUILD pecl-apcu-5.1.19.ebuild 1548 BLAKE2B aba9db198f7da659f246651b97ff72e923f1e2732b7d8ca017ad7d56e1a6d7515c9929299b92b9aeb9001a529f1bacc44cbad500599236488233828ab5ac8688 SHA512 a88172344ee589b4103cf8b2bd527f07ac81a3e31a9ad6722045607a072481a19e39f2098eb99d161a96d2184ebf294c00f7a99d5ae365812a26475e17404322
+EBUILD pecl-apcu-5.1.19.ebuild 1547 BLAKE2B 9a3ce32faa9bfb154b49a68df3dbf72eb156012dd59dbb29fea4170fb3a0875719066679eb7153621cfa60af2c379412808ce6d8f3778f04fd7e87b1a97e03ee SHA512 8ed4391919f3a2378d5f94824a3490730020db5878b8b8936c887008ae0861715dd37b3090350673aff6d81323be07d1196e8b97876a1b4ba065d4a734348d8f
 MISC metadata.xml 540 BLAKE2B a29196911604b13d643db1b09cdae2c578c52f3b3ce92f9d6ae534c6fe9872435a46b15dca79ce8ccf5ca02070f2e694f518c69524ea9380eff8e597d8d4124d SHA512 acd09a9a8e52ddc7e4cde2f048db7f7721fcbe3e24b7b628bf1c14b17381a75b463dede6faa0acfecf8e270693001c30b83758f8ad761979fcbdccb454098e56
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild
index 374c3077b81c..ee8c1e4d7cb5 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ USE_PHP="php7-2 php7-3 php7-4 php8-0"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 DESCRIPTION="Stripped down version of APC supporting only user cache"
 LICENSE="PHP-3.01"
diff --git a/dev-php/pecl-apcu_bc/Manifest b/dev-php/pecl-apcu_bc/Manifest
index 03146fdfbe73..041a86062242 100644
--- a/dev-php/pecl-apcu_bc/Manifest
+++ b/dev-php/pecl-apcu_bc/Manifest
@@ -1,5 +1,5 @@
 DIST apcu_bc-1.0.4.tgz 7406 BLAKE2B c7099f13bfe589c9752fb7fa8454f16094a13d63924ceef614db1fef11d37265673e745383241836685dcabca8ae83af3c71ba2f2d8a77b4ab213db209924f12 SHA512 633ae74c4be3ee0c2c98540f696dc440f3f345c52811e856cb46c65c6b6fa8fa9f06ecb1d784cd990cf8b5219b65e14a29b97e57828dc6e7aa6b91d2475e6a0e
 DIST apcu_bc-1.0.5.tgz 7415 BLAKE2B d86c5a4949239d9196b4bfc22c19f97ff66b47ec87962540295a0d9f08c72c0f1213439dd6c4006355a73c7fa3dbdcc51e9f897b289f134116d33d9eb2c67cb7 SHA512 60ee1540c31873d7963fd8efa6293006eae19cb6c7815cea1f3b50b197a982840472a1e632cc7af5666f6af5522008bec30e48cd764920240a6c5a0d0eb0e6e0
 EBUILD pecl-apcu_bc-1.0.4-r1.ebuild 1154 BLAKE2B dde5159347241f01fdae6d78f725483679df2eca6cc04e1cc30301e74f5edb34cf2e186870701165a89222baa07f5a62833b1bde309e6f6f25d328c49e29978e SHA512 02d0a26157b8d2c16e4753af3208959b5bf1cbe409125fdfca6cf440e02275c9c650eda555febb2e409eaf031a27c03db4cbe98d2a8a4c5ee06cdfb3fd7b9ec8
-EBUILD pecl-apcu_bc-1.0.5.ebuild 1176 BLAKE2B 5b63f34b1cf5a31fba665025d1f75146abe6b224847df30b682d6b2fe4d5ca4b7733c59864e96f436d1060cd963fea8ac7e6b23a8c587e49449f9b166f573bbd SHA512 a0c62afc9e16ea11a47dbb1c3664aec280d5095da2a3f7cb22dc30d13cfbb1b8d65555d167131f295f15d57c6991ee8e2ca50adc6c49ff50b3da28cfad0dbe18
+EBUILD pecl-apcu_bc-1.0.5.ebuild 1175 BLAKE2B 0bc6ba2cf470d6f472dba908b431cb10a55a49c8cd742bd84df05f58d241531136475b29f8c9d194cd51c7a98bcc60c5031baf08476559d15d4f93fe7e04af20 SHA512 609de9032a1dd74cda4ff017c4945e12693eda3b8384c03eef973be75214bf0bd0778bbc248f007fc2c7af816a0584fd5b3a0c7343840409befb5b5bfcae8060
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild
index 2ac07f3f2d20..e21eb0b6de2b 100644
--- a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild
+++ b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,7 @@ USE_PHP="php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3 multilib
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DESCRIPTION="Provides APC backwards compatibility functions via APCu"
 LICENSE="PHP-3.01"
diff --git a/dev-php/pecl-dio/Manifest b/dev-php/pecl-dio/Manifest
index f3eb0d324fac..26bc234e209b 100644
--- a/dev-php/pecl-dio/Manifest
+++ b/dev-php/pecl-dio/Manifest
@@ -1,5 +1,3 @@
-DIST dio-0.1.0.tgz 36960 BLAKE2B 0a2c1fd6289cc9606c44c81216ce8d0f63d4bbddfae554e65499f586f5aa17f419a048e97723ff365407260740d28e36ec5dae8a45e18422a7bd900ec88b60fd SHA512 6fca1c3f2d6247f5e0c52a27b49d80a6d13f9630772956ff7aa73ad45e445686502edd956346c43955cb2f858c0c0259af86c3f92b6f93309a2b90583ad8ea05
 DIST dio-0.2.0.tgz 37328 BLAKE2B e7ad6be1a4c957c155753e834d79f51b985578a03781ddbc66f05961dc270d58b20abcc74c64a0e9744d5cfbb6e545c1a7ac2bc1d54009c74f26bf786587ef49 SHA512 172c2a2a84d348d684d84ca94f23b767952461ca848cd114e899ea3fd39503a35ac0624a2a774b9dc6fd2d463d3f6aa6937e780e2faa6a0955a8594aad27ec8b
-EBUILD pecl-dio-0.1.0-r1.ebuild 431 BLAKE2B a4d1d6a8908455204590b684ef376cd10b4afe6fbb93bf94620bb1a88e579f73f77ed8f4a695d80c31e7ad9874d224f8b291923725bb71a7442ef13f74dccdb7 SHA512 37f8af13d6a940b25b7ca0c457ba30d6231e372c10310bf7c12da0551a95b67eed1c8b624bbe785b12e0aa53d23578995bf8427515a8b9f9947887c6bb5e28be
-EBUILD pecl-dio-0.2.0.ebuild 431 BLAKE2B c2306263ecbc5e6a02aa60312c8c2669796428327a003e5e3aa8a576eb7fd666cead80fc00e0400ed368ac8c4a88b80f70a21ce57aa130ef08f9bdcdcb00ff62 SHA512 494c240552cd11aaf6b115762d3c9c423de96a9c36000e5678ea5a5f91e6fb049f41645fb9cdac1b41420b8eee4a7626e647a63b9c9e5aff6e2c19f89d27fd05
+EBUILD pecl-dio-0.2.0-r1.ebuild 417 BLAKE2B 1541835c23ded156e87bef4076e30e01fdf1e255d95cd9ffdbfd5bb4efd735de20df1c46006cee479b11a46db57a8320d5dfe2bb8b46158ca2e6cf3f045a38dd SHA512 0969d9f15b4de7f7c1f6413d94bfce8be4ef3887f14adabe5f3cec0a112a00f31ad8085d002b79e3ddf9d811d4d564dedd65c8d4fbbc94f17d8684368b4920fe
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/pecl-dio/pecl-dio-0.1.0-r1.ebuild b/dev-php/pecl-dio/pecl-dio-0.2.0-r1.ebuild
index 7d9f4db0e722..cb33182010a9 100644
--- a/dev-php/pecl-dio/pecl-dio-0.1.0-r1.ebuild
+++ b/dev-php/pecl-dio/pecl-dio-0.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ PHP_EXT_NAME="dio"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-3 php7-4 php8-0"
 
 MY_PV=${PV/_rc/RC}
 PHP_EXT_S="${WORKDIR}/${PN/pecl-/}-${MY_PV}"
diff --git a/dev-php/pecl-dio/pecl-dio-0.2.0.ebuild b/dev-php/pecl-dio/pecl-dio-0.2.0.ebuild
deleted file mode 100644
index 38453c8973f0..000000000000
--- a/dev-php/pecl-dio/pecl-dio-0.2.0.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"
-
-PHP_EXT_NAME="dio"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
-
-MY_PV=${PV/_rc/RC}
-PHP_EXT_S="${WORKDIR}/${PN/pecl-/}-${MY_PV}"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Direct I/O functions for PHP"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE=""
-
-S="${PHP_EXT_S}"
diff --git a/dev-php/pecl-eio/Manifest b/dev-php/pecl-eio/Manifest
index 128935130157..83fea759d703 100644
--- a/dev-php/pecl-eio/Manifest
+++ b/dev-php/pecl-eio/Manifest
@@ -1,3 +1,3 @@
 DIST eio-2.0.4.tgz 74118 BLAKE2B 0228f0ca91ed6410614242e7ea1ddadaa1d1aa8211b3ea6f730c0711e4339bc158d661c5addee685d750a51e654874d35a04cf011d2a02ad06ab3f249b893753 SHA512 a74464752af5792c527b9149a7edff574952cac0b5b09e1e7ff3b7c0a2cc88ab171d916d94d508b9f92aa40bd5262a5b9f8d4ba239908f13ebcb89c6513da4d0
-EBUILD pecl-eio-2.0.4.ebuild 516 BLAKE2B 1a379f35e56480cd0966a17ed7c27c6c1a9f76e9085559354a90daa8b09d89412d43b0587b22dc2e8ed2803c1a1aec51b7a1cbc34b255ec08a5c7150031f9fa8 SHA512 4de1a8e3402144a6ee0e130e95dc515555bbf8fa7f423878f1efefebe80e8f0d75b9c4eb5f5cf5d6989a400c6d557e4602f5ec08226513d2535ca02293597e6d
+EBUILD pecl-eio-2.0.4-r1.ebuild 493 BLAKE2B db326dd5383340a4f28028c490dc977b8e86e403c4cc10fe3d23cdc0fed8a84c084a5e7c4be8a37a894fa608ba623ab724a83eeb64de110a781cb16271994e28 SHA512 0ce554142872b0b4955e8744b9c9caeedae295a1d731b5738e517f69d08482e5317b2f556fa01dc052c28080e5fd05d1190ca4aeaa439894671b3486cf7bd7af
 MISC metadata.xml 354 BLAKE2B 468d2c00c6aa9335b37ad1cfe50547fd620182f78c04d924309b429f9a05475a8e023c69121ac0d47243a479d80d891956d4e8ca0edfacc3a82f05be74a6d046 SHA512 de8f034f4f5b9891d46191e0960bd7cf53c3b831908f70beb6b164d062462dab78ba5c3de85509c3b616bd0ad3a9231e991e370b674b694708afca0736e8a60b
diff --git a/dev-php/pecl-eio/pecl-eio-2.0.4.ebuild b/dev-php/pecl-eio/pecl-eio-2.0.4-r1.ebuild
index 2c0e722da89e..ef6623eb4e18 100644
--- a/dev-php/pecl-eio/pecl-eio-2.0.4.ebuild
+++ b/dev-php/pecl-eio/pecl-eio-2.0.4-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PHP_EXT_NAME="eio"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( README.md )
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-3 php7-4"
 inherit php-ext-pecl-r3
 
 KEYWORDS="~amd64 ~x86"
@@ -19,6 +19,6 @@ SLOT="0"
 IUSE="debug"
 
 src_configure() {
-	local PHP_EXT_ECONF_ARGS="--with-eio $(use_enable debug eio-debug)"
+	local PHP_EXT_ECONF_ARGS=("--with-eio" "$(use_enable debug eio-debug)" )
 	php-ext-source-r3_src_configure
 }
diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest
index d89aaf85887d..2f375df20683 100644
--- a/dev-php/pecl-http/Manifest
+++ b/dev-php/pecl-http/Manifest
@@ -1,8 +1,12 @@
 DIST pecl_http-3.2.1.tgz 221244 BLAKE2B b6581829fb8a800e24ccedd4d0f3efbaf558850bdc356d27a6e1d1097a8e2cfc61963a1daccd1d0f269a7cef5b243d45cdfaff5138321fe20df615dde44d19e3 SHA512 e67d4b32ba6f524e3fcf65f5497b94275e1a4a14fce97c57afe366369f368b3acdbedf364ed73cf983fb2c5f57f498adaa1100e7c936f11cbc5de1caedad7b51
 DIST pecl_http-3.2.3.tgz 220204 BLAKE2B 2a712dc8f69a8a80f6f8c306883df580fdff4a0d4cb0ac06cc004f8622b30b8e2f5d373276381fd3ad67657a80cc929be81745f200a98b6ed5e475de5639dfc5 SHA512 e955e3246db9a9172081dd9a077154139c585bfce546e91839052bbab4d0db9d0695122574a66891ceba5c0b7e8a8f0768274e1516521ccb95cd19504dc13666
+DIST pecl_http-3.2.4.tgz 220631 BLAKE2B 996236cf9dd2f7d9bfaf046306e99c3ccf778261df19df8fd828b5811798f784841d89a6890e7347bd20cc6da71c966ea3ac9b17bf058e0bb766db7e1a8a6c49 SHA512 59c41d57c94a6e50e2f0b261130a24791b2845246f783b55e7f644f9a897d3650da364c5b38a860761b4a23f9266ed05000d6348bae2a7941e59d6bf5fb61a9e
+DIST pecl_http-4.0.0.tgz 218259 BLAKE2B c9f5973686fd4db95a24dd4c50f217b93becc6a439066a395b0b7fec6e977154e5ae8f2261414458aed8e4a9d1281f44da2ecc67a05127610579f5be91196a88 SHA512 268b569c23f10ed72fe3c84fc5e5bf526c3e5ac345ca0556a24fbd01ce95da468d4e9aac6300d058001534ab826836793bf901e9560b744f1e20d7059be2ec79
 DIST pecl_http-4.0.0beta1.tgz 219277 BLAKE2B 184ea0a92fc514f24fd31aaec7824ba80293a52d168d11b3b3a9cea410df1bc9a6a819c45f301b357a3d19246e3c36b56f238c264579509eadf00fb42ae32d91 SHA512 d3e487d10e18e8af1a750d171e4432dd30562e1fb8d8ae7cbb33a379e3d385d27a6ce1896ed8f727802eae1045505254cb68840395098310e22f6dc640c5c616
 EBUILD pecl-http-3.2.1.ebuild 2300 BLAKE2B 60e5a929270af09032e8494a55d90ef56b7a82821c4fb20a3ed8b03e08aa8ef77cc2d101ddbc31b095ec8b051acf9ebf2d0506a195e6f1aed4124eb54c6564b7 SHA512 0e2d36bfea79ec4662aff2425dae4193eff07864c2ef8c25bd087b56cba02c4c0eaa2af9c8449e64322ce0e42d75fbcfa8381e737172bd59c3e8a7d4dd90e0e0
 EBUILD pecl-http-3.2.3-r1.ebuild 2225 BLAKE2B 45d41708ee444876c304c109abc79dea3ae6fe905f3e479185b14ab4a56214e27b9e86cba06d64316a6d5070a93c535f3c71d62e8bd8d8c52c27db0079f728b5 SHA512 a20e4f6321d9f31a4b4c4e80b91ab7686b38ac984efc2529033793bc0ada3c48792141b99a566a148454619c74c663bf03cbc443a44e7da1e83200f813966583
 EBUILD pecl-http-3.2.3.ebuild 2471 BLAKE2B 1ffdd3704cf738741f61dd0370995530b32404d49d3bfbfd517612c11e27dbe8456786dc018d5cc03bd59cb03437bc2629ff775e52eb58cf4f1b14ac9e77bbdd SHA512 aaeb45f27eb7815b8fd4708ad7741a96fbe6050c01fc5465db364679f3224321e647d56a7b5e66bb87bbc960b674b453467baa7db7324e9b41974af155cbd97f
+EBUILD pecl-http-3.2.4.ebuild 2034 BLAKE2B 801d05dd8f4faf201c5079deb6d367b6b7cb6340ea693e019f321dfc2a96e6a94545139e8fabc57e26b179d829fe08da58666436ab276ce1e59edd3421e10ef0 SHA512 e3d2bae0a7c135d19a600e944d97190777a46421c3fccdb48bc6c7f64f391a161ca4ce4b22faebd6f8fdd8bcb071878daaea8b023cfe3d9972a1a07a0502f154
+EBUILD pecl-http-4.0.0.ebuild 1769 BLAKE2B 712a4d8aee8498a6cb8a9074ee7fc1c676021a336dcae0bc9a8c9115be389fe44189793363283099e747c61232460c2078213ef819f5c21134a851122c605d6d SHA512 b3d1d2f3760aebe5dee98de6e0068b614dc136a7e0daec92da5c295c228c7a857bb3880f42e93676702a3717a70026b3ebec1490e30fa6c79788182c0beec81e
 EBUILD pecl-http-4.0.0_beta1.ebuild 1844 BLAKE2B bba6fbc8f959af90e10eac63c9b5ee3d0fcc51680941073e602f8a2d0beee9c67b81c6ab59f072cf325dfb1c16b1283ceccc8de191145bfb00ce5840313a61c0 SHA512 6ecf7da9af0a836d5bacaac6c3bfe653c4503f933a590ad68ffeedc10fabc5bee0af6c517818b523159cebd19d441fbdf3cfcb90aeac798641a244e0d6827b6b
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-http/pecl-http-3.2.4.ebuild b/dev-php/pecl-http/pecl-http-3.2.4.ebuild
new file mode 100644
index 000000000000..f4816f1ac8c3
--- /dev/null
+++ b/dev-php/pecl-http/pecl-http-3.2.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="http"
+PHP_EXT_PECL_PKG="pecl_http"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_INI_NAME="50-http"
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php7-3 php7-4"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Extended HTTP Support for PHP"
+LICENSE="BSD-2 MIT"
+SLOT="7"
+IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl"
+
+COMMON_DEPEND="app-arch/brotli:=
+	dev-libs/libevent
+	dev-php/pecl-propro:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?]
+	>=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?]
+	net-dns/libidn2
+	sys-libs/zlib
+	ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] )
+	!ssl? ( net-misc/curl[-ssl] )
+"
+DEPEND="
+	php_targets_php7-3? ( ${COMMON_DEPEND} dev-lang/php:7.3[hash,session,iconv] )
+	php_targets_php7-4? ( ${COMMON_DEPEND} dev-lang/php:7.4[session,iconv] )"
+RDEPEND="${DEPEND}
+	php_targets_php8-0? ( dev-php/pecl-http:8[php_targets_php8-0(-)] )"
+
+PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
+
+src_prepare() {
+	if use php_targets_php7-3 || use php_targets_php7-4 ; then
+		php-ext-source-r3_src_prepare
+	else
+		default_src_prepare
+	fi
+}
+
+src_install() {
+	if use php_targets_php7-3 || use php_targets_php7-4 ; then
+		php-ext-pecl-r3_src_install
+	fi
+}
+
+src_test() {
+	# Cannot use eclass function due to required modules
+	# All tests SKIP otherwise
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		# Link in required modules for testing
+		ln -s "${EXT_DIR}/propro.so" "modules/propro.so" || die
+		ln -s "${EXT_DIR}/raphf.so" "modules/raphf.so" || die
+		sed -i \
+			's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=propro.so -d extension=raphf.so/' \
+			Makefile || die
+		SKIP_ONLINE_TESTS=yes NO_INTERACTION="yes" emake test
+		# Clean up testing links
+		rm modules/propro.so modules/raphf.so || die
+	done
+}
diff --git a/dev-php/pecl-http/pecl-http-4.0.0.ebuild b/dev-php/pecl-http/pecl-http-4.0.0.ebuild
new file mode 100644
index 000000000000..a65db6f26344
--- /dev/null
+++ b/dev-php/pecl-http/pecl-http-4.0.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="http"
+PHP_EXT_PECL_PKG="pecl_http"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_INI_NAME="50-http"
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php8-0"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Extended HTTP Support for PHP"
+LICENSE="BSD-2 MIT"
+SLOT="8"
+IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl"
+
+COMMON_DEPEND="app-arch/brotli:=
+	dev-libs/libevent
+	>=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?]
+	net-dns/libidn2
+	sys-libs/zlib
+	ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] )
+	!ssl? ( net-misc/curl[-ssl] )
+"
+DEPEND="
+	php_targets_php8-0? ( ${COMMON_DEPEND} dev-lang/php:8.0[session,iconv] )"
+RDEPEND="${DEPEND}
+	php_targets_php7-3? ( dev-php/pecl-http:7[php_targets_php7-3(-)] )
+	php_targets_php7-4? ( dev-php/pecl-http:7[php_targets_php7-4(-)] )"
+
+PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
+
+src_prepare() {
+	if use php_targets_php8-0 ; then
+		php-ext-source-r3_src_prepare
+	else
+		default_src_prepare
+	fi
+}
+
+src_install() {
+	if use php_targets_php8-0 ; then
+		php-ext-pecl-r3_src_install
+	fi
+}
+
+src_test() {
+	# Cannot use eclass function due to required modules
+	# All tests SKIP otherwise
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		# Link in required modules for testing
+		ln -s "${EXT_DIR}/raphf.so" "modules/raphf.so" || die
+		sed -i \
+			's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=raphf/' \
+			Makefile || die
+		SKIP_ONLINE_TESTS=yes NO_INTERACTION="yes" emake test
+		# Clean up testing links
+		rm modules/raphf.so || die
+	done
+}
diff --git a/dev-php/pecl-lzf/Manifest b/dev-php/pecl-lzf/Manifest
index 34fa0396fd4a..d6ae01ec6006 100644
--- a/dev-php/pecl-lzf/Manifest
+++ b/dev-php/pecl-lzf/Manifest
@@ -1,5 +1,3 @@
-DIST LZF-1.6.7.tgz 17999 BLAKE2B c7ee3049d7bcc862a400edf56e19745667052c32b2d3faaa26cb55f811e6721b7140446e676467fa5cee3ea87a751b6b0a2a9c6df203227d1bd29f31842e8514 SHA512 920a7d3bd0f0c9f1019a3180e38482ead24610a4a235d967d1f4010101e6f777a2450d517f2d3440edb45bb6a7f6d1012124b1b59aa7c34f9a17fdc93613acab
 DIST LZF-1.6.8.tgz 18071 BLAKE2B 83a12c44c02145baac75bc7b5172b09a6a15d4d02852f25d56ea97cf58a83709d59d56cb12be7df510fd687fd5ade760939527ee8151d3ecdb4407b7be2022e3 SHA512 c35543a40b2b44da4bd60e3142ba6ecf33e3460a8ea9f4f7fe6cdc4d728048593b33c423195d58707355975d655f614249642aff2d9b810af0e6a34d42fa1c43
-EBUILD pecl-lzf-1.6.7.ebuild 376 BLAKE2B 2ea8c09d2fecc4f87a80f9f5e0dc765fef749f8bd62a93535eaa1fe50c7713dfe9216dcace62ad642ff691e58d6bbaa672e9390665caff53afd32f02e81c9f5a SHA512 f03134f1ea92ab38dbcd5efc9b5fda6c268f470431a04c6ad144ffef52231c765e63c3be639f5d90fc3fc4dcbdb43a2fdc2a4791a692fdde3fb3308374e8f58e
-EBUILD pecl-lzf-1.6.8.ebuild 376 BLAKE2B c989e8325998e4b9b64d0f171a594d5117dbd9562b13a8e6df99c166422a4b85e76e4cd7a498ebf5f5c403a1225e7d6752e5d34d1e5708b1f35b2a45bccc268f SHA512 56976594863e020d3bd874cd1b06547c1e241ce8238a5582755f61d80157af3925923982d9de5a5fff3ddbec682efbdc128752592f987dcf29351c8806ec0dd3
+EBUILD pecl-lzf-1.6.8-r1.ebuild 362 BLAKE2B 5fdc958b627eedabaf9f571b2c28631156b53422dcc4c0c2362050fc8c94b1176ed0d1d40641e7f6bc602f9eb679a77c6d5cf110dfcbbde54e100c698d2bbe2b SHA512 546ad4a80e992e9d75c393de75d8f3c5e7d0e84e329fee3a621b6290ec2151502baf4a2fd12d3897e5130fcc18e88350f363b6c3da2e0f1a43f968909f4ef948
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/pecl-lzf/pecl-lzf-1.6.7.ebuild b/dev-php/pecl-lzf/pecl-lzf-1.6.7.ebuild
deleted file mode 100644
index 192a06e95b05..000000000000
--- a/dev-php/pecl-lzf/pecl-lzf-1.6.7.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="lzf"
-PHP_EXT_PECL_PKG="LZF"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="This package handles LZF de/compression"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE=""
diff --git a/dev-php/pecl-lzf/pecl-lzf-1.6.8.ebuild b/dev-php/pecl-lzf/pecl-lzf-1.6.8-r1.ebuild
index 15525c812da6..2cce616bb3dc 100644
--- a/dev-php/pecl-lzf/pecl-lzf-1.6.8.ebuild
+++ b/dev-php/pecl-lzf/pecl-lzf-1.6.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ PHP_EXT_NAME="lzf"
 PHP_EXT_PECL_PKG="LZF"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-3 php7-4 php8-0"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest
index f6b26be61752..b5cd8d66ddc1 100644
--- a/dev-php/pecl-mailparse/Manifest
+++ b/dev-php/pecl-mailparse/Manifest
@@ -3,5 +3,5 @@ DIST mailparse-3.1.0.tgz 941058 BLAKE2B 050b16d90ba2cb4443df05eadb85d9835d1af894
 DIST mailparse-3.1.1.tgz 941192 BLAKE2B 00b5a506031cd03439e3d67172c17aeeb6af3b950694251f7654007642bf80fff3cda900fc97ba177b91ca970e47416132080793ce64d8038e7aecbf2fdaf6c0 SHA512 01ddb8d4d27a74c14f70b02b49322c60fc79affab374205fee91b9da21e5148e08dba024f6bc620e4f26c2c937675e09092c52ca69172d2f7797c3e2bf374bee
 EBUILD pecl-mailparse-3.0.4.ebuild 660 BLAKE2B 66ce0d63743294160c0373cea35497d689b6eb17f8a83e4fe106ea053fc67ebce72a65fada5161796da3085bd2398b9424398c386363b3a88095190639ba90f2 SHA512 c6823e9b33de01c7c04f2cf80bdf368c4cc560d33d4e4944aad24b40c003efc97a01ef8976408a1022445d3ed1f3f3639bcda51f700d60c071bb4255408c67a4
 EBUILD pecl-mailparse-3.1.0.ebuild 664 BLAKE2B 270d6723aa9b83db4a0de11a7199c56712f4bb23b1d16303461049f4f1bb36c524ed52000b21f4183047c78e27145097e818936c3cb5b1c34cf765d83933db0f SHA512 40c8110d0627a466452520d5627e97d195b9d888fee4284ca7358406268f27c8a9413f559bfeb3ac0b0734c3a22e66aaa302dee13def03cacb34d0b65f45eeba
-EBUILD pecl-mailparse-3.1.1.ebuild 496 BLAKE2B a7883843794a924d72522ea85bcb4adb8e0509896d7ab7d4b9a8a448bf2de38efc2045bc758ceb683d439995ac7d9c635f759db91cc1ee4cc900c69d9aba51c5 SHA512 e91bd41589dfa2860f0680366c628f84299490ba09fbe91a52475506a3687643f1afd10b4ff58b7cf71db59b09a826d1f5b86aa5b6c77a6068d3758d1820cc60
+EBUILD pecl-mailparse-3.1.1.ebuild 495 BLAKE2B 77df8d711bc69e85122aa20dfb7cfca341af6f6e5e499902ce1324457d14869db08139acfb972e080b406c637aeb3e37ac525b7ede305f7e13aae750869eb8fe SHA512 6ec1afb3cc21719d1ccc4a42e09f128f0ed6caac2d645a0c92e07c82b9cf8ceb24ca92e69d9bb40adcb5d82492625e346dc3605863f1f48ba9c5ed68dc68ab88
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild
index 68fd925dfe8b..1dffdab86610 100644
--- a/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild
+++ b/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ DOCS=( README.md )
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 
 DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME compliant messages"
 LICENSE="PHP-3.01"
diff --git a/dev-php/pecl-mcrypt/Manifest b/dev-php/pecl-mcrypt/Manifest
index a2fc55980380..f6b4f24a6ba5 100644
--- a/dev-php/pecl-mcrypt/Manifest
+++ b/dev-php/pecl-mcrypt/Manifest
@@ -1,7 +1,3 @@
-DIST mcrypt-1.0.1.tgz 33782 BLAKE2B db5f89fdbc64c81bd50c92301155527f40b28cd274312565c79327133baa20e14c488f8ad1f87e6ddfd3ced9706ca30f10dc69a08279c82c9ec83fb5f713e826 SHA512 1677202715499a41ac6999089257a059106e58cbac06ca8a7dd2e9edd28be5a4118234dd7468110e9e3d7f9de5d099367848fe84bcd06716ea56645c9015c578
-DIST mcrypt-1.0.2.tgz 33698 BLAKE2B b79985455986ca28e7cb55d3f6f62f87e1112f57c4e26761a08a2d9ce7c702cf325fccb50f703cfe5c570c7e3abc473030742f098b10e709145f7ac9676f834a SHA512 bf3796b60f1d8d34185c3ad0d813653fe64ccfc883106ba544b01a8caa7bf9729978f44e0d481d28af9f8827803dcc5cd8bfc83e50dc950d26f851fabc868b18
 DIST mcrypt-1.0.3.tgz 33590 BLAKE2B 5de1108f53604fffea9e3cb64d9efdae2008da164acd47b27fd0df8f12a0f508345d63bee4d588c1eecd9a935f8be3b2db5c3d119c5b3013955c54085ebe9e9f SHA512 ef215b576b471d6e1ecac4bb097f518fa57fd551b678b7fdddd9d5058f6667b0ee757e887f00b61672b89cd86f1962cbfe0e355681fa47daba9873c3bf4db679
-EBUILD pecl-mcrypt-1.0.1.ebuild 643 BLAKE2B bf6681c494f092acbcd868ed66a0b50ca0fa72713463b96b8c392380ee12edbaac8e17d3cf3171e7b0ba47b11a064f9b1e55005f95b647d0e8f3b2dc6cf992e3 SHA512 b6bb1f170a9bcca8cb9d076090c209610435422ce8b186f07c1502db3cbbdbec6daf8f77095de2d5191d2139b839e173b588434fe2e34c2ad2c87233351603ee
-EBUILD pecl-mcrypt-1.0.2.ebuild 673 BLAKE2B a5e32bd4510bf76b05d1103c65fd8636e4d37f1cd3de6147dd1f1c0c494318ce4f7f81f8bdd46431adbd6b7ccb09041a523992275568fc9da6ca14bc9ef3984e SHA512 926055b28940c84eb9f959bf5c62113e80bb24e3e5f1bedea0235de6cb82f0fe881c09ca2bf8ff7d1c8b1e1a758a9c5e5fe6bf4362095041bb83e953c0adcb30
 EBUILD pecl-mcrypt-1.0.3.ebuild 726 BLAKE2B 869726eb6c6e36082f3ca9e1c23f993d46b9733de66a087a4e0139f8703f2bfb4759ca15d259bd4c9f2a13e5d752ef63e33e533a3dff150f5c8e9d3a3490e397 SHA512 a1dfe478a62d2f93bfe5cdf93da2ad15a0d731f2f4869c1a37be2fef187b61884d87e86e661d19b122b53123035eb0fed8fb7738133198f8e71762a3d9309727
 MISC metadata.xml 379 BLAKE2B 8e9441d2b290b2055894f11d940424ead756cc408b91b5eecd413f6ed4476de9e025fac57b71d8b92ec655787ba8c6e4ec7565f40c2ab22fc0d96051a56faefb SHA512 f39a4765eca2676d25bd98ad9f17c85e528a31ccc1b06e6327203ddfca981363a5eac870fd4f856f4d11926f689dd5b2ea45297055625e2f7089a7b9aec3f975
diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.1.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.1.ebuild
deleted file mode 100644
index 2e2076290b17..000000000000
--- a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="mcrypt"
-USE_PHP="php7-2"
-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="Bindings for the libmcrypt library"
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="amd64"
-
-DEPEND="dev-libs/libmcrypt"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# PHP Warning: Use of undefined constant MCRYPT_CBC - assumed 'MCRYPT_CBC'
-	sed -i '/MODE3/s/MCRYPT_CBC/"MCRYPT_CBC"/g' tests/bug8040.phpt || die
-
-	php-ext-source-r3_src_prepare
-}
diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.2.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.2.ebuild
deleted file mode 100644
index 078d2acdae8c..000000000000
--- a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="mcrypt"
-USE_PHP="php7-2 php7-3"
-MY_P="${PN/pecl-/}-${PV/_rc/RC}"
-PHP_EXT_ECONF_ARGS=()
-PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
-PHP_EXT_S="${WORKDIR}/${MY_P}"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="Bindings for the libmcrypt library"
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-libs/libmcrypt"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# PHP Warning: Use of undefined constant MCRYPT_CBC - assumed 'MCRYPT_CBC'
-	sed -i '/MODE3/s/MCRYPT_CBC/"MCRYPT_CBC"/g' tests/bug8040.phpt || die
-
-	php-ext-source-r3_src_prepare
-}
diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index 3d5604bf19f2..ad8a5e1b25cf 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -1,5 +1,3 @@
-DIST memcached-3.1.3.tgz 82673 BLAKE2B ccb9267cbd974337b7cd8836ab6e35c4fd9398d731dcd333bcb664b91037d1775651e6bb5d00b602767834681289064ede678ea2e6e3641631bba4990a380dee SHA512 9c09648c26011c5e749bee1a556c976e6e5e648dc65580e7caa296dab79e3764edf1408f96edcaca5efb0229320c86fcfa0422e55d486beb6466892f7e08c4a3
 DIST memcached-3.1.5.tgz 83015 BLAKE2B 80f5cbed8e34f867962792d95d242015690f64ab3b462e09813a11b8b86234b0b05b0f6a78f7c6184482b66ba8015064b37f77bbb816a3aee2edd0ce97ab0cbc SHA512 87d5fd079fcaad81139785d6766da71b23a1a0fe907d4b22f3a787af148a20412c11df11c4d98c165241658baf0d87c8a6b29de15db07a0f9d1fabc8aec8f0e9
-EBUILD pecl-memcached-3.1.3-r1.ebuild 2179 BLAKE2B ec037ba55dd9cf0a41779d04c7d1b9e3f4c48c8fc9ff9c62db32c8128c1231891da49fcb9c5b190105e04b76b51e26e4979ee97be4a99de63494d404058b5e95 SHA512 fdabf00ea90160f615698325a74d9abfd5cd6f476f910d20c06ff4fe0b3ef8fe0e01b915615ec764e05fc565cf4cfbe3b940c496511d5d800740f34ab2002cbf
 EBUILD pecl-memcached-3.1.5-r1.ebuild 1582 BLAKE2B 7cb8c180c14bf80a1e4447bfde1c1087f483c582b3f748c819b2e1d9393e5eb5c8a3ac7c4c0cd99d8dd62ecfd2eb302cf83224fdf7de370d21e9a2520b6990cf SHA512 b9aa92fafe9a68a647e3e76212b40c36b65ebcfed423d82a22fe3aad146149a1d915a895cf77c06830b9a0bb589d992d4470e640365f3beb7f46d5c5b3e70662
 MISC metadata.xml 568 BLAKE2B f99b2eb530ffd87100256bb477bfbd50e48b28283bc01147b0cb1e3dd7dbfb940cd8e16e24c68723fe764df0cbdb1ecb0b995e151c67a37673a19a2cfeb1bcfa SHA512 9fb2c3ea2dba6b4b1cdda8acc02afa006a95651b4fdb5011b15e4046bc44742cc5306d20db070f4f1977352873576040a34ed24a660ec2c640e118115359f2c6
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild
deleted file mode 100644
index 755ce7ed1adf..000000000000
--- a/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PHP_EXT_NAME="memcached"
-DOCS=( ChangeLog README.markdown )
-
-USE_PHP="php5-6 php7-1 php7-2 php7-3" # Pretend to support all four targets...
-inherit php-ext-pecl-r3
-USE_PHP="php7-1 php7-2 php7-3" # But only truly build for these three.
-
-DESCRIPTION="Interface PHP with memcached via libmemcached library"
-LICENSE="PHP-3"
-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
-"
-
-RDEPEND="
-	php_targets_php7-1? (
-		${COMMON_DEPEND} dev-lang/php:7.1[session?,json?]
-		igbinary? ( dev-php/igbinary[php_targets_php7-1(-)] )
-	)
-	php_targets_php7-2? (
-		${COMMON_DEPEND} dev-lang/php:7.2[session?,json?]
-		igbinary? ( dev-php/igbinary[php_targets_php7-2(-)] )
-	)
-	php_targets_php7-3? (
-		${COMMON_DEPEND} dev-lang/php:7.3[session?,json?]
-		igbinary? ( dev-php/igbinary[php_targets_php7-3(-)] )
-	)"
-DEPEND="${RDEPEND} test? ( net-misc/memcached )"
-RDEPEND="${RDEPEND} php_targets_php5-6? ( dev-php/pecl-memcached:0[php_targets_php5-6(-)] )"
-
-src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-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() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
-		local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 )
-		[[ ${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}
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
-		php-ext-source-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-mongodb/Manifest b/dev-php/pecl-mongodb/Manifest
index 05eb32828065..2131f8054318 100644
--- a/dev-php/pecl-mongodb/Manifest
+++ b/dev-php/pecl-mongodb/Manifest
@@ -1,14 +1,7 @@
-DIST mongodb-1.5.3.tgz 1059580 BLAKE2B 23bd5f6b0f218cf55bd5713a770f3990d5c1492925623712583356d8aee42a1b47519b93ba64036aaf98f97ab4b1b30de9d8aa39659f2575c4f4dba3892d574d SHA512 35704e75bd7867a436d953c00c7560c9a08a4fa8f3555d7cc00aeda34e87c6c7aa7ecc1d7f674747e34f4f8dac35d320f6317e60229528ea9782bbe669bafec0
-DIST mongodb-1.5.5.tgz 1060017 BLAKE2B 475ca0f6a1cbd5270c9bde0f195d6092ef25441e0cee0a45ed378a868bd1ad27c7a77c4f4702b6f82004433805563cdaa728cbc11bb5beff83b982122cad339b SHA512 1eefc8f8e359a979082dc7808e89ff5418cd2dc73d4250638e33dc32cce40ef42502e9dbbb07303381e0062b84818568034f4e4cda8c8bf905513d00bf008392
-DIST mongodb-1.6.0.tgz 1096156 BLAKE2B 16c3b1d07d31d29a214aba320347f8e40cfc4f0dae8b0713b02cd0e3ff98fd54b09217472f333722228efdfcae755bbdbfe58da7db89d4dda2893ba7b3b0e8bb SHA512 e75dc607bf41bb71a0fce3b73785ef4203af97a3e8b21bf70a80c2216e9530463a6aaca55b013a4fa2f3c4eb72405a25209935ea1a238475f990763af54aa641
 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
-EBUILD pecl-mongodb-1.5.3-r1.ebuild 1009 BLAKE2B 4c1e9184619bc2f90558608f5ab5e2413c969e99bab0a8fcfb50b5a6fd6e5cbbf7f05f1a5155e2805a22aecee5f3a09e7e1c80d17b79cfcbfcdfaadeae6c13fd SHA512 7cf1a6fca2ce421abfd4f5509c585eff0627bd638749c2fda2be9be0fe12044ace79fab604cba54ba153d24cb8bc677ecb7c64c5cedd2af2e2361950e87a4b7e
-EBUILD pecl-mongodb-1.5.3.ebuild 1019 BLAKE2B cf4f6615b0d70b685817105fb53227bddc4b85d9ef60000eed1a48b5f8601d3868ed5e7af096b7df7c4882d2fbdf22c56d21bf512c5b267a8893443e14ca7c3d SHA512 ddba025e9e91ab5fa2b065ebdef36b61510bd589afa09611dafe4e5b27f1af35019f3dc0ef7a6915d035225dcd13ef5e6cb91c2c0a9e6b0699f335d6b8d211b8
-EBUILD pecl-mongodb-1.5.5.ebuild 1009 BLAKE2B 4c1e9184619bc2f90558608f5ab5e2413c969e99bab0a8fcfb50b5a6fd6e5cbbf7f05f1a5155e2805a22aecee5f3a09e7e1c80d17b79cfcbfcdfaadeae6c13fd SHA512 7cf1a6fca2ce421abfd4f5509c585eff0627bd638749c2fda2be9be0fe12044ace79fab604cba54ba153d24cb8bc677ecb7c64c5cedd2af2e2361950e87a4b7e
-EBUILD pecl-mongodb-1.6.0.ebuild 1426 BLAKE2B 4b32da42a4141f6db317f0f77b5207f623e17560a6964d27700dbccd13caee470e29005fc97b2b1c3c1e5b59b40c5a84bb8d399b8d4b6f4c43db6bc972314675 SHA512 b185eb19982a9acd6a49b9be5f33da6106ba452d9402bd4b514f56eabcfc63637e111bfe4d0042483f826a4d5a8fb71714c900b9f398ab4c1d0611643bfdfc5a
 EBUILD pecl-mongodb-1.7.4.ebuild 1360 BLAKE2B 694ac42a3fdaf5ab1b2fe968dd3cb473022b5cffebdec5da6510bc5eebe34980e9a7ebe0bdd5036ffab306bf854dd00797c25cecd6ecb1da110e940b1869e385 SHA512 c699a3790c2e0f9ecd94f2dbc6f3a5200a374fe3c9a10ac0e8ad5f7d356d9b844393114bbe5b1090b88a7d1e13b6202781064800716c9b9149f61696968471ab
 EBUILD pecl-mongodb-1.7.5.ebuild 1362 BLAKE2B d2727126b6a41701aa3855f7cddaaf5cf9ca1fa69998a98a14d16509b87319c79d30c08e66483a85f08a8f7d6f5fac030357a6f5baa08f01bf211b844d2919b8 SHA512 7ec2c9c6bf1514a655222febae3bbf40ecfde2180308d65fdc8dbf7d4fdf50cf6c736a328384cc14abfb8d0eb6f66c9fedb18946c722c27b5683d6b71e5d81f8
 EBUILD pecl-mongodb-1.8.0.ebuild 1362 BLAKE2B da7514971e440ed3938edbc1b74fa02fdc3c7f7ebf94783aada4094a9d80271a390830161f187bf6d05f179825318617a4d6e999517d92b3b7db963fcf8f8dee SHA512 13bd15a1774e8ed26332b80c83f4313c3199c95aee2361a1bed82a55fc68cebecab3f1b4b51155eafad5393117a5a2338fdc000f604dfb348b82c4e916ed5604
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.5.3-r1.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.5.3-r1.ebuild
deleted file mode 100644
index 62a5bf128339..000000000000
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.5.3-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="mongodb"
-USE_PHP="php5-6 php7-1 php7-2 php7-3"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="MongoDB database driver for PHP"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl sasl"
-
-COMMON_DEPEND="
-	php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] )
-	php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] )
-	php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] )
-	php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/libbson-1.13.0
-	>=dev-libs/mongo-c-driver-1.13.0[sasl?,ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sasl? ( dev-libs/cyrus-sasl )"
-RDEPEND="${DEPEND}"
-BDEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-mongodb
-		--with-libbson
-		--with-libmongoc
-		--with-mongodb-sasl=$(usex sasl)
-	)
-	php-ext-source-r3_src_configure
-}
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.5.3.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.5.3.ebuild
deleted file mode 100644
index 353be18eae0c..000000000000
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.5.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="mongodb"
-USE_PHP="php5-6 php7-0 php7-1 php7-2"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="MongoDB database driver for PHP"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libressl sasl"
-
-RDEPEND="
-	php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] )
-	php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] )
-	php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] )
-	php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] )
-	>=dev-libs/libbson-1.13.0
-	>=dev-libs/mongo-c-driver-1.13.0[sasl?,ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-# pkgconfig needed if system libraries are used for bson and libmongoc
-DEPEND="${RDEPEND} virtual/pkgconfig"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-mongodb
-		--with-libbson
-		--with-libmongoc
-		--with-mongodb-sasl=$(usex sasl)
-	)
-	php-ext-source-r3_src_configure
-}
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.5.5.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.5.5.ebuild
deleted file mode 100644
index 62a5bf128339..000000000000
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.5.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="mongodb"
-USE_PHP="php5-6 php7-1 php7-2 php7-3"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="MongoDB database driver for PHP"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl sasl"
-
-COMMON_DEPEND="
-	php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] )
-	php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] )
-	php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] )
-	php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/libbson-1.13.0
-	>=dev-libs/mongo-c-driver-1.13.0[sasl?,ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sasl? ( dev-libs/cyrus-sasl )"
-RDEPEND="${DEPEND}"
-BDEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-mongodb
-		--with-libbson
-		--with-libmongoc
-		--with-mongodb-sasl=$(usex sasl)
-	)
-	php-ext-source-r3_src_configure
-}
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.6.0.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.6.0.ebuild
deleted file mode 100644
index 6dc6dd1ed288..000000000000
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.6.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="mongodb"
-USE_PHP="php7-1 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="libressl sasl test"
-
-PHP_DEPEND="
-	php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] )
-	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.15.1
-	>=dev-libs/mongo-c-driver-1.15.1[sasl?,ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl: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-redis/Manifest b/dev-php/pecl-redis/Manifest
index 3bd274d0b9dc..3977c5658876 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -1,11 +1,3 @@
-DIST redis-5.1.1.tgz 245205 BLAKE2B b7177be5282b081562a446b1b37c7b46ba0ef382e55f27989d5586346a10f842d050ee46e881e480ea6b768e1259458df565d02193eda13a95704cd5455c1ca2 SHA512 eb6aa538d2ae4115634fd5841e3ccccf788cad13b99e0485fb2af43def85e93328012e5cef66d1be4bdd494be6f68de329a066e41b710e434f94f3ed3401bfee
-DIST redis-5.2.1.tgz 251570 BLAKE2B 297d6130469735a53f6dfb6ffea8c7c813363099eb76f25619f0cbb05cd06f5ecad9c0f30c370e33985523cf26488cf133aa0a48a99075bc6d5796309e3d914d SHA512 de90bf65cce0cb8c5ea28415e4f7bfff23c8bb3dc96ddca3158f94be2e4bd051e13ec3f34429b0e8ceb436096520e3998f544f377d5ef7d4d1df4edba7f66bc2
-DIST redis-5.2.2.tgz 251629 BLAKE2B e6ca740412dd1ba4ee960e1c71b3f75ebb1a1e2605bc93159395c657ab61eda4c8222b6e890a447c06cd1ef016e061861ffc5d8a6fd6e7e324353a148b54c593 SHA512 0020c572bcd24cdb479046727fba2d30ca87c9a7111c51e5fe3be0b85459e3e7dfc8892b690650de0a7dc80c1a8921f9de45590f6e60257fbf0534729c6e6f4f
-DIST redis-5.3.1.tgz 264485 BLAKE2B 51f68841d51329cbbbd2012e539351b3220dc1361ae5a3782b6c3e9620ed14b9a0b9097a0d6ba6e2fa60e8a794fd2ea57fff871d2fceb7bcdb4a2ab4a6d8789f SHA512 dca62e0e87d22c25818f0eb84ec0a4ae8ab4c1a2de295b7d56d10548c95448637e1b1ca86c55adf0f801fe22bf3c05fad4ff58f3823e5d74c506d041b64f1d4a
 DIST redis-5.3.2.tgz 266814 BLAKE2B 2be79d850e5958bcaf4fddcbdef0a402e62a522f260ae94c0fdc931a988e9b266c7a4e049b89b507a29a8e9085590e4077e336b85974d70a7cb9b3d6c806949d SHA512 95ce960b78cf94ecd212ec88914935167af37e4176d4b111dfc8c6f1a0846a34beba7f9f516cd7a5e1c9dda23f46cce44c99aaa5b42724c0c2a188b0698af414
-EBUILD pecl-redis-5.1.1.ebuild 1288 BLAKE2B 59d4de29ee1b61edede0c31ab5bb4fc40885c3d13744125f0838052299ead06f10965e5a5b9f269b368d3d4981e309fc1ee168f9a1cdbefe8eaee1554bd4c1cb SHA512 90bc2609cb87d3d3aacb72bd507a5895b5b531d243363676bbda1fb14548960b0073b61bac44e77b983570a9c116b2f369ab835bfd179e9af610deb0afadf994
-EBUILD pecl-redis-5.2.1.ebuild 1262 BLAKE2B d29de451a8f863b87a77a356f52b781c94fd448c3ba1e4ab5c74a35e0d977d64a70412fc2b51f7e2267eda03dd2e886d1faa11bb4fe5bdf186682052f3b7b52b SHA512 1d975f3afc197a779295686e9645f24dd82611e326e1c89c387f3dcc8ce20f32cf68ebd5d2fe2f8451329c7d6c655ee998cd602ba0821227319ff84c85f705a0
-EBUILD pecl-redis-5.2.2.ebuild 1262 BLAKE2B d29de451a8f863b87a77a356f52b781c94fd448c3ba1e4ab5c74a35e0d977d64a70412fc2b51f7e2267eda03dd2e886d1faa11bb4fe5bdf186682052f3b7b52b SHA512 1d975f3afc197a779295686e9645f24dd82611e326e1c89c387f3dcc8ce20f32cf68ebd5d2fe2f8451329c7d6c655ee998cd602ba0821227319ff84c85f705a0
-EBUILD pecl-redis-5.3.1.ebuild 1486 BLAKE2B 718fe2c3f07f6d6088ea908b4e0c41dc8a996bf09a5ac75c2ab0716afcb843aed71547cb10118df3b1d670ee678f6fd14b3b1acfb32813000fb47cad517c7a1d SHA512 98412ca22de8a169b782ff44b9120ad328e55a99e15fc162d067046c71b545db00c2a5179ee8b6e8814b302898c7ab4215151f0da8a90635903a8b8ef6ae18b0
-EBUILD pecl-redis-5.3.2.ebuild 1528 BLAKE2B 76143189f10f1bff85c597bc4946d69dea4abfff0303b5e7a54fb1ca39f0e109157cdf1ba88bed6ee20848a409114717d16a990b1ebad9e213a747961f4b166c SHA512 55df2dfdb69d06fe1302c8d81beec4c06559f226b2e3275c2e8795cd6bd5b77c89b1cffc90343515fdea7d94ec479f72a14e970c70a0825c5008d6b39258c23e
+EBUILD pecl-redis-5.3.2.ebuild 1527 BLAKE2B 6121552e2c86d9b4e333c4ed9487553a24160dfee4d5f9155b9de65195146609983d13fb37258347645ac2144a005ca4630ac147bf6baf5adc54ce7e4254af7c SHA512 cf6f2b0e878b751b040a1ac4e3d99a275dda5a89ef5eb5996cd76613ff4f95bca7295371a0ba6f16f2b2712faa5ba4a881c7e1ff2e689e9bdf013e9f982adc73
 MISC metadata.xml 383 BLAKE2B b7a47896565db2f132479963a5479262864421a8388bd262ba9aa8eb6445e0d351478530475b5dba12cc9cbbc33089a904f9945816d3009c75f09dcea9c4cfdc SHA512 da5c3918a6652f1f3ae58a5bcd2c5eb3308d764df1a14bae1658f5f2022ee364b6cd288c4a3c700cf27b70b2f967f66668c17ea9850fc48910005310d16125b0
diff --git a/dev-php/pecl-redis/pecl-redis-5.1.1.ebuild b/dev-php/pecl-redis/pecl-redis-5.1.1.ebuild
deleted file mode 100644
index f765a4d536ff..000000000000
--- a/dev-php/pecl-redis/pecl-redis-5.1.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="redis"
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-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 +session"
-
-DEPEND="
-	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] )
-"
-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
-		$(use_enable igbinary redis-igbinary)
-		$(use_enable json redis-json)
-		$(use_enable session redis-session)
-	)
-	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-redis/pecl-redis-5.2.1.ebuild b/dev-php/pecl-redis/pecl-redis-5.2.1.ebuild
deleted file mode 100644
index ec5cd6b371d3..000000000000
--- a/dev-php/pecl-redis/pecl-redis-5.2.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="redis"
-USE_PHP="php7-2 php7-3 php7-4"
-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 +session"
-
-DEPEND="
-	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] )
-"
-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
-		$(use_enable igbinary redis-igbinary)
-		$(use_enable json redis-json)
-		$(use_enable session redis-session)
-	)
-	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-redis/pecl-redis-5.2.2.ebuild b/dev-php/pecl-redis/pecl-redis-5.2.2.ebuild
deleted file mode 100644
index ec5cd6b371d3..000000000000
--- a/dev-php/pecl-redis/pecl-redis-5.2.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="redis"
-USE_PHP="php7-2 php7-3 php7-4"
-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 +session"
-
-DEPEND="
-	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] )
-"
-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
-		$(use_enable igbinary redis-igbinary)
-		$(use_enable json redis-json)
-		$(use_enable session redis-session)
-	)
-	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-redis/pecl-redis-5.3.1.ebuild b/dev-php/pecl-redis/pecl-redis-5.3.1.ebuild
deleted file mode 100644
index 9f7ec9e88930..000000000000
--- a/dev-php/pecl-redis/pecl-redis-5.3.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="redis"
-USE_PHP="php7-2 php7-3 php7-4"
-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-2?,php_targets_php7-3?,php_targets_php7-4?] )
-	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-redis/pecl-redis-5.3.2.ebuild b/dev-php/pecl-redis/pecl-redis-5.3.2.ebuild
index 65762af9b8d8..28935f2552a5 100644
--- a/dev-php/pecl-redis/pecl-redis-5.3.2.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-5.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ inherit php-ext-pecl-r3
 DESCRIPTION="PHP extension for interfacing with Redis"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="amd64 ~arm"
 IUSE="igbinary +json lz4 +session zstd"
 
 DEPEND="
diff --git a/dev-php/pecl-rrd/Manifest b/dev-php/pecl-rrd/Manifest
index deaeba9088a6..5bcbc9156f1b 100644
--- a/dev-php/pecl-rrd/Manifest
+++ b/dev-php/pecl-rrd/Manifest
@@ -1,3 +1,5 @@
+AUX 2.0.1/0001-arginfo.patch 2714 BLAKE2B 23b597baafd80f10abd922d096b94968b54bb4d3b5682242ad66f85d85dd3ab984d9e3623cd03a4f8c38a8798887ceba62e33c177d3ce8c0ebaf6e3cae99a149 SHA512 01ff4826777e30048dd9db3b9589017a39da6e038a113fdc772e1023c85527af146ee5ad7f79cc91976f7991e1b182e20537df38e94ac28307fc26a6708bb290
+AUX 2.0.1/0002-relax-float-test-result.patch 3214 BLAKE2B 28be00e2e4c85baf8f3da4da764d45e9f5f9a232c49e73c9d4f76a94c9eeb9b265ed56feffe3b19f7a5f314907139446e4b6ec837ceabb4f760c08fa0092202f SHA512 fd18c196df8a9fb36acf7f4f5cfbf048f829c00b08f2ad3c371252adbe9f148082026ce7c2e48126cb089e8820b77db8e19f86fe6e97836eac0eec4ca97a2871
 DIST rrd-2.0.1.tgz 18880 BLAKE2B c3fb65e95aece39690085830ec1c43ba173e173591215d6a66145ac71079f8d5ba5b097acd9018c86d2342550001334f8e1c98e22204d94a24aee5cc086295ca SHA512 b6f7173f54fcf49bf014cc6c78263c169cdf53dac66c12f5f88db7e01b49ea74da84a55f61deb25c866e6e2e74275ec48fc4a3d1b46719f66b5b7b7eb000b6b3
-EBUILD pecl-rrd-2.0.1-r3.ebuild 1615 BLAKE2B bc514bf53d9e03ac778a5a91151ca70bf501d671f9de82b4a0f8623a4106df22d549855f7607b15b305a36ced11553b89cff32da206c06bcd2191dd5c4dea437 SHA512 3176ee9520fd9fa7c5748c2dc3c2920ba2ac2a87b303a6cc79e9ae65cd14fd55039201baeb13a08479f06db1cacef9e2bc2718814911b7e1691396b978ae9905
+EBUILD pecl-rrd-2.0.1-r4.ebuild 553 BLAKE2B b7a7c2030a7a8ee0ef20603d94be73a293144ef08b9026fcb365f2a3eca9d9050389cf042b379dadeddb65d62c777b89b4f30f15d3a7db119c37cf981448f052 SHA512 d01b856299b59636fa5a116a94b0a76497a74aadac7bae2149c881880d346dcce02f0dfe8c5f67f74c72602d05adeb0d08dd40c52496a10c4161bf4c41db7dde
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-rrd/files/2.0.1/0001-arginfo.patch b/dev-php/pecl-rrd/files/2.0.1/0001-arginfo.patch
new file mode 100644
index 000000000000..28496fe19c96
--- /dev/null
+++ b/dev-php/pecl-rrd/files/2.0.1/0001-arginfo.patch
@@ -0,0 +1,81 @@
+--- a/rrd.c	2020/09/23 07:41:40	350617
++++ b/rrd.c	2020/09/23 09:09:08	350618
+@@ -552,6 +552,9 @@
+ 	ZEND_ARG_INFO(0, file)
+ 	ZEND_ARG_INFO(0, options)
+ ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_rrd_void, 0)
++ZEND_END_ARG_INFO()
+ /* }}} */
+ 
+ /* {{{ */
+@@ -559,7 +562,7 @@
+ 	PHP_FE(rrd_update, arginfo_rrd_update)
+ 	PHP_FE(rrd_create, arginfo_rrd_create)
+ 	PHP_FE(rrd_graph, arginfo_rrd_graph)
+-	PHP_FE(rrd_error, NULL)
++	PHP_FE(rrd_error, arginfo_rrd_void)
+ 	PHP_FE(rrd_fetch, arginfo_rrd_fetch)
+ 	PHP_FE(rrd_first, arginfo_rrd_first)
+ 	PHP_FE(rrd_info, arginfo_rrd_info)
+@@ -569,9 +572,9 @@
+ 	PHP_FE(rrd_tune, arginfo_rrd_tune)
+ 	PHP_FE(rrd_xport, arginfo_rrd_xport)
+ #ifdef HAVE_RRDC_DISCONNECT
+-	PHP_FE(rrdc_disconnect, NULL)
++	PHP_FE(rrdc_disconnect, arginfo_rrd_void)
+ #endif
+-	PHP_FE(rrd_version, NULL)
++	PHP_FE(rrd_version, arginfo_rrd_void)
+ 	PHP_FE_END
+ };
+ /* }}} */
+--- a/rrd_create.c	2020/09/23 07:41:40	350617
++++ b/rrd_create.c	2020/09/23 09:09:08	350618
+@@ -323,10 +323,13 @@
+ 	ZEND_ARG_INFO(0, description)
+ ZEND_END_ARG_INFO()
+ 
++ZEND_BEGIN_ARG_INFO_EX(arginfo_rrdcreator_void, 0, 0, 0)
++ZEND_END_ARG_INFO()
++
+ /* class method table */
+ static zend_function_entry rrd_create_methods[] = {
+ 	PHP_ME(RRDCreator, __construct, arginfo_rrdcreator_construct, ZEND_ACC_PUBLIC)
+-	PHP_ME(RRDCreator, save, NULL, ZEND_ACC_PUBLIC)
++	PHP_ME(RRDCreator, save, arginfo_rrdcreator_void, ZEND_ACC_PUBLIC)
+ 	PHP_ME(RRDCreator, addDataSource, arginfo_rrdcreator_description, ZEND_ACC_PUBLIC)
+ 	PHP_ME(RRDCreator, addArchive, arginfo_rrdcreator_description, ZEND_ACC_PUBLIC)
+ 	PHP_FE_END
+--- a/rrd_graph.c	2020/09/23 07:41:40	350617
++++ b/rrd_graph.c	2020/09/23 09:09:08	350618
+@@ -140,6 +140,7 @@
+ 	array_init(&zv_argv);
+ 
+ 	ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL(obj->zv_arr_options), num_key, zs_key, zv_option_val) {
++		(void)num_key; /* to avoid -Wunused-but-set-variable */
+ 		smart_string option = {0}; /* one argument option */
+ 
+ 		/* option with string key means long option, hence they are used as
+@@ -356,6 +357,9 @@
+ /* }}} */
+ 
+ /* arguments */
++ZEND_BEGIN_ARG_INFO_EX(arginfo_rrd_void, 0, 0, 0)
++ZEND_END_ARG_INFO()
++
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_rrd_path, 0, 0, 1)
+ 	ZEND_ARG_INFO(0, path)
+ ZEND_END_ARG_INFO()
+@@ -367,8 +371,8 @@
+ /* class method table */
+ static zend_function_entry rrd_graph_methods[] = {
+ 	PHP_ME(RRDGraph, __construct, arginfo_rrd_path, ZEND_ACC_PUBLIC)
+-	PHP_ME(RRDGraph, save, NULL, ZEND_ACC_PUBLIC)
+-	PHP_ME(RRDGraph, saveVerbose, NULL, ZEND_ACC_PUBLIC)
++	PHP_ME(RRDGraph, save, arginfo_rrd_void, ZEND_ACC_PUBLIC)
++	PHP_ME(RRDGraph, saveVerbose, arginfo_rrd_void, ZEND_ACC_PUBLIC)
+ 	PHP_ME(RRDGraph, setOptions, arginfo_rrd_options, ZEND_ACC_PUBLIC)
+ 	PHP_FE_END
+ };
diff --git a/dev-php/pecl-rrd/files/2.0.1/0002-relax-float-test-result.patch b/dev-php/pecl-rrd/files/2.0.1/0002-relax-float-test-result.patch
new file mode 100644
index 000000000000..b4a692fc3f5f
--- /dev/null
+++ b/dev-php/pecl-rrd/files/2.0.1/0002-relax-float-test-result.patch
@@ -0,0 +1,132 @@
+--- a/tests/rrd_010.phpt	2020/09/23 07:41:40	350617
++++ b/tests/rrd_010.phpt	2020/09/23 09:09:08	350618
+@@ -40,11 +40,11 @@
+       [920805900]=>
+       float(0)
+       [920806200]=>
+-      float(0.033333333333333)
++      float(0.03333333333%s)
+       [920806500]=>
+-      float(0.033333333333333)
++      float(0.03333333333%s)
+       [920806800]=>
+-      float(0.033333333333333)
++      float(0.03333333333%s)
+       [920807100]=>
+       float(0.02)
+       [920807400]=>
+@@ -52,20 +52,20 @@
+       [920807700]=>
+       float(0.02)
+       [920808000]=>
+-      float(0.013333333333333)
++      float(0.01333333333%s)
+       [920808300]=>
+-      float(0.016666666666667)
++      float(0.01666666666%s)
+     }
+     ["speed2"]=>
+     array(13) {
+       [920804700]=>
+       float(NAN)
+       [920805000]=>
+-      float(0.056666666666667)
++      float(0.05666666666%s)
+       [920805300]=>
+       float(0.02)
+       [920805600]=>
+-      float(0.0033333333333333)
++      float(0.00333333333%s)
+       [920805900]=>
+       float(0)
+       [920806200]=>
+@@ -73,7 +73,7 @@
+       [920806500]=>
+       float(0)
+       [920806800]=>
+-      float(0.066666666666667)
++      float(0.06666666666%s)
+       [920807100]=>
+       float(0.02)
+       [920807400]=>
+@@ -81,9 +81,9 @@
+       [920807700]=>
+       float(0.02)
+       [920808000]=>
+-      float(0.013333333333333)
++      float(0.01333333333%s)
+       [920808300]=>
+-      float(0.016666666666667)
++      float(0.01666666666%s)
+     }
+   }
+-}
+\ No newline at end of file
++}
+--- a/tests/rrd_012.phpt	2020/09/23 07:41:40	350617
++++ b/tests/rrd_012.phpt	2020/09/23 09:09:08	350618
+@@ -69,7 +69,7 @@
+   ["rra[1].xff"]=>
+   float(0.5)
+   ["rra[1].cdp_prep[0].value"]=>
+-  float(0.026666666666667)
++  float(0.02666666666%s)
+   ["rra[1].cdp_prep[0].unknown_datapoints"]=>
+   int(0)
+ }
+--- a/tests/rrd_017.phpt	2020/09/23 07:41:40	350617
++++ b/tests/rrd_017.phpt	2020/09/23 09:09:08	350618
+@@ -47,11 +47,11 @@
+         [920805900]=>
+         float(0)
+         [920806200]=>
+-        float(0.033333333333333)
++        float(0.0333333333%s)
+         [920806500]=>
+-        float(0.033333333333333)
++        float(0.0333333333%s)
+         [920806800]=>
+-        float(0.033333333333333)
++        float(0.0333333333%s)
+         [920807100]=>
+         float(0.02)
+         [920807400]=>
+@@ -59,9 +59,9 @@
+         [920807700]=>
+         float(0.02)
+         [920808000]=>
+-        float(0.013333333333333)
++        float(0.0133333333%s)
+         [920808300]=>
+-        float(0.016666666666667)
++        float(0.0166666666%s)
+       }
+     }
+     [1]=>
+@@ -81,11 +81,11 @@
+         [920805900]=>
+         float(0)
+         [920806200]=>
+-        float(33.333333333333)
++        float(33.333333333%s)
+         [920806500]=>
+-        float(33.333333333333)
++        float(33.333333333%s)
+         [920806800]=>
+-        float(33.333333333333)
++        float(33.333333333%s)
+         [920807100]=>
+         float(20)
+         [920807400]=>
+@@ -93,9 +93,9 @@
+         [920807700]=>
+         float(20)
+         [920808000]=>
+-        float(13.333333333333)
++        float(13.333333333%s)
+         [920808300]=>
+-        float(16.666666666667)
++        float(16.666666666%s)
+       }
+     }
+   }
diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild
deleted file mode 100644
index 16e4bc484026..000000000000
--- a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-# Define 5.6 here to have the {I,REQUIRED_}USE generated
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-# But we really only build 7.0
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-DESCRIPTION="RRDtool bindings for PHP"
-LICENSE="BSD"
-SLOT="7"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	php_targets_php7-1? ( net-analyzer/rrdtool[graph] )
-	php_targets_php7-2? ( net-analyzer/rrdtool[graph] )
-	php_targets_php7-3? ( net-analyzer/rrdtool[graph] )
-	php_targets_php7-4? ( net-analyzer/rrdtool[graph] )
-"
-RDEPEND="${DEPEND} php_targets_php5-6? ( ${CATEGORY}/${PN}:0 )"
-
-src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default
-	fi
-}
-
-src_configure() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		local PHP_EXT_ECONF_ARGS=()
-		php-ext-source-r3_src_configure
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
-
-src_test() {
-	local slot
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		for slot in $(php_get_slots); do
-			php_init_slot_env "${slot}"
-			# Prepare test data
-			emake -C tests/data all
-			NO_INTERACTION="yes" emake test
-		done
-	fi
-}
diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r4.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r4.ebuild
new file mode 100644
index 000000000000..7652ef702136
--- /dev/null
+++ b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="RRDtool bindings for PHP"
+LICENSE="BSD"
+SLOT="7"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-analyzer/rrdtool[graph(-)]"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PV}" )
+PHP_EXT_ECONF_ARGS=()
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		# Prepare test data
+		emake -C tests/data all
+		NO_INTERACTION="yes" emake test
+	done
+}
diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index 6cfb27dc0d00..55a3c9fbf3fb 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -4,5 +4,5 @@ DIST pecl-ssh2-1.2.tar.gz 32447 BLAKE2B 3a9d0f205097a381d07fb9dd5ab4dcb8e361f555
 DIST ssh2-1.1.2.tgz 32057 BLAKE2B 88ffb3fb608687a086bbe345677982e944210791acc100312ba56ac7c35188a52cde5529d78caf473d19710e9965fba853ea9ff046715413a0b488ae2d8b690c SHA512 36793191448745b8a9b3cc628fe9fb431480792c7a2ff0bf2eccd58cda1cf944933be1d301c455d4a6f3dabf7e04ffef248bc402a8ff99bfafcba0deddb25c36
 EBUILD pecl-ssh2-1.1.2.ebuild 893 BLAKE2B 22fdf4b37e9f003d9ff65df2a28b7d434d43fdd12604f8ee86e51ff3f8985dd88ea6c721ba599f85fcd215eee3e82c4695b026d59200fb9bc66731b265c06c56 SHA512 f35b181900d8bd252fb1f248c0327b57fcc1f204e40741f327a6624427546a7ef9b58dbad59f6d16c42d6481cda865741f71cc346ecce0714084a723d6606f32
 EBUILD pecl-ssh2-1.2.ebuild 866 BLAKE2B caa168d611c4ce00afee58568ef3ae39a19e81b978f9c49d9eab58b300ce30b97650bc88145a4b4dd1e532de6a4078b2e53d785519ec054f731a28453ce864da SHA512 0e873df6151fcbd7892b85ed8681c1a5da398e5fe5a11e9bf5b179046aeaa5195efb72cdc320656c80b4e82826020a0c5d8829d26bf851c3522177d904c194c8
-EBUILD pecl-ssh2-9999.ebuild 470 BLAKE2B 52a706cd1ae45c62ec273770e887f793c2f26cc0e6dbf4558edd0460b835c6bb53400fd23374492a6e29cf22a37d1074470227ed6df71383b7d0332f53785894 SHA512 8b946aa5cd6ba27c1f84bc74fb287a2d89f6cb8c59188877f167f66d879f142a3bca0154d9e79fad8f272f75c021bd0ba65c8d7112d052a0684199598b47e37a
+EBUILD pecl-ssh2-9999.ebuild 470 BLAKE2B df043a226f20088177b0734bcb88d4096fde26ddfcc9a328746c729a4d64aa6e9423bb027e096aa19ead8ec27532874e804cc72be78dd6ef7fc65b61449d832d SHA512 46e54835cf0b3c793eb821113d318b0a797409dc19833922369608eb42c7a877c039fb36243796cc69afcc9308f35832a8f8378b3715704642953d3e4b63e359
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
index bbaca4c60d00..3d6ba5b1e14c 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 PHP_EXT_NAME="ssh2"
 
-USE_PHP="php7-2 php7-3 php7-4"
+USE_PHP="php7-3 php7-4 php8-0"
 EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git"
 
 inherit php-ext-source-r3 git-r3
diff --git a/dev-php/pecl-taint/Manifest b/dev-php/pecl-taint/Manifest
index 00284cf2c2aa..d03dfa5cf1b6 100644
--- a/dev-php/pecl-taint/Manifest
+++ b/dev-php/pecl-taint/Manifest
@@ -1,5 +1,3 @@
-DIST taint-2.0.5.tgz 18203 BLAKE2B 1e7d31f5a4eee810923420606892f2cd672d4fdcaf6decda1966d0ad44f779cf019a624c0f5971a44e8ceadf37159359f41ff52f523157eace26d7335405bad6 SHA512 625809e553d782dc6bb41b4dace1a32bf47157e3438430b3717e0ca692959625b293011220e47f95f4b484558e39454138b0760806fcd1e4ae42f608ab290b31
-DIST taint-2.0.6.tgz 18321 BLAKE2B dfa2765a0045072506e85664805c36beec2663b2d54c5bb385b3c1f624f1124bdafada38578d335a5054fb4c823cd4713d76fddb5588b2e1065ae30289539059 SHA512 ea99d738a73f98f881eb2ad82a756d915fbb43faa4ddf7bce52aaca2590d5cff0d4f3739015754d256f97a81cc54183900250dec249397aab1aebe9587140f6c
-EBUILD pecl-taint-2.0.5.ebuild 431 BLAKE2B 9bbaa821a7f976b4548bd2f516b6fd948e2a7e96baf33dd8344a36e69ff677ade9ae050accfbd339d190dd58e956d9e2f26045c2c304ee13071ddaa26912b97c SHA512 beb8c6819462f93efa3a22931f18ac128ef3fcbd6f33bf0d69d4236b74b2b019a6ac978f0b2bb7d2e5e906830f7ebb5ba76bba2e56fb3325213f1fd52259f898
-EBUILD pecl-taint-2.0.6.ebuild 438 BLAKE2B 0151ed125ab4ab75b6abf094ed3dfee5eb89c4ad4f9a3bae69d8ada75c2a267c13523cddf3457201180a263568bf1ad35e06ba9776fe763c81748205ec936b90 SHA512 6c105f2d021931bbda5811d0021e9f73c37de66045e75bf453a4eac9e3e18dfe34df9dc5fc93797580c09990696e069a83bcd91da68231726e69e7c9d7027016
+DIST taint-2.1.0.tgz 18613 BLAKE2B a76299140dade9a9a2adf7f873cdbaf762abf9248fa7eb16ed502651ade0bcb3a8ca4fc52d495a809d9360e0650dd34ce57798e864e81587a65791f861dd051a SHA512 26374654b07f6c07de0993c91b331d4b35fa485b3d5d737f27daf401b4db0da3d10f59f7b38e523ab705cc76938c4bbf3aa862389122a9afbba008d912de1a6a
+EBUILD pecl-taint-2.1.0.ebuild 424 BLAKE2B f025af8e03536d331620a04718ab62ba736a263f1399251b9054fcc6037f19008a518436238d2052a9b0d29ce383328d8e1efe49441b5628df2b93e1bcddf49c SHA512 6f186d3f79de10b8482f3bfa5dcdee3ecc839c6570c0993293008e4dadfca4d9f04aa63bee454119aaa7846333e6949b9a9794936b624ad923e4cecd3309bd3e
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-taint/pecl-taint-2.0.6.ebuild b/dev-php/pecl-taint/pecl-taint-2.0.6.ebuild
deleted file mode 100644
index 33166802822c..000000000000
--- a/dev-php/pecl-taint/pecl-taint-2.0.6.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 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
-
-DESCRIPTION="Extension used for detecting XSS code (tainted strings)"
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-pkg_postinst() {
-	elog 'To enable this extension, add'
-	elog '  taint.enable=1'
-	elog 'to /etc/php/<sapi>-<slot>/ext/taint.ini'
-}
diff --git a/dev-php/pecl-taint/pecl-taint-2.0.5.ebuild b/dev-php/pecl-taint/pecl-taint-2.1.0.ebuild
index 916d01e54270..0719c8b569b5 100644
--- a/dev-php/pecl-taint/pecl-taint-2.0.5.ebuild
+++ b/dev-php/pecl-taint/pecl-taint-2.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-USE_PHP="php7-1 php7-2 php7-3"
+USE_PHP="php7-3 php7-4"
 inherit php-ext-pecl-r3
 
 DESCRIPTION="Extension used for detecting XSS code (tainted strings)"
diff --git a/dev-php/pecl-timezonedb/Manifest b/dev-php/pecl-timezonedb/Manifest
index 3a08dd2c88bb..1f7914e8b664 100644
--- a/dev-php/pecl-timezonedb/Manifest
+++ b/dev-php/pecl-timezonedb/Manifest
@@ -1,7 +1,3 @@
-DIST timezonedb-2019.3.tgz 413166 BLAKE2B 99542a2c0dc50d96316dc14b22c8a2404db07a88d3f46050a954f10bfb501cd81fb7161805a91336075d607ac106208285e6d2281a9ed68b344fd4837fabcb49 SHA512 8342a0ed83a52ade0415430751d4efeaa84fb72e7da3aec8921338e9dfbf37ff1f098f6b6e1ed9c8f1c9c62017a0fe9c14f86a53be72f8b9f1ec137fa45d057d
-DIST timezonedb-2020.1.tgz 413993 BLAKE2B 1f598269060c7f228d103549ac31429df3e31e68961fb41182101400c9f71ea8503cb11943732b49b749aa055e7eedfb4fd06e11cc11c1381bc69f294c3433b6 SHA512 31c38d5b25db921ec5be924ac85d9cf9dd2180c4e2d50e074a143dfdf9415a8c7579e96f7a768b305554bf1cb332b46f2c652fda7d2f1638502b995fc0679ca5
 DIST timezonedb-2020.4.tgz 414667 BLAKE2B 1a219a090ae33a9f3eef76ab52e2bafd453a1f1161bbeeb53ee995d090f3fdd03c7a658a93ade72e3e1ae61df9d646eaef85dd4cacb5cea45c00adcfac8d6651 SHA512 d5c41c76b4b0b033464a4f086072d061504fc439c910c47a7077a0586b308cc37a4202ff9f418a39cee63534d55136d15a173bb94923160c0fa16bb33ac89a09
-EBUILD pecl-timezonedb-2019.3.ebuild 457 BLAKE2B 11e94c73d390e4df765d0d302ceb86b85bdc7896ca13db1c6ed5bc420041d114f420da7bd65eea558790dd2a4cb855c9da365264670efd2853822377bc8f0b9d SHA512 333a3b507cd55a817dad36564758565ad1b7b0210860c7f2392239ff63d95c3058008e9edcb659a4156dc2d498fc8323f15abcfba29b2965b4465b53db84c27d
-EBUILD pecl-timezonedb-2020.1.ebuild 457 BLAKE2B 11e94c73d390e4df765d0d302ceb86b85bdc7896ca13db1c6ed5bc420041d114f420da7bd65eea558790dd2a4cb855c9da365264670efd2853822377bc8f0b9d SHA512 333a3b507cd55a817dad36564758565ad1b7b0210860c7f2392239ff63d95c3058008e9edcb659a4156dc2d498fc8323f15abcfba29b2965b4465b53db84c27d
 EBUILD pecl-timezonedb-2020.4.ebuild 450 BLAKE2B ce811112800741e818bfeb9d7275462e50e48dab938a11166e9a3a3f2afc3e10ab541d1308bb10590dfb5da819200076df33165c148432c8a82297f73cf7e467 SHA512 afb8a8dd9808a66dc0c97e86cfcb9814855e50845780533d394e9882a6b4bff578abaac660d1b58ac938d48b2d05872c0b593ba340dff04f97c97ab89f2685c2
 MISC metadata.xml 635 BLAKE2B 9c3fa685e184fdb85fd630b9bbbd69bfc20569455f1fa84f147b2d2404739077f5bffbe2c4e5d1a1ff28a9f2ec36bb04d7d55952c7cee4cc5ee3dbc1b11bbc40 SHA512 3b06142a7f995b5859650fa156973deb5cf783be8ee123dc2820f1c4a0d8588d6c73a739a3fe547a3b450ee544a0a69abd260c44d53c87ba0c9911cd68e539dc
diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2019.3.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2019.3.ebuild
deleted file mode 100644
index ce13c87b5e74..000000000000
--- a/dev-php/pecl-timezonedb/pecl-timezonedb-2019.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 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="php5-6 php7-1 php7-2 php7-3 php7-4"
-
-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.1.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2020.1.ebuild
deleted file mode 100644
index ce13c87b5e74..000000000000
--- a/dev-php/pecl-timezonedb/pecl-timezonedb-2020.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 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="php5-6 php7-1 php7-2 php7-3 php7-4"
-
-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-translit/Manifest b/dev-php/pecl-translit/Manifest
index 194a0232b1a0..9d25fd37ccff 100644
--- a/dev-php/pecl-translit/Manifest
+++ b/dev-php/pecl-translit/Manifest
@@ -1,5 +1,3 @@
-DIST pecl-translit-0.6.3.tar.gz 227419 BLAKE2B ebff291a00d61bb4f8e2c47e26baef4278f317be8acd7e5265d3056f8992e6b7e792718c86633277c4a0af5403e253b317241a71aba9b73079a8efb53389ab30 SHA512 5b5e3097a972e45424696abea4d4698fc6c7b6598f1a76754224a4b66776752a01b3bad52bc14afb8cc6e75d36c4558677e609a379898cdd91a5b0a652155cd1
 DIST pecl-translit-0.7.1.tar.gz 227287 BLAKE2B 4d9c9a74ec775d720bf4f2742460e7c96f52bac7b0ddec71622818d5e257bf468092b067ce33b335eee78ded8f2e74f0378acb22a18ef7a30db57a78d9215939 SHA512 62a2a26dbc01bd802c16ab0346d8c2a1960c1066b221bc05d609ca49fef26e9ffbbee9b685fbd82ca9b02be954fbd7f5eb2d9de307c746a792b8785f44e64d46
-EBUILD pecl-translit-0.6.3.ebuild 660 BLAKE2B 025a34d8f2f676e5bc0141d34f8a466af159b491d97112e404f7fbb1b186b7fed1531e462b3bdadfd4b52e0a704ded5e6208e27cc5fc4109ac89654ebae298a5 SHA512 735fb8350f7dbbddd1fac5f5cd7a1204d276042901c2c9b502b1357055afec113b75b72c92bc884ebf7b54773d87eb5f98645dba5ce1416635658052b4ff8f1c
 EBUILD pecl-translit-0.7.1.ebuild 660 BLAKE2B 832e82180a85e7995e41bd4f6ea6c647b8d2ddfc43e1108b30f6aef7c6e070a8c8ef349e9b0028f555df783b534a4c3195fa53e888e76e71c523f08ae780edd9 SHA512 0a820e3782cc17a636b7ff60ab81ae42a96d8386432f4a1350d5714cbeda34fac61fc8cadb5cb9c26c9058400a79ba3c1c7d8a9cac5b1a0a0e9195d728270d0c
 MISC metadata.xml 325 BLAKE2B a089699f9d6ab5df97554c8ff39057077aa28eb48f636adf1d2f85eafb3a4952d7c1dc5b86e1bf1e147bf020ed27119a3567c23b7fcd562ca44966970addbbc5 SHA512 b81117beceea889e292daa2bfad712b51f40a2e12e826388bc0d0f2ae2455dacbcdb4a041fdc72bdbfcc123af11c87346643fd0298b0c2bc726c13ede3a2ea5e
diff --git a/dev-php/pecl-translit/pecl-translit-0.6.3.ebuild b/dev-php/pecl-translit/pecl-translit-0.6.3.ebuild
deleted file mode 100644
index 767d97480c0e..000000000000
--- a/dev-php/pecl-translit/pecl-translit-0.6.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="translit"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-PHP_EXT_NAME="translit"
-
-inherit php-ext-source-r3
-
-SRC_URI="https://github.com/derickr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://github.com/derickr/pecl-translit"
-
-DESCRIPTION="Transliterates non-latin character sets to latin"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-PHP_EXT_ECONF_ARGS=()
-
-src_test() {
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		NO_INTERACTION="yes" emake test
-	done
-}
diff --git a/dev-php/pecl-uuid/Manifest b/dev-php/pecl-uuid/Manifest
index 623bc232f14e..ef6e34deb8c5 100644
--- a/dev-php/pecl-uuid/Manifest
+++ b/dev-php/pecl-uuid/Manifest
@@ -1,5 +1,3 @@
-DIST uuid-1.1.0.tgz 15225 BLAKE2B 0a5a326076707e0d3e7c779151a13853e52d026ebdf62c9ab147cf5d00bbc68a3d82e15101c1d4a232d96ea7e988304a25517723adb3127938474172dfab16c2 SHA512 aea814a12e266e4a9e36c58bae78927fa9de6d2b7bf9c75a911710b26958aeecd31d972f56519cf4882a4b13864bc0740ad968b06e704ce7642279253009e76d
 DIST uuid-1.2.0.tgz 16270 BLAKE2B a3746dce1c27973247fd84ccdf8d73809fae775fa0cf133c3bf09c862d93c6c3a53f2d093a1df3dd8bab90f4e58c326e6e7944bfdf436723c79ad5b634e46e18 SHA512 bd557823a8c2b78f74675a2554445eafc69193c6fe5af1f9435cdd90a8efdec0d3974ae8af759fe7d30b2f805876fc2ef55058dea245c9d89a792f634fdb0a10
-EBUILD pecl-uuid-1.1.0.ebuild 422 BLAKE2B 9365759899e4c20d1c12e2b54c19f1f9bdd981f8ece3e0ef187cda55144581b2f6779fa372e7f8dbe1d1b1b87c3f3e651d0d1765373fad29648f5d8138b6514b SHA512 269853f1eb67f90e89b2ed2a6155cacd1c2f55627cbc75c5fd2e4ffd3e8185d55dc93c7e29d4e3113127641afe957bbd0166de6bbedbd75b9bf0f48bee9b1f07
 EBUILD pecl-uuid-1.2.0.ebuild 422 BLAKE2B b745ddc981d571b499cad800b794fed79ee210bab02c80141f4940e658dacac3afee537f0f74e5f8fe361257e263636a0cf77a2058f28296ac534851600804b1 SHA512 cea2e6da940717e2b24c5562f69b4a8458610a2194453ff7a25b971166da18a0b7fab815e8df84853eb5cb6ae505e89d89e8f56d2f1eab0a159fe12d86cb223e
 MISC metadata.xml 245 BLAKE2B 7d88a41bb224d6e6c8bc6ed766d24c4141ff7079307fc4e2dadd0d2300b565f5d8332f5a61ad49896af208f136f102bbfedb7b1f61241a82f21cbb6b0d9cc7e9 SHA512 81a613ac5d1bbcb88aad55e16c2b878dcc3a985a8c0d3b802a302067d94c3f878fa8b10aa4804a799a4180464b523eac2ee1bd6547d8baca8647e1e5cce38897
diff --git a/dev-php/pecl-uuid/pecl-uuid-1.1.0.ebuild b/dev-php/pecl-uuid/pecl-uuid-1.1.0.ebuild
deleted file mode 100644
index f030569d725f..000000000000
--- a/dev-php/pecl-uuid/pecl-uuid-1.1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="uuid"
-PHP_EXT_INIT="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS )
-
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="A wrapper around libuuid"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="sys-apps/util-linux"
-RDEPEND="${DEPEND}"
-PHP_EXT_ECONF_ARGS=()
diff --git a/dev-php/pecl-xdiff/Manifest b/dev-php/pecl-xdiff/Manifest
index 572fda221a3e..8a615f8e834c 100644
--- a/dev-php/pecl-xdiff/Manifest
+++ b/dev-php/pecl-xdiff/Manifest
@@ -1,3 +1,6 @@
+AUX 2.1.0_pre-php8-2.patch 7546 BLAKE2B fc865765641195bce5ca2411ec1bf5153846a6289a6849a0029091bc66fdf9a30d4c44c198d20afa33432a4946a3976093cabfb146a1c4c2874a5265b04d7cc4 SHA512 8fcb7de738503a38a939bee7d58b1303e09faa2753b1a69f03813051ef79d7df2603342445350a30a0a194d1bb7e204526580d2f007d9e2a924f03c216d74ff4
+AUX 2.1.0_pre-php8-3.patch 1029 BLAKE2B a13459bf89ff56f2015e9c2c5a443af2217f83704d9e5abed6d532e512d850a3a2b03e33820d58d92db047d35d9229b1cb592e65fca89e34a342a545be52c0df SHA512 c428fbf2250dcc82977457c75610cea2f7bdd8bb3b45cf36520e7eb62bee5983fddfcc91cf6cebc144fb82d5421002af4fc5aba4320cd136360593d8cc665694
+AUX 2.1.0_pre-php8.patch 16933 BLAKE2B d2dcd690d756307b1ca30d7ff74a66d93cd51ee99c4caf007b9f9de05035326cae0782e155285db7a8c74ac59a2afaea9c3c3fed6c818431de87f77d50170f23 SHA512 89e1ce8f169624c1f5c3d1ae9f4dda5bba5bea3a43d351fe294551d1e41970069a173b352ee653435d74578933646decb6c36ae468c12a0cf0631c99b3ee83fd
 DIST xdiff-2.0.1.tgz 10418 BLAKE2B d80afd629db788343e5804925fb8a9971cb0df2db6462be5adcace7e15e9b7fb2bf52cbb49f900878659fcf5e91c69b721c01e01f04876e8245ecc8094f0be61 SHA512 43f2bddac82ac19ac688ae7dad3fef65b0d8887c0e6adefd1fc15236582c31d78a54538903760270dee294ca8b8ba3def48bfa9b1d44160bcc450f5c6516402a
-EBUILD pecl-xdiff-2.0.1-r2.ebuild 1353 BLAKE2B 69ff93c8d5a6c6feb884bba0bd243c134073b70743954e590f320c9324bca85a90ed80497870ae83354451dd14d82e390d5ab9ef1b012690b9598315a843458f SHA512 b5c3b774e12f546bbde22a632404788d7ce3c1c321b1c35e175ba4d48bbbe0179b1efb283d8166318d7015ff3128da680f8667a6c0cdc2edee59533cca4bb5e3
+EBUILD pecl-xdiff-2.1.0_pre.ebuild 644 BLAKE2B 4779987df63e9bc76140318358bc9068b24abd1942013cd79b7dd8bb5e79224578638977a547fedfc682555d97c2b9c76e7b21319ec50884c10e58d5d80e6f27 SHA512 f24eeac4813cfec63c89d5dc6681e52d8686474947d274ee37d0368a5ca590ac1679c5c2c8a34fbbb1668114dbc474b662c8862c9c9a8b71630737c3bca6060d
 MISC metadata.xml 333 BLAKE2B dd00945bd203358c600ca21b80034f9d42bf71a8ecc2fdef73bcd871a87addd962e82357f274e35bbc31bc3debf329283adff20870f56f54116800df5d6ca7d4 SHA512 c91d330b2363fbc4286bd17dfdf5883e1cb3c111a68c0f7cf795967775b4a45a00907c7c85a8ff70f59d379c7ccd2d4ad909235e0b4ace619602cc068e99a599
diff --git a/dev-php/pecl-xdiff/files/2.1.0_pre-php8-2.patch b/dev-php/pecl-xdiff/files/2.1.0_pre-php8-2.patch
new file mode 100644
index 000000000000..80bebf7dfddd
--- /dev/null
+++ b/dev-php/pecl-xdiff/files/2.1.0_pre-php8-2.patch
@@ -0,0 +1,214 @@
+From 2afb71ae1d6bcebe66f2e52019222a117c607f66 Mon Sep 17 00:00:00 2001
+From: Rasmus Lerdorf <rasmus@lerdorf.com>
+Date: Thu, 14 Jan 2021 08:23:43 -0800
+Subject: [PATCH] Version 2.1.0 PHP 8 support Drop PHP 5 support
+
+diff --git a/xdiff.stub.php b/xdiff.stub.php
+new file mode 100644
+index 0000000..4597e7f
+--- /dev/null
++++ b/xdiff.stub.php
+@@ -0,0 +1,84 @@
++<?php
++/** @generate-function-entries */
++
++/**
++ * @param string $str1
++ * @param string $str2
++ * @param int $context
++ * @param bool $minimal
++ * @return string|false
++ */
++function xdiff_string_diff(string $str1, string $str2, int $context = 3, bool $minimal = false) {}
++
++function xdiff_file_diff(string $file1, string $file2, string $dest, int $context = 3, bool $minimal = false): bool {}
++
++/**
++ * @param string $str1
++ * @param string $str2
++ * @return string|false
++ * @alias xdiff_string_bdiff
++ */
++function xdiff_string_diff_binary(string $str1, string $str2) {}
++
++/** @alias xdiff_file_bdiff */
++function xdiff_file_diff_binary(string $file1, string $file2, string $dest): bool {}
++
++/**
++ * @param string $str1
++ * @param string $str2
++ * @return string|false
++ */
++function xdiff_string_rabdiff(string $str1, string $str2) {}
++
++function xdiff_file_rabdiff(string $file1, string $file2, string $dest): bool {}
++
++function xdiff_file_bdiff_size(string $file1, string $file2, string $dest): bool {}
++
++function xdiff_string_bdiff_size(string $file1, string $file2, string $dest): bool {}
++
++/**
++ * @param string $file
++ * @param string $patch
++ * @param string $dest
++ * @param int $flags
++ * @return string|bool
++ */
++function xdiff_file_patch(string $file, string $patch, string $dest, int $flags=XDIFF_PATCH_NORMAL) {}
++
++/**
++ * @param string $file
++ * @param string $patch
++ * @param int $flags
++ * @param string $error
++ * @return string|bool
++ */
++function xdiff_string_patch(string $file, string $patch, int $flags=XDIFF_PATCH_NORMAL, string &$error=null) {}
++
++/** @alias xdiff_file_bpatch */
++function xdiff_file_patch_binary(string $file, string $patch, string $dest): bool {}
++
++/**
++ * @param string $file
++ * @param string $patch
++ * @return string|false
++ * @alias xdiff_string_bpatch
++ */
++function xdiff_string_patch_binary(string $str, string $patch) {}
++
++/**
++ * @param string $file1
++ * @param string $file2
++ * @param string $file3
++ * @param string $dest
++ * @return string|bool
++ */
++function xdiff_file_merge3(string $file1, string $file2, string $file3, string $dest) {}
++
++/**
++ * @param string $str1
++ * @param string $str2
++ * @param string $str3
++ * @param string $error
++ * @return string|bool
++ */
++function xdiff_string_merge3(string $str1, string $str2, string $str3, string &$error=null) {}
+diff --git a/xdiff_arginfo.h b/xdiff_arginfo.h
+new file mode 100644
+index 0000000..2016f7e
+--- /dev/null
++++ b/xdiff_arginfo.h
+@@ -0,0 +1,110 @@
++/* This is a generated file, edit the .stub.php file instead.
++ * Stub hash: ec3a63aa4462f084433c3576ad532de87da7f867 */
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_xdiff_string_diff, 0, 0, 2)
++	ZEND_ARG_TYPE_INFO(0, str1, IS_STRING, 0)
++	ZEND_ARG_TYPE_INFO(0, str2, IS_STRING, 0)
++	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_LONG, 0, "3")
++	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, minimal, _IS_BOOL, 0, "false")
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xdiff_file_diff, 0, 3, _IS_BOOL, 0)
++	ZEND_ARG_TYPE_INFO(0, file1, IS_STRING, 0)
++	ZEND_ARG_TYPE_INFO(0, file2, IS_STRING, 0)
++	ZEND_ARG_TYPE_INFO(0, dest, IS_STRING, 0)
++	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_LONG, 0, "3")
++	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, minimal, _IS_BOOL, 0, "false")
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_xdiff_string_diff_binary, 0, 0, 2)
++	ZEND_ARG_TYPE_INFO(0, str1, IS_STRING, 0)
++	ZEND_ARG_TYPE_INFO(0, str2, IS_STRING, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xdiff_file_diff_binary, 0, 3, _IS_BOOL, 0)
++	ZEND_ARG_TYPE_INFO(0, file1, IS_STRING, 0)
++	ZEND_ARG_TYPE_INFO(0, file2, IS_STRING, 0)
++	ZEND_ARG_TYPE_INFO(0, dest, IS_STRING, 0)
++ZEND_END_ARG_INFO()
++
++#define arginfo_xdiff_string_rabdiff arginfo_xdiff_string_diff_binary
++
++#define arginfo_xdiff_file_rabdiff arginfo_xdiff_file_diff_binary
++
++#define arginfo_xdiff_file_bdiff_size arginfo_xdiff_file_diff_binary
++
++#define arginfo_xdiff_string_bdiff_size arginfo_xdiff_file_diff_binary
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_xdiff_file_patch, 0, 0, 3)
++	ZEND_ARG_TYPE_INFO(0, file, IS_STRING, 0)
++	ZEND_ARG_TYPE_INFO(0, patch, IS_STRING, 0)
++	ZEND_ARG_TYPE_INFO(0, dest, IS_STRING, 0)
++	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "XDIFF_PATCH_NORMAL")
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_xdiff_string_patch, 0, 0, 2)
++	ZEND_ARG_TYPE_INFO(0, file, IS_STRING, 0)
++	ZEND_ARG_TYPE_INFO(0, patch, IS_STRING, 0)
++	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "XDIFF_PATCH_NORMAL")
++	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(1, error, IS_STRING, 0, "null")
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xdiff_file_patch_binary, 0, 3, _IS_BOOL, 0)
++	ZEND_ARG_TYPE_INFO(0, file, IS_STRING, 0)
++	ZEND_ARG_TYPE_INFO(0, patch, IS_STRING, 0)
++	ZEND_ARG_TYPE_INFO(0, dest, IS_STRING, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_xdiff_string_patch_binary, 0, 0, 2)
++	ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
++	ZEND_ARG_TYPE_INFO(0, patch, IS_STRING, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_xdiff_file_merge3, 0, 0, 4)
++	ZEND_ARG_TYPE_INFO(0, file1, IS_STRING, 0)
++	ZEND_ARG_TYPE_INFO(0, file2, IS_STRING, 0)
++	ZEND_ARG_TYPE_INFO(0, file3, IS_STRING, 0)
++	ZEND_ARG_TYPE_INFO(0, dest, IS_STRING, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_xdiff_string_merge3, 0, 0, 3)
++	ZEND_ARG_TYPE_INFO(0, str1, IS_STRING, 0)
++	ZEND_ARG_TYPE_INFO(0, str2, IS_STRING, 0)
++	ZEND_ARG_TYPE_INFO(0, str3, IS_STRING, 0)
++	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(1, error, IS_STRING, 0, "null")
++ZEND_END_ARG_INFO()
++
++
++ZEND_FUNCTION(xdiff_string_diff);
++ZEND_FUNCTION(xdiff_file_diff);
++ZEND_FUNCTION(xdiff_string_bdiff);
++ZEND_FUNCTION(xdiff_file_bdiff);
++ZEND_FUNCTION(xdiff_string_rabdiff);
++ZEND_FUNCTION(xdiff_file_rabdiff);
++ZEND_FUNCTION(xdiff_file_bdiff_size);
++ZEND_FUNCTION(xdiff_string_bdiff_size);
++ZEND_FUNCTION(xdiff_file_patch);
++ZEND_FUNCTION(xdiff_string_patch);
++ZEND_FUNCTION(xdiff_file_bpatch);
++ZEND_FUNCTION(xdiff_string_bpatch);
++ZEND_FUNCTION(xdiff_file_merge3);
++ZEND_FUNCTION(xdiff_string_merge3);
++
++
++static const zend_function_entry ext_functions[] = {
++	ZEND_FE(xdiff_string_diff, arginfo_xdiff_string_diff)
++	ZEND_FE(xdiff_file_diff, arginfo_xdiff_file_diff)
++	ZEND_FALIAS(xdiff_string_diff_binary, xdiff_string_bdiff, arginfo_xdiff_string_diff_binary)
++	ZEND_FALIAS(xdiff_file_diff_binary, xdiff_file_bdiff, arginfo_xdiff_file_diff_binary)
++	ZEND_FE(xdiff_string_rabdiff, arginfo_xdiff_string_rabdiff)
++	ZEND_FE(xdiff_file_rabdiff, arginfo_xdiff_file_rabdiff)
++	ZEND_FE(xdiff_file_bdiff_size, arginfo_xdiff_file_bdiff_size)
++	ZEND_FE(xdiff_string_bdiff_size, arginfo_xdiff_string_bdiff_size)
++	ZEND_FE(xdiff_file_patch, arginfo_xdiff_file_patch)
++	ZEND_FE(xdiff_string_patch, arginfo_xdiff_string_patch)
++	ZEND_FALIAS(xdiff_file_patch_binary, xdiff_file_bpatch, arginfo_xdiff_file_patch_binary)
++	ZEND_FALIAS(xdiff_string_patch_binary, xdiff_string_bpatch, arginfo_xdiff_string_patch_binary)
++	ZEND_FE(xdiff_file_merge3, arginfo_xdiff_file_merge3)
++	ZEND_FE(xdiff_string_merge3, arginfo_xdiff_string_merge3)
++	ZEND_FE_END
++};
+-- 
+2.11.0
+
diff --git a/dev-php/pecl-xdiff/files/2.1.0_pre-php8-3.patch b/dev-php/pecl-xdiff/files/2.1.0_pre-php8-3.patch
new file mode 100644
index 000000000000..e41155467973
--- /dev/null
+++ b/dev-php/pecl-xdiff/files/2.1.0_pre-php8-3.patch
@@ -0,0 +1,39 @@
+From 5458ecb8ce81e921239af1a76d6acb54cf945863 Mon Sep 17 00:00:00 2001
+From: Rasmus Lerdorf <rasmus@lerdorf.com>
+Date: Thu, 14 Jan 2021 15:23:43 -0800
+Subject: [PATCH] Don't need these here
+
+---
+ php_xdiff.h | 16 ----------------
+ 1 file changed, 16 deletions(-)
+
+diff --git a/php_xdiff.h b/php_xdiff.h
+index de882fa..1b9a699 100644
+--- a/php_xdiff.h
++++ b/php_xdiff.h
+@@ -39,22 +39,6 @@ extern zend_module_entry xdiff_module_entry;
+ PHP_MINIT_FUNCTION(xdiff);
+ PHP_MINFO_FUNCTION(xdiff);
+ 
+-PHP_FUNCTION(xdiff_file_diff);
+-PHP_FUNCTION(xdiff_file_bdiff);
+-PHP_FUNCTION(xdiff_file_patch);
+-PHP_FUNCTION(xdiff_file_bpatch);
+-PHP_FUNCTION(xdiff_file_merge3);
+-PHP_FUNCTION(xdiff_file_rabdiff);
+-PHP_FUNCTION(xdiff_file_bdiff_size);
+-
+-PHP_FUNCTION(xdiff_string_diff);
+-PHP_FUNCTION(xdiff_string_bdiff);
+-PHP_FUNCTION(xdiff_string_patch);
+-PHP_FUNCTION(xdiff_string_bpatch);
+-PHP_FUNCTION(xdiff_string_merge3);
+-PHP_FUNCTION(xdiff_string_rabdiff);
+-PHP_FUNCTION(xdiff_string_bdiff_size);
+-
+ #endif	/* PHP_XDIFF_H */
+ 
+ 
+-- 
+2.11.0
+
diff --git a/dev-php/pecl-xdiff/files/2.1.0_pre-php8.patch b/dev-php/pecl-xdiff/files/2.1.0_pre-php8.patch
new file mode 100644
index 000000000000..8a8f3ab43299
--- /dev/null
+++ b/dev-php/pecl-xdiff/files/2.1.0_pre-php8.patch
@@ -0,0 +1,467 @@
+From 2afb71ae1d6bcebe66f2e52019222a117c607f66 Mon Sep 17 00:00:00 2001
+From: Rasmus Lerdorf <rasmus@lerdorf.com>
+Date: Thu, 14 Jan 2021 08:23:43 -0800
+Subject: [PATCH] Version 2.1.0 PHP 8 support Drop PHP 5 support
+
+diff --git a/php_xdiff.h b/php_xdiff.h
+index c79ad63..de882fa 100644
+--- a/php_xdiff.h
++++ b/php_xdiff.h
+@@ -24,7 +24,7 @@
+ extern zend_module_entry xdiff_module_entry;
+ #define phpext_xdiff_ptr &xdiff_module_entry
+ 
+-#define PHP_XDIFF_VERSION "2.0.1"
++#define PHP_XDIFF_VERSION "2.1.0"
+ 
+ #ifdef PHP_WIN32
+ #define PHP_XDIFF_API __declspec(dllexport)
+diff --git a/xdiff.c b/xdiff.c
+index 0756c5a..f4c09f2 100644
+--- a/xdiff.c
++++ b/xdiff.c
+@@ -27,6 +27,29 @@
+ #include "ext/standard/info.h"
+ #include "php_xdiff.h"
+ 
++#ifndef ZEND_ARG_INFO_WITH_DEFAULT_VALUE
++#define ZEND_ARG_INFO_WITH_DEFAULT_VALUE(pass_by_ref, name, default_value) \
++	ZEND_ARG_INFO(pass_by_ref, name)
++#endif
++#if PHP_VERSION_ID < 70200
++#undef ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX
++#define ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, class_name, allow_null) \
++	static const zend_internal_arg_info name[] = { \
++		{ (const char*)(zend_uintptr_t)(required_num_args), ( #class_name ), 0, return_reference, allow_null, 0 },
++#endif
++
++#ifndef ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX
++#define ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, return_reference, required_num_args, class_name, allow_null) \
++	ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, class_name, allow_null)
++#endif
++
++#ifndef ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE
++#define ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(pass_by_ref, name, type_hint, allow_null, default_value) \
++	ZEND_ARG_TYPE_INFO(pass_by_ref, name, type_hint, allow_null)
++#endif
++
++#include "xdiff_arginfo.h"
++
+ #include <xdiff.h>
+ 
+ /* Not exported by header file */
+@@ -37,14 +60,7 @@ struct string_buffer {
+ 	unsigned long size;
+ };
+ 
+- ZEND_BEGIN_ARG_INFO(xdiff_arg_force_ref, 0)
+-     ZEND_ARG_PASS_INFO(0)
+-     ZEND_ARG_PASS_INFO(0)
+-     ZEND_ARG_PASS_INFO(0)
+-     ZEND_ARG_PASS_INFO(1)
+- ZEND_END_ARG_INFO()
+-
+-static int load_mm_file(const char *filepath, mmfile_t *dest TSRMLS_DC);
++static int load_mm_file(const char *filepath, mmfile_t *dest);
+ static int load_into_mm_file(const char *buffer, unsigned long size, mmfile_t *dest);
+ static int append_string(void *ptr, mmbuffer_t *buffer, int array_size);
+ static int append_stream(void *ptr, mmbuffer_t *buffer, int array_size);
+@@ -52,17 +68,17 @@ static int init_string(struct string_buffer *string);
+ static void free_string(struct string_buffer *string);
+ static void invalidate_string(struct string_buffer *string);
+ 
+-static int make_diff(char *filepath1, char *filepath2, xdemitcb_t *output, int context, int minimal TSRMLS_DC);
++static int make_diff(char *filepath1, char *filepath2, xdemitcb_t *output, int context, int minimal);
+ static int make_diff_str(char *str1, int size1, char *str2, int size2,  xdemitcb_t *output, int context, int minimal);
+-static int make_bdiff(char *filepath1, char *filepath2, xdemitcb_t *output TSRMLS_DC);
++static int make_bdiff(char *filepath1, char *filepath2, xdemitcb_t *output);
+ static int make_bdiff_str(char *str1, int size1, char *str2, int size2, xdemitcb_t *output);
+-static int make_patch(char *file_path, char *patch_path, xdemitcb_t *output, xdemitcb_t *error, int flags TSRMLS_DC);
++static int make_patch(char *file_path, char *patch_path, xdemitcb_t *output, xdemitcb_t *error, int flags);
+ static int make_patch_str(char *file, int size1, char *patch, int size2, xdemitcb_t *output, xdemitcb_t *error, int flags);
+-static int make_bpatch(char *file_path, char *patch_path, xdemitcb_t *output TSRMLS_DC);
++static int make_bpatch(char *file_path, char *patch_path, xdemitcb_t *output);
+ static int make_bpatch_str(char *file, int size1, char *patch, int size2, xdemitcb_t *output);
+-static int make_merge3(char *filepath1, char *filepath2, char *filepath3, xdemitcb_t *output, xdemitcb_t *error TSRMLS_DC);
++static int make_merge3(char *filepath1, char *filepath2, char *filepath3, xdemitcb_t *output, xdemitcb_t *error);
+ static int make_merge3_str(char *content1, int size1, char *content2, int size2, char *content3, int size3, xdemitcb_t *output, xdemitcb_t *error);
+-static int make_rabdiff(char *filepath1, char *filepath2, xdemitcb_t *output TSRMLS_DC);
++static int make_rabdiff(char *filepath1, char *filepath2, xdemitcb_t *output);
+ static int make_rabdiff_str(char *str1, int size1, char *str2, int size2, xdemitcb_t *output);
+ 
+ static void *xdiff_malloc(void *foo, unsigned int size)
+@@ -84,33 +100,6 @@ static void *xdiff_realloc(void *foo, void *ptr, unsigned int nsize)
+ 
+ static memallocator_t allocator = { NULL, xdiff_malloc, xdiff_free, xdiff_realloc };
+ 
+-/* {{{ xdiff_functions[]
+- *
+- * Every user visible function must have an entry in xdiff_functions[].
+- */
+-zend_function_entry xdiff_functions[] = {
+-	PHP_FE(xdiff_file_diff,				NULL)
+-	PHP_FE(xdiff_file_bdiff,			NULL)
+-	PHP_FE(xdiff_file_patch,			NULL)
+-	PHP_FE(xdiff_file_bpatch,			NULL)
+-	PHP_FE(xdiff_file_merge3,			NULL)
+-	PHP_FE(xdiff_file_rabdiff,			NULL)
+-	PHP_FE(xdiff_file_bdiff_size,		NULL)
+-	PHP_FE(xdiff_string_diff,			NULL)
+-	PHP_FE(xdiff_string_bdiff,			NULL)
+-	PHP_FE(xdiff_string_patch,			xdiff_arg_force_ref)
+-	PHP_FE(xdiff_string_bpatch,			NULL)
+-	PHP_FE(xdiff_string_merge3,			xdiff_arg_force_ref)
+-	PHP_FE(xdiff_string_rabdiff,		NULL)
+-	PHP_FE(xdiff_string_bdiff_size,		NULL)
+-	PHP_FALIAS(xdiff_file_diff_binary,		xdiff_file_bdiff,      NULL)
+-	PHP_FALIAS(xdiff_file_patch_binary,		xdiff_file_bpatch,     NULL)
+-	PHP_FALIAS(xdiff_string_diff_binary,	xdiff_string_bdiff,    NULL)
+-	PHP_FALIAS(xdiff_string_patch_binary,	xdiff_string_bpatch,   NULL)
+-	{NULL, NULL, NULL}
+-};
+-/* }}} */
+-
+ /* {{{ xdiff_module_entry
+  */
+ zend_module_entry xdiff_module_entry = {
+@@ -118,7 +107,7 @@ zend_module_entry xdiff_module_entry = {
+ 	STANDARD_MODULE_HEADER,
+ #endif
+ 	"xdiff",
+-	xdiff_functions,
++	ext_functions,
+ 	PHP_MINIT(xdiff),
+ 	NULL,
+ 	NULL,
+@@ -172,7 +161,7 @@ PHP_FUNCTION(xdiff_string_diff)
+ 	xdemitcb_t output;
+ 	struct string_buffer string;
+ 
+-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|lb", &str1, &str2, &context, &minimal) == FAILURE) {
++	if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS|lb", &str1, &str2, &context, &minimal) == FAILURE) {
+ 		RETURN_FALSE;
+ 	}
+ 
+@@ -204,7 +193,7 @@ PHP_FUNCTION(xdiff_file_diff)
+ 	xdemitcb_t output;
+ 	php_stream *output_stream;
+ 
+-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSS|lb", &filepath1, &filepath2, &dest, &context, &minimal) == FAILURE) {
++	if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSS|lb", &filepath1, &filepath2, &dest, &context, &minimal) == FAILURE) {
+ 		RETURN_FALSE;
+ 	}
+ 
+@@ -217,7 +206,7 @@ PHP_FUNCTION(xdiff_file_diff)
+ 	output.priv = output_stream;
+ 	output.outf = append_stream;
+ 
+-	retval = make_diff(filepath1->val, filepath2->val, &output, context, minimal TSRMLS_CC);
++	retval = make_diff(filepath1->val, filepath2->val, &output, context, minimal);
+ 	if (!retval)
+ 		goto out_stream_close;
+ 
+@@ -239,7 +228,7 @@ PHP_FUNCTION(xdiff_string_bdiff)
+ 	xdemitcb_t output;
+ 	struct string_buffer string;
+ 
+-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS", &str1, &str2) == FAILURE) {
++	if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS", &str1, &str2) == FAILURE) {
+ 		RETURN_FALSE;
+ 	}
+ 
+@@ -270,7 +259,7 @@ PHP_FUNCTION(xdiff_file_bdiff)
+ 	xdemitcb_t output;
+ 	php_stream *output_stream;
+ 
+-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSS", &filepath1, &filepath2, &result) == FAILURE) {
++	if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSS", &filepath1, &filepath2, &result) == FAILURE) {
+ 		RETURN_FALSE;
+ 	}
+ 
+@@ -283,7 +272,7 @@ PHP_FUNCTION(xdiff_file_bdiff)
+ 	output.priv = output_stream;
+ 	output.outf = append_stream;
+ 
+-	retval = make_bdiff(filepath1->val, filepath2->val, &output TSRMLS_CC);
++	retval = make_bdiff(filepath1->val, filepath2->val, &output);
+ 	if (!retval)
+ 		goto out_stream_close;
+ 
+@@ -305,7 +294,7 @@ PHP_FUNCTION(xdiff_string_rabdiff)
+ 	xdemitcb_t output;
+ 	struct string_buffer string;
+ 
+-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS", &str1, &str2) == FAILURE) {
++	if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS", &str1, &str2) == FAILURE) {
+ 		RETURN_FALSE;
+ 	}
+ 
+@@ -336,7 +325,7 @@ PHP_FUNCTION(xdiff_file_rabdiff)
+ 	xdemitcb_t output;
+ 	php_stream *output_stream;
+ 
+-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSS", &filepath1, &filepath2, &result) == FAILURE) {
++	if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSS", &filepath1, &filepath2, &result) == FAILURE) {
+ 		RETURN_FALSE;
+ 	}
+ 
+@@ -349,7 +338,7 @@ PHP_FUNCTION(xdiff_file_rabdiff)
+ 	output.priv = output_stream;
+ 	output.outf = append_stream;
+ 
+-	retval = make_rabdiff(filepath1->val, filepath2->val, &output TSRMLS_CC);
++	retval = make_rabdiff(filepath1->val, filepath2->val, &output);
+ 	if (!retval)
+ 		goto out_stream_close;
+ 
+@@ -371,13 +360,13 @@ PHP_FUNCTION(xdiff_file_bdiff_size)
+ 	long result;
+ 	mmfile_t file;
+ 
+-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &filepath) == FAILURE) {
++	if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &filepath) == FAILURE) {
+ 		RETURN_FALSE;
+ 	}
+ 
+ 	RETVAL_FALSE;
+ 
+-	retval = load_mm_file(filepath->val, &file TSRMLS_CC);
++	retval = load_mm_file(filepath->val, &file);
+ 	if (!retval)
+ 		goto out;
+ 
+@@ -403,7 +392,7 @@ PHP_FUNCTION(xdiff_string_bdiff_size)
+ 	long result;
+ 	mmfile_t file;
+ 
+-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &patch) == FAILURE) {
++	if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &patch) == FAILURE) {
+ 		RETURN_FALSE;
+ 	}
+ 
+@@ -437,7 +426,7 @@ PHP_FUNCTION(xdiff_file_patch)
+ 	xdemitcb_t output, error_output;
+ 	struct string_buffer error_string;
+ 
+-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSS|l", &src_path, &patch_path, &dest_path, &flags) == FAILURE) {
++	if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSS|l", &src_path, &patch_path, &dest_path, &flags) == FAILURE) {
+ 		RETURN_FALSE;
+ 	}
+ 
+@@ -457,7 +446,7 @@ PHP_FUNCTION(xdiff_file_patch)
+ 	error_output.priv= &error_string;
+ 	error_output.outf = append_string;
+ 
+-	retval = make_patch(src_path->val, patch_path->val, &output, &error_output, flags TSRMLS_CC);
++	retval = make_patch(src_path->val, patch_path->val, &output, &error_output, flags);
+ 	if (retval < 0)
+ 		goto out_free_string;
+ 
+@@ -487,7 +476,7 @@ PHP_FUNCTION(xdiff_string_patch)
+ 	xdemitcb_t output, error_output;
+ 	struct string_buffer output_string, error_string;
+ 
+-	if (zend_parse_parameters_ex(0, ZEND_NUM_ARGS() TSRMLS_CC, "SS|lz", &src, &patch, &flags, &error_ref) == FAILURE) {
++	if (zend_parse_parameters_ex(0, ZEND_NUM_ARGS(), "SS|lz", &src, &patch, &flags, &error_ref) == FAILURE) {
+ 		RETURN_FALSE;
+ 	}
+ 
+@@ -539,7 +528,7 @@ PHP_FUNCTION(xdiff_file_bpatch)
+ 	int retval;
+ 	xdemitcb_t output;
+ 
+-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSS", &src_path, &patch_path, &dest_path) == FAILURE) {
++	if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSS", &src_path, &patch_path, &dest_path) == FAILURE) {
+ 		RETURN_FALSE;
+ 	}
+ 
+@@ -552,7 +541,7 @@ PHP_FUNCTION(xdiff_file_bpatch)
+ 	output.outf = append_stream;
+ 	output.priv = output_stream;
+ 
+-	retval = make_bpatch(src_path->val, patch_path->val, &output TSRMLS_CC);
++	retval = make_bpatch(src_path->val, patch_path->val, &output);
+ 	php_stream_close(output_stream);
+ 
+ 	if (retval == 0)
+@@ -572,7 +561,7 @@ PHP_FUNCTION(xdiff_string_bpatch)
+ 	xdemitcb_t output;
+ 	struct string_buffer output_string;
+ 
+-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS", &src, &patch) == FAILURE) {
++	if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS", &src, &patch) == FAILURE) {
+ 		RETURN_FALSE;
+ 	}
+ 
+@@ -608,7 +597,7 @@ PHP_FUNCTION(xdiff_file_merge3)
+ 	xdemitcb_t output, error_output;
+ 	int retval;
+ 
+-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSSS", &file1, &file2, &file3, &dest) == FAILURE) {
++	if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSSS", &file1, &file2, &file3, &dest) == FAILURE) {
+ 		RETURN_FALSE;
+ 	}
+ 
+@@ -628,7 +617,7 @@ PHP_FUNCTION(xdiff_file_merge3)
+ 	error_output.priv = &string;
+ 	error_output.outf = append_string;
+ 
+-	retval = make_merge3(file1->val, file2->val, file3->val, &output, &error_output TSRMLS_CC);
++	retval = make_merge3(file1->val, file2->val, file3->val, &output, &error_output);
+ 	if (!retval)
+ 		goto out_free_string;
+ 
+@@ -657,7 +646,7 @@ PHP_FUNCTION(xdiff_string_merge3)
+ 	xdemitcb_t output, error_output;
+ 	int retval;
+ 
+-	if (zend_parse_parameters_ex(0, ZEND_NUM_ARGS() TSRMLS_CC, "SSS|z", &file1,  &file2, &file3, &error_ref) == FAILURE) {
++	if (zend_parse_parameters_ex(0, ZEND_NUM_ARGS(), "SSS|z", &file1,  &file2, &file3, &error_ref) == FAILURE) {
+ 		RETURN_FALSE;
+ 	}
+ 
+@@ -700,7 +689,7 @@ out:
+ }
+ /* }}} */
+ 
+-static int load_mm_file(const char *filepath, mmfile_t *dest TSRMLS_DC)
++static int load_mm_file(const char *filepath, mmfile_t *dest)
+ {
+ 	int retval;
+ 	off_t filesize;
+@@ -789,7 +778,6 @@ static int append_stream(void *ptr, mmbuffer_t *buffer, int array_size)
+ {
+ 	php_stream *stream = ptr;
+ 	unsigned int i;
+-	TSRMLS_FETCH();
+ 
+ 	for (i = 0; i < array_size; i++) {
+ 		php_stream_write(stream, buffer[i].ptr, buffer[i].size);
+@@ -821,18 +809,18 @@ static void free_string(struct string_buffer *string)
+ 		efree(string->ptr);
+ }
+ 
+-static int make_diff(char *filepath1, char *filepath2, xdemitcb_t *output, int context, int minimal TSRMLS_DC)
++static int make_diff(char *filepath1, char *filepath2, xdemitcb_t *output, int context, int minimal)
+ {
+ 	mmfile_t file1, file2;
+ 	xpparam_t params;
+ 	xdemitconf_t conf;
+ 	int retval, result = 0;
+ 
+-	retval = load_mm_file(filepath1, &file1 TSRMLS_CC);
++	retval = load_mm_file(filepath1, &file1);
+ 	if (!retval)
+ 		goto out;
+ 
+-	retval = load_mm_file(filepath2, &file2 TSRMLS_CC);
++	retval = load_mm_file(filepath2, &file2);
+ 	if (!retval)
+ 		goto out_free_mmfile;
+ 
+@@ -885,17 +873,17 @@ out:
+ 	return result;
+ }
+ 
+-static int make_bdiff(char *filepath1, char *filepath2, xdemitcb_t *output TSRMLS_DC)
++static int make_bdiff(char *filepath1, char *filepath2, xdemitcb_t *output)
+ {
+ 	mmfile_t file1, file2;
+ 	bdiffparam_t params;
+ 	int retval, result = 0;
+ 
+-	retval = load_mm_file(filepath1, &file1 TSRMLS_CC);
++	retval = load_mm_file(filepath1, &file1);
+ 	if (!retval)
+ 		goto out;
+ 
+-	retval = load_mm_file(filepath2, &file2 TSRMLS_CC);
++	retval = load_mm_file(filepath2, &file2);
+ 	if (!retval)
+ 		goto out_free_mmfile;
+ 
+@@ -945,16 +933,16 @@ out:
+ 	return result;
+ }
+ 
+-static int make_rabdiff(char *filepath1, char *filepath2, xdemitcb_t *output TSRMLS_DC)
++static int make_rabdiff(char *filepath1, char *filepath2, xdemitcb_t *output)
+ {
+ 	mmfile_t file1, file2;
+ 	int retval, result = 0;
+ 
+-	retval = load_mm_file(filepath1, &file1 TSRMLS_CC);
++	retval = load_mm_file(filepath1, &file1);
+ 	if (!retval)
+ 		goto out;
+ 
+-	retval = load_mm_file(filepath2, &file2 TSRMLS_CC);
++	retval = load_mm_file(filepath2, &file2);
+ 	if (!retval)
+ 		goto out_free_mmfile;
+ 
+@@ -999,16 +987,16 @@ out:
+ 	return result;
+ }
+ 
+-static int make_patch(char *file_path, char *patch_path, xdemitcb_t *output, xdemitcb_t *error, int flags TSRMLS_DC)
++static int make_patch(char *file_path, char *patch_path, xdemitcb_t *output, xdemitcb_t *error, int flags)
+ {
+ 	mmfile_t file, patch;
+ 	int retval, result = 0;
+ 
+-	retval = load_mm_file(file_path, &file TSRMLS_CC);
++	retval = load_mm_file(file_path, &file);
+ 	if (!retval)
+ 		goto out;
+ 
+-	retval = load_mm_file(patch_path, &patch TSRMLS_CC);
++	retval = load_mm_file(patch_path, &patch);
+ 	if (!retval)
+ 		goto out_free_mmfile;
+ 
+@@ -1053,16 +1041,16 @@ out:
+ 	return result;
+ }
+ 
+-static int make_bpatch(char *file_path, char *patch_path, xdemitcb_t *output TSRMLS_DC)
++static int make_bpatch(char *file_path, char *patch_path, xdemitcb_t *output)
+ {
+ 	mmfile_t file_mm, patch_mm;
+ 	int retval, result = 0;
+ 
+-	retval = load_mm_file(file_path, &file_mm TSRMLS_CC);
++	retval = load_mm_file(file_path, &file_mm);
+ 	if (!retval)
+ 		goto out;
+ 
+-	retval = load_mm_file(patch_path, &patch_mm TSRMLS_CC);
++	retval = load_mm_file(patch_path, &patch_mm);
+ 	if (!retval)
+ 		goto out_free_mmfile;
+ 
+@@ -1107,20 +1095,20 @@ out:
+ 	return result;
+ }
+ 
+-static int make_merge3(char *filepath1, char *filepath2, char *filepath3, xdemitcb_t *output, xdemitcb_t *error TSRMLS_DC)
++static int make_merge3(char *filepath1, char *filepath2, char *filepath3, xdemitcb_t *output, xdemitcb_t *error)
+ {
+ 	mmfile_t file1, file2, file3;
+ 	int retval, result = 0;
+ 
+-	retval = load_mm_file(filepath1, &file1 TSRMLS_CC);
++	retval = load_mm_file(filepath1, &file1);
+ 	if (!retval)
+ 		goto out;
+ 
+-	retval = load_mm_file(filepath2, &file2 TSRMLS_CC);
++	retval = load_mm_file(filepath2, &file2);
+ 	if (!retval)
+ 		goto out_free_mmfile;
+ 
+-	retval = load_mm_file(filepath3, &file3 TSRMLS_CC);
++	retval = load_mm_file(filepath3, &file3);
+ 	if (!retval)
+ 		goto out_free_mmfile2;
+ 
diff --git a/dev-php/pecl-xdiff/pecl-xdiff-2.0.1-r2.ebuild b/dev-php/pecl-xdiff/pecl-xdiff-2.0.1-r2.ebuild
deleted file mode 100644
index 4acbe27c4126..000000000000
--- a/dev-php/pecl-xdiff/pecl-xdiff-2.0.1-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="xdiff"
-PHP_EXT_PECL_PKG="xdiff"
-DOCS=( README.API )
-
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php7-0 php7-1 php7-2 php7-3 php7-4"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP extension for generating diff files"
-LICENSE="PHP-3.01"
-SLOT="7"
-
-DEPEND="
-	php_targets_php7-0? ( dev-libs/libxdiff )
-	php_targets_php7-1? ( dev-libs/libxdiff )
-	php_targets_php7-2? ( dev-libs/libxdiff )
-	php_targets_php7-3? ( dev-libs/libxdiff )
-	php_targets_php7-4? ( dev-libs/libxdiff )
-"
-RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-xdiff:0[php_targets_php5-6] )"
-
-src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		php-ext-source-r3_src_prepare
-	else
-		eapply_user
-	fi
-}
-
-src_configure() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		local PHP_EXT_ECONF_ARGS=()
-		php-ext-source-r3_src_configure
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-xdiff/pecl-xdiff-2.1.0_pre.ebuild b/dev-php/pecl-xdiff/pecl-xdiff-2.1.0_pre.ebuild
new file mode 100644
index 000000000000..336f7f480f72
--- /dev/null
+++ b/dev-php/pecl-xdiff/pecl-xdiff-2.1.0_pre.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="xdiff"
+PHP_EXT_PECL_PKG="xdiff"
+DOCS=( README.API )
+
+USE_PHP="php7-3 php7-4 php8-0"
+PHP_EXT_PECL_FILENAME="${PN/pecl-/}-2.0.1.tgz"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP extension for generating diff files"
+LICENSE="PHP-3.01"
+SLOT="7"
+
+DEPEND="dev-libs/libxdiff"
+RDEPEND="${DEPEND}"
+PHP_EXT_ECONF_ARGS=()
+PATCHES=(
+"${FILESDIR}/2.1.0_pre-php8.patch"
+"${FILESDIR}/2.1.0_pre-php8-2.patch"
+"${FILESDIR}/2.1.0_pre-php8-3.patch"
+)
+S="${WORKDIR}/${PHP_EXT_PECL_FILENAME/.tgz/}"
+PHP_EXT_S="${S}"
diff --git a/dev-php/pecl-yaz/Manifest b/dev-php/pecl-yaz/Manifest
index 001026281575..fc0e2ff8a568 100644
--- a/dev-php/pecl-yaz/Manifest
+++ b/dev-php/pecl-yaz/Manifest
@@ -1,3 +1,6 @@
+AUX 1.2.3/0001-arginfo_php8-support.patch 7166 BLAKE2B 42859817ae81ba437670c721e3967e9ec3d5eaca15dacee049a0e57d84ef9df1ac6fcff564d3ab1ba07acb75a0ce15dfdfa761d6eda4556a129c91d317292ca4 SHA512 01e742cf947fa2d4e167d16e9112a863ab23911aace807ca6a9e17f66cb304c96aec2a93dcef9f712243b2eeaa24df3a51afd999fcdf95ee7345f2586ba9768b
+AUX 1.2.3/0002-arginfo-fixes.patch 1148 BLAKE2B 5910c1ccf81193cd4da155302c460b8a4859995c94bf2994631c288b60f4bc4681687a0426642b902c31e5ffd515c67346ad3fcd7e507fd45621a7f163a279d5 SHA512 5cb04810fc9dcf6cd6aa3b8f605dd8059c3e528b135c1433f2801c2737308341dc5f5475f5c14d91abe526d8fb86cbb13f62244ac26d223ad88aff2804e10d81
 DIST yaz-1.2.3.tgz 20059 BLAKE2B 3fbf6d57e8519f6d363dbf308cb6ba259098521ae352f8886e8e12ca2a0d8119eaa31fc30301aea6979b32c6c321c4de0ad63ebe72e8f52cbb630d7f136f3e60 SHA512 5e6ebccac05fa44b0758b6817530e8cb436e45ead659f6a5029383515213bcce8c8cc7ceb8ef5ff4ec2335ad5c3009c6ccf8786116b115c24a013329d107bd7a
+EBUILD pecl-yaz-1.2.3-r1.ebuild 600 BLAKE2B b9a06a24d1e1d3f4598469567481de50974c0ba6c45b4143c17c5a3d415669de28868944410e2bfc596289fc56d97604fbb808c6dc6cda83216fc5c135b74298 SHA512 0ecdcff2a264cc9461e62513241a8db02c547611c16b6901290a37931578de58e68caa945105eeb53e4ef9741f3e1e8980161c44266bade0ea2aa289eb925c6c
 EBUILD pecl-yaz-1.2.3.ebuild 585 BLAKE2B 37e8fabd3f532839c24b42b5fecb7c524353c381ec86c783fe4d3a75143f0d59ea44a824dd1c4ad767810d10e1314950a29dda547caac4679741eb1893fece87 SHA512 e61ec097ebb350a9dde9c3bbe79380f22d00a685bcd3d65d28ebae37e92f1bdac233284b856835d836d001fd47c589eef2c1d976bb1375d475bf58d51769925e
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-yaz/files/1.2.3/0001-arginfo_php8-support.patch b/dev-php/pecl-yaz/files/1.2.3/0001-arginfo_php8-support.patch
new file mode 100644
index 000000000000..8cc9929f06c3
--- /dev/null
+++ b/dev-php/pecl-yaz/files/1.2.3/0001-arginfo_php8-support.patch
@@ -0,0 +1,245 @@
+From e629fb640e11f2358c04fe72d50afbd0a004596c Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 23 Sep 2020 16:44:57 +0200
+Subject: [PATCH] add arginfo for all functions - drop support for PHP 4.x -
+ add compatibility with PHP 8
+
+---
+ .gitignore  |   2 +
+ package.xml |   2 +-
+ php_yaz.c   | 209 +++++++++++++++++++++++++++++++++++++++-------------
+ 3 files changed, 162 insertions(+), 51 deletions(-)
+
+diff --git a/php_yaz.c b/php_yaz.c
+index e157815..64b5079 100644
+--- a/php_yaz.c
++++ b/php_yaz.c
+@@ -18,6 +18,12 @@
+ 
+ #include "php_yaz.h"
+ 
++/* for PHP 8+ */
++#ifndef TSRMLS_CC
++#define TSRMLS_CC
++#define TSRMLS_DC
++#endif
++
+ #ifndef YAZ_VERSIONL
+ #error YAZ version 3.0.2 or later must be used.
+ #elif YAZ_VERSIONL < 0x030020
+@@ -138,62 +144,165 @@ static int le_link;
+ ZEND_GET_MODULE(yaz)
+ #endif
+ 
+-#ifdef ZEND_BEGIN_ARG_INFO
+-    ZEND_BEGIN_ARG_INFO(first_argument_force_ref, 0)
+-        ZEND_ARG_PASS_INFO(1)
+-    ZEND_END_ARG_INFO();
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_connect, 0, 0, 1)
++    ZEND_ARG_INFO(0, url)
++    ZEND_ARG_INFO(0, options)
++ZEND_END_ARG_INFO();
+ 
+-    ZEND_BEGIN_ARG_INFO(second_argument_force_ref, 0)
+-        ZEND_ARG_PASS_INFO(0)
+-        ZEND_ARG_PASS_INFO(1)
+-    ZEND_END_ARG_INFO();
+-
+-    ZEND_BEGIN_ARG_INFO(third_argument_force_ref, 0)
+-        ZEND_ARG_PASS_INFO(0)
+-        ZEND_ARG_PASS_INFO(0)
+-        ZEND_ARG_PASS_INFO(1)
+-    ZEND_END_ARG_INFO();
+-#else
+-static unsigned char first_argument_force_ref[] = {
+-        1, BYREF_FORCE };
+-static unsigned char second_argument_force_ref[] = {
+-        2, BYREF_NONE, BYREF_FORCE };
+-static unsigned char third_argument_force_ref[] = {
+-        3, BYREF_NONE, BYREF_NONE, BYREF_FORCE };
+-#endif
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_close, 0, 0, 1)
++    ZEND_ARG_INFO(0, id)
++ZEND_END_ARG_INFO();
++
++#define arginfo_yaz_present       arginfo_yaz_close
++
++#define arginfo_yaz_errno         arginfo_yaz_close
++
++#define arginfo_yaz_error         arginfo_yaz_close
++
++#define arginfo_yaz_addinfo       arginfo_yaz_close
++
++#define arginfo_yaz_es_result     arginfo_yaz_close
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_search, 0, 0, 3)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, type)
++    ZEND_ARG_INFO(0, query)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_wait, 0, 0, 0)
++    ZEND_ARG_INFO(1, options)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_hits, 0, 0, 1)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(1, searchresult)
++    ZEND_ARG_INFO(0, query)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_record, 0, 0, 3)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, pos)
++    ZEND_ARG_INFO(0, type)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_syntax, 0, 0, 2)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, syntax)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_element, 0, 0, 2)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, elementsetname)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_schema, 0, 0, 2)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, schema)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_set_option, 0, 0, 2)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, options_or_name)
++    ZEND_ARG_INFO(0, value)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_get_option, 0, 0, 2)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, name)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_range, 0, 0, 3)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, start)
++    ZEND_ARG_INFO(0, number)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_sort, 0, 0, 2)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, sortspec)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_itemorder, 0, 0, 2)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, package)
++ZEND_END_ARG_INFO();
++
++#define arginfo_yaz_ccl_conf      arginfo_yaz_itemorder
++
++#define arginfo_yaz_cql_conf      arginfo_yaz_itemorder
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_es, 0, 0, 3)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, type)
++    ZEND_ARG_INFO(0, package)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_scan, 0, 0, 3)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, type)
++    ZEND_ARG_INFO(0, query)
++    ZEND_ARG_INFO(0, flags)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_scan_result, 0, 0, 2)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(1, options)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_ccl_parse, 0, 0, 3)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, query)
++    ZEND_ARG_INFO(1, result)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_cql_parse, 0, 0, 4)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, cql)
++    ZEND_ARG_INFO(1, result)
++    ZEND_ARG_INFO(0, rev)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_databases, 0, 0, 2)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, package)
++ZEND_END_ARG_INFO();
+ 
+ 
+ zend_function_entry yaz_functions [] = {
+-	PHP_FE(yaz_connect, NULL)
+-	PHP_FE(yaz_close, NULL)
+-	PHP_FE(yaz_search, NULL)
+-	PHP_FE(yaz_wait, first_argument_force_ref)
+-	PHP_FE(yaz_errno, NULL)
+-	PHP_FE(yaz_error, NULL)
+-	PHP_FE(yaz_addinfo, NULL)
+-	PHP_FE(yaz_hits, second_argument_force_ref)
+-	PHP_FE(yaz_record, NULL)
+-	PHP_FE(yaz_syntax, NULL)
+-	PHP_FE(yaz_element, NULL)
+-	PHP_FE(yaz_range, NULL)
+-	PHP_FE(yaz_itemorder, NULL)
+-	PHP_FE(yaz_es_result, NULL)
+-	PHP_FE(yaz_scan, NULL)
+-	PHP_FE(yaz_scan_result, second_argument_force_ref)
+-	PHP_FE(yaz_present, NULL)
+-	PHP_FE(yaz_ccl_conf, NULL)
+-	PHP_FE(yaz_ccl_parse, third_argument_force_ref)
++	PHP_FE(yaz_connect, arginfo_yaz_connect)
++	PHP_FE(yaz_close, arginfo_yaz_close)
++	PHP_FE(yaz_search, arginfo_yaz_search)
++	PHP_FE(yaz_wait, arginfo_yaz_wait)
++	PHP_FE(yaz_errno, arginfo_yaz_errno)
++	PHP_FE(yaz_error, arginfo_yaz_error)
++	PHP_FE(yaz_addinfo, arginfo_yaz_addinfo)
++	PHP_FE(yaz_hits, arginfo_yaz_hits)
++	PHP_FE(yaz_record, arginfo_yaz_record)
++	PHP_FE(yaz_syntax, arginfo_yaz_syntax)
++	PHP_FE(yaz_element, arginfo_yaz_element)
++	PHP_FE(yaz_range, arginfo_yaz_range)
++	PHP_FE(yaz_itemorder, arginfo_yaz_itemorder)
++	PHP_FE(yaz_es_result, arginfo_yaz_es_result)
++	PHP_FE(yaz_scan, arginfo_yaz_scan)
++	PHP_FE(yaz_scan_result, arginfo_yaz_scan_result)
++	PHP_FE(yaz_present, arginfo_yaz_present)
++	PHP_FE(yaz_ccl_conf, arginfo_yaz_ccl_conf)
++	PHP_FE(yaz_ccl_parse, arginfo_yaz_ccl_parse)
+ #if YAZ_VERSIONL >= 0x050100
+-	PHP_FE(yaz_cql_parse, third_argument_force_ref)
+-	PHP_FE(yaz_cql_conf, NULL)
+-#endif
+-	PHP_FE(yaz_database, NULL)
+-	PHP_FE(yaz_sort, NULL)
+-	PHP_FE(yaz_schema, NULL)
+-	PHP_FE(yaz_set_option, NULL)
+-	PHP_FE(yaz_get_option, NULL)
+-	PHP_FE(yaz_es, NULL)
++	PHP_FE(yaz_cql_parse, arginfo_yaz_cql_parse)
++	PHP_FE(yaz_cql_conf, arginfo_yaz_cql_conf)
++#endif
++	PHP_FE(yaz_database, arginfo_databases)
++	PHP_FE(yaz_sort, arginfo_yaz_sort)
++	PHP_FE(yaz_schema, arginfo_yaz_schema)
++	PHP_FE(yaz_set_option, arginfo_yaz_set_option)
++	PHP_FE(yaz_get_option, arginfo_yaz_get_option)
++	PHP_FE(yaz_es, arginfo_yaz_es)
++#ifdef PHP_FE_END
++	PHP_FE_END
++#else
+ 	{NULL, NULL, NULL}
++#endif
+ };
+ 
+ static void get_assoc(INTERNAL_FUNCTION_PARAMETERS, zval *id, Yaz_Association *assocp)
diff --git a/dev-php/pecl-yaz/files/1.2.3/0002-arginfo-fixes.patch b/dev-php/pecl-yaz/files/1.2.3/0002-arginfo-fixes.patch
new file mode 100644
index 000000000000..53cde0a92769
--- /dev/null
+++ b/dev-php/pecl-yaz/files/1.2.3/0002-arginfo-fixes.patch
@@ -0,0 +1,39 @@
+From 323962299bae3b2085dde44790785a39878f5f9a Mon Sep 17 00:00:00 2001
+From: Adam Dickmeiss <adam@indexdata.dk>
+Date: Thu, 24 Sep 2020 19:45:58 +0200
+Subject: [PATCH] Fixes for arg info
+
+---
+ php_yaz.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/php_yaz.c b/php_yaz.c
+index 64b5079..de9693d 100644
+--- a/php_yaz.c
++++ b/php_yaz.c
+@@ -176,7 +176,6 @@ ZEND_END_ARG_INFO();
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_hits, 0, 0, 1)
+     ZEND_ARG_INFO(0, id)
+     ZEND_ARG_INFO(1, searchresult)
+-    ZEND_ARG_INFO(0, query)
+ ZEND_END_ARG_INFO();
+ 
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_record, 0, 0, 3)
+@@ -244,7 +243,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_scan, 0, 0, 3)
+     ZEND_ARG_INFO(0, flags)
+ ZEND_END_ARG_INFO();
+ 
+-ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_scan_result, 0, 0, 2)
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_scan_result, 0, 0, 1)
+     ZEND_ARG_INFO(0, id)
+     ZEND_ARG_INFO(1, options)
+ ZEND_END_ARG_INFO();
+@@ -264,7 +263,7 @@ ZEND_END_ARG_INFO();
+ 
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_databases, 0, 0, 2)
+     ZEND_ARG_INFO(0, id)
+-    ZEND_ARG_INFO(0, package)
++    ZEND_ARG_INFO(0, databases)
+ ZEND_END_ARG_INFO();
+ 
+ 
diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..1b66eaf384cc
--- /dev/null
+++ b/dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="yaz"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( README )
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+DESCRIPTION="This extension implements a Z39.50 client for PHP using the YAZ toolkit"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-libs/yaz-3.0.2:0="
+RDEPEND="${DEPEND}"
+
+# Needs network access
+RESTRICT="test"
+
+PHP_EXT_ECONF_ARGS="--with-yaz=/usr"
+
+PATCHES=( "${FILESDIR}/${PV}" )
diff --git a/dev-php/xdebug-client/Manifest b/dev-php/xdebug-client/Manifest
index 71391a28edb6..5e68ee14bcce 100644
--- a/dev-php/xdebug-client/Manifest
+++ b/dev-php/xdebug-client/Manifest
@@ -1,11 +1,5 @@
-DIST xdebug-2.9.4.tar.gz 434622 BLAKE2B bd0d0c6a46867ffba88693f142346d11b5abfab3254c549b74ff9169536c42903b1fb1cb94c3344060590b63e287878ea05c6ef7ad8343234bada3857e0dbe75 SHA512 cf19fb9fd12c32e04c18f296694d0667dfe6e14617da932804d17526c88ab19dd2307ad43d036a8c0cb1f871a964523473879da8815f346faf83ec3b9e3952e3
-DIST xdebug-2.9.5.tar.gz 434947 BLAKE2B 08fd7cc92880c9b00180d495341fc7e54998cf3c2294b824d94c3c4ed982ae5b087084b776bcc4f8f4e1aa420396c803d330bc76748cf972cccab4e3f1416d38 SHA512 2a937d08468d3a2963559a56bdf9c9aa6ede3f0ee63797aa14831bcab33a5ede65b87791171a0c794eefdfcffa65bb4d0c06b5377fe03ade65f4defa6e328c72
 DIST xdebug-2.9.6.tar.gz 436208 BLAKE2B 00cfb42c41bfb44f285b97779d6ba625641fc34494465e9e791ab5458c6a608e432df0ad45c561df2f8c9aba04ab34b3a98bb5e6bfb92ace39a3ad4145f3514a SHA512 13ed07a1489ba7bc0b4e85bf56306c733e7894cea8cb442649635196606b12d92e5618ab2485e7cde4aaee2ac6752993aecd933c24fd64b5113ef619339403d2
-DIST xdebug-2.9.7.tar.gz 437517 BLAKE2B 6d3cb615b6b75354e5dc993a2de9f90b5865ee1a98935c084a9d7a4e1d03cceb71278b06da1d5e47f2b4105937f6d24cb8d767c7179fa55798e61a599e173c13 SHA512 ec23f7b5b2e2b109a753e12f1cb01377db52716600fbb31ca5b9a749e9d98e0eb60942b272c25a42efcb56add016310c79eda2c7385a3e0fc18e563f2f486d1e
 DIST xdebug-2.9.8.tar.gz 438295 BLAKE2B 8645052faceb354817ddb448f46af5b849507d31255b43ac59bcef4ece7837ef835ae2ad624ed8a95f8f98d552ef0e7195a4ade7df9176bc300d855a0156f405 SHA512 c431d51a0d9c5ac1c7fc529c2819db480cbfff6f65c35c3c0dbef4e78427aa28ede164f397f92c409e58e386a6be34ecd2ded0ee35e01df1cbf92a49fd2f2aab
-EBUILD xdebug-client-2.9.4.ebuild 814 BLAKE2B 70a121144f1144210566d3c97e38551da0c7910a23e35896e12c2973205d86d3f92f8fadee8d5249ba1b7668d923265b420285f755b857d34f65ba7db1485f0d SHA512 186c937cfcf12e626d098456a096ce27244c308d528c48126cf839d67badd7b9ff3de593ea58227f94391d1b8c85a4c48d08fd67e7904c4d3cdf6d6ef198d2fe
-EBUILD xdebug-client-2.9.5.ebuild 818 BLAKE2B 8cb831537f4919e004b7b6b683d9cca39d3abc7a82a1ca22181e0d626bd0781396128fe8d6fa6ec8396b7025460f3b7e4e295126489c6b85ce8b8f8347b463f2 SHA512 7440d82ecf5685dc1832e34912aa9aff85e0bdb2da42ee5fd02249aa3e07945b3ac095300bdd3344e0583d5a64c58abe28e5cdbf4be96131b7c90db840e663ac
 EBUILD xdebug-client-2.9.6.ebuild 814 BLAKE2B 70a121144f1144210566d3c97e38551da0c7910a23e35896e12c2973205d86d3f92f8fadee8d5249ba1b7668d923265b420285f755b857d34f65ba7db1485f0d SHA512 186c937cfcf12e626d098456a096ce27244c308d528c48126cf839d67badd7b9ff3de593ea58227f94391d1b8c85a4c48d08fd67e7904c4d3cdf6d6ef198d2fe
-EBUILD xdebug-client-2.9.7.ebuild 818 BLAKE2B 8cb831537f4919e004b7b6b683d9cca39d3abc7a82a1ca22181e0d626bd0781396128fe8d6fa6ec8396b7025460f3b7e4e295126489c6b85ce8b8f8347b463f2 SHA512 7440d82ecf5685dc1832e34912aa9aff85e0bdb2da42ee5fd02249aa3e07945b3ac095300bdd3344e0583d5a64c58abe28e5cdbf4be96131b7c90db840e663ac
 EBUILD xdebug-client-2.9.8.ebuild 851 BLAKE2B ca8209ad31bd453375d27a701c410a3aebc8d15926fcdf122c3ad8130973492aaa932c5fac6f3923905553a5d93e6e485baa5d9fffd94a3b154740db5ce94b76 SHA512 5e8cc96d466c52e31184549d83f3b2e63c6ced3e3baf1b8c059f867ae24ffea1b2b2e46fc9ddfb39500708385eeb6ae8359661287f98e0f86fe71314f4166347
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug-client/xdebug-client-2.9.4.ebuild b/dev-php/xdebug-client/xdebug-client-2.9.4.ebuild
deleted file mode 100644
index e78a7cba61c8..000000000000
--- a/dev-php/xdebug-client/xdebug-client-2.9.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-
-MY_PN="xdebug"
-MY_PV="${PV/_/}"
-MY_PV="${MY_PV/rc/RC}"
-
-inherit autotools
-
-DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)"
-HOMEPAGE="https://xdebug.org/"
-# Using tarball from GitHub for tests
-#SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz"
-SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
-LICENSE="Xdebug"
-SLOT="0"
-IUSE="libedit"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}/debugclient"
-
-DEPEND="libedit? ( dev-libs/libedit ) net-libs/libnsl:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with libedit)
-}
-
-src_install() {
-	newbin debugclient xdebug
-}
diff --git a/dev-php/xdebug-client/xdebug-client-2.9.5.ebuild b/dev-php/xdebug-client/xdebug-client-2.9.5.ebuild
deleted file mode 100644
index ad1c2866a297..000000000000
--- a/dev-php/xdebug-client/xdebug-client-2.9.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-MY_PN="xdebug"
-MY_PV="${PV/_/}"
-MY_PV="${MY_PV/rc/RC}"
-
-inherit autotools
-
-DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)"
-HOMEPAGE="https://xdebug.org/"
-# Using tarball from GitHub for tests
-#SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz"
-SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
-LICENSE="Xdebug"
-SLOT="0"
-IUSE="libedit"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}/debugclient"
-
-DEPEND="libedit? ( dev-libs/libedit ) net-libs/libnsl:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with libedit)
-}
-
-src_install() {
-	newbin debugclient xdebug
-}
diff --git a/dev-php/xdebug-client/xdebug-client-2.9.7.ebuild b/dev-php/xdebug-client/xdebug-client-2.9.7.ebuild
deleted file mode 100644
index ad1c2866a297..000000000000
--- a/dev-php/xdebug-client/xdebug-client-2.9.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-MY_PN="xdebug"
-MY_PV="${PV/_/}"
-MY_PV="${MY_PV/rc/RC}"
-
-inherit autotools
-
-DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)"
-HOMEPAGE="https://xdebug.org/"
-# Using tarball from GitHub for tests
-#SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz"
-SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
-LICENSE="Xdebug"
-SLOT="0"
-IUSE="libedit"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}/debugclient"
-
-DEPEND="libedit? ( dev-libs/libedit ) net-libs/libnsl:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with libedit)
-}
-
-src_install() {
-	newbin debugclient xdebug
-}
diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest
index 739516aac201..4e08a063e40b 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -1,15 +1,9 @@
 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.4.tar.gz 434622 BLAKE2B bd0d0c6a46867ffba88693f142346d11b5abfab3254c549b74ff9169536c42903b1fb1cb94c3344060590b63e287878ea05c6ef7ad8343234bada3857e0dbe75 SHA512 cf19fb9fd12c32e04c18f296694d0667dfe6e14617da932804d17526c88ab19dd2307ad43d036a8c0cb1f871a964523473879da8815f346faf83ec3b9e3952e3
-DIST xdebug-2.9.5.tar.gz 434947 BLAKE2B 08fd7cc92880c9b00180d495341fc7e54998cf3c2294b824d94c3c4ed982ae5b087084b776bcc4f8f4e1aa420396c803d330bc76748cf972cccab4e3f1416d38 SHA512 2a937d08468d3a2963559a56bdf9c9aa6ede3f0ee63797aa14831bcab33a5ede65b87791171a0c794eefdfcffa65bb4d0c06b5377fe03ade65f4defa6e328c72
 DIST xdebug-2.9.6.tar.gz 436208 BLAKE2B 00cfb42c41bfb44f285b97779d6ba625641fc34494465e9e791ab5458c6a608e432df0ad45c561df2f8c9aba04ab34b3a98bb5e6bfb92ace39a3ad4145f3514a SHA512 13ed07a1489ba7bc0b4e85bf56306c733e7894cea8cb442649635196606b12d92e5618ab2485e7cde4aaee2ac6752993aecd933c24fd64b5113ef619339403d2
-DIST xdebug-2.9.7.tar.gz 437517 BLAKE2B 6d3cb615b6b75354e5dc993a2de9f90b5865ee1a98935c084a9d7a4e1d03cceb71278b06da1d5e47f2b4105937f6d24cb8d767c7179fa55798e61a599e173c13 SHA512 ec23f7b5b2e2b109a753e12f1cb01377db52716600fbb31ca5b9a749e9d98e0eb60942b272c25a42efcb56add016310c79eda2c7385a3e0fc18e563f2f486d1e
 DIST xdebug-2.9.8.tar.gz 438295 BLAKE2B 8645052faceb354817ddb448f46af5b849507d31255b43ac59bcef4ece7837ef835ae2ad624ed8a95f8f98d552ef0e7195a4ade7df9176bc300d855a0156f405 SHA512 c431d51a0d9c5ac1c7fc529c2819db480cbfff6f65c35c3c0dbef4e78427aa28ede164f397f92c409e58e386a6be34ecd2ded0ee35e01df1cbf92a49fd2f2aab
-DIST xdebug-3.0.1.tar.gz 432140 BLAKE2B f326de9a24c7c766b0f49213625ab7c455f7fd564af1848f2acb728fe513457140ee9669a05ddf83fd4ca07ecd591896d06bd570b60319178b484eaa7664cf88 SHA512 c50dea2abcad9c7e78ad7b7600a71c1bf0543c5fa31280a41c2acad2423bb6af8160e9d6b1e653f350f20660cfb2d8e4de07ae8f1181a465cc858dec13331c67
-EBUILD xdebug-2.9.4.ebuild 1151 BLAKE2B 98c639f2e4b8af9bc775d502a89583f88c1933d1d9c8b0e271aa597012d6d7212fc347afdddaa009bc8cf54dbc556307b3bf85852e92ebd5b8d5f289c33da1fc SHA512 f892dc8ba343d01733bef047addad1166e738d97ef6071faa510d8fa75dc7b92b74369033bfb51e6414d959e1507a9e98882fd9c3210ee848ae50200d591d30b
-EBUILD xdebug-2.9.5.ebuild 1155 BLAKE2B 82a9636995566fd9143a02281c2114f98dfdea9f6d721f3e5916dbeac3d6d07d1a24a73cad866fad8729c472daa416c89ab95c41f0d84e258d4075a5a95dadfb SHA512 76d4db91e8346cc5a8ce97abe00994ac5773b9c55359ff596d61b6e2bf73539fbe968dc6aa00f98b372bc390381c9ec70f6ec0db1d92e3de20e3a1d82f6275be
+DIST xdebug-3.0.2.tar.gz 435761 BLAKE2B 0476d29b3a960d83fd0818098a3d076f48f4d67057a2b6ec79571b011a9f364b18d3319771ad18e7145aa0f0f45fab7ed13d814b863731abe1721aafa8b59408 SHA512 723e00885a49a5626870cc4cb0f7fd49a3173c8d4e9b4022009430fdeaa1b152828de18e6e7fa709be8bb11989c89dc2d9940de9cc3d592174b5dafbc3d2c52d
 EBUILD xdebug-2.9.6.ebuild 1194 BLAKE2B 3bc713d7a87b093287f00a41372c72c0245d7a8db887c90110eb047df2a1511d0aa313623c289839668fbc8d79e9a53be4d90ef3de02e8a0b087dcecfd1d066b SHA512 ca1870abca6bf2f68ee42cbd81db5eb65cf91d2fde533f1dd7eb14b5067f830b134716115629270d415e8ec5d0a0653a175a40f36c6f37a3a9ea9e6ad1c8215d
-EBUILD xdebug-2.9.7.ebuild 1198 BLAKE2B c248c825f3437ff09276529712c5baac9d2e8067842cdab6c62779939c9accc53d18e5bd6b650a6a7df98b3fff633686d89a276e001fce3fee45e35d77353d33 SHA512 ea107d25c3d47c2f1b8f62a689d7d796ef7c76b7301f991f3162770a5a4cd9232e392234e9c21342a1aac3a4d2bf3aaa912d58df132ca09ed60d9a1da59fd7f3
 EBUILD xdebug-2.9.8.ebuild 1198 BLAKE2B c248c825f3437ff09276529712c5baac9d2e8067842cdab6c62779939c9accc53d18e5bd6b650a6a7df98b3fff633686d89a276e001fce3fee45e35d77353d33 SHA512 ea107d25c3d47c2f1b8f62a689d7d796ef7c76b7301f991f3162770a5a4cd9232e392234e9c21342a1aac3a4d2bf3aaa912d58df132ca09ed60d9a1da59fd7f3
-EBUILD xdebug-3.0.1.ebuild 1513 BLAKE2B 81068b7a19172b5930471325913c60924921573fdad9b155a6b348a658531a94f82d8ccbe227234c06928234241c7c92a7ed2c134ab37173183b8d239d40392e SHA512 a6fb945fda54e3f3063c7b3dbd4626f576cf349f9e1fa23212e0b5bd5e88028e53578f748f5f798f21211bac4736beae8f6e309426483acdd75c7487390b5a2b
+EBUILD xdebug-3.0.2.ebuild 1506 BLAKE2B d5b410eb3783d66b0f31401e3ec6ad8c29a3fc4ac60557ca4e1acc8d70d3ba64883b534bbcf87099b8f3c6b8e564000092b94f46eaa36a42c8a456fa9b8b8316 SHA512 909e02611a9fc710cb92e07884cd8cd2ff7085190574e5f33a3ed097da95f4759ec45d977d9aa72ab17ca046ae4f019a37246a6ae6aa636052fc0595306e77a1
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug/xdebug-2.9.4.ebuild b/dev-php/xdebug/xdebug-2.9.4.ebuild
deleted file mode 100644
index c1072c7b3cba..000000000000
--- a/dev-php/xdebug/xdebug-2.9.4.ebuild
+++ /dev/null
@@ -1,42 +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=""
-
-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.5.ebuild b/dev-php/xdebug/xdebug-2.9.5.ebuild
deleted file mode 100644
index 95745e2c779d..000000000000
--- a/dev-php/xdebug/xdebug-2.9.5.ebuild
+++ /dev/null
@@ -1,42 +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=""
-
-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.7.ebuild b/dev-php/xdebug/xdebug-2.9.7.ebuild
deleted file mode 100644
index 2edd756ef66e..000000000000
--- a/dev-php/xdebug/xdebug-2.9.7.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.1.ebuild b/dev-php/xdebug/xdebug-3.0.2.ebuild
index 26eee1e35033..5c7410f4c1ab 100644
--- a/dev-php/xdebug/xdebug-3.0.1.ebuild
+++ b/dev-php/xdebug/xdebug-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="yes"
 PHP_EXT_INIFILE="3.0-xdebug.ini"
 
-USE_PHP="php7-2 php7-3 php7-4 php8-0"
+USE_PHP="php7-3 php7-4 php8-0"
 
 MY_PV="${PV/_/}"
 MY_PV="${MY_PV/rc/RC}"
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
commit	abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree	eca3dd248b73b92013cba00a0fcc1edf2696e19a /dev-php
parent	24fd814c326e282c4321965c31f341dad77e270d (diff)