gentoo resync : 14.12.2020

91 files changed, 1363 insertions, 603 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 92c308412762..8436ba398b93 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 5c3b1affe056..66a775ed2102 100644
--- a/dev-php/PEAR-Archive_Tar/Manifest
+++ b/dev-php/PEAR-Archive_Tar/Manifest
@@ -1,5 +1,3 @@
-DIST Archive_Tar-1.4.10.tgz 21481 BLAKE2B d6658f344baee4c70aedc7c8e59d8e4e481a5c2fbd72920d65943e2d9cf3a6d955a77c62c58fe3391a9250206f105d96b2cf186cefd13a261269d29b27722350 SHA512 265a00b0e71e718a0a0f1f5640b2a95c3b5f3a62235477a22ef762109cb2f6dbdaa0319f2f5aed5fdd9b4f52317bf761b3fcefd03a82c941e71e04c1a3e4d2a9
 DIST Archive_Tar-1.4.11.tgz 21556 BLAKE2B f7e450f4581400159099dba023192ec4026da8867c675119001085651c20315523a58180e0ccd4528e3b1764e222945055702e0fd8e42bb5976b891230351f29 SHA512 a67ff191eb1d814094fc752b58b5d4b4d3db0fd2476fce403f8e5cac49a35fd1219167817dc84d6f957af87d326435aef000e2e0b16357a0d051ab407b76d2cc
