gentoo resync : 21.06.2020

25 files changed, 617 insertions, 0 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 3a38f2b5d59f..c4a37049019c 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Crypt_GPG/Manifest b/dev-php/PEAR-Crypt_GPG/Manifest
index 50258d62622c..58f12da037fb 100644
--- a/dev-php/PEAR-Crypt_GPG/Manifest
+++ b/dev-php/PEAR-Crypt_GPG/Manifest
@@ -1,6 +1,8 @@
 AUX fix-unit-tests-with-new-gpg.patch 2090 BLAKE2B 7cc3b79bfd29244eec6e0152130d33d64ff99ddb4da9508affa9a06274d8b888d4e7ea38c2a8e090953b40533b19a5224f803d71199ece8dde70444959fba9eb SHA512 3b6b301d19cde1eebd411caf409dd11add712717a638f2b4d8567114cc065efdc899cb8244412da7b3438850a9bedfafe95e370705fd7439b312f4cb318f4124
 DIST Crypt_GPG-1.6.2.tgz 346709 BLAKE2B abced2fe8c909f06690c38884506ce03df4c5ef3ef460aafce65ea9405c6974f8af320fd5a07a7967b45421a9a67aa27026c28ef7eb1402ffefba527007a33ae SHA512 9d954d96b4e461c75f79ce9bc701d062e3f19671690228e6e0ce5265733ac1de9c06520f9f750348f3c37f01ccb79720574b2d2f371e69c8a25ae6e1bc18aabd
 DIST Crypt_GPG-1.6.3.tgz 346999 BLAKE2B 8402ef382a6393972a3fda7370fbd37dec19d0ebabb6b316d35783538dbc01746476977d7dc3da487876201cd678964d9572dc67a43911319b1b614004a3c909 SHA512 f1ad2560a43a1e8f5a33269bc4ae4067e19e5325fdbd8d2fc55f6cb8aad89258df45fbecedd93a21749f33024c819f07399580b1a4760f5740f26043109dc396
+DIST Crypt_GPG-1.6.4.tgz 346390 BLAKE2B 22e9e9d893f96bb3c3dc538b168a35366d2b699e92bf832370223879e90e8018cfd3b736e099807fdcc897b7569a40af66e72f011eaeb7400477053b7838409d SHA512 3eee39702abe97fc322e5976ebe8a7f7ba07bc950d22aa6636cadf38b0bd9c6c6316d7be35f21a8d0e8dfdb66a76db33121edb34736869d31ae89b03468cf470
 EBUILD PEAR-Crypt_GPG-1.6.2.ebuild 1170 BLAKE2B 437691fd331a1c589a256764c9d441f1b9a8812ce4c7b435ba73de7a3aecbc4417c1e9e52a61e1b3ecdfc26b8cd37c14ae3a7bf0683ddcd4eeefb0a516b3f753 SHA512 51cbb2871f7093b20962ec8726ec59aa333557c1b2fc843ca28bdf1896b5b4bfeca2002fd906af2c0607e22ac25108ad373c17cf75e1576d98d5b3049870c554
 EBUILD PEAR-Crypt_GPG-1.6.3.ebuild 1117 BLAKE2B e79952729e05686e9915b4ea3baf6089c52ee55043d79fc5826a29a3028e2cdaf82b42f087c169a50eb06694482a61c284bc9313b12ccf23c8bf14e556d85238 SHA512 2316799e3357d240a23a4020bf0c971abaecdde9792745f38bd9fafa26f78bc94eae9845ee1c1ff1d959d954bab1dc6ab09f92496c2497335b1fa42f6a49c562
+EBUILD PEAR-Crypt_GPG-1.6.4.ebuild 1117 BLAKE2B e79952729e05686e9915b4ea3baf6089c52ee55043d79fc5826a29a3028e2cdaf82b42f087c169a50eb06694482a61c284bc9313b12ccf23c8bf14e556d85238 SHA512 2316799e3357d240a23a4020bf0c971abaecdde9792745f38bd9fafa26f78bc94eae9845ee1c1ff1d959d954bab1dc6ab09f92496c2497335b1fa42f6a49c562
 MISC metadata.xml 490 BLAKE2B ae0122e23babc3353357016c47707d7a9ec6cf92d2a981c25eaebcc13713c676cd6c283b2810d6f337071651546085db6a4de56e6decd22275de90da88181f08 SHA512 21423e113024e94c04f245071ecc0a0308672387b92f42c7f57b0d716b0d681d2008fab84cec1bf0b0d37981d5548515e5f3997e76e288d9aafee678b5411ab9
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.4.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.4.ebuild
new file mode 100644
index 000000000000..46eb948e97d4
--- /dev/null
+++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/PEAR-/}"
+MY_PV="${PV/_/}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="PHP interface to the GNU Privacy Guard (GnuPG)"
+HOMEPAGE="https://pear.php.net/package/Crypt_GPG"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-crypt/gnupg
+	dev-lang/php:*[posix,unicode]
+	dev-php/PEAR-Console_CommandLine
+	dev-php/PEAR-Exception"
+BDEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	sed -i "s|@bin-dir@|${EPREFIX}/usr/bin|" Crypt/GPG/Engine.php || die
+	sed -i "s|@package-name@|${MY_PN}|" Crypt/GPG/PinEntry.php || die
+	sed -i "s|@data-dir@|${EPREFIX}/usr/share|" Crypt/GPG/PinEntry.php || die
+}
+
+src_install() {
+	dodoc README.md
+	dobin scripts/crypt-gpg-pinentry
+
+	insinto "/usr/share/${MY_PN}"
+	doins -r data
+
+	insinto /usr/share/php
+	doins -r Crypt
+}
+
+src_test() {
+	phpunit tests/ || die "test suite failed"
+}
diff --git a/dev-php/PEAR-Log/Manifest b/dev-php/PEAR-Log/Manifest
index e996bc2efbbe..581d55671342 100644
--- a/dev-php/PEAR-Log/Manifest
+++ b/dev-php/PEAR-Log/Manifest
@@ -1,3 +1,5 @@
 DIST Log-1.13.1.tgz 46764 BLAKE2B dc0f4605ed801818ddf070ec3beb6818af1630d99bec721cd3f487e709f87bd4a1628a05854c48fe9775aab546bdce4618061ef37674aa9921f536deccc6a080 SHA512 246510b7dbff4dc9f9cdd951d76baf2dd377e30ffde6d38cadac10091dcb92f8095406edb6d8a87ebe2330d514ce99f355f84ebfe57cd8a3f3babc316995148a
+DIST Log-1.13.2.tgz 46801 BLAKE2B 529677ed8a840742840a8ebeb5f5c7d4e8a8af257f9c3b1cb9ff990e42e760e0040f7df8d94794f40ec5654cf33e1909b7b48ca3f656d2a2bc0310c6705d6c24 SHA512 a4adaf7ee2af600a6c14ed398159c61a7df73b2c6be928f0ea6bbaf90d4b0e866e5a169953fa7819e293cd5cb29c6aca762ced79f3619dfbb38af1ea8731b1c4
 EBUILD PEAR-Log-1.13.1.ebuild 1348 BLAKE2B 8ffba37aebb27becc35d76b635b25bdea8a084f9e6dfbdf33295ae4313150f73ad6b9741a0de2c9046d99441fe7df7aebc8b96867c41f2f88cb9d2dce14789fa SHA512 825574468c5848d094b18e6e9961c942556f4498cc0eaa7f6731909f730724eede1501e3dbe4da6dcbee6867ccb76e405c6636149f8acdf71eb7a843cad4989f
+EBUILD PEAR-Log-1.13.2.ebuild 1355 BLAKE2B 9b3c58f6b927d4231a010ca39eac6d374c855a175a4dae4f19f4a1e6cbf62eba674e589d97f5bcd41f21e96c39dc1e23b9050126247019d36bf6c1729a3d2844 SHA512 a1c01f4d37ef9217f8dcc7ffdb8dddc3d0530630a9cea89d6aace531461b45737d7a48819f90862b1293a1b385c24e0ca07114b24eb0a92f5e143daf78b59ca2
 MISC metadata.xml 305 BLAKE2B 9ae588d4fa3e555b0362d0f9ba19dd3bfd459f1788fb047852f22cde3d2688e3807d4ad87247b9dd8759450af1c1ce55192b2e551a8337abd08fbc771f32cd36 SHA512 8540d045359dc2f4ed04bde79616f2ebe923a0d3a6e401788a37e3bfd973a9db33662f5c01326e0fe0198246dad290d8d3ec3d841394071c215f70a8ad4abf71
diff --git a/dev-php/PEAR-Log/PEAR-Log-1.13.2.ebuild b/dev-php/PEAR-Log/PEAR-Log-1.13.2.ebuild
new file mode 100644
index 000000000000..384c2311aa5c
--- /dev/null
+++ b/dev-php/PEAR-Log/PEAR-Log-1.13.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="The Log framework provides an abstracted logging system"
+HOMEPAGE="https://pear.php.net/package/Log"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+# The DB, Mail, and MDB2 dependencies are technically optional, but
+# automagic. To avoid surprises, we require them unconditionally.
+RDEPEND="dev-lang/php:*
+	dev-php/PEAR-PEAR
+	dev-php/PEAR-DB
+	dev-php/PEAR-Mail
+	dev-php/PEAR-MDB2"
+DEPEND="test? ( ${RDEPEND} )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	dodoc docs/guide.txt misc/log.sql
+	use examples && dodoc -r examples
+
+	# I don't like installing "Log.php" right at the top-level, but any
+	# packages depending on us will expect to find it there and not as
+	# e.g. Log/Log.php.
+	insinto "/usr/share/php/"
+	doins Log.php
+	doins -r Log
+}
+
+src_test() {
+	# Requires the "pear" executable from dev-php/PEAR-PEAR.
+	pear run-tests tests || die
+
+	# The command succeeds regardless of whether or not the test suite
+	# passed, but this file is only written when there was a failure.
+	[[ -f run-tests.log ]] && die "test suite failed"
+}
diff --git a/dev-php/adodb/Manifest b/dev-php/adodb/Manifest
index e6e3d90f1a3d..0303d49b7645 100644
--- a/dev-php/adodb/Manifest
+++ b/dev-php/adodb/Manifest
@@ -1,5 +1,7 @@
 DIST adodb-5.20.14.tar.gz 465896 BLAKE2B acd8494141584b0c02c2e30aa59b3916ae811b8095ca724d22f44ed2cb1456b8e8afc7ff9af41e7476f4a93809e762c44a175fd3775b69654107813342b3a47a SHA512 fa9b764742f3edf15e79da7a34ca52b19f51454fa20bc963cce963cdd40f7e78671e993cd672a21e9917aa2440c63601fbf768b5259dccb64b458a5be6f4b0eb
 DIST adodb-5.20.15.tar.gz 466749 BLAKE2B ca232e15094eaf728dd82b449cfded4f84fc773e5dbe1a06b7bb15fc18487080131c52d7ae9d77e6a401bfd53baa7875810c94b6bda615d0a836a715914de9d7 SHA512 87c6f508f49a54e436b56d47d3c0b2801f4f022876013a2ffa23e751cc4c7aa83aa359e51acc4f8351fd596ad4f5d71326204ae3d57514c4354f68669e412c73
+DIST adodb-5.20.17.tar.gz 466901 BLAKE2B 86e6cc7ae383c698e889925679d1a1f8ace181fe82a178e527ea169f1d21e83844563707e707968522de8bdc180eeb103793fa0468a38f924f29ac4b96310c50 SHA512 c8850f4e330dc058564b59c8a73e0687e1c9d1c56f617b4bbd99aee83e7047626d436c903caf913b11784be1528bb55e442e6365732f8d4bec82edb029831bd6
 EBUILD adodb-5.20.14.ebuild 1445 BLAKE2B 7beb52ccfc3211800b38230d5699e446cf95c263a49971065cd62944aae9c6aa9b612508af0b1c186edb9fb0be45115a10910214d019ca97fe90db50183f7bf7 SHA512 41f97b3992ba0898746d321a3b099f1309794bd38ddaf4ff15c7567bf97ee74e71da73179e1b21afcd9ad73f0f62d960fe4429d393cb1eb65ae52eaa39c07650
 EBUILD adodb-5.20.15.ebuild 1452 BLAKE2B e5286f48e8bdf5fdae03893ea87292ed6da2dffae801140e2dfcd31c1a5994f205d2a17b1f58bcf757f14f1bc6230d367a4deb007facfd097f298982529fac98 SHA512 20efbbea0b7a1db0aae61b433faab6d4ec222c8082c37a5a34875cf214794e1a104a4b5e47e84f822b43576f64233ecea9a1a19e5759c98cef28c80aac4b1444
+EBUILD adodb-5.20.17.ebuild 1452 BLAKE2B aa01cdfbab7c732279973480c2524c8c13668b54c85f8396e205d54f849f8e43a553b6a8325743dc8a17f088317397457a4a3f8e3a3bebaade4515965123fbf1 SHA512 9af2be6f93b6c9d1610393c3fda939b30993ac7121c286541d2e52035b4c084c2034f2bb9c45db1affcbd0f194974276464679c808b3c6d7895b6d16cbea1ccf
 MISC metadata.xml 490 BLAKE2B fe6674acd3eb6a1c95ae4deb6f4215b0c31251918cc96eef1d6c784914d8e3c7eb273b868b90d7b8585421acb58172b7ce6a54d99b6b41abfed923b6e34abfd3 SHA512 c81b170a7a9532e27707f6bccea90be62a8504228571eae8b5564eea37c6789bafcb2681e4de8cc99916e1304056121575c3d8487cc1102f13909d14a7565fcb