-EBUILD PEAR-Archive_Tar-1.4.10.ebuild 747 BLAKE2B 99bbb190966cc20f9f249b140ae738fc588f7caa579f0089e24f090ce149d2d788a5c9dc5b8cff9835d8e6dbc278919cee1f7748319e8755e1aaa1761be1a7c9 SHA512 9ef3018d22c99f8116e5192dec05314c5aa251f42b91c6b828398663e5eb7926cbd343b90de9e01b236245df93a6508ef30e7338c9b3ffc5fd535772dbc84680
-EBUILD PEAR-Archive_Tar-1.4.11.ebuild 754 BLAKE2B e862af920b6f550e73fafef286cd5de5d1148e7233a58056913c1e77acd8721fd1c7f88f8ea9c6c91f059d0d5f99967c55640e5f8fef5d0b8351cddf02e584ab SHA512 be1307b048050ee7ff0c87ee833e1afbd24da2af7e4c71c5e3f4501688375df75efe206308fd3820d961e132097f9692f19e42d2be810a05e1f3a5f422d1dfd4
+EBUILD PEAR-Archive_Tar-1.4.11.ebuild 747 BLAKE2B 99bbb190966cc20f9f249b140ae738fc588f7caa579f0089e24f090ce149d2d788a5c9dc5b8cff9835d8e6dbc278919cee1f7748319e8755e1aaa1761be1a7c9 SHA512 9ef3018d22c99f8116e5192dec05314c5aa251f42b91c6b828398663e5eb7926cbd343b90de9e01b236245df93a6508ef30e7338c9b3ffc5fd535772dbc84680
 MISC metadata.xml 337 BLAKE2B def75fcf8f3291007347252cd8885def7980837bf24cef97f5709ff0166792bb6597d2d0395425e897a8a0afee7fc5436ecfd745e66e4b9147f76f93cb92f923 SHA512 c77cfe795995f88c94b790ac8900e1366e2d4b4adf12f5d18284687145bd37177052ee6f39bf66fe97d8f254366b83019ba51632e15cbfdf7c93d7f08d8f48e7
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.10.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.10.ebuild
deleted file mode 100644
index b4314c0f2407..000000000000
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.10.ebuild
+++ /dev/null
@@ -1,31 +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="Tar file management class"
-HOMEPAGE="https://pear.php.net/package/Archive_Tar"
-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=""
-
-# bzip2 and zlib are needed for compressed tarballs, and there's one
-# call to preg_match to test paths against a pattern of files and
-# directories that will be ignored.
-RDEPEND="dev-lang/php:*[bzip2,pcre(+),zlib]"
-PDEPEND="dev-php/PEAR-PEAR"
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/php
-	doins -r Archive
-
-	dodoc docs/*
-}
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.11.ebuild
index ec77b9463d55..b4314c0f2407 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.11.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Archive_Tar"
 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=""
 
 # bzip2 and zlib are needed for compressed tarballs, and there's one
diff --git a/dev-php/PEAR-Crypt_CHAP/Manifest b/dev-php/PEAR-Crypt_CHAP/Manifest
index 2134573e6bb5..3e6d94f66894 100644
--- a/dev-php/PEAR-Crypt_CHAP/Manifest
+++ b/dev-php/PEAR-Crypt_CHAP/Manifest
@@ -1,4 +1,4 @@
 AUX CHAP-1.5.0-constructor.patch 1273 BLAKE2B 84e35031521587383a843c78f49df567cdaf3fd81360454797993881e272a4d5e7816073cc774e7d7c47e6c30cebaa70521c5b391f28cbc081c96d5d90a207df SHA512 2053c12f4416654b614176ff06565032df25e3db970eaeb02e327ceb986c53adfd6b9c4285d5b81525ad8f93e548794fc81ee3da31ad4ebe1ea0e707f9e47369
 DIST Crypt_CHAP-1.5.0.tgz 5549 BLAKE2B 7b79e311d36a7c59b4838f5d0bfda1a39792519f53e036fb2f500130cd9265280fb2e2fb31683d95dee283875fe738746b19c78fc80fa0fd965e19f431d032ac SHA512 44cdfdf0bc857b3992c2635945374033112d972cdefeac8a45810f5b79a6a532de67fc5e9a06f2ec4b3ce4df62e300451d0f4078b4f8ecc9805dca5c08f6aa95
-EBUILD PEAR-Crypt_CHAP-1.5.0-r3.ebuild 706 BLAKE2B a0dd7781882db0bf2dd4145fc6e25aac226bdda1d8d5de0c5d07655f9807abc16f0d28485d44b24f2d57e8a3b2c29690b54b7a207d40b7bf6ba010e98b5c8f3c SHA512 b4f0403b054f004b59affaeb333472d7ec1235e0805de678dd28bf90dbeccf563fe750e427853c87efa6a7f3cf96e43f5932ca548de8cd87854319d56836140d
+EBUILD PEAR-Crypt_CHAP-1.5.0-r3.ebuild 712 BLAKE2B 8821a63d410778a07f42d570a26c7555cff5b7170751c8fa9a99041ac76a266670ef996c65e9fabf4875885711223926bbce424dd16c28f1886accc971d95742 SHA512 f711e0483c364d086136cd8dd010a0a26dff97a7f1d807fe551550f63579c23df70c8c876369f56c666a2adb6986a820c1a43523d5dda0c8cb360871ab7437cb
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild
index 316e144e79a8..bf43b9f11c90 100644
--- a/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild
+++ b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Generating CHAP packets"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 # Crypt_CHAP_MSv1 needs mcrypt which is gone in 7.2+
diff --git a/dev-php/PHP_CodeCoverage/Manifest b/dev-php/PHP_CodeCoverage/Manifest
index 1e3e135d9a4e..6fbb54cae53e 100644
--- a/dev-php/PHP_CodeCoverage/Manifest
+++ b/dev-php/PHP_CodeCoverage/Manifest
@@ -2,6 +2,8 @@ AUX autoload-7.0.10.php 646 BLAKE2B 71515ed7d8eb3339e2756e8f1af7bba2e0f1cf1b0fc3
 AUX autoload.php 3859 BLAKE2B 65cc25809352182d5c852743a25e2e297fe0819d2feac0fb47cd9f80e9ea36a16f7f2dbc2657bd73d1e484c1b851b5603eaec8c6d0f7fa5e6582876661587fbe SHA512 c33ce039a84f0f6d260bf46e8308df806968328c80dd89b778c76a0620d514c5e101ac3c741a3b68aba07cb59ccfae4a0dfb6157fb056e03ce65c1478300655a
 DIST PHP_CodeCoverage-4.0.7.tar.gz 349906 BLAKE2B 2ba665efa2d20a5eb66c66375a095425057e883697dd1d3ba7214e56de29c96451516adb2843589e64732c994aac7289afa0e34a74d56ef9bc36f36e635eb944 SHA512 8418efa2585d05b3004ab50e7ba77513429d649f71fdb2479412424a0f40a698a962e1d87852db08fec8f92e569a9a5767dad66d5d64e072637dde33182e71e9
 DIST PHP_CodeCoverage-7.0.10.tar.gz 237217 BLAKE2B bd2dc397c15a85ca020abf3d9a1dfb5f438020b577cded7942110dd8affa2d703ed40bf01ae68f38c6ae9383ba59bc9f7706af99596bce0b40cef6d2a7e92fb2 SHA512 37cda2d3687f62b5546372507954eeedd4da1c03fa9cab147b578d035046763799ca1535310ba458403094714060fe8f1327bed6951440392fee3df551be73b1
+DIST PHP_CodeCoverage-7.0.12.tar.gz 237382 BLAKE2B 3051e7e473506a66d7b4720083274f3b3a64b9f480bb1a95682608220d19be60810a899d974ea3189270c0751f8af058f2503ed83c61d92180cbb41708b07536 SHA512 b105672dc50952c3c606010389fd6fb8ebfcbb78d99d72f9a21a1eef045314b0803fdb689bba1314671d0eeab0e5ed00bf416b09ca45d291688f4c59748c2ed1
 EBUILD PHP_CodeCoverage-4.0.7-r2.ebuild 1230 BLAKE2B 188d5861e36f6ea2e84ed51ffd4978a7fec8220ea39cf2c73db6ddecf213f51f51630ed9bf03cd8c8887bc5194ea8591035666db6142a2fc2871ac573066c174 SHA512 d1abcbf404a985cca1f774e914919f715009349faa21e5c49c97ff99fb6eeb0a1c2ac1c18cc641af9418952cb0c6e65a3c17e75885f9e9d653d6c9adce08f01a
 EBUILD PHP_CodeCoverage-7.0.10-r1.ebuild 1951 BLAKE2B 3869286b1e8b8decac2ba671dfec87f6ddaeaef477dd71df4c2b8ac33a6b99681d347f8a6179f732b4a27d83e3ff29e9139b95e8ad91042eee0d2a0f05ac87c6 SHA512 b4aa6e448363d1a9a46a55e0b4e5c17ab542e0395ae8ff7236ef2dfc615912050f0b23a113fc7a02acbf691328ee4d6592f625a6bcc6575da7072c4e68910fbd
+EBUILD PHP_CodeCoverage-7.0.12.ebuild 2785 BLAKE2B b11bd7f0dc6ed14eccf30635fca69279330f75c9ebbda4695b49b6dc43ee5ce27159c355ddb5dd436df91121881d9d6587f975ee681ec82e0320e5066a5ce7de SHA512 3e6a49d58e6180df3cbd5f80d66841db3abb525524ab3bf53b0a4706433116b1bd7d30b6bd021be6bd6360a739ac54f6db8eba7e3a13c2ce39f67fa55b6b399e
 MISC metadata.xml 339 BLAKE2B a9f68f1bacb42eb4e4a6463dc03080c343501c0f6525ed08556f9d04606b42c2744f458ba35fff8cd4f5c8e68f81f226193dc79bf7808da8c4229588f34dc3dc SHA512 5057d1d80d43e4e8f8a6f2bbddabda7c7f639eb26a7be8f534ac2c470341834c7d99e78a20f18062ef1c7252b75428af122f2858dac78f88f8ab6d50a6f66f4a
diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.12.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.12.ebuild
new file mode 100644
index 000000000000..e820503362c9
--- /dev/null
+++ b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.12.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="php-code-coverage"
+
+USE_PHP="php7-2 php7-3 php7-4"
+
+DESCRIPTION="Collection, processing, and rendering for PHP code coverage"
+HOMEPAGE="https://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-php/fedora-autoloader
+	>=dev-php/File_Iterator-2.0.2
+	>=dev-php/Text_Template-1.2.1
+	>=dev-php/PHP_TokenStream-3.1.1
+	>=dev-php/sebastian-environment-4.2.2
+	>=dev-php/sebastian-version-2.0.1
+	>=dev-php/sebastian-code-unit-reverse-lookup-1.0.1
+	>=dev-php/theseer-tokenizer-1.1.3
+	>=dev-lang/php-7.2:*[xml(-),xmlwriter(-)]"
+
+BDEPEND="dev-php/theseer-Autoload
+	test? (
+		${CDEPEND}
+		dev-php/phpunit
+	)"
+
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	phpab \
+		--output src/autoload.php \
+		--template fedora2 \
+		--basedir src \
+		src || die
+
+	cat >> src/autoload.php <<EOF || die "failed to extend autoload.php"
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required([
+	'/usr/share/php/File/Iterator/autoload.php',
+	'/usr/share/php/PHP/Token/autoload.php',
+	'/usr/share/php/SebastianBergmann/Version/autoload.php',
+	'/usr/share/php/SebastianBergmann/Environment/autoload.php',
+	'/usr/share/php/SebastianBergmann/CodeUnitReverseLookup/autoload.php',
+	'/usr/share/php/Text/Template/autoload.php',
+	'/usr/share/php/TheSeer/Tokenizer/autoload.php',
+]);
+EOF
+}
+
+src_install() {
+	insinto /usr/share/php/PHP/CodeCoverage
+	doins -r src/*
+}
+
+src_test() {
+	mkdir vendor || die
+
+	phpab \
+		--output vendor/autoload.php \
+		--template fedora2 \
+		--exclude 'tests/_files/Crash.php' \
+		--exclude 'tests/_files/source*.php' \
+		src \
+		tests \
+		|| die
+
+	cat >> vendor/autoload.php <<EOF || die "failed to extend autoload.php"
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required([
+	'/usr/share/php/File/Iterator/autoload.php',
+	'/usr/share/php/PHP/Token/autoload.php',
+	'/usr/share/php/SebastianBergmann/Version/autoload.php',
+	'/usr/share/php/SebastianBergmann/Environment/autoload.php',
+	'/usr/share/php/SebastianBergmann/CodeUnitReverseLookup/autoload.php',
+	'/usr/share/php/Text/Template/autoload.php',
+	'/usr/share/php/TheSeer/Tokenizer/autoload.php',
+]);
+EOF
+
+	local target
+	for target in ${USE_PHP//-/.} ; do
+		if [[ -x /usr/bin/${target} ]] ; then
+			${target} /usr/bin/phpunit -c phpunit.xml --no-coverage --verbose || die "tests using ${target} failed"
+		fi
+	done
+}
+
+pkg_postinst() {
+	ewarn "This library now loads via /usr/share/php/PHP/CodeCoverage/autoload.php"
+	ewarn "Please update any scripts to require the autoloader"
+}
diff --git a/dev-php/agavi/Manifest b/dev-php/agavi/Manifest
index 7ae2336d0c23..fb22c00374ab 100644
--- a/dev-php/agavi/Manifest
+++ b/dev-php/agavi/Manifest
@@ -1,4 +1,4 @@
 AUX agavi-executable 443 BLAKE2B 6fa22601439d966a6dc0c9db98f3004f362e6345fed70053d47529184b8c806d8342b0ffbd63c6e5019d0266a3ca64654126e4cb8369b141d48679a16a0d2b3a SHA512 5e9e6583a53bb3a8eb8e31e1dd2853c00bfdb95f3531e3d78bae9b401b67dd2e3011721113a219d86f1fe771238c34ad2cb6d2afd03c9227d17124a6a38e09ae
 DIST agavi-1.0.8.tgz 2074126 BLAKE2B b38ff9f15e877604376c6704f007044ed4907df9dcd303646e85d54e98ae65f8f2182841001414ee9326e92515cabb0839f150544e8121c1f87ebf79e6dd4a41 SHA512 9e75ef0be455e329db8b2389d7fd7a7acb25d04dda6c31dea15496dc4e24ab17cf0e44e199d0c2a9fb11987331d582cf0c700adee815cac7276c32643b9183ee
-EBUILD agavi-1.0.8.ebuild 858 BLAKE2B 1199cf929ca7ebdd9a323aa906d05308049057a64fe7240bc6ebc63368008e62d28abd76becf6415b1c06cd7b7629edcd68c524b0993750618c281d7dc5107fa SHA512 f8f2e0d2a98b23d458b87758af1e5436896f5d7cac936061f62027e05545e289aaaf4bf6a35c3b6dd7634c88b9930884528d5fc3db1b2dd9d3c9249f9ed6b32b
+EBUILD agavi-1.0.8.ebuild 858 BLAKE2B a5c90e867181244004ce83fa6206fd686d9ccffb6216d17e1b2ee65364e8b87d334d70e8a39201ec353318bcb3330b6264e1a7ef9f44bec26fab3b20a9ec7f64 SHA512 8086155d88e61be70cf70f49eaa94f78f20af9ff7e6e025033bde4dad14828a4af0d40a502ce3487361391d9c1b83c7e8892d44677ac83a35a0658a8dce682e1
 MISC metadata.xml 592 BLAKE2B 02e7829f8c1fe398f0a52dc628f8c50848dbe0f7942a12fa3dcac173690f7b46352a8de148ad952e88121f7f2ef52c1f6710d13f38945c067d3239aad1c4df04 SHA512 6bd01d95a6f1f2b71cc2a8ad23e49e312e156b5e3d866d583e731ba9bd616867cb8698e40384ac0ca41edfe1aaa4f512e34e871ee86361cc70ad6d7ccca833c9
diff --git a/dev-php/agavi/agavi-1.0.8.ebuild b/dev-php/agavi/agavi-1.0.8.ebuild
index 3edb056ec787..3b7ac5c7ebea 100644
--- a/dev-php/agavi/agavi-1.0.8.ebuild
+++ b/dev-php/agavi/agavi-1.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples +executable iconv session soap xmlrpc"
 
-RDEPEND="dev-lang/php[iconv?,session?,soap?,xml,xmlrpc?]
+RDEPEND="dev-lang/php[iconv?,session?,soap?,xml,xmlrpc(-)?]
 	executable? ( dev-php/phing )"
 
 DOCS=(
diff --git a/dev-php/awl/Manifest b/dev-php/awl/Manifest
index ab8793c58362..0ec4ca11e132 100644
--- a/dev-php/awl/Manifest
+++ b/dev-php/awl/Manifest
@@ -1,3 +1,3 @@
 DIST awl-0.61.tar.xz 124340 BLAKE2B af5d9c063280c93deb55929acf4826b6ba003676a15fcda48019a2a7788d8913d20a05c4aae98f2345d931b8f593bd32622a033fe421b55d0c687b10c7e1be05 SHA512 3492512ec04e523a30562d49aac1be617a2cee80fa363b0fbf13b25b44818a4c85af018193f79a6442419b1f7022cd7ec417e3c34641eb8096750441dcbd22bc
-EBUILD awl-0.61.ebuild 671 BLAKE2B 8626a05d5b521fa6e8ba2f794e536f02227c9e0140147fee6b1acbb7d8e50647e219e900903fa994c0f7d5f208407f9b0d2ee3a72031ea40bfb247d2ef56319a SHA512 135b6727c128ccc40400311bed424e2e0ac68f2689e4877241af2a96c3da7b599bf4c2bda2c4b69ac7bbbbcd4e512e0f361c0533f05b52742c5284749248f3b7
+EBUILD awl-0.61.ebuild 690 BLAKE2B 4d05a6e4cd627f8a5b197990e5619502a5102e391c81c171c57efd7eeedde4a4396b4a051449845e4e3c0e4b55cd8219d7cf8556f81de895d55341f2b5ac2d21 SHA512 7885a6ea48607e8afb12ae1f17a6ed58d225c9bc9225f1a91c0d26c12f97cbfbba01e2381af3aeecb9ab720170e511807ffab925a96822d62dcdbe6349291342
 MISC metadata.xml 607 BLAKE2B 7dbb1cbff742ad363e2ceba2259f44ca5de4abf9d77b61fc6e67b427b9c065589f0bbdb9ef0c2a998c0fa5d2dceccc37b9f9f07b9abea983e961ca9c32e3860d SHA512 329e26d79c646dee99fb39942b7f3e4c754fbee5b747d1575537c5b177ac6d0cbc6711a468630d6f15d0b31fd531c75b1b7237dbb54249ffff3ac8b63a53dc84
diff --git a/dev-php/awl/awl-0.61.ebuild b/dev-php/awl/awl-0.61.ebuild
index 7cdc7c288e25..4e25a5083da7 100644
--- a/dev-php/awl/awl-0.61.ebuild
+++ b/dev-php/awl/awl-0.61.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="test? ( <dev-php/phpunit-6 )"
+BDEPEND="test? ( dev-php/phpunit )"
 RDEPEND="dev-lang/php:*[pdo,postgres,xml]"
 
 S="${WORKDIR}"
@@ -23,7 +23,7 @@ src_compile() {
 }
 
 src_test() {
-	phpunit tests/ || die "test suite failed"
+	phpunit --do-not-cache-result tests/ || die "test suite failed"
 }
 
 src_install() {
diff --git a/dev-php/doctrine/Manifest b/dev-php/doctrine/Manifest
index 8f2c16bd8137..ed945aa07dd6 100644
--- a/dev-php/doctrine/Manifest
+++ b/dev-php/doctrine/Manifest
@@ -1,9 +1,5 @@
-DIST doctrine-1.2.5.tar.gz 659173 BLAKE2B fd703eb52d209548dd44950cdb23c2e3298e044f9387acadb2edc67bba79dd9b0a60fdf9a98d46e8078415c1e0ff21976323a6df1ab9f798ee475690ce50d4d8 SHA512 c72f4e829a92b011af0bd96d2f8a780c3106afb57a9677a21aed683473ff00aebdf7143a276c7cc70f1b142196968b5e2e5e1f744dba5c8ae1267b867b4e0310
-DIST doctrine-2.4.6.tar.gz 456426 BLAKE2B 775c14750954ced8728c220dee6ca41cbfa66a7c34b00476f6941d5681302b1f10cc8dfa5e206780bb3b4b5d0e591b0e770de182340c6e7a881d3c4ca3f5795c SHA512 d7aeb58e8c76df384a472df08618a058b70f2b8499de6a3157c36bde125ab32c7bf4f80d1e6d880502ccfed2db704f3218a6f1f1ecbf603cc828e2a757c366b5
 DIST doctrine-2.6.1.tar.gz 554462 BLAKE2B 3481a1e7c8acfb0de5c4aa64aa32d583e8f01b2175b2957ec8aa0ae29c962e7482ae1d36217aa765fc38198dc851cbecb5e8ee24829f9e335ad4d18bec3bb1f5 SHA512 f2ca1df4a1da814a0047d2da76da0df64ef704e8f5b2464f2a546e61e615d40de9508c72543ae5574188882dd2a3917d8205ec194c63d7b264257443cdfd47c8
 DIST doctrine-2.6.4.tar.gz 558995 BLAKE2B 789a9d3e5c53a19e9e9d6dc24680888e0703a51cf22df052604bdee0b5148edd5153a625528dc9cf7cea9e5b245c7c73153efc8a05e3f91150536c2d4bcc2243 SHA512 7f4ed67ff5a3921da5e630e51987ceb3f896824baa0db6065c1a17f0389c363c4ee149298335ce4eccce37dbb9e1572caa31196d0e67251a5ea72d449471eec6
-EBUILD doctrine-1.2.5.ebuild 555 BLAKE2B 1f4aca307534c7d6d1154fc072e8a41ee7784b616454caac7f7d76002fc441a6e9214c9a51a95e6c0c4f6530b1a1fa5d8f3fdd9ec29877e4e612a2899b105c79 SHA512 2fe2c0712b7591360e004d952deea9fd9946d027cf10e00ae2f180772c505d055a7e7bc9c1e7010c6af87196ac58a7dbd1387141a9eff8fe33cd933791fabc9b
-EBUILD doctrine-2.4.6.ebuild 531 BLAKE2B 7a4b5fbe31fd84083473455ce554f4f60252b383e517428a6c268e84c2646434ea5f933e38e9c2da17edc2206331da72d933874ece96f47a6a8df98315f58a0c SHA512 7d4f306bd2978ae62ca4b0d1746ea33d3bc5f39f01e031b352fc723e2ae77180a3ad7ddf7682f546ce6e0f38d1352ecec171d4cb2c7bc451f9d297868f8cca8f
 EBUILD doctrine-2.6.1.ebuild 672 BLAKE2B 288f877b15cf75273ce1de0df0d64030ff17f5a68da6ec74808ded7b1f98e8b6c42326b0be0285e5f21413b72a6091ccfe6427ca0fbe4e92b55c131680924c0d SHA512 67ac1a18dc3e145497acb0ac6e7ad95c7806d22feac227d7111cfaa2923d761594eb57daa731e2cfdbc86195dad17d469fa9881e703d5a2d041194ffb12e14ad
 EBUILD doctrine-2.6.4.ebuild 663 BLAKE2B aa1e7b8136ae1bb1dad744349e9cd936a43ada78de5fa226782c869f7009f73f04f1315855f471cc4ddb977fb8e1dad4b3ec7fb8e82c29e9b68bbf2e9c742396 SHA512 e440413eec4e57da55bdedaf308b5d68e5f90d5d3c34f50e9697fc147744232065ea4fdb8aa0d60d89a28b47d1149c9211c352bec0e8628509834d7e11bd97c9
 MISC metadata.xml 332 BLAKE2B 34b5c4879dbbabaf08883df45cc3fbed8c8c9e4af84defb70af64a25863914320e637f2fe0d388c21066b55921edf68cec06d0fb24de4464bb785a63d7cdcc72 SHA512 44f05e8196f20572f12f8ced92fdc76a78198ada035dd4eff11d37fea991aefd35364b07beb3abb213b63c900e7b9ed2b3e23f4d32fa0680928a342e0a5df8db
diff --git a/dev-php/doctrine/doctrine-1.2.5.ebuild b/dev-php/doctrine/doctrine-1.2.5.ebuild
deleted file mode 100644
index bf2faae0288f..000000000000
--- a/dev-php/doctrine/doctrine-1.2.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN}1-${PV}"
-DESCRIPTION="An object relational mapper for PHP5"
-HOMEPAGE="https://www.doctrine-project.org/"
-SRC_URI="https://github.com/${PN}/${PN}1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MIT BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/php-5.2.3:*[cli,pdo]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/php
-	doins -r lib/Doctrine
-	doins lib/Doctrine.php
-}
diff --git a/dev-php/doctrine/doctrine-2.4.6.ebuild b/dev-php/doctrine/doctrine-2.4.6.ebuild
deleted file mode 100644
index 5184f5a1812f..000000000000
--- a/dev-php/doctrine/doctrine-2.4.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN}2-${PV}"
-DESCRIPTION="An object relational mapper for PHP5"
-HOMEPAGE="https://www.doctrine-project.org/"
-SRC_URI="https://github.com/${PN}/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MIT BSD"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/php-5.3.2:*[cli,pdo]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/php
-	doins -r lib/Doctrine
-}
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index 886189fe9c0a..240c1f0fed18 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -1,5 +1,6 @@
 DIST igbinary-3.1.5.tar.gz 216569 BLAKE2B 3aa453fc0669c331202f38d41a80fa34332033d272a7b6e523988923d84a1e93967e4d588ac32d4a2ac3ed5d0bc832bf0380293604f67350557628ecbcded91a SHA512 af0e473673e624635cad44a6f34aa2e4d655e8f2dc3df8a9e0cf9b241ef1f53c627edb508b5bb41c7f8925c2256a4a4d0b4c083227564212cb7747a810dfc83d
 DIST igbinary-3.1.6.tar.gz 220415 BLAKE2B 62bc77d5b3ecbccb9e928e30f33a598630d3ee9f394f4e78c0978b316d4dbc29656f98773e9ff6bd6b9cd4961f4e00c6c760b1a07234849736d4e0d9e3199d5b SHA512 55f7fd1a6e2a422cf04e944c4c15126167c4aab6d4f5f1e6af8be6c345ec6ff0c25d7ea8c023062bdd4882484cede155ea7a598666e4616985873a32a0a272d1
 EBUILD igbinary-3.1.5.ebuild 597 BLAKE2B 8f09f317dfc74612c30bdf35905411ad3c26077c02579b8fafedf2cd79d0aaf95ef275e0396dace13d0ae733d7cdf5b29cd9f5c419845c942ee49df44e9a2470 SHA512 b352c8647cf6faa2c7fc223d5b78514225bf04c308cf4e802f6c6305fe4b4470db33af634a34fbc3c67849ba933aad9b4ac77113eac940e4a7eff40e55ce7225
+EBUILD igbinary-3.1.6-r1.ebuild 599 BLAKE2B 7052c71b8fb7bafc0e694c75104487c988f73cc30ecd5dbf9f0c72354a11239b4c66927522a01b2e726aa722f4892c91fbd63ca854f0452fb9d47bb896a8cca6 SHA512 d181b6f2524d497af0216da5c26b58fa2af4c6c057eeab8f9a4820d18db21b6596820fab7cf405dfd6008e4d3ee15c591f934a2f6bf92dacb0dbb1df362a317e
 EBUILD igbinary-3.1.6.ebuild 595 BLAKE2B 5cd27a7fec301252289616350fb56f599fa9f1d5e660fb8cf140be2e3c737b1151bb66f857fa7e47c942742441f65cc3e63a4a76f0d5061e29da3592f9e207a8 SHA512 4c1636cd05f1d1eb86a136cf044138029e7c3124c67ab8089b388bd07aca1ea801d4b7cb4914d61fe17b3ad2fe0c03f5574c2d588f1a8a8b1edad2de1ef45e4a
 MISC metadata.xml 331 BLAKE2B 4187300236aa128879679c7cb4a8ddfa19dfd512a76466e835224c30323f2fafd55189228bdced507ababd5b90f561f6bb44c1554392eb0682b6ba5c7a20b681 SHA512 86f467f549b36915940e45a4e151742f2925293106dd3da2958e6153aaa8fed378b2eb563bf69da0d38101409858a4abe308f608bd94de6b4517daf9da092405
diff --git a/dev-php/igbinary/igbinary-3.1.6-r1.ebuild b/dev-php/igbinary/igbinary-3.1.6-r1.ebuild
new file mode 100644
index 000000000000..49b4f02bfb38
--- /dev/null
+++ b/dev-php/igbinary/igbinary-3.1.6-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PHP_EXT_NAME="${PN}"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( CREDITS NEWS README.md )
+PHP_EXT_ECONF_ARGS=( --enable-${PN} )
+
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
+HOMEPAGE="https://github.com/igbinary/igbinary"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+#IUSE=""
+
+#DEPEND=""
+#RDEPEND=""
diff --git a/dev-php/myclabs-deepcopy/Manifest b/dev-php/myclabs-deepcopy/Manifest
index d06d3596e07f..f4adec65315e 100644
--- a/dev-php/myclabs-deepcopy/Manifest
+++ b/dev-php/myclabs-deepcopy/Manifest
@@ -1,7 +1,9 @@
 AUX autoload.php 239 BLAKE2B c67e02841a85ce3cb1cb27286eaf799a8060644d35dad28c9a32462ea4f95b7b0b357369c19033f1408f588e2acd47ac955f99e38928bedacd1430a723dba669 SHA512 d59e462c851383a3e2a487fbdaff75c50c805572c151ca3ce4ca9ae5cba1cac85a76f2a8bb50730caaa76eabc0c76a9f97dd2135008939df874d57cc654d3fab
+DIST myclabs-deepcopy-1.10.2.tar.gz 9770 BLAKE2B 17be538ad4916a96098dce908d569fdc9e7bf792a754e6e199f98f1a05855de5f8888712b5500a34b01107655a100daa44b82a7f49a6fa09d23319801dbb1f73 SHA512 8cdb0c96991817bba573c147bace161412bccbb1479f67441be709dedd06355b387bd0c39e699fb7b0f89b50b4c99e94187c1145193a1324a7ca6fa9dd0e33de
 DIST myclabs-deepcopy-1.6.0.tar.gz 43612 BLAKE2B 18e3f532043cfbf700230a82772938082611922b9a04c7a99d63f79210e6c6f144521a29356977f4c44843cae6628e0a13fa0a46e0d34cb2e251f138ed60ab44 SHA512 a1d0ce8386172b963bca1e34e0e6d69268177f6aaf5309498780e4f9e43b9126916937e0b422644199b96f46212d0267af9b56993b9ffe295adb5f872c24584c
 DIST myclabs-deepcopy-1.6.1.tar.gz 43589 BLAKE2B e62ed5384bf9d4ad0286189772de8eeb9fed9962cf1d109b9e282c37ceadc885c6850fbed1695de35935b85fcc789a796485f44e97269a556d3498be8b691af4 SHA512 6cf13127401304ff92277c7c433353ecc20764fd5b8db0f8ae8d6767d8d9bc9c2f6b6ed3d68eeca5960357517038062c6f6b82831f433596d0a05cd0cea916d4
 DIST myclabs-deepcopy-1.9.4.tar.gz 44812 BLAKE2B bdc273f55b082ccd728ce786bb573dec5e96427f1692e3f502e2ee7eddd804e9a1589efe1323e3961d2c4e2b210f597c1ba80bbd8fcedeca77a7440df8925fb1 SHA512 879ecc6409ecb21a90e87b8368f64fce57e692f0e2916fc341d55744c2663163d6bac70562c0d8a1a1a51a409121f5e5905979dbb9fd2842cda7f21cda33e50a
+EBUILD myclabs-deepcopy-1.10.2.ebuild 770 BLAKE2B 3f002cba16edfa8cb4e86f06c7f4d88d74fe3a2223cf495a42262a3660b0cd7ed41bc3d0b5e36e5bcf26f7c7593423613fd0a431b48958082d74fe9c30adbd37 SHA512 4b4feecdfc73b2913987ef80366b633359f0f97aa2be7ef668b9a53de6a74232a2c4267b8571e1b53d23ddef417968907d3287b21df57d3644121779b30985af
 EBUILD myclabs-deepcopy-1.6.0.ebuild 647 BLAKE2B 9014e8bc8c59bbf9b666bf6072ee02c73f1ce8ac2aa617c06a9ba5a8730db753fa9c4c05b9c70d6fff40254e5d13ef68081aa2410e0e9d0c5e67963ee8d1fd6c SHA512 1ce25d46c63a84eb99e1d032d1595918eef59df4aae700f7ecf99315a3d3e147c6dd30df49ff8aadbad73d0b6598990d030a20bb5d9f3df8b4d2096df964cb0e
 EBUILD myclabs-deepcopy-1.6.1.ebuild 654 BLAKE2B 216541ee72e5454c8ef5a1fe23a664e43f10e131fb9d221c66a12a3430addec7dad56ce53ebbb90166645f5d28e9af93bee0c573ceb5c2eda6464c0ef389a23e SHA512 8956ac9933609b03f71ad2149660b7c224c0ba33abbbbdabfc88179748f6a78ff182c6668431cd48610929b1b6dab604eccfe72cd93a4dc772a382c73fa3bd13
 EBUILD myclabs-deepcopy-1.9.4.ebuild 654 BLAKE2B 40936ed9f955bbb554b48ec355cdccc9b5402135ca88d5c84da460f459ae2f69cbcecfc1a124d0d9c6438c4dcfe0871174c5322892e95949a284f96f1698eaf9 SHA512 28c15466c4bf23aba8234121d5ce207bc29dee38bad1294dec822a16665a269cb2bb283e873e1999daa6786b3f58d326a83ad9085dfbafd7ef2f03fc3118a6ad
diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.10.2.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.10.2.ebuild
new file mode 100644
index 000000000000..24bc536d4d03
--- /dev/null
+++ b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.10.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="DeepCopy"
+
+DESCRIPTION="Create deep copies (clones) of your objects"
+HOMEPAGE="https://github.com/myclabs/DeepCopy"
+SRC_URI="https://github.com/myclabs/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="dev-php/fedora-autoloader
+	>=dev-lang/php-7.1:*"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	phpab \
+		--output src/${MY_PN}/autoload.php \
+		--template fedora2 \
+		--basedir src/${MY_PN} \
+		src || die
+}
+
+src_install() {
+	insinto /usr/share/php/myclabs
+	doins -r src/*
+
+	einstalldocs
+}
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index 5b6bc641e1d0..7a4e199380cb 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 ee3ff6320e07737f0f144085275f5291115181c94431268453cf051d795afd2462c08b99e4a582fc0e505b7ec1ae768f9e202946748f538933599a5f75b5b36a SHA512 9c5219e2a63f1420777ecc5c270d0d7819619717ac1da0736a9c42f85a9b92aa51c5ece6731de2c7bbf42c51cc7f325d70cadcf9b05bac5a610c9235e2c963a8
+EBUILD pecl-apcu-5.1.19.ebuild 1548 BLAKE2B aba9db198f7da659f246651b97ff72e923f1e2732b7d8ca017ad7d56e1a6d7515c9929299b92b9aeb9001a529f1bacc44cbad500599236488233828ab5ac8688 SHA512 a88172344ee589b4103cf8b2bd527f07ac81a3e31a9ad6722045607a072481a19e39f2098eb99d161a96d2184ebf294c00f7a99d5ae365812a26475e17404322
 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 2b180c6dc0d5..374c3077b81c 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild
@@ -8,7 +8,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( NOTICE README.md TECHNOTES.txt )
 
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-apcu_bc/Manifest b/dev-php/pecl-apcu_bc/Manifest
index 74cafa8f2a53..03146fdfbe73 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 1194 BLAKE2B c5af895e3752df004b444311b950a505ea7ae25da0a309e38702b515eb36758bdf9cdab4bf38c3f62acd73027887a1ee578c4548990ecd4a48ed21cfe5805b7a SHA512 260549647fc36d7e0ad5aeb8d5be894d63f6f8534a6ca31d01ef023085183eee717ddff20da92eb062f11d21ee088a35ca875a8448314af868704342819c6389
+EBUILD pecl-apcu_bc-1.0.5.ebuild 1176 BLAKE2B 5b63f34b1cf5a31fba665025d1f75146abe6b224847df30b682d6b2fe4d5ca4b7733c59864e96f436d1060cd963fea8ac7e6b23a8c587e49449f9b166f573bbd SHA512 a0c62afc9e16ea11a47dbb1c3664aec280d5095da2a3f7cb22dc30d13cfbb1b8d65555d167131f295f15d57c6991ee8e2ca50adc6c49ff50b3da28cfad0dbe18
 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 79ea5781e4d9..2ac07f3f2d20 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-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -10,7 +10,7 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_EXTRA_ECONF=""
 DOCS=( README.md )
 
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3 multilib
 
@@ -21,7 +21,7 @@ LICENSE="PHP-3.01"
 SLOT="0"
 IUSE=""
 
-DEPEND=">=dev-php/pecl-apcu-5.1.18:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?]"
+DEPEND=">=dev-php/pecl-apcu-5.1.18:7[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?]"
 RDEPEND="${DEPEND}"
 
 src_test() {
diff --git a/dev-php/pecl-dbase/Manifest b/dev-php/pecl-dbase/Manifest
index cf672a579b16..51f06ce8e786 100644
--- a/dev-php/pecl-dbase/Manifest
+++ b/dev-php/pecl-dbase/Manifest
@@ -1,3 +1,5 @@
 DIST dbase-7.0.1.tgz 33588 BLAKE2B 50cc5b4e0096dbdd7067e9c05cb7b580ff5a9d548ec6acb8a777fa3ba62ac4fa06b30e040bdec2a77b87736cdd0684a662aab344db11806e6ca2c6824cee6908 SHA512 8aa743545e807773be6a3f74cd9ae686a982a5455e494ff2bc0e3fe6f1fdf25574702054253eaefc55a6e9529b3e70c8390a02bd317b74db17bfe6b7797d4ba2
-EBUILD pecl-dbase-7.0.1.ebuild 1253 BLAKE2B 9f4a54c11fd4d308d9db68e33556aa8fd418c46150235c4e340779ec4bfac9104fbc4361ea47661145a7a58d4bd107f3173f2f2f1f615bd70aaec4bd00f45766 SHA512 24041868a3af76468991bc27145cd715248da6a1c8144e6d4e26a97a47a438d01e31ad49fa7e0e2a191e0c2c27148eda8e88754933b6f6c38acf3e2caa948592
+DIST dbase-7.1.0RC2.tgz 37029 BLAKE2B 93c011c428c4bc989481505fade25a6bd6f2841c32146b8efbaf67cbea4193b7362bf6dbb7dca382c607dd04f217f04dbdd529443e1b931f2149e7e32e30a6dd SHA512 dd3d0f67ffb1f8e8b7bd87f83f134d06cece225bcca52609e395771430d337632bbf1daff2a7db25dd163e3707db9ca2aaebace359c5f95a52debb1ceaefb379
+EBUILD pecl-dbase-7.0.1.ebuild 337 BLAKE2B 7b6d332b6236fa1dac0cfe5fda5df822e3884d52a4126ff4e32a522a25f3160acc3202faa5045cc36364f1e061002a208dda611b0c3cc981a68533bbecc9f249 SHA512 6a7a4d56e2c6837f063e7d89ecc7e33221c5d9733f42d8040d377a02826795a22a8232a9efcf16de71c41c1742b606875c0811eefc024997739b2ffd8f035046
+EBUILD pecl-dbase-7.1.0_rc2.ebuild 449 BLAKE2B 08675baa273e22acaf3c9312c26fab6124b43bf9ee80c15912ce4a9fcb2f0838b3b191d7f6dca7da96ba150b07aea6c69d306e9206ab5d7f29b1f76d0d198f08 SHA512 bb7fa6ca50b40b4405f089d48370032a89de6ff0ad16896ae5a4ba53bc6e355d0418019d56714791ebff9bf3f5685dca4c402bc0e2481561f1f622c056a25df6
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-dbase/pecl-dbase-7.0.1.ebuild b/dev-php/pecl-dbase/pecl-dbase-7.0.1.ebuild
index 43d998a62c33..e39dbd9f0ad1 100644
--- a/dev-php/pecl-dbase/pecl-dbase-7.0.1.ebuild
+++ b/dev-php/pecl-dbase/pecl-dbase-7.0.1.ebuild
@@ -1,17 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-# Define 5.6 here so we get the USE and REQUIRED_USE from the eclass
-# This allows us to depend on the other slot
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
-# However, we only really build for 7.x; so redefine it here
-USE_PHP="php7-0 php7-1 php7-2 php7-3 php7-4"
-
 KEYWORDS="~amd64 ~x86"
 
 DESCRIPTION="dBase database file access functions"
@@ -20,25 +15,5 @@ SLOT="7"
 IUSE=""
 
 DEPEND=""
-RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-dbase: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
-}
+RDEPEND="${DEPEND}"
+PHP_EXT_ECONF_ARGS=( )
diff --git a/dev-php/pecl-dbase/pecl-dbase-7.1.0_rc2.ebuild b/dev-php/pecl-dbase/pecl-dbase-7.1.0_rc2.ebuild
new file mode 100644
index 000000000000..86cf3a4e3909
--- /dev/null
+++ b/dev-php/pecl-dbase/pecl-dbase-7.1.0_rc2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
+
+MY_PV="${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="dbase-${MY_PV}.tgz"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="dBase database file access functions"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PHP_EXT_PECL_FILENAME%.tgz}"
+PHP_EXT_S="${S}"
diff --git a/dev-php/pecl-geoip/Manifest b/dev-php/pecl-geoip/Manifest
index 0b4cfb2af656..fe992ff8898a 100644
--- a/dev-php/pecl-geoip/Manifest
+++ b/dev-php/pecl-geoip/Manifest
@@ -1,4 +1,6 @@
 AUX fix-failing-tests-1.1.1.patch 1250 BLAKE2B 587561ec400fe54b21333d09d2ad721b66c321de5a9c1823c0cb9706e63c41a24f81e53eb9fb92bc1f33bc867e141e8f29c26abc1452058dc387d29a53b0c7bc SHA512 9e3c93b337c38feaec29001a5a5b243f376bc7a32caaafa848b51daa3f0efbdecf407de6c8f304801ad106aa0e4906513588c42aa19bc6d5b261ccd6cb00b652
+AUX php8-support-1.1.1.patch 3017 BLAKE2B a3a200c6f9b081a1776a39a11cbcc1d547b5a1fa945e13436175e3e4834e5e83ad5980ed8b5d0e0b2f3c6fc31d8011a995cba98e3681ea2be22df55391767026 SHA512 80e234a37deb2a5ba075979aacb5f4a343ff2e938b42e398b1cb8fe98cc13cc70a2b9b1118e155a4ebc80783743e2f85ad09b1d48735112e807e902095d92035
 DIST geoip-1.1.1.tgz 13004 BLAKE2B fe073b9459c434751ea0291ce6802041db47254f9d2d5b930db51751b3a66ce5cf925dc4bd07764920748b1735f26ba8bd136654e08ed9c24ac3b520e842f45d SHA512 395715297726aa8e7ed71297d403bea9cb08417a03adfca29dc6ea68bbc738c176f71ea621f9026109e07cd5a2adc647e2af8e140e18a6af1c8f0fe4ed1a9c6b
-EBUILD pecl-geoip-1.1.1-r4.ebuild 460 BLAKE2B f3e510fde3b552397efce311d83db0a2a78433408831f63778efbf01994baa2e45ce6f4e68424d5b775f21f0748476c67aa7957c6fe4ae4a98a86c462ded7b2d SHA512 9c32fc046bb9cf433894faee4ff537566df9c543a5af42ca0d3e422dba92789db9daf317a886cf81d25b5cd215898541860e5221ad495d5b4497b894cbcf8c06
+EBUILD pecl-geoip-1.1.1-r4.ebuild 439 BLAKE2B bc68853acc3e32b5a5e5f2b1c0485d346a93a7976735aaa8cbf0e9a94cacb7185083d89f670a8200167254d764d8255dceae1d5be14aaac593c2731f33f9a2f5 SHA512 2dfb9075f54995b439bf67642d2babb448d271c6cde649e8302e4ca7f51c1f5a029114a923131ec1c7c6699428db5128256fb382e6e911fd2e0ab87cc7748f6e
+EBUILD pecl-geoip-1.1.1-r5.ebuild 489 BLAKE2B 33b7073fe499d84d64df5dd07139a350e60bef86bd9f3bae5db8854faeb8a36c2c7286dabd3bcd9b3b53da63da3128aed44246631e70e26eb4efb8390b9c1472 SHA512 9cec410429e6ed5f24d55e71aa7b8a62cd722952acdfced25f0f97e006acc5d81a0b2d976bb67200709665b65a0f17770a7ba7d01ce3846a3a0914134ebb8974
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-geoip/files/php8-support-1.1.1.patch b/dev-php/pecl-geoip/files/php8-support-1.1.1.patch
new file mode 100644
index 000000000000..50c53d1a94a7
--- /dev/null
+++ b/dev-php/pecl-geoip/files/php8-support-1.1.1.patch
@@ -0,0 +1,93 @@
+--- a/geoip.c	2020/10/30 12:04:28	351081
++++ b/geoip.c	2020/10/30 12:51:07	351082
+@@ -34,41 +34,72 @@
+ #include "ext/standard/info.h"
+ #include "php_geoip.h"
+ 
+-
++/* For PHP 8 */
++#ifndef TSRMLS_CC
++#define TSRMLS_CC
++#endif
+ 
+ ZEND_DECLARE_MODULE_GLOBALS(geoip)
+ 
++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_void, 0, 0, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_database_opt, 0, 0, 0)
++	ZEND_ARG_INFO(0, database)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_database, 0, 0, 1)
++	ZEND_ARG_INFO(0, database)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_host, 0, 0, 1)
++	ZEND_ARG_INFO(0, host)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_region, 0, 0, 2)
++	ZEND_ARG_INFO(0, country_code)
++	ZEND_ARG_INFO(0, region_code)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_directory, 0, 0, 1)
++	ZEND_ARG_INFO(0, directory)
++ZEND_END_ARG_INFO()
++
+ static int le_geoip;
+ 
+ /* {{{ */
+ zend_function_entry geoip_functions[] = {
+-	PHP_FE(geoip_database_info,   NULL)   
++	PHP_FE(geoip_database_info,           arginfo_geoip_database_opt)   
+ #define GEOIPDEF(php_func, c_func, db_type) \
+-	PHP_FE(php_func,	NULL)
++	PHP_FE(php_func,	                  arginfo_geoip_host)
+ #include "geoip.def"
+ #undef GEOIPDEF
+-	PHP_FE(geoip_continent_code_by_name,   NULL)
+-	PHP_FE(geoip_org_by_name,   NULL)
+-	PHP_FE(geoip_record_by_name,   NULL)
+-	PHP_FE(geoip_id_by_name,   NULL)
+-	PHP_FE(geoip_region_by_name,   NULL)
+-	PHP_FE(geoip_isp_by_name,   NULL)
+-	PHP_FE(geoip_db_avail,	NULL)
+-	PHP_FE(geoip_db_get_all_info,	NULL)
+-	PHP_FE(geoip_db_filename,	NULL)
++	PHP_FE(geoip_continent_code_by_name,   arginfo_geoip_host)
++	PHP_FE(geoip_org_by_name,              arginfo_geoip_host)
++	PHP_FE(geoip_record_by_name,           arginfo_geoip_host)
++	PHP_FE(geoip_id_by_name,               arginfo_geoip_host)
++	PHP_FE(geoip_region_by_name,           arginfo_geoip_host)
++	PHP_FE(geoip_isp_by_name,              arginfo_geoip_host)
++	PHP_FE(geoip_db_avail,	               arginfo_geoip_database)
++	PHP_FE(geoip_db_get_all_info,	       arginfo_geoip_void)
++	PHP_FE(geoip_db_filename,	           arginfo_geoip_database)
+ #if LIBGEOIP_VERSION >= 1004001
+-	PHP_FE(geoip_region_name_by_code,	NULL)
+-	PHP_FE(geoip_time_zone_by_country_and_region,	NULL)
++	PHP_FE(geoip_region_name_by_code,      arginfo_geoip_region)
++	PHP_FE(geoip_time_zone_by_country_and_region,	arginfo_geoip_region)
+ #endif
+ #ifdef HAVE_CUSTOM_DIRECTORY
+-    PHP_FE(geoip_setup_custom_directory,	NULL)
++    PHP_FE(geoip_setup_custom_directory,   arginfo_geoip_directory)
+ #endif
+-	PHP_FE(geoip_asnum_by_name,   NULL)
+-	PHP_FE(geoip_domain_by_name,   NULL)
++	PHP_FE(geoip_asnum_by_name,            arginfo_geoip_host)
++	PHP_FE(geoip_domain_by_name,           arginfo_geoip_host)
+ #if LIBGEOIP_VERSION >= 1004008
+-	PHP_FE(geoip_netspeedcell_by_name, NULL)
++	PHP_FE(geoip_netspeedcell_by_name,     arginfo_geoip_host)
+ #endif
++#ifdef PHP_FE_END
++	PHP_FE_END
++#else
+ 	{NULL, NULL, NULL}
++#endif
+ };
+ /* }}} */
+ 
diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild
index 956d2192df64..9b8d00516a8d 100644
--- a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild
+++ b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PHP_EXT_NAME="geoip"
 DOCS="README ChangeLog"
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild
new file mode 100644
index 000000000000..f5bbf1f24038
--- /dev/null
+++ b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="geoip"
+DOCS="README ChangeLog"
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP extension to map IP address to geographic places"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-libs/geoip"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/fix-failing-tests-1.1.1.patch"
+	"${FILESDIR}/php8-support-1.1.1.patch"
+)
diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest
index 2c9a81dbbc90..d89aaf85887d 100644
--- a/dev-php/pecl-http/Manifest
+++ b/dev-php/pecl-http/Manifest
@@ -1,5 +1,8 @@
 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-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-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.3-r1.ebuild b/dev-php/pecl-http/pecl-http-3.2.3-r1.ebuild
new file mode 100644
index 000000000000..209edf1ed14b
--- /dev/null
+++ b/dev-php/pecl-http/pecl-http-3.2.3-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 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-2 php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php7-2 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-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?]
+	>=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-2(-)?,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-2? ( ${COMMON_DEPEND} dev-lang/php:7.2[hash,session,iconv] )
+	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-2 || 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-2 || 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_beta1.ebuild b/dev-php/pecl-http/pecl-http-4.0.0_beta1.ebuild
new file mode 100644
index 000000000000..af5bbf3e0b54
--- /dev/null
+++ b/dev-php/pecl-http/pecl-http-4.0.0_beta1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 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-2 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-2? ( dev-php/pecl-http:7[php_targets_php7-2(-)] )
+	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-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest
index 7e0e62ad309e..f6b26be61752 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 664 BLAKE2B 270d6723aa9b83db4a0de11a7199c56712f4bb23b1d16303461049f4f1bb36c524ed52000b21f4183047c78e27145097e818936c3cb5b1c34cf765d83933db0f SHA512 40c8110d0627a466452520d5627e97d195b9d888fee4284ca7358406268f27c8a9413f559bfeb3ac0b0734c3a22e66aaa302dee13def03cacb34d0b65f45eeba
+EBUILD pecl-mailparse-3.1.1.ebuild 496 BLAKE2B a7883843794a924d72522ea85bcb4adb8e0509896d7ab7d4b9a8a448bf2de38efc2045bc758ceb683d439995ac7d9c635f759db91cc1ee4cc900c69d9aba51c5 SHA512 e91bd41589dfa2860f0680366c628f84299490ba09fbe91a52475506a3687643f1afd10b4ff58b7cf71db59b09a826d1f5b86aa5b6c77a6068d3758d1820cc60
 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 cb73196e10c0..68fd925dfe8b 100644
--- a/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild
+++ b/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild
@@ -8,7 +8,7 @@ PHP_EXT_NAME="mailparse"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_ECONF_ARGS=""
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
 PHP_EXT_NEEDED_USE="unicode"
 DOCS=( README.md )
 
@@ -20,9 +20,3 @@ DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME complian
 LICENSE="PHP-3.01"
 SLOT="7"
 IUSE=""
-
-src_prepare() {
-	# Missing test source files in archive.  Fixed upstream in next release.
-	rm tests/011.phpt tests/bug001.phpt || die
-	php-ext-source-r3_src_prepare
-}
diff --git a/dev-php/pecl-mcrypt/Manifest b/dev-php/pecl-mcrypt/Manifest
index d1967f629b92..a2fc55980380 100644
--- a/dev-php/pecl-mcrypt/Manifest
+++ b/dev-php/pecl-mcrypt/Manifest
@@ -3,5 +3,5 @@ DIST mcrypt-1.0.2.tgz 33698 BLAKE2B b79985455986ca28e7cb55d3f6f62f87e1112f57c4e2
 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 720 BLAKE2B 456f72365cef8f93219ae55f55439ffa2dcbcbee7044c19ac99c3ee765c7656c456eb36c841f38b847602e9c3ab5dd73b68a5f75ca7e79cd2dfb0cdedb0e6a2e SHA512 bb8046db6ec85b6742c71b352211e9ac7343356011de803220fc72e8027b0f11f39a4a7f94635f6089af11db8deb63cc05905065069ca3419af2bf5864234987
+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.3.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild
index 540f56f2fa1a..f2c29f734582 100644
--- a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild
+++ b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild
@@ -15,7 +15,7 @@ inherit php-ext-pecl-r3
 DESCRIPTION="Bindings for the libmcrypt library"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 DEPEND="dev-libs/libmcrypt"
 RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-oauth/Manifest b/dev-php/pecl-oauth/Manifest
index d6a04bac45cc..863fccf13c98 100644
--- a/dev-php/pecl-oauth/Manifest
+++ b/dev-php/pecl-oauth/Manifest
@@ -1,3 +1,3 @@
 DIST oauth-2.0.7.tgz 78926 BLAKE2B 2fbe8f9c6df19790b9f617af64a04ed2387e904c3775753ac23fcf3f796007891a546ad6d5fae9b04cab707905f5ff3e9cc56b5c0b4bd1d9bab8745428c683f8 SHA512 261bbe6d1c4299f44ce40030b3959e26f2535c70d01b7a4e870d14c84b0a01e68484e61907554d720667fa08a2ec00b7d43cf2f523800c832f02b093e7b6534a
-EBUILD pecl-oauth-2.0.7.ebuild 796 BLAKE2B 0920a98c13019a02bff4931a391d23b5c57c35e9bad623a7e2857aa4c5da80ec829514beac42589d486a0ee135f9980eb64641f1322ffec1632c62048077eb29 SHA512 3c88ef0b87789d5478363c4b1f1639d44a8ab86a57a55fcd43523a22d3172fabec015e70e9a77774e2740fb4a81e1e2225b677c075c2d3addeb6c2157502d982
+EBUILD pecl-oauth-2.0.7.ebuild 682 BLAKE2B 3774fd14c1b7149041bd2368bde2ff893f30fdd90a6f91216fad5af6eac8a78c0e9817b2705d64eccfb7f28bd3df3ddb7e0c7ed49eca9b44ce7be0dafe9985d3 SHA512 e76e06531162d12ca3ed85a2665c0ac8947a20f80eb720a35fa52a45e4e7034018ef624edf760d971ce124adab5374126eec6274c426d003d6b43a080c578662
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild b/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild
index 18221a56290e..775332d83c50 100644
--- a/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild
+++ b/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild
@@ -6,7 +6,7 @@ PHP_EXT_NAME="oauth"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
 
 inherit php-ext-pecl-r3
 
@@ -17,12 +17,11 @@ LICENSE="BSD"
 SLOT="7"
 IUSE="+curl examples"
 
-DEPEND="php_targets_php7-2? ( dev-lang/php:7.2[hash(-)]
-		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
-	php_targets_php7-3? ( dev-lang/php:7.3[hash(-)]
-		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
-	php_targets_php7-4? (
-		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
+DEPEND="
+	dev-libs/libpcre:3=
+	curl? ( net-misc/curl:0= )
+	php_targets_php7-2? ( dev-lang/php:7.2[hash(-)] )
+	php_targets_php7-3? ( dev-lang/php:7.3[hash(-)] )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-php/pecl-radius/Manifest b/dev-php/pecl-radius/Manifest
index 0b8204c478b1..1ac9136c5d28 100644
--- a/dev-php/pecl-radius/Manifest
+++ b/dev-php/pecl-radius/Manifest
@@ -1,3 +1,3 @@
 DIST radius-1.4.0b1.tgz 50953 BLAKE2B 1f6f2a4c4cfa7600a37b8bc30e4d263b899a687becac83fd01bac2466de08cad4233984ca694dc73eaf20b64ef94e1e6a6ca7f843474c8f0c9de2c39df9d9705 SHA512 db6ebe928673db1ff4c565338010ef5acf6029844994eb240f2e8eaeda4aff734ed300a7ddf16c09e245671aad377283f99cf1c485569b3bad0c7c7b24a19664
-EBUILD pecl-radius-1.4.0_beta1-r2.ebuild 829 BLAKE2B da5781ed23af8292df6bb9f40589130e10cb81cdf7e5c6996f9545f286c94969a0df0715b8bc0e995b578d66c70cb9d3d5260f13bdd440353b781623504ac50c SHA512 26d4c42a1cef310af9a940b9b82deb1b6163f2a3949b08494557c21077e977b991c4f1656ab88510481461faef197d040e82b2af4536f719aa078c88e6ad0eb5
+EBUILD pecl-radius-1.4.0_beta1-r3.ebuild 781 BLAKE2B 6a4ae327771de09f3b6b19d0f2f5bbaf6cdcbd0278644b32d5bd5d306cbbacae37884e75510749a997d3dbf7b617f725d771b1f436a004d21048dde8cfc6006a SHA512 adc5f01561131d9786d5f165bbe2c87d40b6ae8ac5488971dc0675c95756e6d7c24dd3e2e79fef72e8ac72056379df0cabf88bf7777c448a4f0dd003c06ed441
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r2.ebuild b/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r3.ebuild
index a18ff95d221c..467867d6f62c 100644
--- a/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r2.ebuild
+++ b/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ PHP_EXT_NAME="radius"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4"
 PHP_EXT_PECL_FILENAME="${PN/pecl-/}-${PV/_beta/b}.tgz"
 PHP_EXT_S="${WORKDIR}/${PHP_EXT_PECL_FILENAME%.tgz}"
 
@@ -18,14 +18,14 @@ KEYWORDS="~amd64 ~x86"
 DESCRIPTION="Provides support for RADIUS authentication (RFC 2865) and accounting (RFC 2866)"
 LICENSE="BSD"
 SLOT="0"
-IUSE="examples"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 S="${PHP_EXT_S}"
 
 RDEPEND="
-	php_targets_php5-6? ( dev-lang/php:5.6[pcntl,sockets] )
-	php_targets_php7-1? ( dev-lang/php:7.1[pcntl,sockets] )
-	php_targets_php7-2? ( dev-lang/php:7.2[pcntl,sockets] )
-	php_targets_php7-3? ( dev-lang/php:7.3[pcntl,sockets] )
-	php_targets_php7-4? ( dev-lang/php:7.3[pcntl,sockets] )
+	php_targets_php7-2? ( dev-lang/php:7.2[pcntl(-),sockets(-)] )
+	php_targets_php7-3? ( dev-lang/php:7.3[pcntl(-),sockets(-)] )
+	php_targets_php7-4? ( dev-lang/php:7.4[pcntl(-),sockets(-)] )
 "
+DEPEND="test? ( ${RDEPEND} )"
diff --git a/dev-php/pecl-raphf/Manifest b/dev-php/pecl-raphf/Manifest
index 7ef514902122..1fa6a6fef840 100644
--- a/dev-php/pecl-raphf/Manifest
+++ b/dev-php/pecl-raphf/Manifest
@@ -1,5 +1,6 @@
 DIST raphf-2.0.0.tgz 15715 BLAKE2B bab2997d9ce8358efaa69f2e633f49e4dd16f640e8d30284ebb33767285bead1aabcd973e7133152b82cf624e2c2e68cc6247e424aa5ed540e4211b5ed3da365 SHA512 16b029b694d30817a68a1a9d80bdf031d058ada45a93a4b34b49ec5d61fa8af78d0dbf1a3e5e2f1b950b2a11ac0b86b5a467807551556ab2a77f7f99739ed11b
 DIST raphf-2.0.1.tgz 16003 BLAKE2B 4eaf9f89e6572e17e0df347543dc99221f68d45103444f89e59862b9078574722278fbb1e2841b0a5952ffd6dfc4ea0fa81298f2014ffbe8a6b51ed6887f6692 SHA512 0a609fc21a62880963e7afb75297eb75a2598aab2c816cb61e84d665b0453e4952aa9bf25fe2c818cc94492a4b94aed965053c67899fdb984d88661364fffb1e
 EBUILD pecl-raphf-2.0.0-r2.ebuild 919 BLAKE2B 14dfe1232c27311d3606cb8ae7c7719db41a62d379dd22573868c208e1507958647d3132c31d71aa67c3402cf6baab00daed248e4fcb046e4e92ed4b48d5e4c9 SHA512 5af2ec4f69bd7d5ae63199bde5cdb486af2685b6e9174d7e83b1d5547f87e3852b98d22f3f7c4c07cc69c760f1aae864053fe87be89749accd7130fc2cd6eee6
+EBUILD pecl-raphf-2.0.1-r1.ebuild 422 BLAKE2B 868dc5bcc9d3d51ce7ee9cadc31e6693d23fa015f7c79846f3b2bb155a54b3c30396b4c1f39621f863d5c77c3a8c4ef188bd6f7f517b35c5b93c1c25e2e77346 SHA512 b73b9aab5e84924dc19dc05ab2ab8db23e526dc2053c2d01791187a6500ce6a52c9c36012a67d5bed8d8b61d4bf2f74eb5838744bcb7edd7ea2b918b8bddc3b1
 EBUILD pecl-raphf-2.0.1.ebuild 936 BLAKE2B 93e6dff75e26213d70f78b51f60875ea7f4d1a356935a2a2657bd1ee016980cb73f23b388c9095534fb6e8bca559c899e829aaaed2374a804d2cc879416f1452 SHA512 96af5e9198f568f0fa60d71eeb9022098c03105d5bd6407b41ccb788ad6adb309c50ca48558f26e54f7a5e7df03000ea869594cdd61b5f0fbc01fb3c01bdef3a
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-raphf/pecl-raphf-2.0.1-r1.ebuild b/dev-php/pecl-raphf/pecl-raphf-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..7c2efe5219cd
--- /dev/null
+++ b/dev-php/pecl-raphf/pecl-raphf-2.0.1-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="raphf"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=""
+PHP_INI_NAME="30-${PHP_EXT_NAME}"
+
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="A reusable, persistent handle and resource factory API"
+LICENSE="BSD-2"
+SLOT="7"
+IUSE=""
diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest
index be771f6243f8..3bd274d0b9dc 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -7,5 +7,5 @@ EBUILD pecl-redis-5.1.1.ebuild 1288 BLAKE2B 59d4de29ee1b61edede0c31ab5bb4fc40885
 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 1486 BLAKE2B 718fe2c3f07f6d6088ea908b4e0c41dc8a996bf09a5ac75c2ab0716afcb843aed71547cb10118df3b1d670ee678f6fd14b3b1acfb32813000fb47cad517c7a1d SHA512 98412ca22de8a169b782ff44b9120ad328e55a99e15fc162d067046c71b545db00c2a5179ee8b6e8814b302898c7ab4215151f0da8a90635903a8b8ef6ae18b0
+EBUILD pecl-redis-5.3.2.ebuild 1528 BLAKE2B 76143189f10f1bff85c597bc4946d69dea4abfff0303b5e7a54fb1ca39f0e109157cdf1ba88bed6ee20848a409114717d16a990b1ebad9e213a747961f4b166c SHA512 55df2dfdb69d06fe1302c8d81beec4c06559f226b2e3275c2e8795cd6bd5b77c89b1cffc90343515fdea7d94ec479f72a14e970c70a0825c5008d6b39258c23e
 MISC metadata.xml 383 BLAKE2B b7a47896565db2f132479963a5479262864421a8388bd262ba9aa8eb6445e0d351478530475b5dba12cc9cbbc33089a904f9945816d3009c75f09dcea9c4cfdc SHA512 da5c3918a6652f1f3ae58a5bcd2c5eb3308d764df1a14bae1658f5f2022ee364b6cd288c4a3c700cf27b70b2f967f66668c17ea9850fc48910005310d16125b0
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 9f7ec9e88930..65762af9b8d8 100644
--- a/dev-php/pecl-redis/pecl-redis-5.3.2.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-5.3.2.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 PHP_EXT_NAME="redis"
-USE_PHP="php7-2 php7-3 php7-4"
-PHP_EXT_NEEDED_USE="json?,session?"
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
+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"
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm"
 IUSE="igbinary +json lz4 +session zstd"
 
 DEPEND="
-	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] )
+	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?,php_targets_php8-0(-)?] )
 	lz4? ( app-arch/lz4:= )
 	zstd? ( app-arch/zstd:= )
 "