diff --git a/dev-php/adodb/adodb-5.20.17.ebuild b/dev-php/adodb/adodb-5.20.17.ebuild
new file mode 100644
index 000000000000..a1cd6765bdcf
--- /dev/null
+++ b/dev-php/adodb/adodb-5.20.17.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="ADOdb"
+DESCRIPTION="Database abstraction layer for PHP"
+HOMEPAGE="https://github.com/ADOdb"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+# If you want to be picky, we should require that PHP be built with at
+# least one database driver enabled; otherwise adodb isn't going to be
+# able to do anything. But, the database USE flags for dev-lang/php are
+# a mess. What we would *like* to do is have a set of USE flags for
+# adodb that then propagate to PHP itself... for example, adodb[mysql]
+# could require php[mysql]. To do that would require that we duplicate
+# the database USE flag mess for adodb -- not desirable. Instead we punt
+# and let the user install adodb unconditionally. If he doesn't have
+# database support in PHP, it just won't work.
+RDEPEND="dev-lang/php:*"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	DOCS="README.md docs/changelog*.md xmlschema*.dtd session/*.sql"
+	DOCS+=" session/*.txt session/*.xml pear/auth_adodb_example.php"
+	DOCS+=" pear/readme.Auth.txt"
+
+	dodoc $DOCS
+	rm -f $DOCS || die "failed to remove docs before installation"
+
+	insinto "/usr/share/php/${PN}"
+	doins *.php
+	doins -r contrib datadict drivers lang pear perf replicate session xsl
+}
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index 56e9c3b73a99..f6cb78463e88 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -2,9 +2,11 @@ AUX autoload-r1.php 973 BLAKE2B d01d694be6f50af0e995dc24da1545b666609ce0098b4206
 DIST composer-1.10.1.tar.gz 421852 BLAKE2B a40f59ab0af5eba777f1926bab78e55fd1973e53b324eec73fdca70678fc1cfe6f892790a61a66dbdbe07caa03343bfd109318daec99c2c18707785c6bf149e0 SHA512 ebc3ee48bf0d2597e7221e9ac0ab7188e7a99096d5dacdee4176b4c7b4d252d079c117b5bd9131ff38d8963f95930fa9c83fa51ed542d4f7d58276561de1f2b8
 DIST composer-1.10.5.tar.gz 423065 BLAKE2B 0c8595f3583a692f89294455984aeff2ad9cbf2a39541355cbb736e717baacae8245fa81e6b9fde11dd5bb56ad3a074262f6f8ecb65b4bef9c782ef39887deec SHA512 cdadb2d146afcc140316b83d3b4f4c018d79e8222f6a6207cdd52db75ae9c78e787a509d88a3fe113f8218df2ace56ba2dd043e1b6e6c3dbb5129fd51d8e9925
 DIST composer-1.10.6.tar.gz 423789 BLAKE2B 74d93e769c660f2c74e0ad5dd3ed5e5279c217552eb6d342ffd43d7fba10647865ade7b284c811f63504e0335e5655eae681cf14ae4d876eb56ff6a306c61268 SHA512 fdc209a82d3adda2728190282327b02d2b71bb9b1a80cbcda3699a826ee56451c997edac13d76e2784ebd4297d413bd46dd47b9538accd4bfe6c569464696779
+DIST composer-1.10.7.tar.gz 424264 BLAKE2B 9939e4d1f29071ca4467076c13e0ceab32d10282876ebb0a76f41dd3efbd9c40a50dbf278dd0a12b2119d40ff9424c171f07381fbaadb94218b1fdf69f403fdb SHA512 81ece3314cddced101b0be491e40b60d42ef503cef4b1d5598c32f3378f10524004a7a8ef4360453a4cdaaf9d3b986ce07696de075dc424deae7703945f6d577
 DIST composer-1.9.3.tar.gz 412212 BLAKE2B fc293a38baaf87cc2581304e1438d48e94a85ca2c5da4eff388b1307dadacb67327d9612211af70f1734872c7a377b8713492839c2d330c9e0e7226206cdc1f6 SHA512 42a37b2187895e06f2dc8c5225a1328377afc408ad28af12d9ef5d15fe083dcf22459ce0f482abfd528683113af5f9fd1a19758294c59c69b59a5bb32e65f2cc
 EBUILD composer-1.10.1.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
 EBUILD composer-1.10.5.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
 EBUILD composer-1.10.6.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
+EBUILD composer-1.10.7.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
 EBUILD composer-1.9.3.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
 MISC metadata.xml 774 BLAKE2B 8a1f75c0c7da6f0d193a981c6db3888d62e2223b6368c4a7dece62ae33cc9a2a8c0b34714170462f262569954e70cc9b976012ff864ccfa36a46da3c719169ae SHA512 1a17bfae65923a3bea593c57d7ecf4fb2aeef43d0537636105e52294de295cbfeaed4b3c36ffb8675a563f657f4f969e62096cee20b9ab178c962acf2f68ac3a
diff --git a/dev-php/composer/composer-1.10.7.ebuild b/dev-php/composer/composer-1.10.7.ebuild
new file mode 100644
index 000000000000..29915836e3cf
--- /dev/null
+++ b/dev-php/composer/composer-1.10.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.1.3
+	>=dev-php/psr-log-1.1.0
+	dev-php/fedora-autoloader
+	>=dev-php/json-schema-5.2.7
+	>=dev-php/jsonlint-1.7.1
+	>=dev-php/phar-utils-1.0.1
+	>=dev-php/semver-1.4.2
+	>=dev-php/spdx-licenses-1.5.0
+	>=dev-php/symfony-console-2.8.48
+	>=dev-php/symfony-filesystem-2.8.48
+	>=dev-php/symfony-finder-2.8.49
+	>=dev-php/symfony-process-2.8.48
+	>=dev-php/xdebug-handler-1.3.1"
+
+src_install() {
+	insinto "/usr/share/${PN}"
+
+	# Composer expects the LICENSE file to be there, and the
+	# easiest thing to do is to give it what it wants.
+	doins -r src res LICENSE
+
+	insinto "/usr/share/${PN}/vendor"
+	newins "${FILESDIR}"/autoload-r1.php autoload.php
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
+}
diff --git a/dev-php/doctrine-instantiator/Manifest b/dev-php/doctrine-instantiator/Manifest
index f3fa24de992f..a807ea41a652 100644
--- a/dev-php/doctrine-instantiator/Manifest
+++ b/dev-php/doctrine-instantiator/Manifest
@@ -2,7 +2,9 @@ AUX autoload.php 258 BLAKE2B 3ed7c897b02b90914e7ba7fa06e79805586b0b5bf2b614e8b81
 DIST doctrine-instantiator-1.0.5.tar.gz 10202 BLAKE2B 77ab3fba96672f6aa2826002510c99c21beccdc09e92dbc2c09426f8fc47590554ef5d32b6bec92ea2dc2ab1c61a178c280ab01090b3aafc14a10a4b4fec3628 SHA512 78b00b2550b47772b5825fbde59729e0613a90c1d9dacf1b7b7d13ccb5bbd8534af7e732dcc1b5b6f9bbafa2f9c3e7418e184851ab0f3a37c0c945b5eed1e229
 DIST doctrine-instantiator-1.1.0.tar.gz 5343 BLAKE2B 73f737f19c8ae7a3fa9a7dcaa760246da6d688e28f15be0c40e031be8147887885bba2ec0a7770ead7de7b718247108b41b4c1d08712137c9c06911bde263176 SHA512 7f59dd7f80df02fd1e46f4b0ecd8488022b34933effddfc40d3424b279a35928adfc0fb7567172149338a8d4273b24305eaa46fc51aa0af45a7b230646354f09
 DIST doctrine-instantiator-1.3.0.tar.gz 6299 BLAKE2B 6eb41562f52965381a780243475bda73a921d44784a66cf23816dd228efe4299d225f0cd52a4625a3516d8ae22b7f691a2724b477b944211e8d1ffd2c4c90540 SHA512 989b14bb28f75d091243dd5833a0a7c91889b45a1fcafb425b38de223485aae4470e1f1877b024ca58c5cf3539f8b39ef337166dbbd664bede7a5f3adde623a9