diff --git a/dev-php/pecl-timezonedb/Manifest b/dev-php/pecl-timezonedb/Manifest
index d4d97e185172..3a08dd2c88bb 100644
--- a/dev-php/pecl-timezonedb/Manifest
+++ b/dev-php/pecl-timezonedb/Manifest
@@ -1,5 +1,7 @@
 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-2020.4.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2020.4.ebuild
new file mode 100644
index 000000000000..a390fa7584ed
--- /dev/null
+++ b/dev-php/pecl-timezonedb/pecl-timezonedb-2020.4.ebuild
@@ -0,0 +1,19 @@
+# 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="php7-2 php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Timezone Database to be used with PHP's date and time functions"
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+PHP_EXT_ECONF_ARGS=""
diff --git a/dev-php/pecl-translit/Manifest b/dev-php/pecl-translit/Manifest
index ff407770ded6..194a0232b1a0 100644
--- a/dev-php/pecl-translit/Manifest
+++ b/dev-php/pecl-translit/Manifest
@@ -1,3 +1,5 @@
 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.7.1.ebuild b/dev-php/pecl-translit/pecl-translit-0.7.1.ebuild
new file mode 100644
index 000000000000..5c7709ce8eff
--- /dev/null
+++ b/dev-php/pecl-translit/pecl-translit-0.7.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 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-2 php7-3 php7-4 php8-0"
+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 7f1fabe749e4..623bc232f14e 100644
--- a/dev-php/pecl-uuid/Manifest
+++ b/dev-php/pecl-uuid/Manifest
@@ -1,5 +1,5 @@
 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 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.2.0.ebuild b/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild
index f030569d725f..65d0a5fb0ec5 100644
--- a/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild
+++ b/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild
@@ -8,7 +8,7 @@ PHP_EXT_INIT="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( CREDITS )
 
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-yaml/Manifest b/dev-php/pecl-yaml/Manifest
index 2c4e36e8dfe0..9a053360c3be 100644
--- a/dev-php/pecl-yaml/Manifest
+++ b/dev-php/pecl-yaml/Manifest
@@ -1,5 +1,3 @@
-DIST yaml-2.0.4.tgz 39071 BLAKE2B 3a5dba0f6a16087909f4673543d64946e5929a5ef4cc616df6a4225aa2d274b2b5492b00ab0e95ed93f808bc2a4dd0a2f6d60c8c2ded078af35c4499042488d6 SHA512 138e5b4566800fc7d624baf71bc585d6d432755046e598ae9f4099fa565727e04d79bb171289a53eb9e5daa416ffee1b0fb4967c84976ac6cd6fc01b0a05fbae
-DIST yaml-2.1.0.tgz 39439 BLAKE2B 76cab7fe0c5cf4140b70dc86333a6a79c6f1684cef9e609b905d626e95cdf5542ef0a95a4e3b7e6b663adc81e240515c4d23b5f029c5519fa88e7178762171b9 SHA512 3731ca2b84e80599d7fae4f58efdd11e9920c672ea6e62ff6b0d57d721d3f6f12ca86efe88f63c324d4ad2b73d6947a21f6e5a47263538ca0d5e822b8fc7b8bd
-EBUILD pecl-yaml-2.0.4.ebuild 1112 BLAKE2B 84a00a78f00c4a74bc1dc305835bd03452d9631e2644f72c4324e2f94cbbe5d1e7b24a8be62d4156e4a1bba9b0c55492867c122d06b024d187ddde0873f2f43a SHA512 b97fa3b263b1492eeb08c2d3f643d19f560e022b082f23fc38028e9e321ef25453ec8b3c3856335bc2122694e2ec5f66019606253428a268969e6f568648d90d
-EBUILD pecl-yaml-2.1.0.ebuild 1112 BLAKE2B 5794d333cad654ad56e0d65012a5425f62f274e44fe48d62e0a07553e871d2d3f87fd52385230c07698b1f86ccb71ff93b7ca8f7c3fc8ab7c325e02994ac2a89 SHA512 741b903df7feaad91b84c28fb680611ae9df3f7192dcf83cfbae68c53f6997906a24bd4e4106298cbefef0d6666f2fa03d20da12dd35eaa184054c33fe7553b8
+DIST yaml-2.2.0.tgz 40716 BLAKE2B ef8e4082cf7aa3c6996d878f04b57438fc5fa4eb6672617685b3fd3ba535581329e8bb8d6b0644b97b2d64e951aea2d46d4e702acf02ac283d8e2b43fc82acba SHA512 3af6a0f2bcbab7d0ea21b81c2914a8c65393156b5a974448645ca079edbd616b5f46564e5f55a83d556f8e3fc38573a869f79c9eb3c2449e1c3d410ae32a6fb5
+EBUILD pecl-yaml-2.2.0.ebuild 584 BLAKE2B 07a25c1be754baa755974d6a67b9b3d61f68843c53d5163a27c9316cbb9db1fea898a195d8578e2430b23176f4ddcd1177876192e18e8626a703556143498627 SHA512 e02b296383d02fb208a1fe38fca466b89f69609aaa49e8ade198d4ce47408f84797fa543e2404a5b29f2b4914e5b59686a23aac265fbbefb1c4bdd132536d1c8
 MISC metadata.xml 238 BLAKE2B 1bb4abee8d968b36a69efa8f634c2d2e4422f5ac0611f123cf9794f1784e155a16cfd98ee209c16a745a58ddfa85d134c68a22bb5bde264c35ea285caa2d4d9a SHA512 560ff28e3776267c429b8d553d2dfc8991fa8d5845af5937c46ec68674d2b3c5cb922e557f43fcba113a70d4b3b5a32f39fc1fbed38de5781c7504fd526430cc
diff --git a/dev-php/pecl-yaml/pecl-yaml-2.0.4.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.0.4.ebuild
deleted file mode 100644
index 3a1a1abfdb9b..000000000000
--- a/dev-php/pecl-yaml/pecl-yaml-2.0.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="${PV/_rc/RC}"
-PHP_EXT_PECL_FILENAME="yaml-${MY_PV}.tgz"
-PHP_EXT_NAME="yaml"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS README )
-
-USE_PHP="php7-0 php7-1 php7-2 php7-3 php7-4 php5-6"
-
-inherit php-ext-pecl-r3
-
-S="${WORKDIR}/yaml-${MY_PV}"
-PHP_EXT_S="${S}"
-USE_PHP="php7-0 php7-1 php7-2 php7-3 php7-4"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="YAML 1.1 (YAML Ain't Markup Language) serialization for PHP"
-LICENSE="MIT"
-SLOT="7"
-IUSE=""
-
-DEPEND=">=dev-libs/libyaml-0.1.0"
-RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-yaml:0[php_targets_php5-6] )"
-PHP_EXT_ECONF_ARGS=""
-
-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
-		default_src_prepare
-	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-yaml/pecl-yaml-2.1.0.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.1.0.ebuild
deleted file mode 100644
index 75dd43747a88..000000000000
--- a/dev-php/pecl-yaml/pecl-yaml-2.1.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="${PV/_rc/RC}"
-PHP_EXT_PECL_FILENAME="yaml-${MY_PV}.tgz"
-PHP_EXT_NAME="yaml"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS README )
-
-USE_PHP="php7-0 php7-1 php7-2 php7-3 php7-4 php5-6"
-
-inherit php-ext-pecl-r3
-
-S="${WORKDIR}/yaml-${MY_PV}"
-PHP_EXT_S="${S}"
-USE_PHP="php7-0 php7-1 php7-2 php7-3 php7-4"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="YAML 1.1 (YAML Ain't Markup Language) serialization for PHP"
-LICENSE="MIT"
-SLOT="7"
-IUSE=""
-
-DEPEND=">=dev-libs/libyaml-0.1.0"
-RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-yaml:0[php_targets_php5-6] )"
-PHP_EXT_ECONF_ARGS=""
-
-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
-		default_src_prepare
-	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-yaml/pecl-yaml-2.2.0.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.2.0.ebuild
new file mode 100644
index 000000000000..9a2570bbf2c0
--- /dev/null
+++ b/dev-php/pecl-yaml/pecl-yaml-2.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="yaml-${MY_PV}.tgz"
+PHP_EXT_NAME="yaml"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( CREDITS README )
+
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+S="${WORKDIR}/yaml-${MY_PV}"
+PHP_EXT_S="${S}"
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DESCRIPTION="YAML 1.1 (YAML Ain't Markup Language) serialization for PHP"
+LICENSE="MIT"
+SLOT="7"
+IUSE=""
+
+DEPEND=">=dev-libs/libyaml-0.1.0"
+RDEPEND="${DEPEND}"
+PHP_EXT_ECONF_ARGS=()
diff --git a/dev-php/php-redmine-api/Manifest b/dev-php/php-redmine-api/Manifest
index 0e4b7ece18f9..26ee20b9eaf4 100644
--- a/dev-php/php-redmine-api/Manifest
+++ b/dev-php/php-redmine-api/Manifest
@@ -1,5 +1,5 @@
 DIST php-redmine-api-1.5.16.tar.gz 34323 BLAKE2B 5879c9a67959ec8104344d1d5c57ead036fc60d3bea2ae94684617a711eae0cf9c7d6d2eae6d94c273fdc06bed82f48e281c2895e37ddef2144be8f0881c5341 SHA512 e25dbcababcde4e0b3160f7060a837aa4e52a2f3b1b91bfb131c04c250c543fc41a3667d87c8a668057d5acbfac84f395dd3180b815921fc05edb6325d34dee5
 DIST php-redmine-api-1.5.9.tar.gz 36297 BLAKE2B 32c8cd500b0134afcb20e792f21585315f9635e038bca118d6ea289e2c0f91632aa5e2db2c023969cb228d592a242902a47bbef119e58560b39ba4b418854f8b SHA512 dd23dcadb27965568c3066f417edbff633eee5e804430568e60abf6b69f0fdfe36b73497984f80b055fae07cd3bb6f94264875f076b98f05327c474eb3f2ae5e
-EBUILD php-redmine-api-1.5.16.ebuild 931 BLAKE2B a276a1aadca6bcda1ef8b61c0d1a6914d755825a7e42a27b7ed778c5f2c62107ee50147ed722a648ee8abf1fd829965a9e72c1a6da7c3ad5d03dbeb1d30f5175 SHA512 a3adc8083ebdc1a8cca31a6fbb78a6bd619fcfad78019449622be66bb3d4a62b671aff783d93504e7683d2c76f2709038653953d2bae45253ebfc403c2cdcb07
-EBUILD php-redmine-api-1.5.9.ebuild 928 BLAKE2B fe9d6513a85f7ef5a081984d6f39506d588e097b7963dd54821695961f2a060d4262fd2d94c5d6cd2b08b936908d6ecf55d94b92a46b13d8baf1a36107162aad SHA512 d3627e57422b58d143dcc16b4cc6ca6a8f9564d89abc35ad76dbec35fe79a8626d35f6649c2980866c052a0b7a26d6962cff0fa8cb4ddbc02c5961e8c13e0287
+EBUILD php-redmine-api-1.5.16.ebuild 934 BLAKE2B e6cdc14d754adcccc8b33b4e62c1d14eb93baf70e93280cb1285c4feaa42f1f2b2e395d0cf95c7e35755bca4fbe0c6f46d5d6387a8b07746e23923149bc818d6 SHA512 b306cbebe5179a4a21a618916fc7787cde13770e1a55f178192d9eee5adf7b933062098ef6d21b1a7d48740425a3097e7ce4aea9aaaa62851faac9861efbc0a6
+EBUILD php-redmine-api-1.5.9.ebuild 931 BLAKE2B 6d274e486ef3673722617c5e6c542dc617fb9610b4d22cc926a6546cefb704811ba8b68918abb497ea3f05534c1042f54fc6c0eabadecfcc64085262e557aa23 SHA512 418d9bf3fa8693139fa57d12d4a0ed5f5b361f18ee8838697290fbc41e7815ce05cb8ed80f1906aafaf2e258f07c581180f3baa89c2af5856343785dd4ac15b3
 MISC metadata.xml 449 BLAKE2B 21f0010b9e04eae8ffbfd97b1f011e6eefc3a31e994e87d83133dcc71ac255eadcec04b57ff00c2a3ca9078173a08961bd46f3c6bd3cb4922f35564f25aa5c6c SHA512 6f2086e4973ea34367123c33eb9b54de38f77619ed548a2db6803634e4dba6ebb4fce03825affd26d58b204b184b0e1207316c7aba277bae7c96c7ea319c216f
diff --git a/dev-php/php-redmine-api/php-redmine-api-1.5.16.ebuild b/dev-php/php-redmine-api/php-redmine-api-1.5.16.ebuild
index 74bf4b9df940..a49c9672f800 100644
--- a/dev-php/php-redmine-api/php-redmine-api-1.5.16.ebuild
+++ b/dev-php/php-redmine-api/php-redmine-api-1.5.16.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-lang/php:*[curl,json,simplexml]"
+RDEPEND="dev-lang/php:*[curl,json(+),simplexml]"
 BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )"
 
 src_install() {
diff --git a/dev-php/php-redmine-api/php-redmine-api-1.5.9.ebuild b/dev-php/php-redmine-api/php-redmine-api-1.5.9.ebuild
index 0a816cb06bb6..770222f7cad6 100644
--- a/dev-php/php-redmine-api/php-redmine-api-1.5.9.ebuild
+++ b/dev-php/php-redmine-api/php-redmine-api-1.5.9.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-lang/php:*[curl,json,simplexml]"
+RDEPEND="dev-lang/php:*[curl,json(+),simplexml]"
 DEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )"
 
 src_install() {
diff --git a/dev-php/phpunit/Manifest b/dev-php/phpunit/Manifest
index 70ffe685b971..4f34cfbce99a 100644
--- a/dev-php/phpunit/Manifest
+++ b/dev-php/phpunit/Manifest
@@ -1,7 +1,6 @@
-AUX autoload-8.5.0.php 20002 BLAKE2B 249f6c025a7fccc22ca6f735f1cac85a1970bca4d3dacd67931fc0fdc528d0fa600a65dd8b5fad746a5bc98c708555d39a7c6e5a07d572f7466b257ba998b284 SHA512 b12ffaa56ea41bc537c3562c9b0abe19fc591b57379b5362a6edab606df0b54754a820622f17c3a49037e989daea027e91856cde2062d0504ef77c148e11cd73
 AUX autoload.php 11422 BLAKE2B 90c68a16ab1c2a81c31430984b426e0717881e29231ea008c6e75113d4180733af64a5edf7b1aabd8fd6e84b312ed79b80ee001d805d40f060b9b641c0c27948 SHA512 1d4fd0854a85bc404f5567b78effbc0eb41859601b8e56faaa4362e85ec4d07969864b21df3188fc5e82d5993c67655fa278a9c310b2ec7366aa2195c91e90da
 DIST phpunit-5.7.15.tar.gz 205474 BLAKE2B 0220edd59fc3f191b7621f275d3e4ee8f8bf514f74533d99bfb925e11cc54a235fb292ffd1bb54f6bec1e038c06e35a0dc43c1227618590f99e7e85638a7de28 SHA512 6a836e1ad1656fd1d1c5a58ced3c1826b4decc01798b6a804b487c9b4e094ec32f6eb8a84058e268eade62a2fe19d7bd1e760b8b9433299d9fe9c09afdf2bdd3
-DIST phpunit-8.5.5.tar.gz 158108 BLAKE2B ecdc339aa501d6f56eb13a26dae290a60609a8804c4160e339ac6900df70647fa3bba1e4a2fa9fb01b0363d0afa57b3e05305d7d055ac8ec03519c503ac3791e SHA512 22209ec189af58e490c688fe7e72c3388dabb497daa4d8c73f7c84036e39b4ae36d89f72b65c67f46487c8bc96f0c0e6760a3d44a3107c5a27eef52f764dd738
+DIST phpunit-8.5.11.tar.gz 159302 BLAKE2B fdf156842b3607f4cbd26194efd7eb7cb204fb1d1d078c0c6bd3bb68e520e5d748767f8aab64b7c9bf313161e3d84e08d415fbf0408c26541ec1f70cfe7af8bd SHA512 3e9db4a1d6c5bea3546b24bd837479a0114a9200f96034aabc96933dfb42c1237b03f7118f19eeb1216e32f2034c1ec8c632d20ecacbe70d3660fbbfd167ac79
 EBUILD phpunit-5.7.15-r3.ebuild 1534 BLAKE2B 749d8ce5f0a947edf9e886e4ae6bfef4fe6d3b98ac9b71602a745db6b5cccfe666094d47d7a54ca15c3ab1b2c6fd521ec1cf64a0452329dcb9289d60415caccd SHA512 03daf408cecf3dd04bd9b43f81c2c551c5b59cb7b62a256966fff308e4dc69c8381dce2ecbdc2c7860717609daae3879b95a7fd7a30f2c1e6173003d2aab1e81
-EBUILD phpunit-8.5.5.ebuild 2154 BLAKE2B b36413b07a97bba3261f173123bd2c1aeae9e084125141b108aae3c54511109191d4f33341b7b470f335804c2b60ae9c7619de810229751ae8cc722304942f9b SHA512 7c822966dd5193b1bc29f6460b5a0e71924f5ed431ede68c940b4f8b62c71af146112950a4ca08b4d876adefbcd56a9e2b8b634e801ccc7c953317f1f0a95717
+EBUILD phpunit-8.5.11.ebuild 3098 BLAKE2B 7290964cb5a5c1785dccf327114bdf9d38c11d585734c3c0787f1c78a9e7ca919febb740387c3a9bb26121816ed98c4107e17ed6fe3c4b7838fc2aca89f783e6 SHA512 75353e382e7b475051ee47bd22a499e1af6e65fdd38b5ce6df4bd98a06e73a2c2c02b4ab039990cb6c1a3eb4cfa0f99a02f4e0230287825d64be67dec5c313be
 MISC metadata.xml 329 BLAKE2B 45eb57929680d3c3d1c60a22dd1b760db42b1ce2a157c9b87209c391a08022c01a103972267b2f36cea142681d3cc3691a27c726b9a132974d7bb418e5316928 SHA512 007a4fea4de75a468e377398bb1539e25eedc8009ad6dcb6c170be653821b73d8eaaaeb236e207a2e33a509d2966f6a9571d8f0219d90b1662d4da1cdc7de896
diff --git a/dev-php/phpunit/files/autoload-8.5.0.php b/dev-php/phpunit/files/autoload-8.5.0.php
deleted file mode 100644
index 179ff7f276c8..000000000000
--- a/dev-php/phpunit/files/autoload-8.5.0.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-/* Autoloader for dev-php/phpunit and its dependencies */
-
-$include_dir = '/usr/share/php';
-
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-	require_once "${include_dir}/Fedora/Autoloader/autoload.php";
-}
-
-\Fedora\Autoloader\Autoload::addClassMap(
-[
-'phpunit\\exception' => '/Exception.php',
-'phpunit\\framework\\assert' => '/Framework/Assert.php',
-'phpunit\\framework\\assertionfailederror' => '/Framework/Exception/AssertionFailedError.php',
-'phpunit\\framework\\codecoverageexception' => '/Framework/Exception/CodeCoverageException.php',
-'phpunit\\framework\\constraint\\arrayhaskey' => '/Framework/Constraint/ArrayHasKey.php',
-'phpunit\\framework\\constraint\\arraysubset' => '/Framework/Constraint/ArraySubset.php',
-'phpunit\\framework\\constraint\\attribute' => '/Framework/Constraint/Attribute.php',
-'phpunit\\framework\\constraint\\callback' => '/Framework/Constraint/Callback.php',
-'phpunit\\framework\\constraint\\classhasattribute' => '/Framework/Constraint/ClassHasAttribute.php',
-'phpunit\\framework\\constraint\\classhasstaticattribute' => '/Framework/Constraint/ClassHasStaticAttribute.php',
-'phpunit\\framework\\constraint\\composite' => '/Framework/Constraint/Composite.php',
-'phpunit\\framework\\constraint\\constraint' => '/Framework/Constraint/Constraint.php',
-'phpunit\\framework\\constraint\\count' => '/Framework/Constraint/Count.php',
-'phpunit\\framework\\constraint\\directoryexists' => '/Framework/Constraint/DirectoryExists.php',
-'phpunit\\framework\\constraint\\exception' => '/Framework/Constraint/Exception.php',
-'phpunit\\framework\\constraint\\exceptioncode' => '/Framework/Constraint/ExceptionCode.php',
-'phpunit\\framework\\constraint\\exceptionmessage' => '/Framework/Constraint/ExceptionMessage.php',
-'phpunit\\framework\\constraint\\exceptionmessageregularexpression' => '/Framework/Constraint/ExceptionMessageRegularExpression.php',
-'phpunit\\framework\\constraint\\fileexists' => '/Framework/Constraint/FileExists.php',
-'phpunit\\framework\\constraint\\greaterthan' => '/Framework/Constraint/GreaterThan.php',
-'phpunit\\framework\\constraint\\isanything' => '/Framework/Constraint/IsAnything.php',
-'phpunit\\framework\\constraint\\isempty' => '/Framework/Constraint/IsEmpty.php',
-'phpunit\\framework\\constraint\\isequal' => '/Framework/Constraint/IsEqual.php',
-'phpunit\\framework\\constraint\\isfalse' => '/Framework/Constraint/IsFalse.php',
-'phpunit\\framework\\constraint\\isfinite' => '/Framework/Constraint/IsFinite.php',
-'phpunit\\framework\\constraint\\isidentical' => '/Framework/Constraint/IsIdentical.php',
-'phpunit\\framework\\constraint\\isinfinite' => '/Framework/Constraint/IsInfinite.php',
-'phpunit\\framework\\constraint\\isinstanceof' => '/Framework/Constraint/IsInstanceOf.php',
-'phpunit\\framework\\constraint\\isjson' => '/Framework/Constraint/IsJson.php',
-'phpunit\\framework\\constraint\\isnan' => '/Framework/Constraint/IsNan.php',
-'phpunit\\framework\\constraint\\isnull' => '/Framework/Constraint/IsNull.php',
-'phpunit\\framework\\constraint\\isreadable' => '/Framework/Constraint/IsReadable.php',
-'phpunit\\framework\\constraint\\istrue' => '/Framework/Constraint/IsTrue.php',
-'phpunit\\framework\\constraint\\istype' => '/Framework/Constraint/IsType.php',
-'phpunit\\framework\\constraint\\iswritable' => '/Framework/Constraint/IsWritable.php',
-'phpunit\\framework\\constraint\\jsonmatches' => '/Framework/Constraint/JsonMatches.php',
-'phpunit\\framework\\constraint\\jsonmatcheserrormessageprovider' => '/Framework/Constraint/JsonMatchesErrorMessageProvider.php',
-'phpunit\\framework\\constraint\\lessthan' => '/Framework/Constraint/LessThan.php',
-'phpunit\\framework\\constraint\\logicaland' => '/Framework/Constraint/LogicalAnd.php',
-'phpunit\\framework\\constraint\\logicalnot' => '/Framework/Constraint/LogicalNot.php',
-'phpunit\\framework\\constraint\\logicalor' => '/Framework/Constraint/LogicalOr.php',
-'phpunit\\framework\\constraint\\logicalxor' => '/Framework/Constraint/LogicalXor.php',
-'phpunit\\framework\\constraint\\objecthasattribute' => '/Framework/Constraint/ObjectHasAttribute.php',
-'phpunit\\framework\\constraint\\regularexpression' => '/Framework/Constraint/RegularExpression.php',
-'phpunit\\framework\\constraint\\samesize' => '/Framework/Constraint/SameSize.php',
-'phpunit\\framework\\constraint\\stringcontains' => '/Framework/Constraint/StringContains.php',
-'phpunit\\framework\\constraint\\stringendswith' => '/Framework/Constraint/StringEndsWith.php',
-'phpunit\\framework\\constraint\\stringmatchesformatdescription' => '/Framework/Constraint/StringMatchesFormatDescription.php',
-'phpunit\\framework\\constraint\\stringstartswith' => '/Framework/Constraint/StringStartsWith.php',
-'phpunit\\framework\\constraint\\traversablecontains' => '/Framework/Constraint/TraversableContains.php',
-'phpunit\\framework\\constraint\\traversablecontainsequal' => '/Framework/Constraint/TraversableContainsEqual.php',
-'phpunit\\framework\\constraint\\traversablecontainsidentical' => '/Framework/Constraint/TraversableContainsIdentical.php',
-'phpunit\\framework\\constraint\\traversablecontainsonly' => '/Framework/Constraint/TraversableContainsOnly.php',
-'phpunit\\framework\\coveredcodenotexecutedexception' => '/Framework/Exception/CoveredCodeNotExecutedException.php',
-'phpunit\\framework\\dataprovidertestsuite' => '/Framework/DataProviderTestSuite.php',
-'phpunit\\framework\\error\\deprecated' => '/Framework/Error/Deprecated.php',
-'phpunit\\framework\\error\\error' => '/Framework/Error/Error.php',
-'phpunit\\framework\\error\\notice' => '/Framework/Error/Notice.php',
-'phpunit\\framework\\error\\warning' => '/Framework/Error/Warning.php',
-'phpunit\\framework\\exception' => '/Framework/Exception/Exception.php',
-'phpunit\\framework\\exceptionwrapper' => '/Framework/ExceptionWrapper.php',
-'phpunit\\framework\\expectationfailedexception' => '/Framework/Exception/ExpectationFailedException.php',
-'phpunit\\framework\\incompletetest' => '/Framework/IncompleteTest.php',
-'phpunit\\framework\\incompletetestcase' => '/Framework/IncompleteTestCase.php',
-'phpunit\\framework\\incompletetesterror' => '/Framework/Exception/IncompleteTestError.php',
-'phpunit\\framework\\invalidargumentexception' => '/Framework/Exception/InvalidArgumentException.php',
-'phpunit\\framework\\invalidcoverstargetexception' => '/Framework/Exception/InvalidCoversTargetException.php',
-'phpunit\\framework\\invaliddataproviderexception' => '/Framework/Exception/InvalidDataProviderException.php',
-'phpunit\\framework\\invalidparametergroupexception' => '/Framework/InvalidParameterGroupException.php',
-'phpunit\\framework\\missingcoversannotationexception' => '/Framework/Exception/MissingCoversAnnotationException.php',
-'phpunit\\framework\\mockobject\\api' => '/Framework/MockObject/Api/Api.php',
-'phpunit\\framework\\mockobject\\badmethodcallexception' => '/Framework/MockObject/Exception/BadMethodCallException.php',
-'phpunit\\framework\\mockobject\\builder\\identity' => '/Framework/MockObject/Builder/Identity.php',
-'phpunit\\framework\\mockobject\\builder\\invocationmocker' => '/Framework/MockObject/Builder/InvocationMocker.php',
-'phpunit\\framework\\mockobject\\builder\\invocationstubber' => '/Framework/MockObject/Builder/InvocationStubber.php',
-'phpunit\\framework\\mockobject\\builder\\match' => '/Framework/MockObject/Builder/Match.php',
-'phpunit\\framework\\mockobject\\builder\\methodnamematch' => '/Framework/MockObject/Builder/MethodNameMatch.php',
-'phpunit\\framework\\mockobject\\builder\\parametersmatch' => '/Framework/MockObject/Builder/ParametersMatch.php',
-'phpunit\\framework\\mockobject\\builder\\stub' => '/Framework/MockObject/Builder/Stub.php',
-'phpunit\\framework\\mockobject\\configurablemethod' => '/Framework/MockObject/ConfigurableMethod.php',
-'phpunit\\framework\\mockobject\\configurablemethodsalreadyinitializedexception' => '/Framework/MockObject/Exception/ConfigurableMethodsAlreadyInitializedException.php',
-'phpunit\\framework\\mockobject\\exception' => '/Framework/MockObject/Exception/Exception.php',
-'phpunit\\framework\\mockobject\\generator' => '/Framework/MockObject/Generator.php',
-'phpunit\\framework\\mockobject\\incompatiblereturnvalueexception' => '/Framework/MockObject/Exception/IncompatibleReturnValueException.php',
-'phpunit\\framework\\mockobject\\invocation' => '/Framework/MockObject/Invocation.php',
-'phpunit\\framework\\mockobject\\invocationhandler' => '/Framework/MockObject/InvocationHandler.php',
-'phpunit\\framework\\mockobject\\matcher' => '/Framework/MockObject/Matcher.php',
-'phpunit\\framework\\mockobject\\method' => '/Framework/MockObject/Api/Method.php',
-'phpunit\\framework\\mockobject\\methodnameconstraint' => '/Framework/MockObject/MethodNameConstraint.php',
-'phpunit\\framework\\mockobject\\mockbuilder' => '/Framework/MockObject/MockBuilder.php',
-'phpunit\\framework\\mockobject\\mockclass' => '/Framework/MockObject/MockClass.php',
-'phpunit\\framework\\mockobject\\mockmethod' => '/Framework/MockObject/MockMethod.php',
-'phpunit\\framework\\mockobject\\mockmethodset' => '/Framework/MockObject/MockMethodSet.php',
-'phpunit\\framework\\mockobject\\mockobject' => '/Framework/MockObject/MockObject.php',
-'phpunit\\framework\\mockobject\\mocktrait' => '/Framework/MockObject/MockTrait.php',
-'phpunit\\framework\\mockobject\\mocktype' => '/Framework/MockObject/MockType.php',
-'phpunit\\framework\\mockobject\\mockedclonemethod' => '/Framework/MockObject/Api/MockedCloneMethod.php',
-'phpunit\\framework\\mockobject\\rule\\anyinvokedcount' => '/Framework/MockObject/Rule/AnyInvokedCount.php',
-'phpunit\\framework\\mockobject\\rule\\anyparameters' => '/Framework/MockObject/Rule/AnyParameters.php',
-'phpunit\\framework\\mockobject\\rule\\consecutiveparameters' => '/Framework/MockObject/Rule/ConsecutiveParameters.php',
-'phpunit\\framework\\mockobject\\rule\\invocationorder' => '/Framework/MockObject/Rule/InvocationOrder.php',
-'phpunit\\framework\\mockobject\\rule\\invokedatindex' => '/Framework/MockObject/Rule/InvokedAtIndex.php',
-'phpunit\\framework\\mockobject\\rule\\invokedatleastcount' => '/Framework/MockObject/Rule/InvokedAtLeastCount.php',
-'phpunit\\framework\\mockobject\\rule\\invokedatleastonce' => '/Framework/MockObject/Rule/InvokedAtLeastOnce.php',
-'phpunit\\framework\\mockobject\\rule\\invokedatmostcount' => '/Framework/MockObject/Rule/InvokedAtMostCount.php',
-'phpunit\\framework\\mockobject\\rule\\invokedcount' => '/Framework/MockObject/Rule/InvokedCount.php',
-'phpunit\\framework\\mockobject\\rule\\methodname' => '/Framework/MockObject/Rule/MethodName.php',
-'phpunit\\framework\\mockobject\\rule\\parameters' => '/Framework/MockObject/Rule/Parameters.php',
-'phpunit\\framework\\mockobject\\rule\\parametersrule' => '/Framework/MockObject/Rule/ParametersRule.php',
-'phpunit\\framework\\mockobject\\runtimedxception' => '/Framework/MockObject/Exception/RuntimeException.php',
-'phpunit\\framework\\mockobject\\stub' => '/Framework/MockObject/Stub.php',
-'phpunit\\framework\\mockobject\\stub\\consecutivecalls' => '/Framework/MockObject/Stub/ConsecutiveCalls.php',
-'phpunit\\framework\\mockobject\\stub\\exception' => '/Framework/MockObject/Stub/Exception.php',
-'phpunit\\framework\\mockobject\\stub\\returnargument' => '/Framework/MockObject/Stub/ReturnArgument.php',
-'phpunit\\framework\\mockobject\\stub\\returncallback' => '/Framework/MockObject/Stub/ReturnCallback.php',
-'phpunit\\framework\\mockobject\\stub\\returnreference' => '/Framework/MockObject/Stub/ReturnReference.php',
-'phpunit\\framework\\mockobject\\stub\\returnself' => '/Framework/MockObject/Stub/ReturnSelf.php',
-'phpunit\\framework\\mockobject\\stub\\returnstub' => '/Framework/MockObject/Stub/ReturnStub.php',
-'phpunit\\framework\\mockobject\\stub\\returnvaluemap' => '/Framework/MockObject/Stub/ReturnValueMap.php',
-'phpunit\\framework\\mockobject\\stub\\stub' => '/Framework/MockObject/Stub/Stub.php',
-'phpunit\\framework\\mockobject\\unmockedclonemethod' => '/Framework/MockObject/Api/UnmockedCloneMethod.php',
-'phpunit\\framework\\mockobject\\verifiable' => '/Framework/MockObject/Verifiable.php',
-'phpunit\\framework\\nochildtestsuiteexception' => '/Framework/Exception/NoChildTestSuiteException.php',
-'phpunit\\framework\\outputerror' => '/Framework/Exception/OutputError.php',
-'phpunit\\framework\\phptassertionfailederror' => '/Framework/Exception/PHPTAssertionFailedError.php',
-'phpunit\\framework\\riskytesterror' => '/Framework/Exception/RiskyTestError.php',
-'phpunit\\framework\\selfdescribing' => '/Framework/SelfDescribing.php',
-'phpunit\\framework\\skippedtest' => '/Framework/SkippedTest.php',
-'phpunit\\framework\\skippedtestcase' => '/Framework/SkippedTestCase.php',
-'phpunit\\framework\\skippedtesterror' => '/Framework/Exception/SkippedTestError.php',
-'phpunit\\framework\\skippedtestsuiteerror' => '/Framework/Exception/SkippedTestSuiteError.php',
-'phpunit\\framework\\syntheticerror' => '/Framework/Exception/SyntheticError.php',
-'phpunit\\framework\\syntheticskippederror' => '/Framework/Exception/SyntheticSkippedError.php',
-'phpunit\\framework\\test' => '/Framework/Test.php',
-'phpunit\\framework\\testbuilder' => '/Framework/TestBuilder.php',
-'phpunit\\framework\\testcase' => '/Framework/TestCase.php',
-'phpunit\\framework\\testfailure' => '/Framework/TestFailure.php',
-'phpunit\\framework\\testlistener' => '/Framework/TestListener.php',
-'phpunit\\framework\\testlistenerdefaultimplementation' => '/Framework/TestListenerDefaultImplementation.php',
-'phpunit\\framework\\testresult' => '/Framework/TestResult.php',
-'phpunit\\framework\\testsuite' => '/Framework/TestSuite.php',
-'phpunit\\framework\\testsuiteiterator' => '/Framework/TestSuiteIterator.php',
-'phpunit\\framework\\unintentionallycoveredcodeerror' => '/Framework/Exception/UnintentionallyCoveredCodeError.php',
-'phpunit\\framework\\warning' => '/Framework/Exception/Warning.php',
-'phpunit\\framework\\warningTestCase' => '/Framework/WarningTestCase.php',
-'phpunit\\runner\\afterincompletetesthook' => '/Runner/Hook/AfterIncompleteTestHook.php',
-'phpunit\\runner\\afterlasttesthook' => '/Runner/Hook/AfterLastTestHook.php',
-'phpunit\\runner\\afterriskytesthook' => '/Runner/Hook/AfterRiskyTestHook.php',
-'phpunit\\runner\\afterskippedtesthook' => '/Runner/Hook/AfterSkippedTestHook.php',
-'phpunit\\runner\\aftersuccessfultesthook' => '/Runner/Hook/AfterSuccessfulTestHook.php',
-'phpunit\\runner\\aftertesterrorhook' => '/Runner/Hook/AfterTestErrorHook.php',
-'phpunit\\runner\\aftertestfailurehook' => '/Runner/Hook/AfterTestFailureHook.php',
-'phpunit\\runner\\aftertesthook' => '/Runner/Hook/AfterTestHook.php',
-'phpunit\\runner\\aftertestwarninghook' => '/Runner/Hook/AfterTestWarningHook.php',
-'phpunit\\runner\\basetestrunner' => '/Runner/BaseTestRunner.php',
-'phpunit\\runner\\beforefirsttesthHook' => '/Runner/Hook/BeforeFirstTestHook.php',
-'phpunit\\runner\\beforetesthook' => '/Runner/Hook/BeforeTestHook.php',
-'phpunit\\runner\\defaulttestresultcache' => '/Runner/DefaultTestResultCache.php',
-'phpunit\\runner\\exception' => '/Runner/Exception.php',
-'phpunit\\runner\\filter\\excludegroupfilteriterator' => '/Runner/Filter/ExcludeGroupFilterIterator.php',
-'phpunit\\runner\\filter\\factory' => '/Runner/Filter/Factory.php',
-'phpunit\\runner\\filter\\groupfilteriterator' => '/Runner/Filter/GroupFilterIterator.php',
-'phpunit\\runner\\filter\\includegroupfilteriterator' => '/Runner/Filter/IncludeGroupFilterIterator.php',
-'phpunit\\runner\\filter\\namefilteriterator' => '/Runner/Filter/NameFilterIterator.php',
-'phpunit\\runner\\hook' => '/Runner/Hook/Hook.php',
-'phpunit\\runner\\nulltestresultcache' => '/Runner/NullTestResultCache.php',
-'phpunit\\runner\\phpttestcase' => '/Runner/PhptTestCase.php',
-'phpunit\\runner\\resultcacheextension' => '/Runner/ResultCacheExtension.php',
-'phpunit\\runner\\standardtestsuiteloader' => '/Runner/StandardTestSuiteLoader.php',
-'phpunit\\runner\\testhook' => '/Runner/Hook/TestHook.php',
-'phpunit\\runner\\testlisteneradapter' => '/Runner/Hook/TestListenerAdapter.php',
-'phpunit\\runner\\testresultcache' => '/Runner/TestResultCache.php',
-'phpunit\\runner\\testsuiteloader' => '/Runner/TestSuiteLoader.php',
-'phpunit\\runner\\testsuitesorter' => '/Runner/TestSuiteSorter.php',
-'phpunit\\runner\\version' => '/Runner/Version.php',
-'phpunit\\textui\\command' => '/TextUI/Command.php',
-'phpunit\\textui\\exception' => '/TextUI/Exception.php',
-'phpunit\\textui\\help' => '/TextUI/Help.php',
-'phpunit\\textui\\resultprinter' => '/TextUI/ResultPrinter.php',
-'phpunit\\textui\\testrunner' => '/TextUI/TestRunner.php',
-'phpunit\\util\\annotation\\docblock' => '/Util/Annotation/DocBlock.php',
-'phpunit\\util\\annotation\\registry' => '/Util/Annotation/Registry.php',
-'phpunit\\util\\blacklist' => '/Util/Blacklist.php',
-'phpunit\\util\\color' => '/Util/Color.php',
-'phpunit\\util\\configuration' => '/Util/Configuration.php',
-'phpunit\\util\\configurationgenerator' => '/Util/ConfigurationGenerator.php',
-'phpunit\\util\\errorhandler' => '/Util/ErrorHandler.php',
-'phpunit\\util\\exception' => '/Util/Exception.php',
-'phpunit\\util\\fileloader' => '/Util/FileLoader.php',
-'phpunit\\util\\filesystem' => '/Util/Filesystem.php',
-'phpunit\\util\\filter' => '/Util/Filter.php',
-'phpunit\\util\\getopt' => '/Util/Getopt.php',
-'phpunit\\util\\globalstate' => '/Util/GlobalState.php',
-'phpunit\\util\\invaliddatasetexception' => '/Util/InvalidDataSetException.php',
-'phpunit\\util\\json' => '/Util/Json.php',
-'phpunit\\util\\log\\junit' => '/Util/Log/JUnit.php',
-'phpunit\\util\\log\\teamcity' => '/Util/Log/TeamCity.php',
-'phpunit\\util\\php\\abstractphpprocess' => '/Util/PHP/AbstractPhpProcess.php',
-'phpunit\\util\\php\\defaultphpprocess' => '/Util/PHP/DefaultPhpProcess.php',
-'phpunit\\util\\php\\windowsphpprocess' => '/Util/PHP/WindowsPhpProcess.php',
-'phpunit\\util\\printer' => '/Util/Printer.php',
-'phpunit\\util\\regularexpression' => '/Util/RegularExpression.php',
-'phpunit\\util\\test' => '/Util/Test.php',
-'phpunit\\util\\testdox\\clitestdoxprinter' => '/Util/TestDox/CliTestDoxPrinter.php',
-'phpunit\\util\\testdox\\htmlresultprinter' => '/Util/TestDox/HtmlResultPrinter.php',
-'phpunit\\util\\testdox\\nameprettifier' => '/Util/TestDox/NamePrettifier.php',
-'phpunit\\util\\testdox\\resultprinter' => '/Util/TestDox/ResultPrinter.php',
-'phpunit\\util\\testdox\\testdoxprinter' => '/Util/TestDox/TestDoxPrinter.php',
-'phpunit\\util\\testdox\\textresultprinter' => '/Util/TestDox/TextResultPrinter.php',
-'phpunit\\util\\testdox\\xmlresultprinter' => '/Util/TestDox/XmlResultPrinter.php',
-'phpunit\\util\\texttestlistrenderer' => '/Util/TextTestListRenderer.php',
-'phpunit\\util\\type' => '/Util/Type.php',
-'phpunit\\util\\xdebugfilterscriptgenerator' => '/Util/XdebugFilterScriptGenerator.php',
-'phpunit\\util\\xml' => '/Util/Xml.php',
-'phpunit\\util\\xmltestlistrenderer' => '/Util/XmlTestListRenderer.php',
-],
-  "${include_dir}/PHPUnit"
-);
-
-// Dependencies
-\Fedora\Autoloader\Dependencies::required([
-  "${include_dir}/File/Iterator/autoload.php",
-  "${include_dir}/PHP/CodeCoverage/autoload.php",
-  "${include_dir}/PHP/Timer/autoload.php",
-  "${include_dir}/SebastianBergmann/Version/autoload.php",
-  "${include_dir}/SebastianBergmann/Diff/autoload.php",
-  "${include_dir}/SebastianBergmann/Environment/autoload.php",
-  "${include_dir}/SebastianBergmann/Exporter/autoload.php",
-  "${include_dir}/SebastianBergmann/GlobalState/autoload.php",
-  "${include_dir}/SebastianBergmann/Comparator/autoload.php",
-  "${include_dir}/SebastianBergmann/ObjectEnumerator/autoload.php",
-  "${include_dir}/SebastianBergmann/ResourceOperations/autoload.php",
-  "${include_dir}/SebastianBergmann/Type/autoload.php",
-  "${include_dir}/SebastianBergmann/Version/autoload.php",
-  "${include_dir}/Symfony/Component/Yaml/autoload.php",
-  "${include_dir}/Text/Template/autoload.php",
-  "${include_dir}/myclabs/DeepCopy/autoload.php",
-  "${include_dir}/phpspec/Prophecy/autoload.php",
-  "${include_dir}/Doctrine/Instantiator/autoload.php",
-  "${include_dir}/PharIo/Manifest/autoload.php",
-  "${include_dir}/PharIo/Version/autoload.php",
-]);
-
diff --git a/dev-php/phpunit/phpunit-8.5.11.ebuild b/dev-php/phpunit/phpunit-8.5.11.ebuild
new file mode 100644
index 000000000000..27257dd7656d
--- /dev/null
+++ b/dev-php/phpunit/phpunit-8.5.11.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A PHP Unit Testing framework"
+HOMEPAGE="https://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="dev-php/fedora-autoloader
+	>=dev-php/File_Iterator-2.0.2
+	>=dev-php/Text_Template-1.2.1
+	>=dev-php/PHP_CodeCoverage-7.0.12
+	>=dev-php/PHP_Timer-2.1.2
+	>=dev-php/doctrine-instantiator-1.3.1
+	>=dev-php/myclabs-deepcopy-1.10.0
+	>=dev-php/phar-io-manifest-1.0.3
+	>=dev-php/phar-io-version-2.0.1
+	>=dev-php/phpspec-prophecy-1.10.3
+	>=dev-php/sebastian-comparator-3.0.2
+	>=dev-php/sebastian-diff-3.0.2
+	>=dev-php/sebastian-environment-4.2.3
+	>=dev-php/sebastian-exporter-3.1.2
+	>=dev-php/sebastian-global-state-3.0.0
+	>=dev-php/sebastian-object-enumerator-3.0.3
+	>=dev-php/sebastian-resource-operations-2.0.1
+	>=dev-php/sebastian-type-1.1.3
+	>=dev-php/sebastian-version-2.0.1
+	|| (
+		dev-lang/php:7.4[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)]
+		dev-lang/php:7.3[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)]
+		dev-lang/php:7.2[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)]
+	)"
+
+src_prepare() {
+	default
+
+	mkdir src/vendor || die
+
+	phpab \
+		--output   src/vendor/autoload.php \
+		--template fedora2 \
+		--basedir  src/vendor \
+		src || die
+
+	cat >> src/vendor/autoload.php <<EOF || die "failed to extend autoload.php"
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required([
+	__DIR__ . '/../../File/Iterator/autoload.php',
+	__DIR__ . '/../../Text/Template/autoload.php',
+	__DIR__ . '/../../PHP/CodeCoverage/autoload.php',
+	__DIR__ . '/../../PHP/Timer/autoload.php',
+	__DIR__ . '/../../phpspec/Prophecy/autoload.php',
+	__DIR__ . '/../../SebastianBergmann/Diff/autoload.php', // Before comparator which may load v2
+	__DIR__ . '/../../SebastianBergmann/Comparator/autoload.php',
+	__DIR__ . '/../../SebastianBergmann/Environment/autoload.php',
+	__DIR__ . '/../../SebastianBergmann/Exporter/autoload.php',
+	__DIR__ . '/../../SebastianBergmann/GlobalState/autoload.php',
+	__DIR__ . '/../../SebastianBergmann/ObjectEnumerator/autoload.php',
+	__DIR__ . '/../../SebastianBergmann/ResourceOperations/autoload.php',
+	__DIR__ . '/../../SebastianBergmann/Type/autoload.php',
+	__DIR__ . '/../../SebastianBergmann/Version/autoload.php',
+	__DIR__ . '/../../Doctrine/Instantiator/autoload.php',
+	__DIR__ . '/../../myclabs/DeepCopy/autoload.php',
+	__DIR__ . '/../../PharIo/Manifest/autoload.php',
+	__DIR__ . '/../../PharIo/Version/autoload.php',
+]);
+EOF
+}
+
+src_install() {
+	insinto /usr/share/php/PHPUnit
+	doins -r src/*
+
+	# referenced by PHPUnit/Util/Configuration.php
+	insinto /usr/share/php/
+	doins phpunit.xsd
+
+	exeinto /usr/share/php/PHPUnit
+	doexe phpunit
+	dosym ../share/php/PHPUnit/phpunit /usr/bin/phpunit
+}
+
+pkg_postinst() {
+	elog "${PN} can optionally use json, pdo-sqlite and pdo-mysql features."
+	elog "If you want those, emerge dev-lang/php with USE=\"json pdo sqlite mysql\"."
+}
diff --git a/dev-php/phpunit/phpunit-8.5.5.ebuild b/dev-php/phpunit/phpunit-8.5.5.ebuild
deleted file mode 100644
index 3632144aa1dd..000000000000
--- a/dev-php/phpunit/phpunit-8.5.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A PHP Unit Testing framework"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-php/fedora-autoloader
-	>=dev-php/File_Iterator-2.0.2
-	<dev-php/File_Iterator-3.0
-	>=dev-php/Text_Template-1.2.1
-	<dev-php/Text_Template-2.0
-	>=dev-php/PHP_CodeCoverage-7.0.7
-	<dev-php/PHP_CodeCoverage-8.0
-	>=dev-php/PHP_Timer-2.1.2
-	<dev-php/PHP_Timer-3.0
-	>=dev-php/doctrine-instantiator-1.2
-	<dev-php/doctrine-instantiator-2.0
-	>=dev-php/myclabs-deepcopy-1.9.1
-	<dev-php/myclabs-deepcopy-2.0
-	>=dev-php/phar-io-manifest-1.0.3
-	<dev-php/phar-io-manifest-2.0
-	>=dev-php/phar-io-version-2.0.1
-	<dev-php/phar-io-version-3.0
-	>=dev-php/phpspec-prophecy-1.8.1
-	<dev-php/phpspec-prophecy-2.0
-	>=dev-php/sebastian-comparator-3.0.2
-	<dev-php/sebastian-comparator-4.0
-	>=dev-php/sebastian-diff-3.0.2
-	<dev-php/sebastian-diff-4.0
-	>=dev-php/sebastian-environment-4.2.2
-	<dev-php/sebastian-environment-5.0
-	>=dev-php/sebastian-exporter-3.1.1
-	<dev-php/sebastian-exporter-4.0
-	>=dev-php/sebastian-global-state-3.0
-	<dev-php/sebastian-global-state-4.0
-	>=dev-php/sebastian-object-enumerator-3.0.3
-	<dev-php/sebastian-object-enumerator-4.0
-	>=dev-php/sebastian-resource-operations-2.0.1
-	<dev-php/sebastian-resource-operations-3.0
-	<dev-php/sebastian-type-2.0
-	<dev-php/sebastian-version-3.0
-	>=dev-lang/php-7.2:*[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)]
-	!dev-php/phpunit-mock-objects
-"
-
-src_install() {
-	insinto /usr/share/php/PHPUnit
-	doins -r src/*
-	insinto /usr/share/php/PHPUnit/vendor
-	newins "${FILESDIR}/autoload-8.5.0.php" autoload.php
-	exeinto /usr/share/php/PHPUnit
-	doexe phpunit
-	dosym ../share/php/PHPUnit/phpunit /usr/bin/phpunit
-	insinto /usr/share/php
-	doins phpunit.xsd
-}
-
-pkg_postinst() {
-	elog "${PN} can optionally use json, pdo-sqlite and pdo-mysql features."
-	elog "If you want those, emerge dev-lang/php with USE=\"json pdo sqlite mysql\"."
-}
diff --git a/dev-php/swoole/Manifest b/dev-php/swoole/Manifest
index b14d9f42b58b..2104a118a1bd 100644
--- a/dev-php/swoole/Manifest
+++ b/dev-php/swoole/Manifest
@@ -4,10 +4,12 @@ DIST swoole-4.4.14.tgz 1440095 BLAKE2B 8a893604a84f750b95bb63a3c6ce9869a80a700b5
 DIST swoole-4.4.15.tgz 1454897 BLAKE2B 38f804e5f2f41ba2bc32ac2e6fd7be3e03f7a361487d7dad41bdc2ee3f2489d41824f60a841de1e3dea0cbf105d11dc1b5c2225ae49a02155604bc09c990ed61 SHA512 5ad797b38a20cfa17b0aa1fc5ab4f6446b84debb38babc05630e07833895401c778f1c6cf9eb32d7204b02c0e170ba6e613f356a054baa29ac511c19ce59620f
 DIST swoole-4.4.16.tgz 1457270 BLAKE2B 4b65270aa1014ea68cadae8eb021d37498dc3fe0bf2d681c95bf7113928138bc26ab73f3be91185eb5ecebcb4940906814913c7908c87592aafd33fbc1820bf7 SHA512 7be4705967ed6b7a955f679f8c39585d34dc8c87ba608ac3ae2b0fc3cae9513d9639c8e9aac4278ce85acc215b500044626aab9b2aac725c9ffaef72dfb02dd7
 DIST swoole-4.4.19.tgz 1469420 BLAKE2B 0240b5fbd6a4625d426d0c960859b8215122fff10be9e70823eb32f196d3ec075a952dc133258b04c323439de982079f5acbab9039958c457aa18f1687118ce3 SHA512 be4671da9fdbf65daf6364e5eaca9b25fd3557bec848a04b636ace48c896d4dbf08f6e877d6166571aa966732a70037bf2d4ba2f302696dd2b1371e2de993106
+DIST swoole-4.5.9.tgz 1552445 BLAKE2B 602ce65f7b59a3c199d7718aeb941d1ebde7d59096335992c2278f7e330f7b48554a8418cc4014f6fcf47af92d315368a16c572055b1fd9575608c2559ed3107 SHA512 9154a2874480218aa3c8935979267efb92a3d5a4f1ba7dc071bf4c2b169d69e31a6ad7412785d00543dc5827ce2d6c5999b6cabea2089818f3f57acc26bcb31f
 EBUILD swoole-4.2.13.ebuild 1789 BLAKE2B 043b1bf3d91ef7f60c7a659c7c9ba0795bd3d8cbfdb8abab88e5ea78234368ce2c793684f18b537831c34ca02148c58e27b253794398470bb9ba8de4a8a4889c SHA512 ccba3090b0f05821e5c8784672c787545774e138b5ad94098be81d535158f551648c81dc790846106caa690417a3d7480c2f709e740dd3e5c8b2760f235e822a
 EBUILD swoole-4.4.12.ebuild 1872 BLAKE2B fd616184c677b17df98f51216296eb7d0bf3e1262ead010c18da737638a8bc5a4709117770148a5fb361cff41e26df075ca1573d92e3d58f4c2dce37a3c50471 SHA512 35c05d7c7719498e1056af08ab9ab0d76ebdb38632836447294709feb0201a3c4adac45f7b4ce94e653afaa90afa1f9df9c56a1c0dcac1e85d16348a0dbce54e
 EBUILD swoole-4.4.14.ebuild 1872 BLAKE2B 35afca5e687dcf37f1fb24d478d174d6c77d440ec0afdcbb02cd49bedf377378544fe6cc0db714dc217339a21514c51e5ff49ef95e338fd42c0a7e75aeb17e3a SHA512 7bfd6458d0ac351eb266004c754d6219c796d906fa25c430bcc565b4e0da799f86380440929804c93c5149308afb92e32cd9e1dcae482d7cf0352f096cf586df
 EBUILD swoole-4.4.15.ebuild 1872 BLAKE2B 35afca5e687dcf37f1fb24d478d174d6c77d440ec0afdcbb02cd49bedf377378544fe6cc0db714dc217339a21514c51e5ff49ef95e338fd42c0a7e75aeb17e3a SHA512 7bfd6458d0ac351eb266004c754d6219c796d906fa25c430bcc565b4e0da799f86380440929804c93c5149308afb92e32cd9e1dcae482d7cf0352f096cf586df
 EBUILD swoole-4.4.16.ebuild 1872 BLAKE2B 35afca5e687dcf37f1fb24d478d174d6c77d440ec0afdcbb02cd49bedf377378544fe6cc0db714dc217339a21514c51e5ff49ef95e338fd42c0a7e75aeb17e3a SHA512 7bfd6458d0ac351eb266004c754d6219c796d906fa25c430bcc565b4e0da799f86380440929804c93c5149308afb92e32cd9e1dcae482d7cf0352f096cf586df
 EBUILD swoole-4.4.19.ebuild 1872 BLAKE2B 35afca5e687dcf37f1fb24d478d174d6c77d440ec0afdcbb02cd49bedf377378544fe6cc0db714dc217339a21514c51e5ff49ef95e338fd42c0a7e75aeb17e3a SHA512 7bfd6458d0ac351eb266004c754d6219c796d906fa25c430bcc565b4e0da799f86380440929804c93c5149308afb92e32cd9e1dcae482d7cf0352f096cf586df
+EBUILD swoole-4.5.9.ebuild 1614 BLAKE2B bb3a07087679e4151055eec5085b471a59f583ffef43f34f55838f3a7a9c1fc73f679c32e6638d9eec8cd05dbf774b46e11a2900639fda494f0536916de39488 SHA512 b9a79e6fcf35b008ec88600185d3e0c1849487a8ff81c50ed71f51adcdeea72579a7d2184cf3358e773aed78a4cb242890a3265639a20ace648976eb7ba7eab3
 MISC metadata.xml 344 BLAKE2B b6bba613a547a33d17c214859118a6f8c499b65763a8373dde96b955efc9609ddb2f2de6cf678a5f0f1552ac1b054661d2771b68cc007327950721b9e36417aa SHA512 8fe672a189916bf935ff0bc312b617658d3fd789bceb0305dbe9745600690cc2b9d93d2bf60b1bd517c1824c5cef2ea8ebe4eab69716ecba5763742b15cf61c0
diff --git a/dev-php/swoole/swoole-4.5.9.ebuild b/dev-php/swoole/swoole-4.5.9.ebuild
new file mode 100644
index 000000000000..721b5a84f00b
--- /dev/null
+++ b/dev-php/swoole/swoole-4.5.9.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="swoole"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_SAPIS="cli"
+PHP_EXT_NEEDED_USE="cli,sockets?"
+DOCS=( README.md )
+
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+HOMEPAGE="https://www.swoole.co.uk"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Event-driven asynchronous & concurrent & coroutine networking engine"
+LICENSE="Apache-2.0"
+SLOT="0"
+# Tests can hang.  Disable until this no longer happens
+RESTRICT="test"
+
+DEPEND="
+	app-arch/brotli:0=
+	dev-libs/libpcre
+	sys-libs/zlib:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	mysql? (
+		php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] )
+		php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] )
+		php_targets_php7-4? ( dev-lang/php:7.4[mysql,mysqli(+)] )
+		php_targets_php8-0? ( dev-lang/php:8.0[mysql,mysqli(+)] )
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+IUSE="debug http2 libressl mysql sockets ssl"
+
+src_configure() {
+	# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-swoole
+		$(use_enable debug)
+		$(use_enable http2)
+		$(use_enable mysql mysqlnd)
+		$(use_enable ssl openssl)
+		$(use_with ssl openssl-dir "${EROOT}/usr")
+		$(use_enable sockets)
+	)
+
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		[[ -f tests/template.phpt ]] && rm tests/template.phpt
+		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
+	done
+}
diff --git a/dev-php/theseer-Autoload/Manifest b/dev-php/theseer-Autoload/Manifest
new file mode 100644
index 000000000000..9d163c44bdde
--- /dev/null
+++ b/dev-php/theseer-Autoload/Manifest
@@ -0,0 +1,7 @@
+AUX autoload.php.tpl 633 BLAKE2B 5e697e4dc3e1e51cd5ec95b44938f96c43d834f41dfb4edfca8d1375891f31fc1afaf048470d7ecbc561e11d29f3ee49d75e2bc00b5a58747cb88557b9eab51d SHA512 310c8b3b8b6b71627bb193b3f7b9b4463b0e41864bb66bba92256e203aa65ce2731296efb649e620a59fa06d6502b5e4a9418384550f9db6bd1f8f7fb87d3419
+AUX fedora.php.tpl 256 BLAKE2B 0a6ffe677079d10668cc7caa0ec6bc22951ae9b78f2a6ce037e8fd9d1fbc0ff947079826e55f312ae2d02546f56933d2ad8cca6fc77c1f4cb4a2eac4d5232bcb SHA512 bf5f6c953efe84847456c3d64709eb813c6876fd496780e4cd4abc543dc1d6713ae9e52f0227b8d5108016cdfee811758267e1149744314a67deb51b17c2a9c6
+AUX fedora2.php.tpl 241 BLAKE2B c7e7dce85f2b7c2f33f9760e7f4c0440fff18ad9679045a7c47be871d6bb3b32d031aded4a410bfd0b2de8affb2cec6b38630864d1b0517c3cf1aad7bf42b924 SHA512 e5c369fd822fbe1ed895f6d97ceff84593f7e74b6e1a3d9bf918dee2063643b6fd991a90bc33fe970b29529760b42a1a6dcac360246bfe67bd8f9248b6b77077
+AUX theseer-Autoload-1.26.0-autoload.php.patch 273 BLAKE2B 02ef287623dded15446172c54344be51bca15723f9de69aee7c75b4b2b6c1c4fef3d1d3df84bcf2da892c9708e5c5916933648e4cf4421ff62580af594ce9007 SHA512 8f8e6d278b2596dee872c14bc794a21d012f29a2e2cf0b56669796e97ceabbb0efade766492b247817f7c6f77b85a12d1d583717914016501b4007659f813abe
+DIST theseer-Autoload-1.26.0.tar.gz 43119 BLAKE2B 7b2413bc2fb281472cee03010c175aae1c8304ab0629c31f09e11497bd6f46d58bae8625da610f5a513b19fc8aafc45c35be7271ba13188466f576e7b4a7392f SHA512 c8fcb3ad39c140517d695c44e6dea3797ea0135ff64246478e55cbf167e4b9fbb3e5027732c201f66b404039a313952c7125f13fdeb1cd96633dbccfdda6f143
+EBUILD theseer-Autoload-1.26.0.ebuild 1875 BLAKE2B 8269ad55d6c5f8efb6ce137aaa8aa62603f6e0fb379bf83646cfa20e67b3f64fbc72a5f8acc4227fd7f6a4070d1e6772c75bfff3a8bd01b671fc1605cd90c026 SHA512 aaa5d2c598df28bcf0b3c1a803a0441965740f451ae2ee2973b2a4d92a3b6959b6e6181fa0a57cf965b33ee75d0b31d8be155499d275041db6891822ac8296c2
+MISC metadata.xml 320 BLAKE2B 98998896c3cef1d685d3b50e33b367fb6b280595a26c51b48eca55704b0c6076d50b4898d09ea1b8662119123e3a256f6079666dc4ac13b62391eecc8d0cc977 SHA512 736f703a29bb821a70dd6651dd06acdfa4b27080f65e83cd3c76d5ef257513e44e37570f1a3f4054ce669dfd6f19d9570b5aff9e4f13fd5b40b84c5b24a649d0
diff --git a/dev-php/theseer-Autoload/files/autoload.php.tpl b/dev-php/theseer-Autoload/files/autoload.php.tpl
new file mode 100644
index 000000000000..cb88eb77c450
--- /dev/null
+++ b/dev-php/theseer-Autoload/files/autoload.php.tpl
@@ -0,0 +1,26 @@
+<?php
+
+require_once 'TheSeer/DirectoryScanner/autoload.php';
+require_once 'ezc/Base/autoload.php';
+require_once 'ezc/ConsoleTools/autoload.php';
+
+// @codingStandardsIgnoreFile
+// @codeCoverageIgnoreStart
+// this is an autogenerated file - do not edit
+spl_autoload_register(
+    function($class) {
+        static $classes = null;
+        if ($classes === null) {
+            $classes = array(
+                ___CLASSLIST___
+            );
+        }
+        $cn = strtolower($class);
+        if (isset($classes[$cn])) {
+            require ___BASEDIR___$classes[$cn];
+        }
+    },
+    true,
+    false
+);
+// @codeCoverageIgnoreEnd
diff --git a/dev-php/theseer-Autoload/files/fedora.php.tpl b/dev-php/theseer-Autoload/files/fedora.php.tpl
new file mode 100644
index 000000000000..d05f27231892
--- /dev/null
+++ b/dev-php/theseer-Autoload/files/fedora.php.tpl
@@ -0,0 +1,12 @@
+<?php
+// @codingStandardsIgnoreFile
+// @codeCoverageIgnoreStart
+require_once '/usr/share/php/Fedora/Autoloader'.'/autoload.php';
+
+\Fedora\Autoloader\Autoload::addClassMap(
+    array(
+        ___CLASSLIST___,
+    ),
+    __DIR__
+);
+// @codeCoverageIgnoreEnd
diff --git a/dev-php/theseer-Autoload/files/fedora2.php.tpl b/dev-php/theseer-Autoload/files/fedora2.php.tpl
new file mode 100644
index 000000000000..b337b9646b34
--- /dev/null
+++ b/dev-php/theseer-Autoload/files/fedora2.php.tpl
@@ -0,0 +1,12 @@
+<?php
+// @codingStandardsIgnoreFile
+// @codeCoverageIgnoreStart
+require_once 'Fedora/Autoloader'.'/autoload.php';
+
+\Fedora\Autoloader\Autoload::addClassMap(
+    array(
+        ___CLASSLIST___,
+    ),
+    __DIR__
+);
+// @codeCoverageIgnoreEnd
diff --git a/dev-php/theseer-Autoload/files/theseer-Autoload-1.26.0-autoload.php.patch b/dev-php/theseer-Autoload/files/theseer-Autoload-1.26.0-autoload.php.patch
new file mode 100644
index 000000000000..d85409d47126
--- /dev/null
+++ b/dev-php/theseer-Autoload/files/theseer-Autoload-1.26.0-autoload.php.patch
@@ -0,0 +1,12 @@
+--- a/composer/bin/phpab
++++ b/composer/bin/phpab
+@@ -56,7 +56,7 @@ foreach ($files as $file) {
+     }
+ }
+ 
+-require __DIR__ . '/../../src/autoload.php';
++require 'TheSeer/Autoload/autoload.php';
+ 
+ $factory = new \TheSeer\Autoload\Factory();
+ $factory->getCLI()->run();
+ 
diff --git a/dev-php/theseer-Autoload/metadata.xml b/dev-php/theseer-Autoload/metadata.xml
new file mode 100644
index 000000000000..bb9f50f08f6f
--- /dev/null
+++ b/dev-php/theseer-Autoload/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">theseer/Autoload</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-php/theseer-Autoload/theseer-Autoload-1.26.0.ebuild b/dev-php/theseer-Autoload/theseer-Autoload-1.26.0.ebuild
new file mode 100644
index 000000000000..01afc209be05
--- /dev/null
+++ b/dev-php/theseer-Autoload/theseer-Autoload-1.26.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="Autoload"
+
+DESCRIPTION="PHP Autoload Builder"
+HOMEPAGE="https://github.com/theseer/Autoload"
+SRC_URI="https://github.com/theseer/${MY_PN}/archive/1.26.0.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-lang/php:*
+	>=dev-php/theseer-DirectoryScanner-1.3
+	<dev-php/theseer-DirectoryScanner-2
+	>=dev-php/zetacomponents-Base-1.8
+	<dev-php/zetacomponents-Base-2
+	>=dev-php/zetacomponents-ConsoleTools-1.7.1
+	<dev-php/zetacomponents-ConsoleTools-2"
+
+BDEPEND="${CDEPEND}
+	test? (
+		>=dev-php/phpunit-8
+		<dev-php/phpunit-9
+	)"
+
+RDEPEND="${CDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.26.0-autoload.php.patch )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	# Set version
+	sed -i \
+		-e "s/%development%/${PV}/" \
+		phpab.php \
+		composer/bin/phpab \
+		|| die
+
+	cp --target-directory src/templates/ci \
+		"${FILESDIR}"/fedora.php.tpl \
+		"${FILESDIR}"/fedora2.php.tpl \
+		|| die
+
+	# Mimick layout to bootstrap phpab
+	mkdir --parents \
+		vendor/theseer/directoryscanner \
+		vendor/zetacomponents/base \
+		vendor/zetacomponents/console-tools \
+		|| die
+
+	ln -s /usr/share/php/TheSeer/DirectoryScanner	vendor/theseer/directoryscanner/src || die
+	ln -s /usr/share/php/ezc/Base			vendor/zetacomponents/base/src || die
+	ln -s /usr/share/php/ezc/ConsoleTools		vendor/zetacomponents/console-tools/src  || die
+
+	./phpab.php \
+		--output src/autoload.php \
+		--template "${FILESDIR}"/autoload.php.tpl \
+		--basedir src \
+		src || die
+}
+
+src_test() {
+	phpunit --no-coverage --verbose || die "Unit testing failed!"
+}
+
+src_install() {
+	insinto /usr/share/php/TheSeer/${MY_PN}
+	doins -r src/*
+
+	dobin "${S}"/composer/bin/phpab
+
+	einstalldocs
+}
diff --git a/dev-php/theseer-DirectoryScanner/Manifest b/dev-php/theseer-DirectoryScanner/Manifest
new file mode 100644
index 000000000000..9626c871d9e4
--- /dev/null
+++ b/dev-php/theseer-DirectoryScanner/Manifest
@@ -0,0 +1,3 @@
+DIST theseer-DirectoryScanner-1.3.2.tar.gz 9262 BLAKE2B 5b16781d9ccd030ea779b286b9d22c528468db52e39c6761e91e0f9f83d4a50e1775382eca4eea0f027cc508f7dd35e416664451f83bdfae8607cf074e5ed9cb SHA512 720db8baa40983918e5c0d7cfac194e26d877becf6e55868ca21c1ab0a4366b86a8aad2c700e38a6360e280d372db0f1be6c80dbb81d279c277bf9f56a6cbadf
+EBUILD theseer-DirectoryScanner-1.3.2.ebuild 575 BLAKE2B 6c233dcda193944db141003e063764782fde04ffd2d2481521f451f2d669f7d58107a840d9c9624e52d47e8cb80a9cb46e05a56d10a7dbc0895451aff74a5c92 SHA512 88ea31f44ea0862d16152e15dccdb738f3ac108db0b914e21121577c2132c44edd19956b0b1caeced62f484e3cae8b42d8cffa7ef92c1867b805bed8d8a7890b
+MISC metadata.xml 328 BLAKE2B 52cb56d1dbe749e10f4d9ebf124b10b7482e783321d81dd4138c2819e06bcce21e2dec6a813e640125ef9d95eac89260e3c51b8966de5c4a1c9201713a237617 SHA512 db1eab2608e388e6bcb80c05937bccf7744d1bc2b348e172613f99d418ff588dcf68728386e72742f9d735965bc6cab674de1a02dd571394124b4b270e61e290
diff --git a/dev-php/theseer-DirectoryScanner/metadata.xml b/dev-php/theseer-DirectoryScanner/metadata.xml
new file mode 100644
index 000000000000..2146686530f9
--- /dev/null
+++ b/dev-php/theseer-DirectoryScanner/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">theseer/DirectoryScanner</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.2.ebuild b/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.2.ebuild
new file mode 100644
index 000000000000..beb2fd3ab07f
--- /dev/null
+++ b/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="DirectoryScanner"
+
+DESCRIPTION="A recursive directory scanner and filter"
+HOMEPAGE="https://github.com/theseer/DirectoryScanner"
+SRC_URI="https://github.com/theseer/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="dev-lang/php:*"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	insinto /usr/share/php/TheSeer/${MY_PN}
+	doins -r src/*
+
+	einstalldocs
+}
diff --git a/dev-php/theseer-tokenizer/Manifest b/dev-php/theseer-tokenizer/Manifest
index ba343f82d7c6..3575d7a4be32 100644
--- a/dev-php/theseer-tokenizer/Manifest
+++ b/dev-php/theseer-tokenizer/Manifest
@@ -1,6 +1,8 @@
 AUX autoload.php 740 BLAKE2B 1776060d0cbd86a165e293cf24ba31c7c6eef748f7d34681d110f1f99f62909f6619f4917743a995c2c9f2edc5de99b5762d3997d09f14c66a6bfe3569f5e17a SHA512 23ec36f9afc24a4df46a866376db86727127351a1c6d9c16f864804ff31fe64c0c0c8a8306fb1a91fce0dd165cbf5fb02cbe545b4f00dc96bcff2dcce7a82b7c
 DIST theseer-tokenizer-1.1.0.tar.gz 10163 BLAKE2B b2360f901d60f784db2045912707a8e293a55967d60d4e72168a1c4b0c9a2d5bdb739fbed9bfec02075476e7bf6762eb1cc7e36870b84fcc341b609527579ca2 SHA512 8b500565dc0d6c8513db3aa72a7ee1fa04510a712ce9b0977feccddc6b2dae53825e39182d43508e196f326776115789e81697116418f6f9f63d08f0c05d0543
 DIST theseer-tokenizer-1.1.3.tar.gz 10553 BLAKE2B 4bed1623abe110cec432a97fbd28752618420a188b450c935c77b5771d6986be9a51c8f100fd81a89d892b0c1e2b46b0124e3c35e3cbe2138eee2d520c74933a SHA512 e29fd41b311bac8021f4c0593d79a9c1bde4b6ccf4774e94d27a0e8a97bac3844109f9312c4aab6e239365630394b602b56a084c291dc13fb439dc8ac22944e3
+DIST theseer-tokenizer-1.2.0.tar.gz 7156 BLAKE2B 61474e3ebed5262b4d250f0057fbe68df6b2b2d6026cba28efbfc35c865bc9491e3b3f7871591a7aa52383c3bb748cf5dfb95f36d680bdbb9755b585b5b8f4f8 SHA512 e0deeffc151a1831cc7226037c75b534aa0d28d9639de45a1f0a6f5865d3df3cfbd7225e075b094603d512b0beb449e91205f40366ef1c7c865c8994e0710ff7
 EBUILD theseer-tokenizer-1.1.0.ebuild 834 BLAKE2B 79ca12311b476cf6528502bfb4302b7e4d65a96c20e9c5c18494bb52d898181099730d78dbffaa6d0e2060c993b85c2629c84269c1e9629df396058c5f2b80ce SHA512 9cb0686954506ccdc4ce6a2e972bf54c482e260205700e521085609872c88f7d59fc966077a1ba062d621502a2f59d5048f2af2279ef08061f7b42a19df655e2
 EBUILD theseer-tokenizer-1.1.3.ebuild 834 BLAKE2B 02ed175c1a5d4c8395b1d049125316dc19a1b87404ca27950869a0ea7e98972bee58ea656f386341f6d623627c797722e69861f59dc96c280296423cbdfb3ac2 SHA512 9b5fff439ac870a1cb80cab1bd048207616bd810e627e4c8c1ab72080565888e12b626d670292d68574a814444a6e299c4feaf073aef1b6e4df0407e9656c95d
+EBUILD theseer-tokenizer-1.2.0.ebuild 811 BLAKE2B 1689dc331b3c96ef1e4667efda296a684dd87c11a365c3857628d02f3ff2f6a23c83f8069571e494832fcc9b626046e1f5b90819d3f0ea41317f6c680f5e2df5 SHA512 20bc503ed195238f76665df069083ed9736487aed15e54db9de5d99a460272a4663f9db724ce8cdfa903d1428370eb4ce097c5ee9df028143e2af6faf3914c87
 MISC metadata.xml 321 BLAKE2B c4c16164af66494e41a3bfe90f4943c905560440eaea9de1a4f82148e1cdc353f9b6871efb618af4ab7ddb8c9fa1dfd931e0610b79c41750744aa6e5dd70580d SHA512 75a4155fe11d88a9d1bde7d46f68954c175c2b8d89872bd53496f11ffd22aa4cbf9f487e36217522e7201aae85c089422a3c7bea3fdec21fc3048b20aad6e5a9
diff --git a/dev-php/theseer-tokenizer/theseer-tokenizer-1.2.0.ebuild b/dev-php/theseer-tokenizer/theseer-tokenizer-1.2.0.ebuild
new file mode 100644
index 000000000000..20e9ed3dcae2
--- /dev/null
+++ b/dev-php/theseer-tokenizer/theseer-tokenizer-1.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Convert tokenized PHP source code into XML and other formats"
+HOMEPAGE="https://github.com/theseer/tokenizer"
+SRC_URI="https://github.com/theseer/tokenizer/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-lang/php:*
+	dev-php/fedora-autoloader"
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/tokenizer-${PV}"
+
+src_prepare() {
+	default
+
+	phpab \
+		--output src/autoload.php \
+		--template fedora2 \
+		--basedir src \
+		src || die
+}
+
+src_install() {
+	insinto /usr/share/php/TheSeer/Tokenizer
+	doins -r src/*
+
+	einstalldocs
+}
diff --git a/dev-php/xdebug-client/Manifest b/dev-php/xdebug-client/Manifest
index 66345d28253a..71391a28edb6 100644
--- a/dev-php/xdebug-client/Manifest
+++ b/dev-php/xdebug-client/Manifest
@@ -7,5 +7,5 @@ EBUILD xdebug-client-2.9.4.ebuild 814 BLAKE2B 70a121144f1144210566d3c97e38551da0
 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 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.8.ebuild b/dev-php/xdebug-client/xdebug-client-2.9.8.ebuild
index ad1c2866a297..36607c13f71b 100644
--- a/dev-php/xdebug-client/xdebug-client-2.9.8.ebuild
+++ b/dev-php/xdebug-client/xdebug-client-2.9.8.ebuild
@@ -9,7 +9,7 @@ MY_PN="xdebug"
 MY_PV="${PV/_/}"
 MY_PV="${MY_PV/rc/RC}"
 
-inherit autotools
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)"
 HOMEPAGE="https://xdebug.org/"
@@ -32,6 +32,7 @@ src_prepare() {
 }
 
 src_configure() {
+	tc-export CC LD
 	econf $(use_with libedit)
 }
 
diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest
index d0f0a1b5ab0f..739516aac201 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -1,12 +1,15 @@
 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
 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
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug/files/3.0-xdebug.ini b/dev-php/xdebug/files/3.0-xdebug.ini
new file mode 100644
index 000000000000..ed95a1214d97
--- /dev/null
+++ b/dev-php/xdebug/files/3.0-xdebug.ini
@@ -0,0 +1,41 @@
+;xdebug.cli_color = 0
+;xdebug.client_discovery_header = 
+;xdebug.client_host = localhost
+;xdebug.client_port = 9003
+;xdebug.collect_params = 0
+;xdebug.collect_return = 0
+;xdebug.connect_timeout_ms = 200
+;xdebug.discover_client_host = 0
+;xdebug.dump.* = Empty
+;xdebug.dump_globals = 1
+;xdebug.dump_once = 1
+;xdebug.dump_undefined = 0
+;xdebug.file_link_format = 
+;xdebug.filename_format = ...%s%n
+;xdebug.force_display_errors = 0
+;xdebug.force_error_reporting = 0
+;xdebug.gc_stats_output_name = gcstats.%p
+;xdebug.halt_level = 0
+;xdebug.idekey = *complex*
+;xdebug.log =
+;xdebug.log_level = 7
+;xdebug.max_nesting_level = 256
+;xdebug.max_stack_frames = -1
+xdebug.mode=off
+;xdebug.output_dir = /tmp
+;xdebug.profiler_append = 0
+;xdebug.profiler_output_name = cachegrind.out.%p
+;xdebug.scream = 0
+;xdebug.show_error_trace = 0
+;xdebug.show_exception_trace = 0
+;xdebug.show_local_vars = 0
+;xdebug.start_upon_error = default
+;xdebug.start_with_request = default
+;xdebug.trace_format = 0
+;xdebug.trace_options = 0
+;xdebug.trace_output_dir = /tmp
+;xdebug.trace_output_name = trace.%c
+;xdebug.trigger_value = ""
+;xdebug.var_display_max_children = 128
+;xdebug.var_display_max_data = 512
+;xdebug.var_display_max_depth = 3
diff --git a/dev-php/xdebug/xdebug-3.0.1.ebuild b/dev-php/xdebug/xdebug-3.0.1.ebuild
new file mode 100644
index 000000000000..26eee1e35033
--- /dev/null
+++ b/dev-php/xdebug/xdebug-3.0.1.ebuild
@@ -0,0 +1,57 @@
+# 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="3.0-xdebug.ini"
+
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="A PHP debugging and profiling extension"
+HOMEPAGE="https://xdebug.org/"
+# Using tarball from GitHub for tests
+#SRC_URI="https://pecl.php.net/get/${PN}-${MY_PV}.tgz"
+SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE=""
+
+# Tests are known to fail
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+DOCS=( README.rst CREDITS )
+PHP_EXT_ECONF_ARGS=()
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		TEST_PHP_EXECUTABLE="${PHPCLI}" \
+		TEST_PHP_CGI_EXECUTABLE="${PHPCGI}" \
+		TEST_PHPDBG_EXECUTABLE="${PHPCLI}dbg" \
+		 "${PHPCLI}" run-xdebug-tests.php
+	done
+}
+
+pkg_postinst() {
+	ewarn "We have set xdebug.mode to off, as xdebug can be"
+	ewarn "installed as a dependency, and not all users will want xdebug to be"
+	ewarn "enabled by default. If you want to enable it, you should edit the"
+	ewarn "ini file and set xdebug.mode to one or more modes e.g. develop,debug,trace"
+	elog ""
+	elog "The 3.0 major release changes many options."
+	elog "Review https://xdebug.org/docs/upgrade_guide for differences from 2.x"
+}
diff --git a/dev-php/xhprof/Manifest b/dev-php/xhprof/Manifest
index baf7557a28f1..ae726ed47d5a 100644
--- a/dev-php/xhprof/Manifest
+++ b/dev-php/xhprof/Manifest
@@ -1,5 +1,5 @@
-DIST xhprof-0.9.10.tar.gz 850440 BLAKE2B f277c4e798c63337d7319ece9e5405fe2aa87677b146bd0a3c73079cda70b005b8a97647a4bfee66e8263eb413b60d685f617d1f8faefe3aff01c5eb5cbcd364 SHA512 f078c7d025d4712858f55a6a212f888cdb67f862c912639db4bd50b9d601e824c7a0bf9e0f9d1b04673230c7a04d9e00fff42f729055677db021ee47e7128088
 DIST xhprof-2.1.4.tgz 841444 BLAKE2B 33be85d55f2636af5664aeb017ccaab6ad03962d44b3143c0eb9d9f9cc0fa74048fbca6beae89d02ed47db8ffe1ea77df1f6a41aa62fbc90fea2c52c467a422d SHA512 8777d29c16bce9e7698cf37c7dd631e951a018fa63ab5a4ab0df8e7621643e7fb905cd9bc189b238d76e32408a43f522bbab455caab6b89f7b6c26590b2733a3
-EBUILD xhprof-0.9.10.ebuild 541 BLAKE2B 84f6cb6126b441543d321d49193436cb8f91fefde036feec8132d8ce388b3be81ff5e75440a96683f48d437cc7cdc50c56a1a7986c8d18fed990c0d5dbe48035 SHA512 0a3be7f712101f71036f190acbd002a164955dc7457053f17a68fc2487ea745c8ae2e8c2e1ed49564e9a1db5eca3a11a09396034867cbd4866563347d0422b7d
+DIST xhprof-2.2.3.tgz 842543 BLAKE2B 5940a5ed8edc334ae2dc09d4621ed7fb4b8b56de6f07dc49e4a84ced33689f242f11ac89dced670f7b54d35fe8c9840fea09e55340174c399fae263760ca35ac SHA512 000468a7fa2a0af25004f0ffd59a8ab111a5cfa4cff275291fcbc54d3283fbf4a904b4aaeb38c2a8c7c81924bc31d9328ccf9fb7de24e20c224e014ed942efaf
 EBUILD xhprof-2.1.4.ebuild 376 BLAKE2B f682e1a892a38da3f476f6175a2c2224d7b0e03a1350de4e782a6159b828fe791fd66e6c30a9f1fa957062c6d6fcca06d16017823786ae7ff221f60ad3a3ac07 SHA512 8798ba51484b6aa0cbbd977305155f67697788334e2b13939141e83c79f59c1149a80ac510be3177f5fa15f4de20141e856b8cf4cc8e7667a9ef2aa1900200f6
+EBUILD xhprof-2.2.3.ebuild 383 BLAKE2B dab9fe1621ed7d9acff750e74013a49f69e4b93189c1fa91f644e946d5c17d17ac9bda5f5f2071b7e230a8ad16734e55c19dfdff29214453792ca30d365257dc SHA512 d22827c910a517930484fdc00f64dfdc97b26cae1e0930dc1e4de20c8e64b41dfe661386b219e8c58f8b6125f26227f63e6ab9ffbe9be0ce8adc5e28570af865
 MISC metadata.xml 320 BLAKE2B b077eb38d67006f7c7531b55c83476e7aeb897c9dc1d3eaa0056dd27fc94cee81c4e5491efe6eb7cb433e8d17c70bafb60f44b4e2bfb6eed1d173ac415084dda SHA512 eb8d1837c8d8a622d4c26ce3a8301cd13f16deb0f3fd4aef58fbf43e265f98b7b05e971d6c65ff3eac076e23f1ec13dc3c32238b1893be7e66f637da6dab0ce2
diff --git a/dev-php/xhprof/xhprof-0.9.10.ebuild b/dev-php/xhprof/xhprof-2.2.3.ebuild
index 340be6e1183e..1d609078c8c4 100644
--- a/dev-php/xhprof/xhprof-0.9.10.ebuild
+++ b/dev-php/xhprof/xhprof-2.2.3.ebuild
@@ -1,17 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-MY_PV="dab44f76da5c8a0d4f1339f7d2ea2bc42408e8e9"
-PHP_EXT_S="${WORKDIR}/${PN}-${MY_PV}/extension"
+PHP_EXT_S="${S}/extension"
 PHP_EXT_ECONF_ARGS=""
-USE_PHP="php7-2 php7-3"
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
 
 inherit php-ext-pecl-r3
 
-SRC_URI="https://github.com/phacility/xhprof/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
 KEYWORDS="~amd64 ~x86"
 
 HOMEPAGE="https://pecl.php.net/package/xhprof"
@@ -19,5 +16,3 @@ DESCRIPTION="A Hierarchical Profiler for PHP"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-
-S="${WORKDIR}"
diff --git a/dev-php/zetacomponents-Base/Manifest b/dev-php/zetacomponents-Base/Manifest
new file mode 100644
index 000000000000..3f1326fc2b0b
--- /dev/null
+++ b/dev-php/zetacomponents-Base/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 2999 BLAKE2B 7e178de212e6f26e621509ced47998bdf501df0a7ece33f98b943c5bfcc4ca32a886e0a09cb83975f83148a29736be50298281f302094f6fb32c91a695c97d76 SHA512 70f2f358fffd4b9d7a9af07badf2e000974ddbde9230797ef4cc955a73326c665e947278ebf3967d81b93c97805293ab230aea7aa3bb98a56d7a3c34cf20be94
+DIST zetacomponents-Base-1.9.1.tar.gz 252350 BLAKE2B cc0d82a107fc1190b57b03ce3a594d9ffa5b3a2627cf30d7d31a1018005a8400917cf7bbd1dfeb23f46d118ae56083e147d148b3bbdba5dfea8fde0a8bcf0c46 SHA512 dd56f123c8ed3b8c0116b878120ba7763e402b8364ba404305a9ab483b1c5a341df994517f160c8a959005ab9b75a5a7af74d08b367daa3fd8f852ba4ede5e05
+EBUILD zetacomponents-Base-1.9.1.ebuild 597 BLAKE2B 5f9231995ccdf2a070de039b6a3eee0505306a63dae4d700f0d47314cae2476574d88b1f76e222a9520384620bf74b83d6a79b13c421d5c77fb133605f1b7b99 SHA512 9abcc265f236beb7c6082006d5395d2e941834201f16292df17198bfa04670eb7e2d7edb5672f7036e5b54eece6c0cc3a0a52ebbce96a30571a2a578f5c33f14
+MISC metadata.xml 323 BLAKE2B c5d83f1d6652e8e2ec9c0eef1e0dd8a6d9de3da700427c3722d9213d719f9f64af8870e83fab300febde6b5104ffa38b3cef26f68a15ee038b1ae10387bc3d11 SHA512 949758b23a6a21bb9d4f2dce2d20e2ed7bca150e5f872adb243d5031710e22522a228aa3da5fb5dc700a32c27da84e1e28550b65ef2e2d4fd0fedde830bb28f4
diff --git a/dev-php/zetacomponents-Base/files/autoload.php b/dev-php/zetacomponents-Base/files/autoload.php
new file mode 100644
index 000000000000..17bec81a6d2e
--- /dev/null
+++ b/dev-php/zetacomponents-Base/files/autoload.php
@@ -0,0 +1,53 @@
+<?php
+// @codingStandardsIgnoreFile
+// @codeCoverageIgnoreStart
+// this is an autogenerated file - do not edit
+spl_autoload_register(
+    function($class) {
+        static $classes = null;
+        if ($classes === null) {
+            $classes = array(
+                'ezcbase' => '/base.php',
+                'ezcbaseautoloadexception' => '/exceptions/autoload.php',
+                'ezcbaseautoloadoptions' => '/options/autoload.php',
+                'ezcbaseconfigurationinitializer' => '/interfaces/configuration_initializer.php',
+                'ezcbasedoubleclassrepositoryprefixexception' => '/exceptions/double_class_repository_prefix.php',
+                'ezcbaseexception' => '/exceptions/exception.php',
+                'ezcbaseexportable' => '/interfaces/exportable.php',
+                'ezcbaseextensionnotfoundexception' => '/exceptions/extension_not_found.php',
+                'ezcbasefeatures' => '/features.php',
+                'ezcbasefile' => '/file.php',
+                'ezcbasefileexception' => '/exceptions/file_exception.php',
+                'ezcbasefilefindcontext' => '/structs/file_find_context.php',
+                'ezcbasefileioexception' => '/exceptions/file_io.php',
+                'ezcbasefilenotfoundexception' => '/exceptions/file_not_found.php',
+                'ezcbasefilepermissionexception' => '/exceptions/file_permission.php',
+                'ezcbasefunctionalitynotsupportedexception' => '/exceptions/functionality_not_supported.php',
+                'ezcbaseinit' => '/init.php',
+                'ezcbaseinitcallbackconfiguredexception' => '/exceptions/init_callback_configured.php',
+                'ezcbaseinitinvalidcallbackclassexception' => '/exceptions/invalid_callback_class.php',
+                'ezcbaseinvalidparentclassexception' => '/exceptions/invalid_parent_class.php',
+                'ezcbasemetadata' => '/metadata.php',
+                'ezcbasemetadatapearreader' => '/metadata/pear.php',
+                'ezcbasemetadatatarballreader' => '/metadata/tarball.php',
+                'ezcbaseoptions' => '/options.php',
+                'ezcbasepersistable' => '/interfaces/persistable.php',
+                'ezcbasepropertynotfoundexception' => '/exceptions/property_not_found.php',
+                'ezcbasepropertypermissionexception' => '/exceptions/property_permission.php',
+                'ezcbaserepositorydirectory' => '/structs/repository_directory.php',
+                'ezcbasesettingnotfoundexception' => '/exceptions/setting_not_found.php',
+                'ezcbasesettingvalueexception' => '/exceptions/setting_value.php',
+                'ezcbasestruct' => '/struct.php',
+                'ezcbasevalueexception' => '/exceptions/value.php',
+                'ezcbasewhateverexception' => '/exceptions/whatever.php'
+            );
+        }
+        $cn = strtolower($class);
+        if (isset($classes[$cn])) {
+            require __DIR__ . $classes[$cn];
+        }
+    },
+    true,
+    false
+);
+// @codeCoverageIgnoreEnd
diff --git a/dev-php/zetacomponents-Base/metadata.xml b/dev-php/zetacomponents-Base/metadata.xml
new file mode 100644
index 000000000000..8dbb073e53ff
--- /dev/null
+++ b/dev-php/zetacomponents-Base/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">zetacomponents/Base</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.1.ebuild b/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.1.ebuild
new file mode 100644
index 000000000000..a1c68a7472bd
--- /dev/null
+++ b/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="Base"
+
+DESCRIPTION="Base package for any Zeta component"
+HOMEPAGE="https://github.com/zetacomponents/Base"
+SRC_URI="https://github.com/zetacomponents/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="dev-lang/php:*"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	insinto /usr/share/php/ezc/${MY_PN}
+	doins -r src/*
+	doins "${FILESDIR}"/autoload.php
+
+	einstalldocs
+}
diff --git a/dev-php/zetacomponents-ConsoleTools/Manifest b/dev-php/zetacomponents-ConsoleTools/Manifest
new file mode 100644
index 000000000000..f56362a90488
--- /dev/null
+++ b/dev-php/zetacomponents-ConsoleTools/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 5729 BLAKE2B d5bc237ca40ba53da13e5c4781e7aab556692e86e02f53aa97c407a4600552390a3160cea2deec437af5abadc116f0e840ad337da4d396c6947daaaf5d258616 SHA512 49443855b2cdd5c01b98b232c2afb7a9e7a689abb40c001466fcbc502c25c2239aadba07849ad64787c7269e8408c202233d40dccf1cf7a981ddd2f932e91ae9
+DIST zetacomponents-ConsoleTools-1.7.2.tar.gz 932028 BLAKE2B 18469bb11af5f4facf7892df765c9511c699c2f362872da7db13dee3a380286a306809c90f28ad4bc4cfcfa99135e7d35b659a242f507afb91b84fee17d16f4a SHA512 871c9a6827c3cc77275b538dc09d21135affe1f06364e83a7a27b7a9eff4537b509e72fffe3d5f6b1ebb0086d489df2b29af276bdbc0276f163b1f9168f82253
+EBUILD zetacomponents-ConsoleTools-1.7.2.ebuild 635 BLAKE2B 70a84efbab47876c843d5ecce5c6d0c310814e8ef1bfd8ce95f474b01add71b2ee0aae6f74cf6e62f9349a60dd661dd2324a5bb3d553d8b7db62c9e2624b7b83 SHA512 68bb32028d1a56df73361f7a0717528ee02bde0e6e552c716db2c26227296de86885c052d2d4323f7be09f974646401609817fc4eedfdba00c393be0afb27fcb
+MISC metadata.xml 331 BLAKE2B 0eb6f6566bb2f1f81bc10dbad55144589ddf3cff694d5843b608407eeca55aafd07b7738dc6db85b0aa3bcaba2aecbb7414c06b16693f1f723dad042ee6b2097 SHA512 c86e12b66b45e61221d91e7150f2e383f6d5f07cd5637ee558d854a91948c4ff293a03e1923ffb17eac228294e2d5fabefee889ed94fdb44d003f85f69fcbcac
diff --git a/dev-php/zetacomponents-ConsoleTools/files/autoload.php b/dev-php/zetacomponents-ConsoleTools/files/autoload.php
new file mode 100644
index 000000000000..b2139b5f618b
--- /dev/null
+++ b/dev-php/zetacomponents-ConsoleTools/files/autoload.php
@@ -0,0 +1,82 @@
+<?php
+// @codingStandardsIgnoreFile
+// @codeCoverageIgnoreStart
+// this is an autogenerated file - do not edit
+spl_autoload_register(
+    function($class) {
+        static $classes = null;
+        if ($classes === null) {
+            $classes = array(
+                'ezcconsoleargument' => '/input/argument.php',
+                'ezcconsoleargumentalreadyregisteredexception' => '/exceptions/argument_already_registered.php',
+                'ezcconsoleargumentexception' => '/exceptions/argument.php',
+                'ezcconsoleargumentmandatoryviolationexception' => '/exceptions/argument_mandatory_violation.php',
+                'ezcconsolearguments' => '/input/arguments.php',
+                'ezcconsoleargumenttypeviolationexception' => '/exceptions/argument_type_violation.php',
+                'ezcconsoledialog' => '/interfaces/dialog.php',
+                'ezcconsoledialogabortexception' => '/exceptions/dialog_abort.php',
+                'ezcconsoledialogoptions' => '/options/dialog.php',
+                'ezcconsoledialogvalidator' => '/interfaces/dialog_validator.php',
+                'ezcconsoledialogviewer' => '/dialog_viewer.php',
+                'ezcconsoleexception' => '/exceptions/exception.php',
+                'ezcconsoleinput' => '/input.php',
+                'ezcconsoleinputhelpgenerator' => '/interfaces/input_help_generator.php',
+                'ezcconsoleinputstandardhelpgenerator' => '/input/help_generators/standard.php',
+                'ezcconsoleinputvalidator' => '/interfaces/input_validator.php',
+                'ezcconsoleinvalidoptionnameexception' => '/exceptions/invalid_option_name.php',
+                'ezcconsoleinvalidoutputtargetexception' => '/exceptions/invalid_output_target.php',
+                'ezcconsolemenudialog' => '/dialog/menu_dialog.php',
+                'ezcconsolemenudialogdefaultvalidator' => '/dialog/validators/menu_dialog_default.php',
+                'ezcconsolemenudialogoptions' => '/options/menu_dialog.php',
+                'ezcconsolemenudialogvalidator' => '/interfaces/menu_dialog_validator.php',
+                'ezcconsolenopositionstoredexception' => '/exceptions/no_position_stored.php',
+                'ezcconsolenovaliddialogresultexception' => '/exceptions/no_valid_dialog_result.php',
+                'ezcconsoleoption' => '/input/option.php',
+                'ezcconsoleoptionalreadyregisteredexception' => '/exceptions/option_already_registered.php',
+                'ezcconsoleoptionargumentsviolationexception' => '/exceptions/option_arguments_violation.php',
+                'ezcconsoleoptiondependencyviolationexception' => '/exceptions/option_dependency_violation.php',
+                'ezcconsoleoptionexception' => '/exceptions/option.php',
+                'ezcconsoleoptionexclusionviolationexception' => '/exceptions/option_exclusion_violation.php',
+                'ezcconsoleoptionmandatoryviolationexception' => '/exceptions/option_mandatory_violation.php',
+                'ezcconsoleoptionmissingvalueexception' => '/exceptions/option_missing_value.php',
+                'ezcconsoleoptionnoaliasexception' => '/exceptions/option_no_alias.php',
+                'ezcconsoleoptionnotexistsexception' => '/exceptions/option_not_exists.php',
+                'ezcconsoleoptionrule' => '/structs/option_rule.php',
+                'ezcconsoleoptionstringnotwellformedexception' => '/exceptions/option_string_not_wellformed.php',
+                'ezcconsoleoptiontoomanyvaluesexception' => '/exceptions/option_too_many_values.php',
+                'ezcconsoleoptiontypeviolationexception' => '/exceptions/option_type_violation.php',
+                'ezcconsoleoutput' => '/output.php',
+                'ezcconsoleoutputformat' => '/structs/output_format.php',
+                'ezcconsoleoutputformats' => '/structs/output_formats.php',
+                'ezcconsoleoutputoptions' => '/options/output.php',
+                'ezcconsoleprogressbar' => '/progressbar.php',
+                'ezcconsoleprogressbaroptions' => '/options/progressbar.php',
+                'ezcconsoleprogressmonitor' => '/progressmonitor.php',
+                'ezcconsoleprogressmonitoroptions' => '/options/progressmonitor.php',
+                'ezcconsolequestiondialog' => '/dialog/question_dialog.php',
+                'ezcconsolequestiondialogcollectionvalidator' => '/dialog/validators/question_dialog_collection.php',
+                'ezcconsolequestiondialogmappingvalidator' => '/dialog/validators/question_dialog_mapping.php',
+                'ezcconsolequestiondialogoptions' => '/options/question_dialog.php',
+                'ezcconsolequestiondialogregexvalidator' => '/dialog/validators/question_dialog_regex.php',
+                'ezcconsolequestiondialogtypevalidator' => '/dialog/validators/question_dialog_type.php',
+                'ezcconsolequestiondialogvalidator' => '/interfaces/question_dialog_validator.php',
+                'ezcconsolestandardinputvalidator' => '/input/validators/standard.php',
+                'ezcconsolestatusbar' => '/statusbar.php',
+                'ezcconsolestatusbaroptions' => '/options/statusbar.php',
+                'ezcconsolestringtool' => '/tools/string.php',
+                'ezcconsoletable' => '/table.php',
+                'ezcconsoletablecell' => '/table/cell.php',
+                'ezcconsoletableoptions' => '/options/table.php',
+                'ezcconsoletablerow' => '/table/row.php',
+                'ezcconsoletoomanyargumentsexception' => '/exceptions/argument_too_many.php'
+            );
+        }
+        $cn = strtolower($class);
+        if (isset($classes[$cn])) {
+            require __DIR__ . $classes[$cn];
+        }
+    },
+    true,
+    false
+);
+// @codeCoverageIgnoreEnd
diff --git a/dev-php/zetacomponents-ConsoleTools/metadata.xml b/dev-php/zetacomponents-ConsoleTools/metadata.xml
new file mode 100644
index 000000000000..417fd96ecc6d
--- /dev/null
+++ b/dev-php/zetacomponents-ConsoleTools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">zetacomponents/ConsoleTools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-php/zetacomponents-ConsoleTools/zetacomponents-ConsoleTools-1.7.2.ebuild b/dev-php/zetacomponents-ConsoleTools/zetacomponents-ConsoleTools-1.7.2.ebuild
new file mode 100644
index 000000000000..6bf3b6766748
--- /dev/null
+++ b/dev-php/zetacomponents-ConsoleTools/zetacomponents-ConsoleTools-1.7.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="ConsoleTools"
+
+DESCRIPTION="A set of classes to do different actions with the console"
+HOMEPAGE="https://github.com/zetacomponents/ConsoleTools"
+SRC_URI="https://github.com/zetacomponents/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="dev-lang/php:*"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	insinto /usr/share/php/ezc/${MY_PN}
+	doins -r src/*
+	doins "${FILESDIR}"/autoload.php
+
+	einstalldocs
+}