+DIST doctrine-instantiator-1.3.1.tar.gz 6328 BLAKE2B 1854e188cb39131a7ad02698d8a43c2eb84f7ec0239c04f973a7e66913664d49d4e89a09c1ec74b07ef87ecdf3dadb3c61140dcc3727556c44d65d8c022cc821 SHA512 eb5de9d38d45de3306d5481a747ae8164199aff222a52ce9d0fb2c2d18a082c7cf48ea3d670ff81d63c5fe8c2a855c583168a3d810ee9d4bb48d23505aaa80c3
 EBUILD doctrine-instantiator-1.0.5.ebuild 690 BLAKE2B 180913a6404d78bc1d72666f37cfbba9bc969a4062674ab11ae30c2e67fdbf6a98728ccad8a38ab8a8cec98916bbe11a3ff66290ff856e4904531cbe108e2bc2 SHA512 b60307c07d87b4a4f0565de9c9a3ca36ab06e9817285b14e50d8e6525c7785dd021b6200342c179bd39d43ac39e2e0913907dade85d49c67d312afc1927492a6
 EBUILD doctrine-instantiator-1.1.0.ebuild 697 BLAKE2B 71bf053159eb6c319c443d2312388d4ff2aa763f1c59f36b3f69cb00c5b775ae2d8a75f8497b35a182505e65872b7941a90c59ad941b1082b74c6f6ea1d5bef4 SHA512 faf9997e0a6c727c1ec3d3e4e8b3026f6dc8098b34add642f53d1670a2b47e30fc245bb5d0e21c651046837b0cac9dd6611c91bceb45c7a7f4373b1d47617687
 EBUILD doctrine-instantiator-1.3.0.ebuild 697 BLAKE2B d649a6ae7e681c1caf12860c61eb8380c4b5b11b4b41f7a20c441643b24102808cad942df3530731cdc4a48b6a00883b97cf76c81210f21c8c13a19f2e10a777 SHA512 457bc64ede2268c0c7af6bd7e748183587dc821a9ed138b300687c25b54fef9464d10b5c1af2e3a63d095110c2324973a7cc2c73c4b5ab28a9ae920e88517e86
+EBUILD doctrine-instantiator-1.3.1.ebuild 697 BLAKE2B d649a6ae7e681c1caf12860c61eb8380c4b5b11b4b41f7a20c441643b24102808cad942df3530731cdc4a48b6a00883b97cf76c81210f21c8c13a19f2e10a777 SHA512 457bc64ede2268c0c7af6bd7e748183587dc821a9ed138b300687c25b54fef9464d10b5c1af2e3a63d095110c2324973a7cc2c73c4b5ab28a9ae920e88517e86
 MISC metadata.xml 313 BLAKE2B 76bc8cb4562afb0810ab8a4a79265bc44ba328370c3ab64d3599c6971ee1005f75cca364a00bfca316584c00c28d1c9ad5b0eb3c86889426852af9a6bca31986 SHA512 6a34d1c5966ec568eb1cdc499ef9ea9c799e104a4c47aa061b3197ecafce3a49a372e5f4d92b834b3b725c7697ed1e5e85be4654b3159a2427f5d649b11bf93d
diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.1.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.1.ebuild
new file mode 100644
index 000000000000..6b79666dab62
--- /dev/null
+++ b/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/doctrine-//}"
+
+DESCRIPTION="Utility to instantiate objects in PHP without invoking their constructors"
+HOMEPAGE="https://github.com/doctrine/instantiator"
+SRC_URI="https://github.com/doctrine/${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=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+	>=dev-lang/php-7.1:*"
+
+src_install() {
+	insinto /usr/share/php/
+	doins -r src/*
+	insinto /usr/share/php/Doctrine/Instantiator
+	doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/json-schema/Manifest b/dev-php/json-schema/Manifest
index f7280678ffde..3c37798300f3 100644
--- a/dev-php/json-schema/Manifest
+++ b/dev-php/json-schema/Manifest
@@ -1,6 +1,8 @@
 AUX autoload.php 272 BLAKE2B 35cf5eb6efc11395c45a12a98d2882bc249b4496cba7b1ceba2abbdfa5dbec43a782e1034701f72e12d586aa80460fa87f0623f497f0da33cd8aaff7948d7370 SHA512 d5b970d485d198c855dcebe4c04adf37d7aaa118d7546c3b6d73944809c69ed18436568e33f847329a8027220f735cd5752ef5019bf8dfad40a740d94d02733c
+DIST json-schema-5.2.10.tar.gz 31261 BLAKE2B 2f2e3f562552105e924aa3e4408e50c6e42171cb8440ca8009166d956dcb9d4d6a3903c3b7e62bcfa228069c1e17f4faeab56e56ff935fd59fe251d27d12ab3a SHA512 b6d31b5478b93ef7dea741307648734d4d93aa4c0518b0037e81f5411810ea0570a046adb314cbee3f06da4cc9e654c419ff0be75b6ad0f5d3770c03be5707c8
 DIST json-schema-5.2.8.tar.gz 31179 BLAKE2B fc422b4ea632299308fe44104ed66365441879441446d47bad1da89182da0c1aba04877c279577fe7e8fc9f82e4677bc755558a4f4fa1893362d2b93e8743a08 SHA512 04a96413a12979ee42cc72dc7d6cd73ab26472c46cffa1ce65d7e2338867ec6cce48da5a058d4c8bb849a8fae72376272b814f3a808ed3374af9c98eb8674fe5
 DIST json-schema-5.2.9.tar.gz 31336 BLAKE2B 42d1a36810a28050bc543a4d79a3701444e86176e3c514ac198c7b6e8300edc615652c0116e44977c2bbbcaad17da96a4d32642cb304b653efe417e6a5aa67d3 SHA512 4666df39ad50a284687c216b30ac50a5ef4019260fbe0ecb052c820f9c029a904c07fae7606df3ab24b1ac18f651ca4a93ee83847e76361fd41072ce04ded222
+EBUILD json-schema-5.2.10.ebuild 860 BLAKE2B 432497563470f73d11cd08b98f72090b921a16d27ea6f83474db8b5fe670fad37e94976e39b19364cb9a9aa16f252b72a742e97efad775fa211b10d37166fa1b SHA512 ebaae8f90dbfc358b2f3ce19a77639959a09bea54914213f85b908c5048383cfd5a2a5da94eeaa566ef9d77ec69e7501e404a3ebe610f4aedaf2f4f67bee3f33
 EBUILD json-schema-5.2.8.ebuild 860 BLAKE2B 008001378526262ff2ab40a288cf887a86c7b40efadf763933519ca2ed24df8986133c91235fababdc922b4ef7c06db5766f073e5e251f68aefd4e0312c13b05 SHA512 ebc9d17959a0903632ef71e28475d912f945ed02b3b28af81bbbc135c42ec590a328dd544d30d056a8650afdf7bb239763b32612cb10a9e4394bc8f68ab7c921
 EBUILD json-schema-5.2.9.ebuild 860 BLAKE2B 008001378526262ff2ab40a288cf887a86c7b40efadf763933519ca2ed24df8986133c91235fababdc922b4ef7c06db5766f073e5e251f68aefd4e0312c13b05 SHA512 ebc9d17959a0903632ef71e28475d912f945ed02b3b28af81bbbc135c42ec590a328dd544d30d056a8650afdf7bb239763b32612cb10a9e4394bc8f68ab7c921
 MISC metadata.xml 681 BLAKE2B 7c94639852b0bb93de2ce1d05e53917d4fb893b503ac71f15b39233fc95a67ee469a53f175cd470b6f1f510e4f943839c848ae89ad74d3155c420740102c1185 SHA512 85ad81e521ac9eec7fcf4a8a162e412e97e29c30ed22048258a0a7a00b7f77c559544b033938570ebe64ce34ecd61d48dd20648751872d69b98740e791178845
diff --git a/dev-php/json-schema/json-schema-5.2.10.ebuild b/dev-php/json-schema/json-schema-5.2.10.ebuild
new file mode 100644
index 000000000000..0698ecde789e
--- /dev/null
+++ b/dev-php/json-schema/json-schema-5.2.10.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="PHP implementation of JSON schema"
+HOMEPAGE="https://github.com/justinrainbow/json-schema"
+SRC_URI="https://github.com/justinrainbow/json-schema/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+# Tests are not in the release tarball
+RESTRICT="test"
+
+RDEPEND="
+	dev-lang/php:*
+	dev-php/fedora-autoloader"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-php/phpunit )"
+
+src_prepare() {
+	default
+	if use test; then
+		cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
+	fi
+}
+
+src_install() {
+	insinto "/usr/share/php/JsonSchema"
+	doins -r src/JsonSchema/. "${FILESDIR}"/autoload.php
+	dodoc README.md
+}
+
+src_test() {
+	phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
+}
diff --git a/dev-php/libvirt-php/Manifest b/dev-php/libvirt-php/Manifest
index d9666c05a529..07dcc532c998 100644
--- a/dev-php/libvirt-php/Manifest
+++ b/dev-php/libvirt-php/Manifest
@@ -1,5 +1,7 @@
 AUX remove-imagick-check.patch 331 BLAKE2B 2d9c164055c3f54baf259326abe22d5aa478141df7f6ea05ba33f040701947038490c1898e89a7019cc1e41008fde5cb43c338730ef7ec3020f5005edd612d9c SHA512 1e949f8c704a2e6b541a276b8cb53e9cf09f009dadc01f4f50ad02e92258cfe30130b2d22b811e0b5b07e1bad4023fad05040c6031bd0063999212c2d6483bcf
 DIST libvirt-php-0.5.4.tar.gz 780793 BLAKE2B 8bb4577c26cc0ef8f2a0ae813ade7f5fdea9a2a7d70c97cab1033fde21d9a1c27b8c2ad7a8284096e143e955202bb564767b4d7e1a4bb9e15993895adc119288 SHA512 b5b204549e6810668203d1df8404a5cb71f646ae7e01ea223c6e9b9eec9b1f6500cc5bb4559859959d821a213ff992f22a97e4b683da2c683be3732710943487
+DIST libvirt-php-0.5.5.tar.gz 761250 BLAKE2B 9899d2f0e5ea387333decce5071afc81d4160d54ef570dcbe04422dc3e93479ee57520f9bf33a0275ee86cd4b1c87e5a3f7d5118e0cd87658faed44d2ccd4807 SHA512 2ea263561a0bf5d155314e06dcf3c3b5c278640bc5edfa674cdd777cb6d0810bda0492c6cf77a02bc88fb6aa99b0ff1f0cbaeea87ff2e45bff9b5774a2507684
 EBUILD libvirt-php-0.5.4.ebuild 1430 BLAKE2B 03a918a8f68b1a6cdbb0b5947497c6af1c8d94de78bd92c6444e57acd7b47a48c6faf4e4d4e0e6737659c8b5276c378fae8d710537031f0c9a3b620fece3de8e SHA512 73025d7466fc468dc74154ead58ddd8149e4c8d0dd8358512a565ddddfe873e16ba066ce943a4a8e383e15f90a6700242ab9ee4e73fc82d828e9667fc154bb01
+EBUILD libvirt-php-0.5.5.ebuild 1430 BLAKE2B 3b67883bd430be157aa60101906eff0301a3bc85dfbbd09aef164706623e14c647f15f68d33b55fd5e2e055246b1665c8fd5c0b552570c1c6ff68bbe42909f93 SHA512 6d3952fd5f0bef9fa8149c5997f55c65ed1c42226c576c049e80518c15cb08fd0b267de0b4f64c2e1e65b681c7371a9cc4f8c7931c205c17e029612cc54dedd3
 EBUILD libvirt-php-9999.ebuild 1417 BLAKE2B 86dbb2400e9b92fb10b36e812bb7be272ea075d80c2710d9a00566a679ee736b6893803965cd8751fb08fec2b14862b68aabf7dcb4508931cae7d276930aafd1 SHA512 4a1ace4769f1402462b91d27bba97544876eab8d8c9d516c40aed331bf11dc9a1cfe9c77770335a935e0c7638aff221440d849d82711bdb1c1f5ae66f0bb3afb
 MISC metadata.xml 371 BLAKE2B a19266222702c53095b36860a4be3dcacd9808273258ec4819f23fd792226d7c3b667e169c69b91419defd64569fc4c9f2e8bf9fb69361fb68bfb5945467a897 SHA512 0d2df32d913253928112d928dbccbb42b19bb62e6d76334966f87fc6df8378a2cda0b057df17bd565976006da61c9fd3a30425b153852c8389557fe85dd3115b
diff --git a/dev-php/libvirt-php/libvirt-php-0.5.5.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.5.ebuild
new file mode 100644
index 000000000000..dae081f9be6e
--- /dev/null
+++ b/dev-php/libvirt-php/libvirt-php-0.5.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="libvirt-php"
+PHP_EXT_SKIP_PHPIZE="yes"
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+PHP_EXT_ECONF_ARGS=()
+
+inherit php-ext-source-r3 autotools
+
+DESCRIPTION="PHP bindings for libvirt"
+HOMEPAGE="http://libvirt.org/php/"
+SRC_URI="http://libvirt.org/sources/php/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="app-emulation/libvirt
+	dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	virtual/pkgconfig
+	doc? ( app-text/xhtml1 )"
+
+RESTRICT="test"
+# ChangeLog and NEWS are empty files
+DOCS=( AUTHORS README )
+# Remove the insane check for pecl-imagick which is only used in examples
+# and is not called upon in any build
+PATCHES=( "${FILESDIR}/remove-imagick-check.patch" )
+
+src_unpack() {
+	default
+
+	# create the default modules directory to be able
+	# to use the php-ext-source-r3 eclass to configure/build
+	ln -s src "${S}/modules"
+}
+
+src_prepare() {
+	php-ext-source-r3_src_prepare
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		eautoreconf
+	done
+}
+
+src_install() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env ${slot}
+		insinto "${EXT_DIR}"
+		doins "src/.libs/${PHP_EXT_NAME}.so"
+	done
+	php-ext-source-r3_createinifiles
+	einstalldocs
+	if use doc ; then
+		docinto /usr/share/doc/${PF}/html
+		dodoc -r docs/*
+	fi
+}
diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest
index 768fed12cfea..e36ed5fa3a97 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -1,5 +1,7 @@
 DIST redis-5.1.1.tgz 245205 BLAKE2B b7177be5282b081562a446b1b37c7b46ba0ef382e55f27989d5586346a10f842d050ee46e881e480ea6b768e1259458df565d02193eda13a95704cd5455c1ca2 SHA512 eb6aa538d2ae4115634fd5841e3ccccf788cad13b99e0485fb2af43def85e93328012e5cef66d1be4bdd494be6f68de329a066e41b710e434f94f3ed3401bfee
 DIST redis-5.2.1.tgz 251570 BLAKE2B 297d6130469735a53f6dfb6ffea8c7c813363099eb76f25619f0cbb05cd06f5ecad9c0f30c370e33985523cf26488cf133aa0a48a99075bc6d5796309e3d914d SHA512 de90bf65cce0cb8c5ea28415e4f7bfff23c8bb3dc96ddca3158f94be2e4bd051e13ec3f34429b0e8ceb436096520e3998f544f377d5ef7d4d1df4edba7f66bc2
+DIST redis-5.2.2.tgz 251629 BLAKE2B e6ca740412dd1ba4ee960e1c71b3f75ebb1a1e2605bc93159395c657ab61eda4c8222b6e890a447c06cd1ef016e061861ffc5d8a6fd6e7e324353a148b54c593 SHA512 0020c572bcd24cdb479046727fba2d30ca87c9a7111c51e5fe3be0b85459e3e7dfc8892b690650de0a7dc80c1a8921f9de45590f6e60257fbf0534729c6e6f4f
 EBUILD pecl-redis-5.1.1.ebuild 1288 BLAKE2B 59d4de29ee1b61edede0c31ab5bb4fc40885c3d13744125f0838052299ead06f10965e5a5b9f269b368d3d4981e309fc1ee168f9a1cdbefe8eaee1554bd4c1cb SHA512 90bc2609cb87d3d3aacb72bd507a5895b5b531d243363676bbda1fb14548960b0073b61bac44e77b983570a9c116b2f369ab835bfd179e9af610deb0afadf994
 EBUILD pecl-redis-5.2.1.ebuild 1262 BLAKE2B d29de451a8f863b87a77a356f52b781c94fd448c3ba1e4ab5c74a35e0d977d64a70412fc2b51f7e2267eda03dd2e886d1faa11bb4fe5bdf186682052f3b7b52b SHA512 1d975f3afc197a779295686e9645f24dd82611e326e1c89c387f3dcc8ce20f32cf68ebd5d2fe2f8451329c7d6c655ee998cd602ba0821227319ff84c85f705a0
+EBUILD pecl-redis-5.2.2.ebuild 1262 BLAKE2B d29de451a8f863b87a77a356f52b781c94fd448c3ba1e4ab5c74a35e0d977d64a70412fc2b51f7e2267eda03dd2e886d1faa11bb4fe5bdf186682052f3b7b52b SHA512 1d975f3afc197a779295686e9645f24dd82611e326e1c89c387f3dcc8ce20f32cf68ebd5d2fe2f8451329c7d6c655ee998cd602ba0821227319ff84c85f705a0
 MISC metadata.xml 383 BLAKE2B b7a47896565db2f132479963a5479262864421a8388bd262ba9aa8eb6445e0d351478530475b5dba12cc9cbbc33089a904f9945816d3009c75f09dcea9c4cfdc SHA512 da5c3918a6652f1f3ae58a5bcd2c5eb3308d764df1a14bae1658f5f2022ee364b6cd288c4a3c700cf27b70b2f967f66668c17ea9850fc48910005310d16125b0
diff --git a/dev-php/pecl-redis/pecl-redis-5.2.2.ebuild b/dev-php/pecl-redis/pecl-redis-5.2.2.ebuild
new file mode 100644
index 000000000000..ec5cd6b371d3
--- /dev/null
+++ b/dev-php/pecl-redis/pecl-redis-5.2.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="redis"
+USE_PHP="php7-2 php7-3 php7-4"
+PHP_EXT_NEEDED_USE="json?,session?"
+DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS )
+MY_P="${PN/pecl-/}-${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="PHP extension for interfacing with Redis"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="igbinary +json +session"
+
+DEPEND="
+	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] )
+"
+RDEPEND="${DEPEND} !dev-php/pecl-redis:7"
+
+# The test suite requires network access.
+RESTRICT=test
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-redis
+		$(use_enable igbinary redis-igbinary)
+		$(use_enable json redis-json)
+		$(use_enable session redis-session)
+	)
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		# Run tests for Redis class
+		${PHPCLI} -d extension=modules/redis.so \
+				  tests/TestRedis.php \
+				  --class Redis \
+				  --host ${PECL_REDIS_HOST} || die 'test suite failed'
+	done
+}
diff --git a/dev-php/phpunit/Manifest b/dev-php/phpunit/Manifest
index c046fa232ad7..c19d9471622d 100644
--- a/dev-php/phpunit/Manifest
+++ b/dev-php/phpunit/Manifest
@@ -5,9 +5,11 @@ DIST phpunit-8.5.0.tar.gz 311500 BLAKE2B 1b21b898f8a933a228bb6f0197e1a884fe1ab67
 DIST phpunit-8.5.1.tar.gz 311607 BLAKE2B be746b70df855dd53a7faf61801258e2a3ec4f1ea008575328505e174193990d60d35533a220e03c93a4a013bcf177de71c3f8c1b856767a7cc52ab6aaaef0d6 SHA512 ab2d01d924ed34fc843f33f917e8aab6987ec547e02cdc662ce1f6d6ee383b064bb63a6f71420daee49ef87499471aa4e98b99ab6fc585229738efcbfb87fd46
 DIST phpunit-8.5.2.tar.gz 311677 BLAKE2B 7cc42db3618a9e6ffcc35a7a38a6691193814a036869c78af6ef4d020f43fe00633eeebc81cf5c4cb2db04b06706206d78885a1a2e39deea4d20e55a0f8189b2 SHA512 2b8c82381b3a4712c8cae453924b5b0ec25e6c4ef2de6d36ab31f6414a32806abfaa0de5068e585f203dcdd0f228b7ddffb930f394ca5af325c1f222e0523642
 DIST phpunit-8.5.4.tar.gz 312261 BLAKE2B cd130c5699abce3614e616525f58448283ac77f285dda421d33596a82a815d85a663204a661089373a5f6e9ef0d55ba8f327df759bfda6d6503c25663b6ad197 SHA512 307e441582399b2fbd77b30306702b0de0550e9f7e13a41cb39d665291d19e11d5952940fc198247688b95da7774786e86676053f5c64bd4405a1252f617f259
+DIST phpunit-8.5.5.tar.gz 158108 BLAKE2B ecdc339aa501d6f56eb13a26dae290a60609a8804c4160e339ac6900df70647fa3bba1e4a2fa9fb01b0363d0afa57b3e05305d7d055ac8ec03519c503ac3791e SHA512 22209ec189af58e490c688fe7e72c3388dabb497daa4d8c73f7c84036e39b4ae36d89f72b65c67f46487c8bc96f0c0e6760a3d44a3107c5a27eef52f764dd738
 EBUILD phpunit-5.7.15-r3.ebuild 1534 BLAKE2B 749d8ce5f0a947edf9e886e4ae6bfef4fe6d3b98ac9b71602a745db6b5cccfe666094d47d7a54ca15c3ab1b2c6fd521ec1cf64a0452329dcb9289d60415caccd SHA512 03daf408cecf3dd04bd9b43f81c2c551c5b59cb7b62a256966fff308e4dc69c8381dce2ecbdc2c7860717609daae3879b95a7fd7a30f2c1e6173003d2aab1e81
 EBUILD phpunit-8.5.0.ebuild 2154 BLAKE2B b36413b07a97bba3261f173123bd2c1aeae9e084125141b108aae3c54511109191d4f33341b7b470f335804c2b60ae9c7619de810229751ae8cc722304942f9b SHA512 7c822966dd5193b1bc29f6460b5a0e71924f5ed431ede68c940b4f8b62c71af146112950a4ca08b4d876adefbcd56a9e2b8b634e801ccc7c953317f1f0a95717
 EBUILD phpunit-8.5.1.ebuild 2154 BLAKE2B b36413b07a97bba3261f173123bd2c1aeae9e084125141b108aae3c54511109191d4f33341b7b470f335804c2b60ae9c7619de810229751ae8cc722304942f9b SHA512 7c822966dd5193b1bc29f6460b5a0e71924f5ed431ede68c940b4f8b62c71af146112950a4ca08b4d876adefbcd56a9e2b8b634e801ccc7c953317f1f0a95717
 EBUILD phpunit-8.5.2.ebuild 2154 BLAKE2B b36413b07a97bba3261f173123bd2c1aeae9e084125141b108aae3c54511109191d4f33341b7b470f335804c2b60ae9c7619de810229751ae8cc722304942f9b SHA512 7c822966dd5193b1bc29f6460b5a0e71924f5ed431ede68c940b4f8b62c71af146112950a4ca08b4d876adefbcd56a9e2b8b634e801ccc7c953317f1f0a95717
 EBUILD phpunit-8.5.4.ebuild 2154 BLAKE2B b36413b07a97bba3261f173123bd2c1aeae9e084125141b108aae3c54511109191d4f33341b7b470f335804c2b60ae9c7619de810229751ae8cc722304942f9b SHA512 7c822966dd5193b1bc29f6460b5a0e71924f5ed431ede68c940b4f8b62c71af146112950a4ca08b4d876adefbcd56a9e2b8b634e801ccc7c953317f1f0a95717
+EBUILD phpunit-8.5.5.ebuild 2154 BLAKE2B b36413b07a97bba3261f173123bd2c1aeae9e084125141b108aae3c54511109191d4f33341b7b470f335804c2b60ae9c7619de810229751ae8cc722304942f9b SHA512 7c822966dd5193b1bc29f6460b5a0e71924f5ed431ede68c940b4f8b62c71af146112950a4ca08b4d876adefbcd56a9e2b8b634e801ccc7c953317f1f0a95717
 MISC metadata.xml 329 BLAKE2B 45eb57929680d3c3d1c60a22dd1b760db42b1ce2a157c9b87209c391a08022c01a103972267b2f36cea142681d3cc3691a27c726b9a132974d7bb418e5316928 SHA512 007a4fea4de75a468e377398bb1539e25eedc8009ad6dcb6c170be653821b73d8eaaaeb236e207a2e33a509d2966f6a9571d8f0219d90b1662d4da1cdc7de896
diff --git a/dev-php/phpunit/phpunit-8.5.5.ebuild b/dev-php/phpunit/phpunit-8.5.5.ebuild
new file mode 100644
index 000000000000..3632144aa1dd
--- /dev/null
+++ b/dev-php/phpunit/phpunit-8.5.5.ebuild
@@ -0,0 +1,69 @@
+# 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 b047e13f641b..b14d9f42b58b 100644
--- a/dev-php/swoole/Manifest
+++ b/dev-php/swoole/Manifest
@@ -3,9 +3,11 @@ DIST swoole-4.4.12.tgz 1436554 BLAKE2B cc9e64e108aa9b393265708a6922f53824c2e9941
 DIST swoole-4.4.14.tgz 1440095 BLAKE2B 8a893604a84f750b95bb63a3c6ce9869a80a700b58e744e0da588dcdb88b9d9ae8fa5b73548cc182e255d7fe4e49139c3da9bcec40a54af94c35d355ee4cbfe0 SHA512 73b598069d38dcc3201a31fdd93c1bcf0ce31ab5399bade8c31f6decae25ef6e9c0aefe0412409158c1dd0fe502751c8e669e0a34561cb1b36448366708572c6
 DIST swoole-4.4.15.tgz 1454897 BLAKE2B 38f804e5f2f41ba2bc32ac2e6fd7be3e03f7a361487d7dad41bdc2ee3f2489d41824f60a841de1e3dea0cbf105d11dc1b5c2225ae49a02155604bc09c990ed61 SHA512 5ad797b38a20cfa17b0aa1fc5ab4f6446b84debb38babc05630e07833895401c778f1c6cf9eb32d7204b02c0e170ba6e613f356a054baa29ac511c19ce59620f
 DIST swoole-4.4.16.tgz 1457270 BLAKE2B 4b65270aa1014ea68cadae8eb021d37498dc3fe0bf2d681c95bf7113928138bc26ab73f3be91185eb5ecebcb4940906814913c7908c87592aafd33fbc1820bf7 SHA512 7be4705967ed6b7a955f679f8c39585d34dc8c87ba608ac3ae2b0fc3cae9513d9639c8e9aac4278ce85acc215b500044626aab9b2aac725c9ffaef72dfb02dd7
+DIST swoole-4.4.19.tgz 1469420 BLAKE2B 0240b5fbd6a4625d426d0c960859b8215122fff10be9e70823eb32f196d3ec075a952dc133258b04c323439de982079f5acbab9039958c457aa18f1687118ce3 SHA512 be4671da9fdbf65daf6364e5eaca9b25fd3557bec848a04b636ace48c896d4dbf08f6e877d6166571aa966732a70037bf2d4ba2f302696dd2b1371e2de993106
 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
 MISC metadata.xml 344 BLAKE2B b6bba613a547a33d17c214859118a6f8c499b65763a8373dde96b955efc9609ddb2f2de6cf678a5f0f1552ac1b054661d2771b68cc007327950721b9e36417aa SHA512 8fe672a189916bf935ff0bc312b617658d3fd789bceb0305dbe9745600690cc2b9d93d2bf60b1bd517c1824c5cef2ea8ebe4eab69716ecba5763742b15cf61c0
diff --git a/dev-php/swoole/swoole-4.4.19.ebuild b/dev-php/swoole/swoole-4.4.19.ebuild
new file mode 100644
index 000000000000..146edf124e9f
--- /dev/null
+++ b/dev-php/swoole/swoole-4.4.19.ebuild
@@ -0,0 +1,74 @@
+# 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"
+DOCS=( README.md )
+
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+
+inherit php-ext-pecl-r3
+
+HOMEPAGE="https://www.swoole.co.uk"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Event-driven asynchronous & concurrent & coroutine networking engine"
+LICENSE="Apache-2.0"
+SLOT="0"
+# Tests can hang.  Disable until this no longer happens
+RESTRICT="test"
+
+DEPEND="
+	app-arch/brotli:0=
+	dev-libs/libaio
+	dev-libs/boost:0=
+	dev-libs/libpcre
+	sys-libs/zlib:0=
+	http2? ( net-libs/nghttp2:0= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] )
+	php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] )
+	php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] )
+	php_targets_php7-4? ( dev-lang/php:7.4[cli,sockets?] )
+	mysql? (
+		php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] )
+		php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] )
+		php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] )
+		php_targets_php7-4? ( dev-lang/php:7.4[mysql,mysqli(+)] )
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+IUSE="debug http2 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/xdebug-client/Manifest b/dev-php/xdebug-client/Manifest
index af7216f2f5d8..01db2168a1b5 100644
--- a/dev-php/xdebug-client/Manifest
+++ b/dev-php/xdebug-client/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD xdebug-client-2.9.4.ebuild 814 BLAKE2B 70a121144f1144210566d3c97e38551da0c7910a23e35896e12c2973205d86d3f92f8fadee8d5249ba1b7668d923265b420285f755b857d34f65ba7db1485f0d SHA512 186c937cfcf12e626d098456a096ce27244c308d528c48126cf839d67badd7b9ff3de593ea58227f94391d1b8c85a4c48d08fd67e7904c4d3cdf6d6ef198d2fe
 EBUILD xdebug-client-2.9.5.ebuild 818 BLAKE2B 8cb831537f4919e004b7b6b683d9cca39d3abc7a82a1ca22181e0d626bd0781396128fe8d6fa6ec8396b7025460f3b7e4e295126489c6b85ce8b8f8347b463f2 SHA512 7440d82ecf5685dc1832e34912aa9aff85e0bdb2da42ee5fd02249aa3e07945b3ac095300bdd3344e0583d5a64c58abe28e5cdbf4be96131b7c90db840e663ac
+EBUILD xdebug-client-2.9.6.ebuild 818 BLAKE2B 8cb831537f4919e004b7b6b683d9cca39d3abc7a82a1ca22181e0d626bd0781396128fe8d6fa6ec8396b7025460f3b7e4e295126489c6b85ce8b8f8347b463f2 SHA512 7440d82ecf5685dc1832e34912aa9aff85e0bdb2da42ee5fd02249aa3e07945b3ac095300bdd3344e0583d5a64c58abe28e5cdbf4be96131b7c90db840e663ac
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug-client/xdebug-client-2.9.6.ebuild b/dev-php/xdebug-client/xdebug-client-2.9.6.ebuild
new file mode 100644
index 000000000000..ad1c2866a297
--- /dev/null
+++ b/dev-php/xdebug-client/xdebug-client-2.9.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+MY_PN="xdebug"
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+inherit autotools
+
+DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)"
+HOMEPAGE="https://xdebug.org/"
+# Using tarball from GitHub for tests
+#SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz"
+SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE="libedit"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}/debugclient"
+
+DEPEND="libedit? ( dev-libs/libedit ) net-libs/libnsl:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with libedit)
+}
+
+src_install() {
+	newbin debugclient xdebug
+}
diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest
index 13cd50a77478..02a0b37225f8 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -1,6 +1,8 @@
 AUX 2.6.0-xdebug.ini 1623 BLAKE2B 6d8c3352dc55778e29cce92794ae36421a6e696244e3c7e1dd4e98d2ff0a6c86ce91e4e4ff2749cd58135e838ff61e2cad5bca8879caf9928d82e2f4bf17af80 SHA512 fe715f986fc5fbc0b92f8d708281feb5b9f6e0a054537ad7883c11acd035d0ddfc20812d64b35a616e0e8048b6332a097a0103329e2c96221571eeecbaaa963f
 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
 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 1155 BLAKE2B 82a9636995566fd9143a02281c2114f98dfdea9f6d721f3e5916dbeac3d6d07d1a24a73cad866fad8729c472daa416c89ab95c41f0d84e258d4075a5a95dadfb SHA512 76d4db91e8346cc5a8ce97abe00994ac5773b9c55359ff596d61b6e2bf73539fbe968dc6aa00f98b372bc390381c9ec70f6ec0db1d92e3de20e3a1d82f6275be
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug/xdebug-2.9.6.ebuild b/dev-php/xdebug/xdebug-2.9.6.ebuild
new file mode 100644
index 000000000000..95745e2c779d
--- /dev/null
+++ b/dev-php/xdebug/xdebug-2.9.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PHP_EXT_NAME="xdebug"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="yes"
+PHP_EXT_INIFILE="2.6.0-xdebug.ini"
+
+USE_PHP="php7-2 php7-3 php7-4"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="A PHP debugging and profiling extension"
+HOMEPAGE="https://xdebug.org/"
+# Using tarball from GitHub for tests
+#SRC_URI="https://pecl.php.net/get/${PN}-${MY_PV}.tgz"
+SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+		~dev-php/xdebug-client-${PV}"
+DOCS=( README.rst CREDITS )
+PHP_EXT_ECONF_ARGS=()
+
+pkg_postinst() {
+	ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
+	ewarn "installed as a dependency, and not all users will want xdebug to be"
+	ewarn "enabled by default. If you want to enable it, you should edit the"
+	ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
+	ewarn "call xdebug_enable() in your code."
+}