gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-php
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
243 files changed, 951 insertions, 1386 deletions
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index a6c9a89ab2e4..b918f9f5e141 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 46f1327322c8..e2a492378db9 100644
--- a/dev-php/PEAR-Archive_Tar/Manifest
+++ b/dev-php/PEAR-Archive_Tar/Manifest
@@ -1,7 +1,9 @@
 DIST Archive_Tar-1.4.5.tgz 20919 BLAKE2B 506b2fae8f99634cf40ecff9c5ec695c101f4e14ae867795851a7e238a62c2611581aaab1cc0e9a9354184b20ba141f29ae3998881e7ebf777c596e5dc251577 SHA512 7a7e16e37b0c7112a77333ed2c4d0a0ae57cc1e971191c79b1858227b46f967aee915757a81bdfef3a9487a53b81a99bfbe84f78a346671fe44ac9f1f203a358
 DIST Archive_Tar-1.4.7.tgz 21134 BLAKE2B 15bc4e7f74a61062d10fa69bb826bbf92dbee6fc3f45da32a2b25964f3e042c0559e0614be13592b68cdea0a819315f43c4331d9dc90e94dd3c773f38c379e99 SHA512 e496fdcb1e7a2bbbc4aae88bae5793b0da6e7e7ee0ebbab78de14279cc3a5b7a2ec30d1424c3977ba6e4edd4780c0cb8dcf4288a7495252e28c560b8781d5b75
 DIST Archive_Tar-1.4.8.tgz 21236 BLAKE2B fded2febc840bdcfd072e4ff44b3002078899c01a3aa3110cd5b54fbb1695e856f5faad447330d174e4b3b73e515d15de7a700c6a0e588f7e038b79e09f02362 SHA512 b4fe4944a6f261de0c9e28aeee7f50fc7220400c6abad3093c81b1b3b98cbb179abb17b53e90071af6f2fb0f13dfabb24a51d826f4bc632631f1e60e038728e1
-EBUILD PEAR-Archive_Tar-1.4.5.ebuild 748 BLAKE2B 9ae08346045fe708e4e3d55acea54e81af88515bd8a6e93c066248fc51ec8cbb4b55e075a25a7b71e38e7536296adf28d03fe56015da1a7c740f39da95c1d84d SHA512 92333f070edf8c5247cb87cbc8316512cb0dd35bf10e89d2d3cac58d22267bcf9dc1fbc328b84ecdac8255d973ad1c434cc7378f3f8d0a768225bc118bda1e92
-EBUILD PEAR-Archive_Tar-1.4.7.ebuild 755 BLAKE2B a05fe470b88db70c1cc686784504e94b4e7f662baf8bcc38464d140e4b9b1149f3da49d9b3584ba12af100ddf71849dfca364ac0cfeadf9c204e2b36c5a51586 SHA512 735a038a3cacead38db5a5eba05d08bbb132ef67e611b757f363f46d7b6ed3450877dab92523f60fe28693173d10158bbbe47584375a21dac5501d12d96cd9de
-EBUILD PEAR-Archive_Tar-1.4.8.ebuild 755 BLAKE2B a05fe470b88db70c1cc686784504e94b4e7f662baf8bcc38464d140e4b9b1149f3da49d9b3584ba12af100ddf71849dfca364ac0cfeadf9c204e2b36c5a51586 SHA512 735a038a3cacead38db5a5eba05d08bbb132ef67e611b757f363f46d7b6ed3450877dab92523f60fe28693173d10158bbbe47584375a21dac5501d12d96cd9de
+DIST Archive_Tar-1.4.9.tgz 21343 BLAKE2B c951a909c151c4582841692dfd85068031ac80f7925b562c408ab8d454fbf693b8dfc046137150ee5ea5e452a669c2f25a8017c5e623ef095fa81e799451f50a SHA512 c0cce8213926aa9fde07bf46d77015b2dfbfe878cf386df43fcd4cf346b4ffdb2587676cfb69fc917cc31b63507c33702938a22aeb26e16b5ea27039c525c4e1
+EBUILD PEAR-Archive_Tar-1.4.5.ebuild 751 BLAKE2B e96088dd60d167367934f0f7cdc21cec689ed686a21f5ba40428566ba87dcc95e1cbf7716132d6de5709297612df13764d651c1796632e99ab9e0feadc337bae SHA512 dd5474a5ec6d2a73d522452fcf02f0eba3ce46ea9a57ef01da8d9212848d865bec41b3a91a5c32743753ca293dbe86c7c7d66e3b2bdc2e549ef303e1d8ced0df
+EBUILD PEAR-Archive_Tar-1.4.7.ebuild 758 BLAKE2B 5cb2c1d541d975b854a474b4c0ec3f6b0a2b70a40f41a18070e8cedcc0db137b1e48d872652763e18570a044c662779fe379ec78eb8c71977b184fd944190d8d SHA512 fe66b6584b258188e413f241abe38cf6f00ae8202f7baaf090e7cb96fd0f673779c27c6237d95a2d7c7f520766e180b3dcc21606a9ea53f6aa842435ef6567fb
+EBUILD PEAR-Archive_Tar-1.4.8.ebuild 758 BLAKE2B 5cb2c1d541d975b854a474b4c0ec3f6b0a2b70a40f41a18070e8cedcc0db137b1e48d872652763e18570a044c662779fe379ec78eb8c71977b184fd944190d8d SHA512 fe66b6584b258188e413f241abe38cf6f00ae8202f7baaf090e7cb96fd0f673779c27c6237d95a2d7c7f520766e180b3dcc21606a9ea53f6aa842435ef6567fb
+EBUILD PEAR-Archive_Tar-1.4.9.ebuild 758 BLAKE2B 5cb2c1d541d975b854a474b4c0ec3f6b0a2b70a40f41a18070e8cedcc0db137b1e48d872652763e18570a044c662779fe379ec78eb8c71977b184fd944190d8d SHA512 fe66b6584b258188e413f241abe38cf6f00ae8202f7baaf090e7cb96fd0f673779c27c6237d95a2d7c7f520766e180b3dcc21606a9ea53f6aa842435ef6567fb
 MISC metadata.xml 313 BLAKE2B 96717f88c6747b4b6dc814ffee022a1bfe7965ca71f0d1dff4acae773d37ba43d21b92343993b19c753360651ae63c7e0cea16d51c12d4fee03d6852a50be7ff SHA512 189683deca6b9b76a4ca070938afa484580b57a8c799f49f26e9b123165d545ab6aec31bc2b96400cfc5390f3837477a8d58b461e317ab14bf1152292880ece1
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild
index f0a7d102c777..c0a300889d88 100644
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Tar file management class"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Archive_Tar"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.7.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.7.ebuild
index 025fa048e203..14ff10890513 100644
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.7.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.7.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Tar file management class"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Archive_Tar"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.8.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.8.ebuild
index 025fa048e203..14ff10890513 100644
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.8.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.8.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Tar file management class"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Archive_Tar"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.9.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.9.ebuild
new file mode 100644
index 000000000000..14ff10890513
--- /dev/null
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.9.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 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 ~sh ~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-Cache_Lite/Manifest b/dev-php/PEAR-Cache_Lite/Manifest
index aa8cceadc474..4706b1368aab 100644
--- a/dev-php/PEAR-Cache_Lite/Manifest
+++ b/dev-php/PEAR-Cache_Lite/Manifest
@@ -1,3 +1,5 @@
 DIST Cache_Lite-1.8.2.tgz 33873 BLAKE2B 0b5a21550fe6eb33242e97b135a7e2532fb0a3a047dfb3e858bf6a6bdc21e991007e4787764561baa9a165fdebd159caa33c14c822a29374be4081d07a63c858 SHA512 dfb3c2dadd0ca60cc62ad71fd6fc51c0665901b4370207dfeb1f0f56e9db4fb24724d22f2939f67d8aa044e1b465483c40ec34fb3bcc5e12031d4dd1e05953b4
+DIST Cache_Lite-1.8.3.tgz 34036 BLAKE2B ca0b404371d370c7aeda2c83805d9f0c7c864063ffe597a277f123fd1de991e0e1c15e134ffa674bd387cc1d3cbb09eed047c7f10b8fbc755c0c8749483b2d01 SHA512 700376dd33afd0b1ed812d0d3dbdc14ad5523b3b181ac64ef0d56b62040c3d7bc9f234b3dae8013876a902f21da8dc92b1de41cea11aa428036bcc6e96166e65
 EBUILD PEAR-Cache_Lite-1.8.2.ebuild 471 BLAKE2B fc12491c7adb9a335fa5005c7cc17657126be607eb533d94f5ed7bb64701fbd5a0266fd58793aafa84ece83b627f56039efd70cb0cb0ffbb7704dfb48b02ce0d SHA512 5b2a782b5df15daeaeba403d4f99496fe51dfd04ee5f4418c47901c1b8c8f82d3a50ce21c3d15d7ec0971eb339121bf3bcf87190630447e1adb5e79339ecd0e8
+EBUILD PEAR-Cache_Lite-1.8.3.ebuild 478 BLAKE2B 9591c22b03771bd9476223f7e01935922fda012125ea2e4f1e70724601c710ee167e3321d65ebb6f77fb2af49bb4e4009b8c26aaaec0150526396ff9567037ad SHA512 f46a4819086a928a70e7a323d2ca60c55a190282e09c23d4cac9cb070b4fc3c93e020c5a39b11634501ee55cc389dcbd13f46a575fbf1891fb2e516efb0388f4
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.3.ebuild b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.3.ebuild
new file mode 100644
index 000000000000..8e86b80d4732
--- /dev/null
+++ b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit php-pear-r2
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+DESCRIPTION="Fast and safe little cache system"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-php/PEAR-PEAR-1.10.1"
+DEPEND="test? ( ${RDEPEND} )"
+DOCS=( README.md TODO docs/technical docs/examples )
+
+src_test() {
+	peardev run-tests -r || die
+}
diff --git a/dev-php/PEAR-Console_Getargs/Manifest b/dev-php/PEAR-Console_Getargs/Manifest
index bbbfb523f35d..f9c45653816f 100644
--- a/dev-php/PEAR-Console_Getargs/Manifest
+++ b/dev-php/PEAR-Console_Getargs/Manifest
@@ -1,3 +1,3 @@
 DIST Console_Getargs-1.4.0.tgz 18267 BLAKE2B c0aab73414a0b6dec9818faa2eae4a4f54d70168d089bb64497599e88f4b8ff86e4195e3705a75bece25f6c7d1054759b846be75f7fc749f1d50b4447ad9ec50 SHA512 927777f48599f64e2cdb05b80a473741718493e9efc20988f2993e6b092852f1432e2e9732c1470f7d580fc7e4000d563b7915a94305fe572b7f6dc27da0858e
-EBUILD PEAR-Console_Getargs-1.4.0.ebuild 364 BLAKE2B dc45652e41be48b28ac977a7e4229c1b32287fd927e9408cc28c2709e7f18fe244363b081eb30e3db31f79778304fbb5b6cec097b4caa81ede8b8d4142a21158 SHA512 e7a30f133d1eb61f9ec5e77aec78bf0aa6765be0906e4b98ee79fd5c173b298f370152df67059af9e6dec137ec73451b6b01e66a621756da8a9c5c7440f0985b
+EBUILD PEAR-Console_Getargs-1.4.0.ebuild 388 BLAKE2B 181071fa5dd25d00e473f2b7ff1bf84bfff347345a03f56cff248e99c7ca89ef4fed77a52fbd701d49c2d49dc75fdb99109d2ce23109804f5330c1f9e017f3bf SHA512 23788a1d9d4b04adcf870eeb69638ccb3f06406297ec9e11607c19f645d84d5e465d7906b719f38de563e9f42a392e14595df957f37363c814763352192b5078
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Console_Getargs/PEAR-Console_Getargs-1.4.0.ebuild b/dev-php/PEAR-Console_Getargs/PEAR-Console_Getargs-1.4.0.ebuild
index 58692f2f12eb..5a186bc0478f 100644
--- a/dev-php/PEAR-Console_Getargs/PEAR-Console_Getargs-1.4.0.ebuild
+++ b/dev-php/PEAR-Console_Getargs/PEAR-Console_Getargs-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,6 +11,7 @@ LICENSE="PHP-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-php/phpunit )"
 
diff --git a/dev-php/PEAR-Console_Table/Manifest b/dev-php/PEAR-Console_Table/Manifest
index 08426f29a382..0acf63787762 100644
--- a/dev-php/PEAR-Console_Table/Manifest
+++ b/dev-php/PEAR-Console_Table/Manifest
@@ -1,5 +1,5 @@
 DIST Console_Table-1.3.0.tgz 11391 BLAKE2B 25cbb72f2fa23026320840eb3e3b85f08dfc6a90ae9a613ec3e7251b407fc971c0a8aad3ac6bccbb9cd99066aca30249373539b8758fed58b0d1fc53898fc71b SHA512 83227ce8e55ae38cdf91b7097879a3406898064d1c047c5a94c6cadc46cbeeea51c43d135e6aadfbdb38fa080a1b27a1d4cea1c36ff9eb3e14dc4b04de334c11
 DIST Console_Table-1.3.1.tgz 11492 BLAKE2B bff94b2ae1b6d23eaf9a60deee4e78ee3467eff9d53c1d6ac8330347647b54700d4b3cf30be84c071afc34a4517b3135f6b18011418ea5dfc0e2841da1a30874 SHA512 abac68c20bb670b29f405625edff0330ce5af51763a50ee7482c3ab9d39c7335134d77c0f1a94ce4914c2f454d493a685841e07628eb2aa58cc66617521b6a65
 EBUILD PEAR-Console_Table-1.3.0-r1.ebuild 391 BLAKE2B bc5ad212a184624db683a114b4a66218bc588245cec020981e9a87112118306e80cd20891fdee59ef7cf1c68a54aa25b1dedd393627d8d107dc0384930ef449d SHA512 be8bdd84909cdd346c111a9361c98ee18f6729156d576b2b59a489bda53191f9dff547654eaafe121d71c4915474d3e6b50fac0ee625ee86c3ed4b1a2fbace44
-EBUILD PEAR-Console_Table-1.3.1.ebuild 492 BLAKE2B 27786247992c3f49c0bc2506c899c08d526d1327f6616c7acb6fd32dcfad6a4ab8b2bfc273f7eab0adac13a71283ce76b6e4a45fa2e6f4f1f57fb39a1ff552af SHA512 8adda02e118a1097aa4356ee5fdfb37805552a169183a1a9096bc8f16b746ac3900594bb5e40686db0addc64e833a3657be043a0f50bd8b271f9c1085e707b13
+EBUILD PEAR-Console_Table-1.3.1.ebuild 519 BLAKE2B db1ba783c2f66dfaba8b3d9ce33f96ca1c80e252877cce22b2ddb9c8a7d240a3184b8f77c54f6df5b97136ceecf3f46f4ba85a4131f0f4a077bb79d5ef05368b SHA512 b587595848b4ce3a8915b29a8a817317001ca11a246a35f6d673b11045881287964c68681cbaef2e6458547d80d4629f6ac32ce060a4764670ebfa371dd57f90
 MISC metadata.xml 315 BLAKE2B 82168e43ddcd8fbbff59b6a83fab3b4abbf540c4c486819da9ccf39b282f4b45c2bab6bedc97bcbcaae1656fd2fd1ebcee0d43b7ae0f5021eaa9767460a75dfc SHA512 8fdf28a135ca48c1d377bd355924214fbad506e853a6e9c85ba1956ea587e84bdcecb21aee700cff77031b37945a0143bbe98ea55e226934d6a7119ba367265b
diff --git a/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.1.ebuild b/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.1.ebuild
index b49bca76c897..fe0e497cf0c0 100644
--- a/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.1.ebuild
+++ b/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,6 +10,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 BDEPEND="test? ( dev-php/pear )"
 
 src_install() {
diff --git a/dev-php/PEAR-Crypt_CHAP/Manifest b/dev-php/PEAR-Crypt_CHAP/Manifest
index de98053c3ba3..9c45de2d84dd 100644
--- a/dev-php/PEAR-Crypt_CHAP/Manifest
+++ b/dev-php/PEAR-Crypt_CHAP/Manifest
@@ -1,5 +1,5 @@
 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-r2.ebuild 623 BLAKE2B 0a9249a37252fa37cdecaf9efe4ce020bd76b3bc01cd8fc73539f9df43b6f1ba4ca47dd54a3f57c151c92e575c7ca792fd519d187a457a6ef4ad29fd04dea708 SHA512 0180031b2adf07bd2daaf3b9647f546e90420a1432fa0c1b1dda5797838bb82158cc2d4f93f3f90d8faa11128ca9e0292ac41da208f863c29e9bea5a326eaf2e
-EBUILD PEAR-Crypt_CHAP-1.5.0-r3.ebuild 697 BLAKE2B 51a9e0e7b0a715f24c5c36638954e55c3e46eefec1cb1efe24d265ca01e1785cae3b52a4079b8cb54b555fb1ef526fe8d20ff38e4fd646ae3b92037d291de33b SHA512 a3edad84c783b669c9dad45e1a3ffa86719c435db60ea963d24cbfda60a94f67c750190582a1cbef930a17e93d3859f22410054ffd120c0150b0c317cc8f249d
+EBUILD PEAR-Crypt_CHAP-1.5.0-r2.ebuild 647 BLAKE2B ba441ffe94ecda8791a7d3197659b41222692fbf75ceae10fe0c88648f334d03209609e702839947d7a520234248d372c06bd696f9ae20fde28e1ece325a7def SHA512 d2d95bc8da59ac0b8e0a4a962d8fde6866eecb3b70c7bc808df3f7f7f41568bebe0bd8d290dc7dbc4f155426fd922622bbfadd47c66d8efd794e2ed89fb96874
+EBUILD PEAR-Crypt_CHAP-1.5.0-r3.ebuild 724 BLAKE2B b3899cfe796a9af254b170138d0014029ef1b850d5b0c77bf85d321b7e35b0a3830a29e76aa1b09ccb268ab426a396c72f531a00f1f95e29696e7d93656d8fcf SHA512 7765892850d5a24139ecc69711d08c5db9dd3f7ec11a51bcd1fcc3da9a934bef4a6894b225ae75e4042cf9ccd01bc8bf87ecbfeb7c58530fbda2bc6f9c2c616e
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r2.ebuild b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r2.ebuild
index a510e844d1a7..4e462d6ccde1 100644
--- a/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r2.ebuild
+++ b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 # Crypt_CHAP_MSv1 needs mcrypt which is gone in 7.2+
 RDEPEND="dev-lang/php:*[crypt,hash]"
 DEPEND="test? ( ${RDEPEND} dev-php/PEAR-PEAR )"
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 2de834bff92b..74ef6222b75d 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
@@ -11,6 +11,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 # Crypt_CHAP_MSv1 needs mcrypt which is gone in 7.2+
 RDEPEND="|| (  ( dev-php/pecl-mcrypt >=dev-lang/php-7.2:*[hash(+)] )
 		<dev-lang/php-7.2:*[crypt,hash]
diff --git a/dev-php/PEAR-Crypt_GPG/Manifest b/dev-php/PEAR-Crypt_GPG/Manifest
index 6f8aa501052e..1e3c6de0e7df 100644
--- a/dev-php/PEAR-Crypt_GPG/Manifest
+++ b/dev-php/PEAR-Crypt_GPG/Manifest
@@ -1,6 +1,6 @@
 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
-EBUILD PEAR-Crypt_GPG-1.6.2.ebuild 1141 BLAKE2B 5feb2ffb14cc87bbd68bd2a6f8a51c07060075d567acd4f2c45e9746a43eb4add8755dc38fcd9c687e5f6fb4b4281988db26f998b0f0105f08af8cfb7fa98315 SHA512 eaeb068e0394baea2e05c54d7aca1ef0bece420658769cee3ad7457f0cbb10f04369ead706eda71c0448cbede1317bd74f86a9bea0b89e613cb453cf69dc2b9e
-EBUILD PEAR-Crypt_GPG-1.6.3.ebuild 1089 BLAKE2B 3885feca314d963f85c7360c23fd8d8ef30e507b03ad5c705bf17e265086775a7c8558a718d17ccb79316ad7c9ee7f1eaf8e9cac2e454acf978dba5c216a80dd SHA512 b57fc443987d59a525790cb203ec8b5185275fa976cd5c9fcb1b86901c6e24f0e279b961477dae132d88382bae07638a593b027bad98f19347174e2044a3bdcb
+EBUILD PEAR-Crypt_GPG-1.6.2.ebuild 1168 BLAKE2B 9ca312b694631f32c9f86ebd6fb0236e7705e2cadaff7e3f289e722d9896e294c14651b7e1351dc3ebc87baeddbf7d1c222db7d010c9e93cd969afee6b341a6c SHA512 34dbb4558fdfe62be822bf85f66bc9e5db61dd7eaa61163a3653a89a17e67944e36c427274cf675727cde9063b0bf42d0eed752092311520217bb18228b1e04e
+EBUILD PEAR-Crypt_GPG-1.6.3.ebuild 1116 BLAKE2B 86de30ae2835a51e25e2c5e7cf29571aaa9a6805c39ac649b15fce531786e119ee7a0e81f035f470a2fdfb79f8eaf293187e4985d61392e41e7b53859c1d9388 SHA512 45f620f05bdf26f604834f723472ef724b7a029ad4366917ceba5fe5f749fa3adb6850e523885aa3e4553844c20c018f7bd896bcc3736d546c6b27ce819303db
 MISC metadata.xml 377 BLAKE2B d87bdb689ac2ef20b8d02bc7f9db6a3f23fa5bcaae752c4f5b1b0e5bbc67251779c0204b2943d044a1ca287bb07ddac9ef0ae960eb7f543e162ef6cabcbed65e SHA512 df55d57721b34bddab42639c469517c86139d60d4a4536b26b61cb35eb688c9d713cf90f92b2272e189e360042a2322e8f87480f4554a7c3cf9ffa314d053186
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild
index 8ce3847954b3..0e3691e00519 100644
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild
+++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild
@@ -14,6 +14,7 @@ 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]
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild
index 8d1ec5f7b2aa..a3270a7d8bd5 100644
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild
+++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild
@@ -14,6 +14,7 @@ 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]
diff --git a/dev-php/PEAR-Crypt_HMAC/Manifest b/dev-php/PEAR-Crypt_HMAC/Manifest
index 71a0cedc7460..3d3db9fd6e36 100644
--- a/dev-php/PEAR-Crypt_HMAC/Manifest
+++ b/dev-php/PEAR-Crypt_HMAC/Manifest
@@ -1,4 +1,4 @@
 AUX HMAC-1.0.1.patch 1501 BLAKE2B 2ee57e59c9d4ec6807c3daecc488a39102280c71da62baf9c3cf90a0af8e08c29e6d6be2593f148f4c4808b5d68fd0b681b511eeefd53bd91123959114651474 SHA512 19c968acbe449436f0bde2bbf9b379d9f04e76adf3283504b2fd396c94f19f5767a89a8fa23e23622b6fc3178be9c995b826d5540d994ca31e30f22a835f8c83
 DIST Crypt_HMAC-1.0.1.tgz 2149 BLAKE2B a95f145101cbd9f089948ac62d47b9a449a8cac328636987b49903c07c714c007309b294dd3a16fb5f5cf5bacf00c6e502fd8e29584803c99bff2bf61c5dec0a SHA512 5fb873d9d2e14f18f729e102b0295aaafef53bb150322f4a75d87f6d5ffd3e8829d424ee7285950d92c3408756b40b9ac7fe5123a73cefb341e4224f049bcb18
-EBUILD PEAR-Crypt_HMAC-1.0.1-r2.ebuild 531 BLAKE2B f17c22933aa6828a389d490839d7301749accaaf04731eed61839ad0528ef5495013ffa26a37f5507a6c0cc61974aecbd79970555c24bff4f46a5123ff2f5bf0 SHA512 363518b34f69265cc3a9723751d9204188b021a609cfc07fa36ed1fe6ad668049f0f36c96939eae2076778224a9c2d18193151480b9a7ce83b31391ea05f7d8e
+EBUILD PEAR-Crypt_HMAC-1.0.1-r2.ebuild 555 BLAKE2B 84e630b126cc502ea43ddc463711076e79af07f006c110e530ff4aa6c152fa9e84d5f742b5a3b19696c644fb569e9d2989acdb8303851eafb684d8b746a02b2b SHA512 899c3c2df4669b4d1a1f32aa6ba93224d47bd9c7ba74ab49b0d7f9c212eb7e03dd73da335273340b3ce1251215e4a1516e289c38d49a3e71d3a6d587df363078
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r2.ebuild b/dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r2.ebuild
index 5fba6c704025..775b68da5bc9 100644
--- a/dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r2.ebuild
+++ b/dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,7 @@ LICENSE="PHP-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-php/PEAR-PEAR )"
 PATCHES=( "${FILESDIR}/HMAC-1.0.1.patch" )
 
diff --git a/dev-php/PEAR-Crypt_HMAC2/Manifest b/dev-php/PEAR-Crypt_HMAC2/Manifest
index 5cd20323f7c7..837abc03133f 100644
--- a/dev-php/PEAR-Crypt_HMAC2/Manifest
+++ b/dev-php/PEAR-Crypt_HMAC2/Manifest
@@ -1,3 +1,3 @@
 DIST Crypt_HMAC2-1.0.0.tgz 8129 BLAKE2B 5e0754b683c1e930af42591a066b137e8ec4633eac10897361d923c84a3d70d327d224909c982b08d3d38ad5c810eb2a94c7d9bcdc41fddc44555e83587e2fca SHA512 0c3bd71ba8c2bf086ca703732fb3ee2471797ea486dbc863acbb5d07426395a65b8c794473ac4b1c1b85e954e27b79361116bee0a36f4b78edd780ea6c06bfca
-EBUILD PEAR-Crypt_HMAC2-1.0.0-r1.ebuild 701 BLAKE2B 89ceed915cf75c0af45f9448168166a64ac588426ea99d38ba6bab1deaa2e5db297fa2cf1c47453395328ecf63154683cc8187fc93ea16c110a4bb9bd1c850e4 SHA512 06bec85713241c64e516230763518c64c426808276af4d3344a2dd0e91ffb4c0a1ccc93c733e04186b058324841c169cf0360853c29acddf3b4d3220934cf9e0
+EBUILD PEAR-Crypt_HMAC2-1.0.0-r1.ebuild 725 BLAKE2B 0f8472d8aa5ab877f70485edba17575e656fc9356ff2f4cef7af552b4ce1901768be4a6521ca34a42c9e3cd0896749548f1d11c547c85d683fbc3359a79d812e SHA512 3f3fbdb7fabef81e1543c40703f1ae600a4f40d5b36e97f02dbe818d4574b6725f62946e39429d72d948666a2ce0d825b67d68fae1e06d534ebc9131597abba1
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0-r1.ebuild b/dev-php/PEAR-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0-r1.ebuild
index 2647980b40b1..5c3b4c4f0cbd 100644
--- a/dev-php/PEAR-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0-r1.ebuild
+++ b/dev-php/PEAR-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-php/PEAR-PEAR dev-php/phpunit )"
 HTML_DOCS=( docs/intro.xml )
 
diff --git a/dev-php/PEAR-DB/Manifest b/dev-php/PEAR-DB/Manifest
index 69167233b055..98f1e304d66e 100644
--- a/dev-php/PEAR-DB/Manifest
+++ b/dev-php/PEAR-DB/Manifest
@@ -1,5 +1,5 @@
 DIST DB-1.9.2.tgz 133795 BLAKE2B 8b37b010145efd10a2b551392988a810c35b9a8c794eb0e162056fcded104276b19e97afb91149f1814f9f838a0db579a76578fb80d96d0574e5b7714d77aa91 SHA512 126bbbb847a24c20731f1e5f4a549e9d7e0651a760f10c49cfc7550f80dd8b05f3560bc80110bcaab9e79dcbb714c6113948f14a727f7f4087a23178b3db0afa
 DIST DB-1.9.3.tgz 132290 BLAKE2B 8970697ac66bc9fe7f8c374431c59627133401e5b591fb3fc95ffc3a6ebb8cfe7e93982178e092eefc79d91657992eb539fc7211a237e3fe7407c75c7013831f SHA512 3fe98f97307818f65c0eaf291169fd13533a4d484d34d7fa7aa82580f6ec3d89b984292f173da2cf896f5f15531db9bde2be981e5a7679cc00c48aa2f9cc1142
-EBUILD PEAR-DB-1.9.2-r1.ebuild 735 BLAKE2B 157d5464d42366cb7bad5bc6d38863f4c2196f2ba3c892cfccd9e410f83658f947207bded84b2511ef560a31564318e10346f9d282b6f31ed4b2be6f3e8be642 SHA512 be2d0de9a3b0bcc94fb9a1492375ba5fb222f60a7fdda63b6d3637ad00930da002849138c0d24e63809af0ce9c1b106aba1eee1e2f06f64985ad05a4fcce2d09
-EBUILD PEAR-DB-1.9.3.ebuild 740 BLAKE2B 1450bd0678f82e051b1bc55bc88f2f4fdd08dac5ea82318cc8bbf992fe35826ab74473461549171ba8aab8111998bd3f16b4fc02475eae897d59e0ca0b21871a SHA512 4df453871bcf77c810cdfaf94f9045e9d6f04067f5aa70854f562843f28ddf65a12d24cf59ac14f40ded231b6fef553b1ee3319ed554f11ad52b03321e73911e
+EBUILD PEAR-DB-1.9.2-r1.ebuild 759 BLAKE2B 937c4eb2f165bcc577ef2e3f256c37dc1ae303e641b2d20b6336730ca3be5faf9b56d607d644397bd8d3cc427916fb421f39b2033b614a04abfd87166510caa9 SHA512 05b7f0004d289a97118d7ca9a11d138094ce233a599d2388aef9466d3cf45330cacde5ee167eb74250cbe9d0afa5438787e6cbd3ce9fc126589105e13997563c
+EBUILD PEAR-DB-1.9.3.ebuild 767 BLAKE2B 51e9da91a0a5e2491e0046a91241a2ad822a63e1f9e7199c81fdc9d68773390a6427fa536b095aaf4d3d4efc5312f0cd25a002111a8968040f59cfd26733aaf2 SHA512 4b92b9173ac854c19e8789d3250650b4280a01a44b649d98a3a5250c2e912bcfa5b3dd5c938b3666407b33e5506089c41b5619fdd12124b32a3b09607e05c74f
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild b/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild
index 58282c17bf5f..be76838871fb 100644
--- a/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild
+++ b/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ DESCRIPTION="Database abstraction layer for PHP"
 LICENSE="PHP-3"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-php/PEAR-PEAR )"
 
 DOCS=( doc/TESTERS doc/IDEAS doc/MAINTAINERS doc/STATUS )
diff --git a/dev-php/PEAR-DB/PEAR-DB-1.9.3.ebuild b/dev-php/PEAR-DB/PEAR-DB-1.9.3.ebuild
index b7d376017594..aef50db8db8c 100644
--- a/dev-php/PEAR-DB/PEAR-DB-1.9.3.ebuild
+++ b/dev-php/PEAR-DB/PEAR-DB-1.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ DESCRIPTION="Database abstraction layer for PHP"
 LICENSE="PHP-3"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-php/PEAR-PEAR )"
 
 DOCS=( doc/TESTERS doc/IDEAS doc/MAINTAINERS doc/STATUS )
diff --git a/dev-php/PEAR-Exception/Manifest b/dev-php/PEAR-Exception/Manifest
index e5e09da94bfd..c2ccdab70b5f 100644
--- a/dev-php/PEAR-Exception/Manifest
+++ b/dev-php/PEAR-Exception/Manifest
@@ -1,3 +1,3 @@
 DIST PEAR_Exception-1.0.0.tgz 5270 BLAKE2B f6f6874083fcef2453e1d07e1ee3e900e4f7d18eca8e9a9eda9891492dd3fc1e31eb13944031e82044f976f1070463a3b099a8223d2dabb2da109bb123997f5a SHA512 f2078186fdad6c6ca59ac462a24f7f9689bea08d30f786acb7779d52cd433e490c752ba0a263067d869151b0c051cded327cb3477a039c5de68c854bff002b58
-EBUILD PEAR-Exception-1.0.0.ebuild 653 BLAKE2B 83bf5bc1dd6344edbf23dd78ede1dbc37d1e0cb64e588d2141df5a8f0d14892738d721f2ed37b04378d4f058dc07b3875586bff30b4d3fded12c0803a1719f87 SHA512 d694b8617f285fc066c12c7519866e9f1e1c795ef63fad4a8804400f43dd78b939917323d1956f90e361cfc5191485ab08c3a4486147e574455f8f5aeda0dc1d
+EBUILD PEAR-Exception-1.0.0.ebuild 680 BLAKE2B e75e8891ec940c4f9db09a9df64b78f7692ec3610d885d4b4daf7ca5f3de878fd38a752973cc35e545bf638bd917be4a0a07975ef36e4e1e04e0c478a120ba98 SHA512 d54948cf80f39d109cc72cb3102bfd043ceec53d344cfe9f235fbf3851ee1ed751272a04a1c37a25a3d6c2e49e98a99d545c8cc9079dedfdd3811c7101c5b440
 MISC metadata.xml 387 BLAKE2B 889a6e870f53bbaf7ea5d86dbddd30c85bbab181886d5eed8b8d05d4b744ed5b1152773a158f7ace3b3bf037d0dc6d5631d5e951a12f4c7a16d05a66156513ba SHA512 c3c5a2c8f8f1696240e9631e2e29d5f0780c856ad92067b24bafdf2325170b24177dd2b0ef6dba4582ec517e64f98019e9c4b823a045c9f65dd5606f0bc29e62
diff --git a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
index 2cb21fe201fe..17309af49608 100644
--- a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
+++ b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 RDEPEND="dev-lang/php:*
 	!<=dev-php/PEAR-PEAR-1.10.3-r1"
 DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
diff --git a/dev-php/PEAR-File/Manifest b/dev-php/PEAR-File/Manifest
index 20ad2c2809e1..eece4fdb299b 100644
--- a/dev-php/PEAR-File/Manifest
+++ b/dev-php/PEAR-File/Manifest
@@ -1,3 +1,3 @@
 DIST File-1.4.1.tgz 8164 BLAKE2B f57a70b6cdd469c152f7beb2dffe0b278ae0eb71c412729a15b8d2a9dfef1b2bb303d96930bba64bfc1d4f2972a4f64087f972fc0367fef67e6b88c29e56a78a SHA512 78dbe4f80296f3c16df89de2f0d332b442d4787be4f7a3bb78259b0e0a0eb719bbadecba6571609ea6b6a488124ff36b6de08061e88268d5f2805fb8a3be05b0
-EBUILD PEAR-File-1.4.1-r1.ebuild 380 BLAKE2B 9e06d1ddbd0337543841e0a4bf31181ec5add3af25ebaff38b0f5c4b9b992bd528541f8859f53a4c530c0b0cedef7a1601c04a53e0dd4d90cce7c721f7ec1cfd SHA512 5a8ece70926d7b22ec4cc73a3b83586e6260f3c161dfb6fb5653e23b23ff57f7443add3b693154013d19f41c130bbe57b60883fe3cd9c87223b257f1b2cde63e
+EBUILD PEAR-File-1.4.1-r1.ebuild 404 BLAKE2B 42d0d37fcda562a411bbfbded1785c0e769457170107b16f345d05bf2219fa7660960b5f781a0296d1e9e5ce13ebe0ed86acd3d1bab4f39da6fe0a5ca0d0a66a SHA512 e103b3669a9d1bc257c84e31b4959acf0a5fd7fe4b7ff07a256548373f0edc75b4828853b552dceba33efc82e1791411578981256bac2d262252ce1d7b0e0087
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild b/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild
index defd8e1a5f82..ef6b2de704c6 100644
--- a/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild
+++ b/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="PHP-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-php/PEAR-PEAR )"
 
 src_test() {
diff --git a/dev-php/PEAR-File_Find/Manifest b/dev-php/PEAR-File_Find/Manifest
index baba520c2db1..042001dc9b5d 100644
--- a/dev-php/PEAR-File_Find/Manifest
+++ b/dev-php/PEAR-File_Find/Manifest
@@ -1,3 +1,3 @@
 DIST File_Find-1.3.3.tgz 8212 BLAKE2B be45210efcf1aad52df123dd141f1a8ea62321a25cb460da4384456baeff13b51f8850f44e08cb75baa350e7b2a1419b27d89dd5a81f58a7302ab93c95c274a3 SHA512 f912e1f680c5869380791979bd33dabce0e95e40a84ee188052b2be8280de806fd117c11d66b98b7072724ecd9d57203ee5a32fe35705c337e73393fec075bb0
-EBUILD PEAR-File_Find-1.3.3.ebuild 1151 BLAKE2B 115ac41471c6172cf5a6107bd22ffccfe21dd18efc0e1f2461405c71e69fbae8e034985048e7781002ca74e08a03a14f9b6cf12bdd7438b040c2f1e0bd8f0418 SHA512 a99a10e073c0ec465f200ab7f3b6b11c84b39c160a5dea70604232eef9a0f0078b3443af804f1cc7ae216e6685d5bb8ca7f5b17d338f5dd7f19735edb03ca8f7
+EBUILD PEAR-File_Find-1.3.3.ebuild 1178 BLAKE2B be731801f62bdb1aed824f0e253ec278c7b9b860dbe46ae07ab999565980f1a042a09a0e4e99eea42c27ac2e3733168a4d78a8cf5b4c5e14ccf189f55b985683 SHA512 9f7b403ae341a0b4fae7d8e46419f0fb103eae8897de5c890aeac7da06f836b7736163579708b34c1b47ac1b91fbceede420f54fca93e4867ac91c12e7d20f85
 MISC metadata.xml 377 BLAKE2B d299154cdb99a5ff1562f245e5a24face117c08cb2bd9f457ee83d40bde667ed659c84e94465c1cbaeb6b2220c48738d261ed690aca9bc43fc83d127adcff872 SHA512 1d640be46e06957c8f3c127a9acac3f4f6b197efdcb96b13a5fff00aa638b3cb7febb5cba261ce45bb68c2356894006e3e57343fdf8bfbdb5d60e6a89f173a73
diff --git a/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild b/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild
index 52cdf5e915eb..72c3e1fd1f34 100644
--- a/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild
+++ b/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild
@@ -13,6 +13,7 @@ LICENSE="PHP-3.01"
 SLOT="0"
 KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 # Really only needs PEAR-Exception at runtime.
 RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-File_Fortune/Manifest b/dev-php/PEAR-File_Fortune/Manifest
index 827805dc5ffc..2db0d101face 100644
--- a/dev-php/PEAR-File_Fortune/Manifest
+++ b/dev-php/PEAR-File_Fortune/Manifest
@@ -1,3 +1,3 @@
 DIST File_Fortune-1.0.0.tgz 14508 BLAKE2B df783a063df6d48692518955f8f1a6306b0e67021c0d3cf6a336ce643a907a5f89578c759f44c9ea36debac28d3819065c2763d5ff8f6c6f63ecd0ea13a68e29 SHA512 4f996e7c6efb339944cdd1cea75400a7539708661b2783fc1126697a12692b3db7a104550da8007fae4e0ac374c2c047a4c90dfa0d2c3424b84f4e1b61ae43ac
-EBUILD PEAR-File_Fortune-1.0.0-r1.ebuild 421 BLAKE2B cc4be0b791cc431250ee7f3aa264e5fa7447361f4d3603c3e80fb4bc8270d57da3bdd0f09b48f04c7a5794d44738e87d3503d9d5a4c6a51f0dcb3577ab26ebe8 SHA512 c1fff21d960c87718579d2274b28262c079b530d2cb74ececd13a4b795159752d5fbaec5d56cb7d91f564429fd75f0f7f95bf0225862a7d7c4ab67db906fb9dc
+EBUILD PEAR-File_Fortune-1.0.0-r1.ebuild 445 BLAKE2B 8eb691e622c988c1a27ce1158e8045ef40f6288f1ba5ac05a59f48626c5c51ebd7b289b54cfc69a9a8e717de6a06abb2b8a19923d397e3d163c59d4ab7497a62 SHA512 43942d9eb252a418bd496b5d10d557d338364a00efcbe7eb506efc7a3ee41b3b79246a6c4bc23dcc41526df28ba91aa952485783353eb698b004f3809847a578
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-File_Fortune/PEAR-File_Fortune-1.0.0-r1.ebuild b/dev-php/PEAR-File_Fortune/PEAR-File_Fortune-1.0.0-r1.ebuild
index ec5a405cb607..a406d87b0d28 100644
--- a/dev-php/PEAR-File_Fortune/PEAR-File_Fortune-1.0.0-r1.ebuild
+++ b/dev-php/PEAR-File_Fortune/PEAR-File_Fortune-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-lang/php-5.1.4:*"
 DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
diff --git a/dev-php/PEAR-HTML_CSS/Manifest b/dev-php/PEAR-HTML_CSS/Manifest
index a3bb436cb898..efc76a4d48de 100644
--- a/dev-php/PEAR-HTML_CSS/Manifest
+++ b/dev-php/PEAR-HTML_CSS/Manifest
@@ -1,4 +1,4 @@
 AUX HTML_CSS-1.5.4-fix-tests.patch 4009 BLAKE2B 6285a30de1d1fae3cb2a1326e451927a8297b77184c6f6371d391358fb8c52852befedbefc4dd65140787cb69e31772a1c1a1ec3c054ba1a4a306cc217f953db SHA512 39bc6ad58740cd7d84cc79285e7cbff3070dd4c5460484cb285d29e1a179a326cb18905288cb581d720327611baf0c33b4b7bfe736fb77f9c52faeb9e0f23490
 DIST HTML_CSS-1.5.4.tgz 45553 BLAKE2B 8fef3897bb577a1c12c7dd96ea4d15de5c1b46b40546b23b7262eaaf99db83c988631639a4f4e9b7a344ec02642e49c01c3afc9858f01ccd8c8e77cb39a75008 SHA512 d9418f5fe62dff27f39a0be80378444db6f9636323dd4a85fc1173cb799aa4e74656a55a1179bfc40a926d6ac3c3d67dde378ac49c2c19468e4541e2302c3afa
-EBUILD PEAR-HTML_CSS-1.5.4-r2.ebuild 658 BLAKE2B 75f540083de1bc6d789fa06b425ca70fd90d938fdbd494b27535e91313bee50869ce58974acaf09f9f752760b0ba369ca940f2ddad8c56d5368f298a86748d10 SHA512 adca37a844f597d37f51a7108c8b03296aeaba2de63010a6146d17c9e3d0c87163fd1caad6d8f7ab571e7c5e1a059d9e4cdb8d5987023441d7794c933a2c26b8
+EBUILD PEAR-HTML_CSS-1.5.4-r2.ebuild 682 BLAKE2B 7c2fa6c09b8d4e3f6bb085cc8df826bd6b0c341fd9a09bf3fb839e563f3f3310b90a68f3f2b641778d83a5f4ae6357df03f5c60d8a53268b436a467f45382121 SHA512 7c704b6186cf81e892b14ca480790e504a81410706bead1f864e546c0434a0be6fce5597c374061cb174b336941007169d5d12da48dd0bdbf00b3d68a9eaaa11
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r2.ebuild b/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r2.ebuild
index c9b8063f636f..60fa3779c978 100644
--- a/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r2.ebuild
+++ b/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="minimal test"
+RESTRICT="!test? ( test )"
 RDEPEND=">=dev-php/PEAR-HTML_Common-1.2.4
 	!minimal? ( >=dev-php/PEAR-Services_W3C_CSSValidator-0.1.0 )"
 DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-3.7 )"
diff --git a/dev-php/PEAR-HTML_Common2/Manifest b/dev-php/PEAR-HTML_Common2/Manifest
index 6a7114699a6e..a2f38c0ab3b4 100644
--- a/dev-php/PEAR-HTML_Common2/Manifest
+++ b/dev-php/PEAR-HTML_Common2/Manifest
@@ -1,5 +1,5 @@
 DIST HTML_Common2-2.1.1.tgz 8664 BLAKE2B 2422d0d32f1ff55bf0e40cda5460d3e891cb9bc27001b8d72b7f52d43a2ed6ed2507593a780819550aa11b9aaff75b286995d013cf3e74051abb8700b9f96ac1 SHA512 3fc868c0c5d69a542d205cf853f8993fe6849eec58b35b080db44a7a788b19dfdc9cd669d269ddab70f37edcde763d1beff4c60f2befc2cf2548f63197634124
 DIST HTML_Common2-2.1.2.tgz 8579 BLAKE2B 43d71ca1010e3cb4d73f25417b601872485f9c8990cb3117d112a84f2eca67437687d423146c1f67f8053116d4aef04b4859982805c7009047a682385878dc8e SHA512 f6082e44578dfa063f4f1a896ea477c485122e3d2cc89764c16ee76c3153d60276cbc290b4f3b8c18536aaeffb6797b9c56b8b0f2ffe1ef953fe02a5fb32b864
-EBUILD PEAR-HTML_Common2-2.1.1.ebuild 425 BLAKE2B f7e96cde580f4fdfcaadd1f09b29d8e58b52cc2ba3b5ff2fa0c0883ac48ae90edfa1294aac32c283b369c192e50bf0bc6b119f612c131c4bc7b7e6fd2027cc7a SHA512 e8f6af67161d427842140359a5002ad059dad35857fdf905af35daa37ed37512c911656a519e6888b706ca468f8bfe3464efff19ab52c2e2b8ca7d250b3564cd
-EBUILD PEAR-HTML_Common2-2.1.2.ebuild 422 BLAKE2B 27a9003016c439990cf5d78a7ef4497d034e4303a710fd0ac9f89b24b331778a48c91d98c330b66df350d973061fa151f279cc9d8ae9a1390a7848878d4092e2 SHA512 b4c7598347fdb8103ff1f368b8bf1f90e302c3f270198714b59bae5f7be44038861e424519a6d468ec6d9e0c7f751d135ef5ad418b2a89b3e79851c65a90288e
+EBUILD PEAR-HTML_Common2-2.1.1.ebuild 449 BLAKE2B 69dbca9cead7a3ea68f81156ddeee1c0ae961287aaa59ea2d086efebb39dbd87d719f0fd36ca019cab69ab0735577116095d5bd652c81916289c2301146c1624 SHA512 61b4c0bfcef16686e421beb56baedd132d60d0ee142c97a3718080cbd2295be83054ae8646d386735e5c709e1fa2aa958bf2594441edded2d75942b04cdcf6f0
+EBUILD PEAR-HTML_Common2-2.1.2.ebuild 449 BLAKE2B 90083ff5d6a17f74c94cd400b623f3c973dd81793a65af8a6a975f93023503319afab1a57a44cfcda379f8dfa71074edd7bb49e8758adc445f2afd9049ec5743 SHA512 51bbc685b08a5f13aab9b33a4368c8639bd109ccda15f80403f50c05f8e01bfea248c9c902085090cb4aa13d4f6c7f3ee5dbdb2a53ff62973f57113f3af52f05
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.1.ebuild b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.1.ebuild
index ca39a6f72e9f..3f9b1d0f198f 100644
--- a/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.1.ebuild
+++ b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-php/phpunit )"
 
 src_test() {
diff --git a/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild
index e03cc9eaca96..114741e6029b 100644
--- a/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild
+++ b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild
@@ -10,6 +10,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-php/phpunit )"
 
 src_test() {
diff --git a/dev-php/PEAR-HTML_Table/Manifest b/dev-php/PEAR-HTML_Table/Manifest
index ca772deb55e6..dd282f1c2ada 100644
--- a/dev-php/PEAR-HTML_Table/Manifest
+++ b/dev-php/PEAR-HTML_Table/Manifest
@@ -1,3 +1,3 @@
 DIST HTML_Table-1.8.4.tgz 16440 BLAKE2B 0dd3a9e7a184fbbab157e1372f753ed7b3b54e90753f7eb4564f0aaa61bc42183b82b2807d84c1214463e74dcf0c9c14a5f905f0c3eef1f772d70cb179416b9f SHA512 98091827a1cb29c5c13ad05081c2deb39d1c3caa84182837e36dd96371f518f1897b271e3c4682e085b2905df78ae202bbb4d7e9528d440ae6c37e801c326068
-EBUILD PEAR-HTML_Table-1.8.4-r1.ebuild 541 BLAKE2B c960e77868f0bd3001293cb917a01a1e88185d8161c67164c1bf886989da5c17991438834d5c4ae85e95b8b05b6b34a466b6616978323627147162245a789187 SHA512 d9be7b8983a4ab9574687685c96e5372db0a18600ac5326145b984ad68100fabb73503656dc644e05a54decc5de716f382a9e1825a9e118a9f73a04be3a4ea6c
+EBUILD PEAR-HTML_Table-1.8.4-r1.ebuild 565 BLAKE2B ce15981934bdeb7dd972c484e8f49141db1213e677d5b7266cb29e5b9b3757673615f979384234f0096107f620f50917a6223abd930919c31226aa50491c9cce SHA512 af170bab1b440bf86e11b22ba35b8d235541f8162542e02818973831cc7818c18d92434505e8f2768a72beb67ca0c11a3beec73ec68526fe2a2471ccba6c928a
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.8.4-r1.ebuild b/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.8.4-r1.ebuild
index 005e85475a60..36d801fded87 100644
--- a/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.8.4-r1.ebuild
+++ b/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.8.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( >=dev-php/PEAR-PEAR-1.5.0
 	>=dev-php/PEAR-HTML_Common-1.2.3 )"
diff --git a/dev-php/PEAR-HTML_Template_Sigma/Manifest b/dev-php/PEAR-HTML_Template_Sigma/Manifest
index 4edc39cb3f2d..b82c4a1ed3ad 100644
--- a/dev-php/PEAR-HTML_Template_Sigma/Manifest
+++ b/dev-php/PEAR-HTML_Template_Sigma/Manifest
@@ -1,4 +1,4 @@
 AUX HTML_Template_Sigma-1.3.0-php7.patch 2155 BLAKE2B 1e46e49bf5bf54719635736f8c5f50c6c123c5777fbcf59c1fb5129f068d4947c0e0669b6df76de80b2cd54ec8674a85174f1acfa3a2601abd82eab6bb30d416 SHA512 ea9399d7b7de2361a11b2cc2e89d534b4289ecd656c9b5d99618d4faef9ad7b39e87884d5c720b62a8d55c58ce66b35ee014d010bef5a8ec5cc4b2884b894eda
 DIST HTML_Template_Sigma-1.3.0.tgz 30185 BLAKE2B 62d91d803a088c45c662191cc4fe544d2ef694577a3250a5bc19bc7b41640fc695be95c075c8c3f53e3ebc03fa7d9d38135d607c408ff3d6cb0f1ad11855b740 SHA512 586068325a3320e2778131c1da98d6179d2385d2d73308b0ea1e8df3e0de23f869e03d74454752631998ef3411d8e8b37feab93c6c7b9f51ae4bedb48155e3ed
-EBUILD PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild 518 BLAKE2B 83c412e7c1a8843221e69979c6529d8c995e6f15ba4a182de42f69221898ab2f28ca54aa16fc413ae703d8f1b87876c364637675daf9e4fb9d4b1c1ea79bb272 SHA512 dfdbdc364abb6c41fa2f1e5521f681873c38b37b008ade7ce0ad1573015af7848078bee6383e1ea111f9e83b7f8158e7a3b51abdf81cdea802ab4656bd21dad2
+EBUILD PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild 542 BLAKE2B 6805809cb7050e9ab3e49e74763ac974a9fb57aa6bf6c184858c303840bbfba07ef0365f9f28101b6e2fcb614af11082a371fca1942bb3c6de0683b1aeedade8 SHA512 fda474a9f45d1c9060250628c2a5a67839b990d537f3aab39ed07587796097dc2c0ab6171cb5bd3a857ae9533c802da3109436e0d979c83cbe34e61650c8948e
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild b/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild
index ad5bb7561c88..906eaf8e4485 100644
--- a/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild
+++ b/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,7 @@ LICENSE="PHP-3.01"
 SLOT="0"
 KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php:*[ctype]"
 DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
diff --git a/dev-php/PEAR-HTTP/Manifest b/dev-php/PEAR-HTTP/Manifest
index 7d66b452c162..e1feaa395542 100644
--- a/dev-php/PEAR-HTTP/Manifest
+++ b/dev-php/PEAR-HTTP/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP-1.4.1.tgz 8635 BLAKE2B 2d834adcd5f5f2123f0d477bcb1b8189312d7fd8e2ff8e23f23a12ce762dbcda359ac61b192b58f60749c527c0545c3ef321a9610f3fbb0eacd3545e42f86e6b SHA512 60f9ef88eea358e83942213c9643ed7a635822c0963b79221eabb1000e126e5a79e4c6b3901c83c53ad1734ac6b774d355328a8d94087faee544af9bdc20f71c
-EBUILD PEAR-HTTP-1.4.1-r3.ebuild 449 BLAKE2B f6c1ff21c8aaf7e75576d874cb136130dab7040bbb8d62bd589d67a813249634f50302b60eaf9aa63eb4d1b9e7882263a9f8ac60a8e5a416f97eb1b0e6999dac SHA512 41e7af06814b2ebfa52d7f93320f25c65e5ae3d94cbc30cf84d0f7b861353fa71d275a23bc148cadbc9d011a9405b147672c266d092bbbeaf4a59bac814070a7
+EBUILD PEAR-HTTP-1.4.1-r3.ebuild 473 BLAKE2B 34dd864cd903d7c2d297e918f2c01f4e2506ce9ab3ecac7a1eeca4eefba1487b029d4a7d9a2f13e8dfd2cbb7632a8b1aa7a404dbf9a18ed71ba7d412e678ffb5 SHA512 f9a7e641987e6326975a90850c46ae95c7a82f5556d1e044056ce45287b9ef1040ca58467c523e62740193ca0c9fb7aafae1a17d5e15c2482ef433947df64785
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild b/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild
index f1b0bab86821..7597f7c664e0 100644
--- a/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild
+++ b/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-php/PEAR-PEAR )"
 
 src_prepare() {
diff --git a/dev-php/PEAR-HTTP_Request2/Manifest b/dev-php/PEAR-HTTP_Request2/Manifest
index 66c94330c07a..ea70b17262c5 100644
--- a/dev-php/PEAR-HTTP_Request2/Manifest
+++ b/dev-php/PEAR-HTTP_Request2/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP_Request2-2.3.0.tgz 119717 BLAKE2B f12972b2423258016f4f4ef8888b5aa1d56bb47146cc6e21f74edfd2e3cd8ae69a1830b4a203990e1346554f2a6e9538e8d5feae27cceadc8465b018dd34ff37 SHA512 52fc2768f3c5afe6fd4505d427255e467b5b7cac8a4116cbabc3f1c0ffe6f1bd061a9c9b31de2ebbd4a7844ae73085ab0d52adf905dce28eb31197117657d77b
-EBUILD PEAR-HTTP_Request2-2.3.0-r1.ebuild 726 BLAKE2B a448dcefcc381fd380dc0a679cd649bb37556c4b26da7ee5a542ff57d5c5a8d9e43bf8ac4530581dafc559b6253e142606c9d32ad82e309d94853c4dcf93877f SHA512 4618a56e7ca5a3ef80e6921fb2f9d8fadf099a4166f1ca420fb436356cd11eb7e2e20e936212bcde457c89e285b78492a1f92fc3d7efe6abf010d4882a4c2d21
+EBUILD PEAR-HTTP_Request2-2.3.0-r1.ebuild 750 BLAKE2B 1a870c917970661da9e0dc387d7692faae3b4cc9990dac69f8fa11e086c26f067c8688feb644f5bcbfaa45db1f6585311e0a9626b9387fa70eec952b57ba401b SHA512 c3750b78522c3b387ff504b913aa8c6749df23ea8b9215e4d971e27c1996da344417c6912b938292ebcf5427a4d9e6d17304676399e3a044b0f31c535fc0e12d
 MISC metadata.xml 719 BLAKE2B 82195b1905bf7b954b7a62502ef524628a05a509e551bdeae9dec1d157579ca6520a8173dd5cfe2eb677f8d26b5fce9195d9312027f6a50d063f0a77acc6152f SHA512 38a38b6d73d885e7222812f54cc4bb67fae6d05c5647b123c00c7676a3feb8fc2cf33a2d308058431e00865a1dc198fd978614c652e614a1058e0319abe72704
diff --git a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild
index 91d265e32693..23d21031598b 100644
--- a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild
+++ b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE="+curl +fileinfo +ssl test +zlib"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php:*[curl?,fileinfo?,ssl?,zlib?]
 >=dev-php/PEAR-Net_URL2-2.2.0"
diff --git a/dev-php/PEAR-HTTP_Session2/Manifest b/dev-php/PEAR-HTTP_Session2/Manifest
index 59d9bb526a53..c717a494e286 100644
--- a/dev-php/PEAR-HTTP_Session2/Manifest
+++ b/dev-php/PEAR-HTTP_Session2/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP_Session2-0.7.3.tgz 16362 BLAKE2B a4f2329adcc8df3434518245010487d8e0e4346359b4576f2c68b8a3533e20ee9a9013ea0d2c632d62b1eda2472665f3080c3deb8f73e9f9a66b087a1aac7adb SHA512 ad598f1b4ca84310c339afe31f45aafc4b8245716be39e220cd9a62ea64f1a0aef0872b0a9b076ecc7f0d9fad4a4fa7dada7b4c46c2eddf4f26a9f5ef2c759c2
-EBUILD PEAR-HTTP_Session2-0.7.3-r2.ebuild 474 BLAKE2B 855200131aef276320e48018a2a214c1789228d590ba673403b5e1527aa36fbc1ce647f9828c315c9bd4fa297170f4158fb26625e4a76da3cda9e105ac3d5c81 SHA512 8d5d2dfd70b1924040042cdab62f8bba6ed7ac5b506bd15524d564b8a550cd7af2f78b3fe6efe1cb89c398893c9d73c3299f0ee76073bf9f70b28a969484633b
+EBUILD PEAR-HTTP_Session2-0.7.3-r2.ebuild 498 BLAKE2B 984eabc83ae383650b5e5713c182591dabda012cfdf3f27509e8a5af6d7b29dee3557a9c8bdf8880b1706fe5fca33e01371a598d8b3690fab31459938e401289 SHA512 7f4f17a0e69e654125dbe4465b087149c27ce548b324d7292a64e7737e0825bae9a34176237933b441a6c3ab482bb2e334269e6a85ad29e77b21f7475cd37cda
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTTP_Session2/PEAR-HTTP_Session2-0.7.3-r2.ebuild b/dev-php/PEAR-HTTP_Session2/PEAR-HTTP_Session2-0.7.3-r2.ebuild
index 2a2f0882b48d..12786ba2a7fc 100644
--- a/dev-php/PEAR-HTTP_Session2/PEAR-HTTP_Session2-0.7.3-r2.ebuild
+++ b/dev-php/PEAR-HTTP_Session2/PEAR-HTTP_Session2-0.7.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="minimal test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="!minimal? ( >=dev-php/PEAR-MDB2-2.4.1
 			>=dev-php/PEAR-DB-1.7.11 )"
diff --git a/dev-php/PEAR-Image_Color2/Manifest b/dev-php/PEAR-Image_Color2/Manifest
index 5c7c1b261c20..02d9ba5568c2 100644
--- a/dev-php/PEAR-Image_Color2/Manifest
+++ b/dev-php/PEAR-Image_Color2/Manifest
@@ -1,3 +1,3 @@
 DIST Image_Color2-0.1.5.tgz 18954 BLAKE2B 836b7a8d9eebb3208ec0a1bb81f50dd0c3e00489c407b85f92a38fd72090e20b0fb61dd8407fc03e94c6dc71a4f84757d4477dd74cb89455baad59994b1f6665 SHA512 b6b5b3252b577828702153b9d2b192b7bf372201d0a41e470c76ace6747294be3f57a24baa109877af2c3333398792e7361e2faf51b50b0e706530ee4ae0394f
-EBUILD PEAR-Image_Color2-0.1.5-r1.ebuild 683 BLAKE2B 6fbe1b535a6d01c1cc4d59e5072509edc1cc1c76389c8fb3734542cedb4e6d852b4793e92104af3a20e345d2d0a5de19c7d0375d6186831e6ee28b1be591167f SHA512 84bf4a64246317bd7c2c50a5de5f2ba5a8ee64e0d3ea35e1b75191872347938906507e4e800a94f08e99a74482b3ee9654cb071b6e96b91b50ed99bc479ab86c
+EBUILD PEAR-Image_Color2-0.1.5-r1.ebuild 707 BLAKE2B 93de99d7f69f36cc243fe1203e1c442e5e9f4af2703649585c0feb08c5481561aff7a877d17fef572ca9f90f0f01a55f4250416ea9351f62528449578e4de68a SHA512 b40b63b25b4c17e36fb56333010f7435ab2476e96d7b7f7b9988a4f09e69fbe782833a4b93f5d64db198d42b526db7962dbd6143fc37cda8e40055133240bd2e
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Image_Color2/PEAR-Image_Color2-0.1.5-r1.ebuild b/dev-php/PEAR-Image_Color2/PEAR-Image_Color2-0.1.5-r1.ebuild
index 657a45b11c2a..2a467775c007 100644
--- a/dev-php/PEAR-Image_Color2/PEAR-Image_Color2-0.1.5-r1.ebuild
+++ b/dev-php/PEAR-Image_Color2/PEAR-Image_Color2-0.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 DEPEND="test? ( >=dev-php/phpunit-5 )"
 
 src_prepare() {
diff --git a/dev-php/PEAR-Image_GraphViz/Manifest b/dev-php/PEAR-Image_GraphViz/Manifest
index 42d5b8264588..2422ea99ed8f 100644
--- a/dev-php/PEAR-Image_GraphViz/Manifest
+++ b/dev-php/PEAR-Image_GraphViz/Manifest
@@ -1,4 +1,4 @@
 AUX Image_GraphViz-1.3.0-constructor.patch 2237 BLAKE2B 5ba878e67e502d74876bcb8af4743035bd8288ef33d4a6e9aafddf7defdce520e85364503055e6442b230227db04fd044484037ea3c501ebb1fc48021476d0c6 SHA512 93f99e3e5c86e2b920a3c66511fd0b44f01747b947e04a69b0bec7256a958ec0a4e15ce81885b5117a941fd3d2a98ce4165d5a9b8e8b0650a9791807f0278964
 DIST Image_GraphViz-1.3.0_p20151104.tar.gz 18109 BLAKE2B 9a8c269a7f4eff787a67c84770c296d3e032a038cae04b888ea5ae26525b24a764ad01d6300d7e7a4c3cf78acb4e077b1f9091cced4ef57031f6ce3aaef2a8e3 SHA512 69e9117cff950a45d8f3cfd5759be8194f477b55c09ceb990707f3ad2de2500a570fa124b73b2c81cdd6ce20b6c11fc0532a0087a515cf3c7c9a5a8ed7b1c58f
-EBUILD PEAR-Image_GraphViz-1.3.0_p20151104.ebuild 697 BLAKE2B 210afe2e444b4e7c5a927b2245b67b7539f21efb918039b74aa921aba06cf6b11a1ecaebde3edfa8c3f9aef2d00d1f2b384aafcd288e42a905fa67b86b341459 SHA512 fd2883e4eb02cdd3b376b1d9babfbcbcb719c17fa1a54234c8fa46ba6e26a6715fe4a34c2dce09600a427ebc876cfd60bbaf600adb73a49ebf1976f1f6b80f1d
+EBUILD PEAR-Image_GraphViz-1.3.0_p20151104.ebuild 721 BLAKE2B 758705428a170c20adaa0c2677af526b756ecd43f0c955f5727e85d4f11c70611ce20acb914626bf538e9e180fc8b73631a08ef561652333d2ed678f763ac29d SHA512 c2ed89ef1a0fa3f51d65b1ccb57c7af33f4cd2e0e875624a0266bda522d0f5ed8de2bade1b4b2ff5e9879ab9767e365b3cd82ff10638758310005eb99a34b03c
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Image_GraphViz/PEAR-Image_GraphViz-1.3.0_p20151104.ebuild b/dev-php/PEAR-Image_GraphViz/PEAR-Image_GraphViz-1.3.0_p20151104.ebuild
index 6f780607fbde..a745ff8c6f5c 100644
--- a/dev-php/PEAR-Image_GraphViz/PEAR-Image_GraphViz-1.3.0_p20151104.ebuild
+++ b/dev-php/PEAR-Image_GraphViz/PEAR-Image_GraphViz-1.3.0_p20151104.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="PHP-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 hppa ~ia64 ~sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 RDEPEND="media-gfx/graphviz"
 DEPEND="test? ( ${RDEPEND} dev-php/PEAR-PEAR )"
 PATCHES=( "${FILESDIR}/Image_GraphViz-1.3.0-constructor.patch" )
diff --git a/dev-php/PEAR-Image_Text/Manifest b/dev-php/PEAR-Image_Text/Manifest
index 3a6e2622c135..d15ff117f2e9 100644
--- a/dev-php/PEAR-Image_Text/Manifest
+++ b/dev-php/PEAR-Image_Text/Manifest
@@ -1,3 +1,3 @@
 DIST Image_Text-0.7.0.tgz 102049 BLAKE2B e4c9cfd1b775891adaede8fc6619c4d32a1078d37939214eb7b21ab0ed8133f6c25e1f79823988103393ce2ba90a0e23109b1f0e9e4e393b460ac2b8bcf1f2c6 SHA512 6644cda649ecf2861af1999a7a1b8c59e2c39f178eaf818c2f3afa532b6eb1fee16eff1f3cb1ef471d5480c023452ab9226edd7ee2232353120ec2976d67b1c5
-EBUILD PEAR-Image_Text-0.7.0-r1.ebuild 371 BLAKE2B 118b76b28caab94c98ddf555cd0a863791b98de83246ab57fba20f6ba971e7ea84259708138b234de378d2b67030b17e57c7ac7c73ecafa93db0ce0ff28f7c4e SHA512 6d84183fa4c8a9bc1da14c855d0ea9ec6d22a31405361d0d83753cbbc66b47cb237491604f61f2864e4f9ee98aeaf894b7e009075f38752738870a600234c9b6
+EBUILD PEAR-Image_Text-0.7.0-r1.ebuild 395 BLAKE2B e46c664659605a5ef69c66f500fd26ccdc18013060a156c310f88cdc54b6488017d52032bef8659d2b38692e5ba8f06e4fb3d244f9a66b258aef73cf77bbda9a SHA512 ebcd72b1ef7cb4fed924f6c6ddfa74c4c44195abeedcd8ce28594a9da9dd59b451e45eec1536cc2d7a27cb04c9f6c68134c90ad4cfde2016b9b0fc7b4dc1d912
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Image_Text/PEAR-Image_Text-0.7.0-r1.ebuild b/dev-php/PEAR-Image_Text/PEAR-Image_Text-0.7.0-r1.ebuild
index 5e2acb0c8d48..1a81ce610386 100644
--- a/dev-php/PEAR-Image_Text/PEAR-Image_Text-0.7.0-r1.ebuild
+++ b/dev-php/PEAR-Image_Text/PEAR-Image_Text-0.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ SLOT="0"
 
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php:*[gd,truetype]"
 DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
diff --git a/dev-php/PEAR-Log/Manifest b/dev-php/PEAR-Log/Manifest
index b879db5361b8..efd01598eccd 100644
--- a/dev-php/PEAR-Log/Manifest
+++ b/dev-php/PEAR-Log/Manifest
@@ -1,3 +1,3 @@
 DIST Log-1.13.1.tgz 46764 BLAKE2B dc0f4605ed801818ddf070ec3beb6818af1630d99bec721cd3f487e709f87bd4a1628a05854c48fe9775aab546bdce4618061ef37674aa9921f536deccc6a080 SHA512 246510b7dbff4dc9f9cdd951d76baf2dd377e30ffde6d38cadac10091dcb92f8095406edb6d8a87ebe2330d514ce99f355f84ebfe57cd8a3f3babc316995148a
-EBUILD PEAR-Log-1.13.1.ebuild 1329 BLAKE2B ee44f936b9486bcfd9b03c633e3de94e6b523c50d0ca1f0acff8675b1ec66e811c35545d7b2314b7ba406ba8a99a80899625d9c6e734dc560b6472c4711d4d0f SHA512 f4071efa2e990410a45ad674cb68d2e2f06d263331f1a6aab9ae0fbcce47621f71297c1f52fd0711f8c3ff6c48905aec4e49695c565a1dbc94a38dbf72151638
+EBUILD PEAR-Log-1.13.1.ebuild 1356 BLAKE2B 439bc3f7ca684187bf964ee78ddb2dbe727758301aee48b8b05375399a1b592742ac4cd8563c588481c03c144836569486959a5a68c778c93eeafaedb11345c2 SHA512 08833ee26e03b0979eb30602bb7ed91cbee93707d6f35ab407fdb48f5ed5cfadb6f1d936866abe67a4c337805da3f93404547fa8fcd3bd226abf8befd49287f2
 MISC metadata.xml 305 BLAKE2B 9ae588d4fa3e555b0362d0f9ba19dd3bfd459f1788fb047852f22cde3d2688e3807d4ad87247b9dd8759450af1c1ce55192b2e551a8337abd08fbc771f32cd36 SHA512 8540d045359dc2f4ed04bde79616f2ebe923a0d3a6e401788a37e3bfd973a9db33662f5c01326e0fe0198246dad290d8d3ec3d841394071c215f70a8ad4abf71
diff --git a/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild b/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild
index fbafa0ae23bb..911e6d7b7879 100644
--- a/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild
+++ b/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh 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.
diff --git a/dev-php/PEAR-Mail/Manifest b/dev-php/PEAR-Mail/Manifest
index 822cfa1dfb24..bd94a89b66f8 100644
--- a/dev-php/PEAR-Mail/Manifest
+++ b/dev-php/PEAR-Mail/Manifest
@@ -1,3 +1,3 @@
 DIST Mail-1.4.1.tgz 21756 BLAKE2B 247df343a7b09760501918681cadc3a649ff9f2bd9974aa714a3661e64af6f1503edeb8ef0030f0ce113c43467cada3e7d62c6a60e751b5c8e6980c14f97fdbb SHA512 851fa64bcf042fba58a70833c12ec5d7af6382e14e6157eeeb5be51b22cdfa5677c5d1eeba8c1f9eef6d55c2d732a4d5d6ea28c726aef232b233c170f7b82307
-EBUILD PEAR-Mail-1.4.1-r1.ebuild 451 BLAKE2B 81b2ee7130bf6407a2cfb1607fcba59b8247568247a98d8fb13b86cb698704d770d0baeccffcfc871fdd09ea7e39ba4f163d09ddccffd55ab4cf9f2c15746987 SHA512 90a25546a0a882f1a95ea107784eef790fe194bee970a7d48d94de8f6212632f5adf802616e40d14113a1a6254b6cba06d6e286d38cf129e99384bc8371614d0
+EBUILD PEAR-Mail-1.4.1-r1.ebuild 475 BLAKE2B c13ac7487089744fae73855d5e1a01283748912ac5dda14c3a78b9005e6a8e15d379e6aa855b3154959ddbf06a651683e09c63e6a61ba9ff3902e16d89a6925c SHA512 e6ebfd041af7e2e893c7de6b07abe39c0265e221d76efe4e00fa3f9ea9b2c53b42651f53fde43ca2801fde1bf72b652d0afa5b8552e599514d3b45de5360344c
 MISC metadata.xml 306 BLAKE2B 82277e19d97f3d3d90c3a7785f58bc83fde319d3713254686f3607c1f5a8750b806080ed4a9db754b5cb5693af5bee73137b14ec368519a4a61b4f15341de91a SHA512 cc21c255e8437d641d2eb2950b641c543bdc8725bd8b7f27382f6355f053c781d36778fdb7fa630270b60ee4580c06cda52dfb3d757c1bf9735915c398df99fa
diff --git a/dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild b/dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild
index 1359cfc25625..494218fd4b90 100644
--- a/dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild
+++ b/dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-php/PEAR-Net_SMTP-1.4.1"
 DEPEND="test? ( ${RDEPEND} dev-php/PEAR-PEAR )"
diff --git a/dev-php/PEAR-Mail_Mime/Manifest b/dev-php/PEAR-Mail_Mime/Manifest
index 8120d5913dc2..ed22479fe663 100644
--- a/dev-php/PEAR-Mail_Mime/Manifest
+++ b/dev-php/PEAR-Mail_Mime/Manifest
@@ -1,5 +1,5 @@
 DIST Mail_Mime-1.10.2.tgz 36501 BLAKE2B 59e900b99061e84d307eb46d295f843404ae06b01936cec4ed610c298b6f7e8fcee15098fa6d935696122311eae2dbf733611410b2249f2535673a3031011fa3 SHA512 4e3b2a2adc58d8b4f16f56509c9f22638dc37aedf1bec60871706390198198be6ed6dccae8c250eb33de3a441aeb122097ffaddbc49191745f0f09693ec6612b
 DIST Mail_Mime-1.10.4.tgz 36909 BLAKE2B 101d050d96b717ad970a6f8c170ba8ea7d94252274f0b006a266a5ef4ac9d49fb350d3bf120ce645e5a54af1f0ad0ab664c828abfa8a4a96170e7204c73dfd82 SHA512 6e58e1078292cf43605313e2402b60deb97be0b56c8eb5dbbb501cf92ca836ca4bdbc9e1ab878c89f8e59941962a91b73dd917c8e678f0944f271e5537f065e5
-EBUILD PEAR-Mail_Mime-1.10.2-r1.ebuild 627 BLAKE2B 9db8ce85ac0f6461524d46ec84cc1db88e38adafefe07c37d67c1a96538f586822e77b955d09c2b7c88bad12b9535fb867a363800f8c4011f0f2941a2b143528 SHA512 a66563c7cdc96ee5602f31ab3410f13c6a9538de436882688e72ceff7710e73dc8ba537b2db7a0ee9abc3d6f496fa7557d1d0396693af88eb49b2c7dcc831259
+EBUILD PEAR-Mail_Mime-1.10.2-r1.ebuild 651 BLAKE2B ecff98990c6f209029ea163a93d2521fcd908100cc257ec7f17189747795bcac5b4972bb5c8d76ac5590be998d2194a96ead357f1639b93bc8c3c5141fa8e375 SHA512 a538af615577fd65dcea28709ee32bda7809b3868f06bd73a1b5853e9de43bfaaed3de31a931523791e5d4a51bd0fb04ba0907da26341dc7697c8faa7f6132f4
 EBUILD PEAR-Mail_Mime-1.10.4.ebuild 663 BLAKE2B c7fec7b8724596d7d4745511c64567a3fbe6793ed1d87b4b08426222998e133c6236701231eda523e4671dd2a3cd4595882b0719d240fcf09b4a4dc95039d0d5 SHA512 b30976ca51d1fd1b1ee08aad5ef3cf5c4f5ca3522734fa73864c671412153f90d1fe67309235990cc5f802a17c6877ed28f4c6a24935b72104bcbe6e7a0d2e08
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild
index 5da30dffac31..53daaa9d92fb 100644
--- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild
+++ b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-php/PEAR-PEAR )"
 
 src_test() {
diff --git a/dev-php/PEAR-Mail_mimeDecode/Manifest b/dev-php/PEAR-Mail_mimeDecode/Manifest
index 1c5cc525d518..504e48d45fce 100644
--- a/dev-php/PEAR-Mail_mimeDecode/Manifest
+++ b/dev-php/PEAR-Mail_mimeDecode/Manifest
@@ -1,3 +1,3 @@
 DIST Mail_mimeDecode-1.5.6.tgz 13258 BLAKE2B 7e027cf9bf2a450bde639f8c530f216cc8dfd9eab719829dedad029d98fc5c4806279d13ec3ffb5191ba23edf64ae658ca0ec8d83f116da3fafbd23d758a9f00 SHA512 fe46ff2542acd3b180981c7dae41a1979b2edb3bfa5ad716a1ff39a255c2c04d92a7d770ae6531e38f3b869173f576fba44410c8e03269510d71dce5fa345bd1
-EBUILD PEAR-Mail_mimeDecode-1.5.6-r2.ebuild 458 BLAKE2B 50cceb7fc4704ef944a6802cd0ef0c520020ad4edcb72e2f4f994c6f173462ce9ed50485eedbbb70f840afa93bce20e77531a85d3c597bfe9e47c592b05d09f1 SHA512 98e2ab9ddc5ad8bf33ee6e4c3cd9251cc1e44f88f1be6bd715a375619f2a59ad33bb8e9e41eff59651708d9684a5b19491626c0ffc7ba226ce2a135059ca8a59
+EBUILD PEAR-Mail_mimeDecode-1.5.6-r2.ebuild 482 BLAKE2B da18d036a388a19fd61a0ec1e8494ff136b7fe7c7984d05ce4fe23f06481330e85d738b02e30a79428462cc2d1e9f05a6661044b0b8ffde7783b878565c99c10 SHA512 652a98d725e8db2cca2cbf818e54596ff8355296b306b6c8846d38c438b5695c3009a21f07342d4a5a64cb42e04e64224197b58bed69ccf4da8f08a3e86923e3
 MISC metadata.xml 317 BLAKE2B 00a849c6fe77dbad0b85efe11bf5826ee7d1527a66615400579b33ad6da1bfbb9e86c70bacec14fe304d20e5672cfd394643b4df5caac1af6fe9991deab8ab59 SHA512 00a0f91819696baf2e347036e70f5c32925ed6694144dfbd68e3aca5a62e3c6a157eabc8b4b74d3392008468eb23ee9c4639031e31334733e33be85bc19e2237
diff --git a/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild b/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild
index aebc2977185c..d4b0e5530aac 100644
--- a/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild
+++ b/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-php/PEAR-Mail_Mime-1.5.2"
 DEPEND="test? ( ${RDEPEND} dev-php/PEAR-PEAR )"
diff --git a/dev-php/PEAR-Net_IPv6/Manifest b/dev-php/PEAR-Net_IPv6/Manifest
index a46ad8c8911c..6601c1cb0af3 100644
--- a/dev-php/PEAR-Net_IPv6/Manifest
+++ b/dev-php/PEAR-Net_IPv6/Manifest
@@ -1,3 +1,3 @@
 DIST Net_IPv6-1.3.0b4.tgz 11437 BLAKE2B 535bb88e650e0985ef18e9415c1be827798d28fe30cae8afa7bf352d3a30e0ac51499662925e2c389e04bf872d240651d671c94a25584df9f3537db4d4695646 SHA512 aabf31e062ff4b3994ec8f5278556ff7e06c01b0cc86de2e57f4a994c71a182663e720a33b312d7e2874008c04ac9c493bb855b9b7ee5d0f008d5c517cb11fbc
-EBUILD PEAR-Net_IPv6-1.3.0_beta4.ebuild 395 BLAKE2B 1796424cb09497330bc537a644ad69813fbdf82dbeaa58a8643d4c65643a0a3e7de50094ad20700033673a471eef0860ce241f7f67e1e8816bd6ab10a38d7559 SHA512 3caed4bfe7a539aa750b95062710c3de95665f2c82d41d54ff2d8715f78a0a178e1933cc65454740c26eacac8cf44889b7cfa52ef61d7b5a9191e661bb2c5827
+EBUILD PEAR-Net_IPv6-1.3.0_beta4.ebuild 422 BLAKE2B 0e96897ce882e804f4122e0678f1cf7ac69fed33d5632e5479d472e49caf568c2d56ca718ddb4fbd7694b4050068e773fb1696d96f1296a663a56877c2dda431 SHA512 7afe25a8667226ab6593934734aac8dc627452aca15df766886d8c32fa5560f35fe06f1bb2858516c57b6d5813820b30eaa48fb8101cc53512e5c49f33510ab3
 MISC metadata.xml 310 BLAKE2B 1c437565e34cf4adbe817fee0039663e05c7e81dd2da8f133650503320040b0878e769bdf6c2ca010384c67fd6af547a9a7665cc15a6ee98caf0dc066ee0f920 SHA512 910fafc59d42416e896901f965523d543520e1967b24d90a54e84b7c9f7d5b8a46e02fe571c67d96a606361dbeb1952f82804ab90e9311de3fa7b7313776bfc6
diff --git a/dev-php/PEAR-Net_IPv6/PEAR-Net_IPv6-1.3.0_beta4.ebuild b/dev-php/PEAR-Net_IPv6/PEAR-Net_IPv6-1.3.0_beta4.ebuild
index 7c48ab81b3ca..b3182c10fd4f 100644
--- a/dev-php/PEAR-Net_IPv6/PEAR-Net_IPv6-1.3.0_beta4.ebuild
+++ b/dev-php/PEAR-Net_IPv6/PEAR-Net_IPv6-1.3.0_beta4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,6 +13,7 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( dev-php/phpunit ${RDEPEND})"
 
diff --git a/dev-php/PEAR-Net_LDAP2/Manifest b/dev-php/PEAR-Net_LDAP2/Manifest
index a5e02186b5e2..dee0f155e9d3 100644
--- a/dev-php/PEAR-Net_LDAP2/Manifest
+++ b/dev-php/PEAR-Net_LDAP2/Manifest
@@ -1,3 +1,3 @@
 DIST Net_LDAP2-2.2.0.tgz 97180 BLAKE2B d2af13f0723f0fe998ef6a1fdd83e664ff5dd16c04d793c4a0b9f233449f82cd16c3156b0f2fb47f26d693d423c9bf0f6fead695b898e89a9e16cae932cd5718 SHA512 9f2f80c31f8b05c032c3bf088e66de942a01eb8ad94037ac5a65d6c526e22ffd4efac053e07f85dcd2b729727cd0755339f8ed76aa5e77997488f27ce59637ca
-EBUILD PEAR-Net_LDAP2-2.2.0-r1.ebuild 723 BLAKE2B 9ae752d0e45715b6d31ef73eac5b21eada2b69dee2c3067c97f759c335c42f44bb5388bafb724390a52325e4f35bab691d2ea22c034a0d29934c15f570648665 SHA512 3c4cc7b26119db1c03364a810aaea073d5cd5a7829d1694416d49d4ad5c3bc4a1dcfdf676b22bc15f7853c0e04374b83745ef7aef0c8e054d91fb8221e1e5bb2
+EBUILD PEAR-Net_LDAP2-2.2.0-r1.ebuild 747 BLAKE2B 8ba9a49d48d2c432324bac69b5f1f86432dff9056fdc173e261ea1777aa2f6118c68f3e12c4860bc19692f1fdedf87e283d1faf88113d0006d0c689fbdddcdc7 SHA512 ea88f7e17fa742ce7770c960eeb3c1d277ab257ae65bc837d124b4ac03d6613411cea82606ae5481db2c394bcd1f860e007ab02753aeda476cd08503d70158a9
 MISC metadata.xml 311 BLAKE2B 62823d5e3195d3f703c214d2250a37832c982904772148388dc89751b3b7d6776e2253819738eeec24a550aaa00092ff91d78e6e1f5ee1475104aabf8028a4c2 SHA512 a885b79978595cef0b7f647b110fa2f5687b72202cf87abd3bf1068b38be8a8cc5e2866c54809a0cee7dc1058f7e9990d102e4b4312a9de96a9f961fdffe831b
diff --git a/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild b/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild
index c2dd7ba16b74..99f3e01fd091 100644
--- a/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild
+++ b/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ SRC_URI="http://download.pear.php.net/package/${MY_PN}-${PV}.tgz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php:*[ldap]
 	dev-php/PEAR-PEAR"
diff --git a/dev-php/PEAR-Numbers_Words/Manifest b/dev-php/PEAR-Numbers_Words/Manifest
index 5b53b05383cc..9f5cb711adb5 100644
--- a/dev-php/PEAR-Numbers_Words/Manifest
+++ b/dev-php/PEAR-Numbers_Words/Manifest
@@ -1,5 +1,5 @@
 DIST Numbers_Words-0.18.1.tgz 72925 BLAKE2B 2dd624fe4ede72c00f68f259c0271ca405e76bab6b43d85024cfa70b74e50e9ac5fbccd7e770c90ac4bcc5eabbdc33ccc9bc6b691e0da2b9a05ee5a141a0d8ac SHA512 b6063db873d65bc872ea64e6ae4282da9b36aa15ac336a5b443e4bc3cc7ad49538327bb56d0b70a482c82dfa1d732426f9cc45453d4d13a25a840871e1f6fb2c
 DIST Numbers_Words-0.18.2.tgz 73113 BLAKE2B e64fd1fcd8017b1768bc0e8918a79a91b83711433d0a29d36b145fdc07cee8cc3149a31d8e3739bd59ee57a821aafd8532fd8a54684da7e2395463662b733335 SHA512 cc719ea47e7da365959a02106d80aabe2ed079064128af1a61c0c53ed44726e7169de5c9d8dd28cbf917e025841e9aa07b4b8c9313a788b0a92eab32a4edb37c
-EBUILD PEAR-Numbers_Words-0.18.1-r1.ebuild 692 BLAKE2B 7ce43245da8f010de50ea09efb05b7949baa55463eabed7575a4fefb7467bcfb9964325c872a610357ec25e1844916c4c82549bd424000c8e8a77f03254dbf82 SHA512 1e596e4f4339e6bbeabf455ada33081908ce3b37bf143a3b38c22439c871a1784da2b005168780ba95ffbcef309d7140517cf744830a62362db359d2da226247
-EBUILD PEAR-Numbers_Words-0.18.2.ebuild 522 BLAKE2B 6884070800827109fcaa5e1bc79cc05cf62aebd36bb646d5c0b0662d098f445a558dbd34aca86f35a2f1d519ddddf102c4c2e61c73306eed1394684ed2446575 SHA512 ffb834e190c3384f8fdc59b91cb8196fb46a84a44313bc056f7051159cbebce377c70355c52e381f4f7a7d7c6025bb607df986cabcd3eb16b469ccfcedb10142
+EBUILD PEAR-Numbers_Words-0.18.1-r1.ebuild 719 BLAKE2B eb0a0ac8f4917da6a29e059dd98b7acc6a614a1e29eb1ceb349d3102db7f36661072faf4a4b311607f57f7b0ee782bced42092cff37e24744ee0b0e7ea2d3b68 SHA512 043c394f9c442935bbe3bd73f05028a4416ef1cc979e2cf3888178c542b267f8a262d6b995a5dc0bf90ab79039ae5ad8ba3f2213e10a2b62d49c73e6a95b57bf
+EBUILD PEAR-Numbers_Words-0.18.2.ebuild 549 BLAKE2B a0616c4038cb2ad5ddff43e904659e584667fdde486b1e8b278562a24f3bce80bd6eea7c064f210bedba129f9ece3c5850316b9dc73cdbc969ef51dbb1308653 SHA512 5376a071214ae52c4dc5575cf5dd917b37d7b117e802617370ba4b83258a93ce332938ae7abf3f61714d3edb996d3d557a40c1b0e5bdc9b7955b03aebaff434d
 MISC metadata.xml 385 BLAKE2B 96fd8d4dffa8bcda044ca563466bd32986e2ddfc984494a13eabcd71377c0a850ad4458f2c0c96870105e215d38295ddd32d640c0f8cba8a6566e78a2bfcc197 SHA512 05fafb5b7437fcffa392b1898b60bc7811dbc0ac3b8da7f0b7205c16a9292cbaad3e62ca59e999ebf9cba1e3d0fe0076203dceb68dcf1a2dc2af496403cf812e
diff --git a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild
index a81e7cc4af67..845170dccb02 100644
--- a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild
+++ b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="PHP-3.01"
 SLOT="0"
 KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php:*
 	dev-php/PEAR-Math_BigInteger"
diff --git a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.2.ebuild b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.2.ebuild
index cc57ecd481a4..53a6fc6a398b 100644
--- a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.2.ebuild
+++ b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.2.ebuild
@@ -11,6 +11,7 @@ LICENSE="PHP-3.01"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-php/PEAR-Math_BigInteger"
 DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
diff --git a/dev-php/PEAR-Text_CAPTCHA_Numeral/Manifest b/dev-php/PEAR-Text_CAPTCHA_Numeral/Manifest
index 8cb757a2936b..5f55dbb79250 100644
--- a/dev-php/PEAR-Text_CAPTCHA_Numeral/Manifest
+++ b/dev-php/PEAR-Text_CAPTCHA_Numeral/Manifest
@@ -1,3 +1,3 @@
 DIST Text_CAPTCHA_Numeral-1.3.2.tgz 7741 BLAKE2B 34ffcf435d4737d4d894fe43bf1ee8e88e2050323d5bd5186c270df25045b6938e0eb9072471c83ae5c2bfb7a7e1bf970b2e0dce05eb8d9b7f8a64c7f78c3116 SHA512 be3660b20b857092859d7bbb3cbb35c08dc79a2ea3ebcca035b1defae07dfcd36ce00a47f1708ce4f1bb412c23a7cc867d8b677032e7c0ce13e910fb038a5b5d
-EBUILD PEAR-Text_CAPTCHA_Numeral-1.3.2-r1.ebuild 426 BLAKE2B dc91d6a8972e06629a67fb787f823140e1db3ce082959c324b9b47152128477173a346f2b1549f037722ddb99652cbaaf1263c30f207c11c0a44e28a91ed680b SHA512 f930850b2eb6daa4dce0069eeddeea8278e5220cb19704b2eb6e471a95dd5b512ca675c098162a93367b597d72873800f184cc8be70d20382738287653019721
+EBUILD PEAR-Text_CAPTCHA_Numeral-1.3.2-r1.ebuild 450 BLAKE2B 8f0083357e120d390da2695a372e36ef5696d3ccc6fe395d809a8a2aa27255cc1769ab195e61078aa365f209ade6f8a67f6f7042ff5f412f441b3d454e0ca36a SHA512 ba72120630ed0e57b9a7e51adba5f1a9eb7b915af5b7c5f9075a89c4f4e2b4b482312e1a5583efc0e18081c691304fcf3c6526949d540a9afc7bbd809f2178f0
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Text_CAPTCHA_Numeral/PEAR-Text_CAPTCHA_Numeral-1.3.2-r1.ebuild b/dev-php/PEAR-Text_CAPTCHA_Numeral/PEAR-Text_CAPTCHA_Numeral-1.3.2-r1.ebuild
index b370be7a4616..1250e1dcb1fd 100644
--- a/dev-php/PEAR-Text_CAPTCHA_Numeral/PEAR-Text_CAPTCHA_Numeral-1.3.2-r1.ebuild
+++ b/dev-php/PEAR-Text_CAPTCHA_Numeral/PEAR-Text_CAPTCHA_Numeral-1.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ SLOT="0"
 
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-php/PEAR-PEAR )"
 
 HTML_DOCS=( examples/liveNumeral.php examples/numeral1.php )
diff --git a/dev-php/PEAR-Text_Password/Manifest b/dev-php/PEAR-Text_Password/Manifest
index 7e732a080495..9a63eac6ac97 100644
--- a/dev-php/PEAR-Text_Password/Manifest
+++ b/dev-php/PEAR-Text_Password/Manifest
@@ -1,3 +1,3 @@
 DIST Text_Password-1.2.1.tgz 5631 BLAKE2B d765606e7082076f92d76d3a2e7a0721950b9fc81b267a51aa3ef56ed92706105486d3a62a6ec81e06dbdb41a15d0a7e9add8ef99c87b76af6445fb7bcbdbaaa SHA512 9f7a357b92b8013f41cd964245fd764c5f1347b41612aacb5fca66e4963e007d7470ea3a046e6186cfebed4960c5b6e6e23e4f2ab9e08c7aee10cba5ea347fc9
-EBUILD PEAR-Text_Password-1.2.1.ebuild 610 BLAKE2B 72315e964384fce714ec1b80d675b3d3fd267141036aef2706f365ad8eaa6e5a27663853904910a9393af912a7c7ab59a315fe989df01c483dfb854369dd7bc5 SHA512 f77cc4724e09990c69863f93ebe0f32ffc9e45de112a892be10c9bcc43b1e14133fee0e076e01a6b0b56137c0fe209c920ad628b2ee2f20e0ca973dea32c8f44
+EBUILD PEAR-Text_Password-1.2.1.ebuild 637 BLAKE2B 8f1f3ab22bc9dfcf8023eb621aa09b8a2218fe26ac89c17223d623d20e9d36274e0d6a5f07cbd0217556add2e741dbe193d66a993a58aae09d3d40fc4ec57e98 SHA512 541c5918b05bb7ee56e0444c5de48a4619497ec1718a4f0c44e5bf480100ffc584fa278f41d6d5ea3f2650e5f3bffdb76f4e3032534514281cb4ec761815d7bf
 MISC metadata.xml 385 BLAKE2B ae61061345cae297a5e8b33dda7940d439f7e59b44cd6b7f298664737a821fdd4abd60cd52655261a999fd850620e4ffe51767931c7edcba6354582c6bdfebf3 SHA512 3898231004b87b780853676c8779ff5162d1111ea9a85ec795ed7dbe1563c6ed70e1dcfc3a8f9fb76b1893db606d9b84e83963537d53f0e3b302893c1b87a4e7
diff --git a/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild b/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild
index 3a0aca92a284..3da1e00f46ef 100644
--- a/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild
+++ b/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php:*"
 DEPEND="test? (	${RDEPEND} dev-php/phpunit )"
diff --git a/dev-php/PEAR-Text_Wiki/Manifest b/dev-php/PEAR-Text_Wiki/Manifest
index 14177071bfb1..3f00ed941ca5 100644
--- a/dev-php/PEAR-Text_Wiki/Manifest
+++ b/dev-php/PEAR-Text_Wiki/Manifest
@@ -1,5 +1,5 @@
 DIST Text_Wiki-1.2.2_p20170904.tar.gz 86810 BLAKE2B 3277fbfae5683c147c1537a7f789b8b9500bfa39014832ed08d91028882813f60727f9ff503d38dde5f017fd5f1ec69d61775a14094b0d267a1b0019f10090c8 SHA512 8e731a6cc9ec0e964d86de5eb96f285155f61d21e229499132f5b06ef8ff520658a42c9c6fb60d73b9bc8828ec9b616bc11e4f04bdd6e74836d52fc53a92dd71
 DIST Text_Wiki-1.2.3.tgz 89906 BLAKE2B 8db39418478085bebbbb32f8d80fbf9f6b9058adf9071f7f7493a4e493fbd088e231759752ddc41aad6c58b1ddab953111df006f901545c896e266b75dc70f26 SHA512 619f5323648b1344c572a1aa03626dc00a4dd9f201814fee5a3b962f69085943a1c7d1ef06e7c0cc4be7628bc76889972f1750aa9f7f67348381df1af4a4bd73
-EBUILD PEAR-Text_Wiki-1.2.2_p20170904.ebuild 764 BLAKE2B adea55bc9b0447d0ff10dca41f59cf679972f1fbf153022cd085316c707de616f9f453e635734df3d455f0fb2c9e4119b5cb5495152e77cbb489f1e53992affa SHA512 fea1083cc5dbf2527d9082dd3c2de987bcbf66dcb82e7c5b1670d0415ac6c799b01936dec9d96523a6f8ae3188a20703cd43c7b77140db21704839822cfbb615
-EBUILD PEAR-Text_Wiki-1.2.3.ebuild 458 BLAKE2B eb0d2e8feaab81e947a495479b18b7a8515e100ea42f4ae082f487a9e4acb444fbad332d837b5533c7a35d6e3a5878ef8e814403d3139b245e684261dcdd5f6e SHA512 9dfb2c17a6c049a7f705882357475fd0ab7684573c406c3c7ee87c0a8f2b1320524cc7ceaa28ed0d49038541f5675c768caeb33748b73e52c78944ac6de52396
+EBUILD PEAR-Text_Wiki-1.2.2_p20170904.ebuild 788 BLAKE2B cbde6b3691e496ba9948846126d2b2889e48eac75eb2e6cc3dcd4f4402732263d77833bd40e4d58ba10eb2b9f341b84e674dbe48974803915d08c324bcb8472c SHA512 8434ce7a3b5051ef53bc3a60dde6a8efa90f286ef289523a009a23611d8ad2ca3fdf8cbd5d52b9a0171bf0f7d5fc74181cbb4077fb5c345f19e41f4597ce1f0b
+EBUILD PEAR-Text_Wiki-1.2.3.ebuild 485 BLAKE2B 453781199731fc81f62380c2464ebe401672d7b988cf1e836c0eb9c5336263d99793694f40e0a6e7cf25d3558d71ca42466d89c798bdd7391ddf2592f3d2cc7f SHA512 689c2a9a6afc79004e581f5e345448e8256ab9edc58c573e33456b16697e567b21ca53cab200ce2c9d399512edc1913e83dec334505b7eaa05ef1335bbad848a
 MISC metadata.xml 326 BLAKE2B a47b62c42ef2f751077622f4a770ffe42148d1d185948fd956e3b6caa57b37962af47733e129851e8931c449fd958d76f5261a1483d0dce20dbd73ff07d688ec SHA512 0d6ef943c1e68ec438ea1ef9627745be5abd72124e378313cb68895452db19873da7ca975f5865ca191b8b9b6855665064000a7d2071df334f486a5b172c7aeb
diff --git a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild
index 0432d3039885..af6715552fb2 100644
--- a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild
+++ b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 # Pull from github as pear.php.net is not updated
 SRC_URI="https://github.com/pear/${PHP_PEAR_PKG_NAME}/archive/32fd5f483f34645f4efd96d385d8950ea26d4a2a.tar.gz -> ${PEAR_P}.tar.gz"
 
diff --git a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.3.ebuild b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.3.ebuild
index 3eaca2e83436..71ce9d98ae0f 100644
--- a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.3.ebuild
+++ b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.3.ebuild
@@ -10,6 +10,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-php/phpunit dev-php/PEAR-PEAR )"
 
diff --git a/dev-php/PEAR-Text_Wiki_Mediawiki/Manifest b/dev-php/PEAR-Text_Wiki_Mediawiki/Manifest
index 8117060a6f95..c702413baf7f 100644
--- a/dev-php/PEAR-Text_Wiki_Mediawiki/Manifest
+++ b/dev-php/PEAR-Text_Wiki_Mediawiki/Manifest
@@ -1,4 +1,4 @@
 AUX 0.2.0-constructor.patch 1554 BLAKE2B 0c8686ac4e11faecc21ef17524e005b580aa887694653318558676f513bddaa3fc33b3efd6763f458ec10fa52559045c8c2d9a9362b2bf66a61d03e5cf855bdb SHA512 7202a7e15bda9dce52dc52c6807abf7f0fb1c5957d2c74c9442c92286aeaf044e2eab1cd062df66345a109a5f574e136bfc2b0d309bdc78f3d099a08b2d667f8
 DIST Text_Wiki_Mediawiki-0.2.0_p20140604.tar.gz 22941 BLAKE2B d208b4df7e01a2b28e44ada0226be0f183fe6ffefe742f9b6cb4f2b366f915ae46d950d574a8357cbec273f41792f17a639f5512613628ee60ed137d909be9dd SHA512 aef4d18a4a0b9f41dc4bad701a90a2e7d674851b63206db9dd87cf87d6705991c8221e41cdbb8d2572a950520ce87db96105a009e4189e48b8e7f5df0f460ee5
-EBUILD PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604.ebuild 762 BLAKE2B f354a9a3bbd91418c06b70c16e8b0a86811a76cfdf7a59ceaf1fac48132da497ad3a71b00e82234ba9bc74dc3fa50faa419f2ec050a5fa23db5baf62a2a6f880 SHA512 521bd3cc516ed6ddd3c7163479504900c51e4ce4cf548bfb64fc84abb1dc1984bb067d425b6946c86cdfe19d897d481f694c8333120e273e5e670d9a57433050
+EBUILD PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604.ebuild 786 BLAKE2B 6521a3f522d4584fa9aa152c149eef6fe891fd9bb7f91a31b8d0bf3c9021e5cd34cdd56000399d684732b3ad73cee90af4c6a9746266bfa45d3a2d2b230801b6 SHA512 a7903ebc2ceaafa5010ca20f2ac6704d45b86a1923e9c696876be762fdee3a4c6854d38fc409a01594f5fff8ab81fb5729aeb5cf7777670c37f485cd315d57c9
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Text_Wiki_Mediawiki/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604.ebuild b/dev-php/PEAR-Text_Wiki_Mediawiki/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604.ebuild
index ad7c16118923..a83c1f9779ec 100644
--- a/dev-php/PEAR-Text_Wiki_Mediawiki/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604.ebuild
+++ b/dev-php/PEAR-Text_Wiki_Mediawiki/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 RDEPEND=">=dev-php/PEAR-Text_Wiki-1.2.2_p20170904"
 DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
 PATCHES=( "${FILESDIR}/0.2.0-constructor.patch" )
diff --git a/dev-php/PEAR-Validate/Manifest b/dev-php/PEAR-Validate/Manifest
index ddec47e34d6c..175fdc27f109 100644
--- a/dev-php/PEAR-Validate/Manifest
+++ b/dev-php/PEAR-Validate/Manifest
@@ -1,4 +1,4 @@
 AUX 0.8.5-fix-test-php7.patch 905 BLAKE2B 5d000b990cd38d697af861ff828f2e9efd8fdef0e2a6fec87fbc60208c1a9f40686c5c0be63cdf862221311f235f87bccb975cf78bb4d5f2b03be6916d3899bb SHA512 44aa6cb09f19ad3246bc7e6d825de786139da433564b902bfff020be52b14f554f752f0ca7f790d378a74a3a62e15cf13383a9bff25db2f67e4496d5bcef5e7b
 DIST Validate-0.8.5.tgz 21668 BLAKE2B 5f1897f9a796bab047beb7bdcf79726f58f069874cb1d08a17078c8d974bed626b3e37dd792e8b941fd0115d9060986278d459037580adedf6088ef51d5f2c13 SHA512 4e2e330b0a74a24d18af262ef42d872ab9eb2386e11c5647d898c60e11a29d06c97c0295cdf0999c3a4805f3f1efae2949c54520da50cf6adfcc5a6c4f6e1b63
-EBUILD PEAR-Validate-0.8.5-r1.ebuild 542 BLAKE2B aa9482713eb2581ccefd89c07c06fa4104fe5f72f6748b724550e62f337680aadfe4c143aaee6f9d454bd7b2f38689dde413bf88b2e123b993efa2a53036db90 SHA512 719357fa010b05cef6333f988d8ed33063b904ffa30cd44ee1bf50ba5948dd7c5408072ea7696ee4dcc4177aab0f5c3f2090f23a34621b81deeef62291300fb5
+EBUILD PEAR-Validate-0.8.5-r1.ebuild 566 BLAKE2B a5f74e8824ea5aae2c8a6662f0bc5a14c15a62a60ca76645b8d7bf4af0943896263a731cd7b9dfe5c651de537c33a3bcb5de8907be1548ea57c11006379a5855 SHA512 8de0c4cc0a897fa007f98793d2100ba79bcf291bd7801e22beb2f805564b96e8b6f89108734569b0968bd3847e48889a5319053cc1f0f8ca40af8f6533037db6
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild b/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild
index 494b84196b9b..e26e198b0c9c 100644
--- a/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild
+++ b/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ DESCRIPTION="Validation class"
 LICENSE="BSD"
 SLOT="0"
 IUSE="minimal test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-php/PEAR-PEAR dev-php/PEAR-Date )"
 RDEPEND="!minimal? ( dev-php/PEAR-Date )"
diff --git a/dev-php/PEAR-VersionControl_SVN/Manifest b/dev-php/PEAR-VersionControl_SVN/Manifest
index db08d3916d08..f29b8aa21171 100644
--- a/dev-php/PEAR-VersionControl_SVN/Manifest
+++ b/dev-php/PEAR-VersionControl_SVN/Manifest
@@ -1,5 +1,5 @@
 DIST PEAR-VersionControl_SVN-0.5.2_p20180314.tar.gz 36697 BLAKE2B 998e9c08d19284de2bd723fff07bc4c319ed65b12baad012f5f8e6b283060cd25cdefa5141e71f8368555d963e7ab1eec7b8e41d38cbd9a89dbd6977f72b5102 SHA512 aaba6fcd65d3906c9d98085b109d1357578be7557a9ac5b5997ae9a9896cb0970f3bf707246e5afc68dfbb8268a8fad36265b484220387b56e8de85e390db82a
 DIST VersionControl_SVN-0.5.2.tgz 31356 BLAKE2B d59971b0677d3e88b47f1fb249c6ba6971db7b868e390589705058fa0cc19a3b4e7a2da38db78b37a9fa7b8f9233297a4fb5376b1b225c8e93f41bbe65c99007 SHA512 09aaab0461a52fe87e5723472b9978c8f928a4741e11a69672ae1350ecdf90b287d951b8343b5fbfbc1d7cd449055cb249f229a1e943cdcd807e9b36e0a48b86
 EBUILD PEAR-VersionControl_SVN-0.5.2-r1.ebuild 586 BLAKE2B fe71070981e12a7151c32e16d4f4d08259dd4fbb79b4b70f43eb18a39763e4cd3de7c734cabf4759f6eda80de2f0711d62466607332b2a128c1077db84efd767 SHA512 12ce42b63818dc4bfd2960ee83c640767ca70fb782853aa1783e160699b793bec7d3d3f69a39e812d0a8dd0c3182b77fce0e9678b3c2061bcf896aea23eeb004
-EBUILD PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild 938 BLAKE2B ff3f32f8a981a526a31251ee0d3a62c0d2d55fedfaa1ecf43a3963cee1fc0d64f3bddc554d8ebc5f9052b117997042d250c690c884eef3a2d16edf687177bc15 SHA512 5a2fd603d9f1e31d1e820575c870c55e98b5b6dc1bdb6119a20ced539c147e13b4ecb6ab669dd1585e9a33c71723fb8975b5926dffd50c671b212969206e7e2c
+EBUILD PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild 962 BLAKE2B 9bafc3dd06fc35e2b85e280633f3d68b73585aa5be176420fe1d183df5f8adcfbf3bbc6d627b98e0a36ae7f98429c9ce7b790baa7271b2fee10623feb270aa78 SHA512 da3bca5d0fbe98cf053a5a5b9cbf799b14a9ac83ecf7911a104aa181427793b47842ba5a4c78b764ecb49090cc3a5a045c42e71ac4384685fdfa09c26ae5098f
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild b/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild
index e228a7700964..87a974669e13 100644
--- a/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild
+++ b/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 RDEPEND=""
 DEPEND="test? ( dev-vcs/subversion dev-php/phpunit )"
 S="${WORKDIR}/PEAR-${PHP_PEAR_PKG_NAME}-${PV}"
diff --git a/dev-php/PEAR-XML_Serializer/Manifest b/dev-php/PEAR-XML_Serializer/Manifest
index ac85a6ca152e..4b729a8b85ca 100644
--- a/dev-php/PEAR-XML_Serializer/Manifest
+++ b/dev-php/PEAR-XML_Serializer/Manifest
@@ -1,3 +1,3 @@
 DIST XML_Serializer-0.21.0.tgz 33362 BLAKE2B dc7d9f5d40f538e4cdb6a9046bd5ba4d3970fe710dca5b809a808e057f782628aa124a6f541b800f55e15c5f5aaef335150c7342a2a96845ae60eb275bc897a3 SHA512 f547fc92d5b102681229c8c8830ca8201ba529c06a720ad761f2c3cedd757d858711c3d8b0dbd2f88b0815758561acc297cee002162bdee6002c1c7310c8f67a
-EBUILD PEAR-XML_Serializer-0.21.0-r1.ebuild 627 BLAKE2B ad36c17e3b51e7cecd1718a149f63be832e31bdad2ba67504e964d52dbf1988f3ec717d1898c8979de63bf7a4c94d85a98fccbdd4509897034e1bdcbdccefc7a SHA512 b95ccb0fb7e79059ac2a089fa8855e64c1ac76e16250e01ec0c50c536f922389a41dc1351910158277c2f5003586cc18ae99dc213404ebd9bb304c07848ffab8
+EBUILD PEAR-XML_Serializer-0.21.0-r1.ebuild 651 BLAKE2B dc21ca9b6914653f9de3ed858828a5e2da4eda499d234f59fbe2195e39eefabe08455b38555a6284583426982a22c100bbfc6b99d99466486ecd5c9cfead54f9 SHA512 3c8aa596bfc75faeaaa3f9a1661deccbcd2a4b90f5f24079724fd16fbd9abfab2d5078a728175e01bb7262d821daebe6cb55a9698e8dd2aa101f5bf43a2f095f
 MISC metadata.xml 316 BLAKE2B 901abfe1e0ca8a6a60797d2376d048547811123601008200b10f48784af8d0e92eca6bc0ce38d8d2b2cf8c0c98d47666bf9215546cf53d7a1558dd8018c03c8c SHA512 c8b05d370fd3dad6cda63253224f1e5cb331efbbbcc1915d5ca90551b79754c6a18f590278595128a46c39d8721f913ec5dbe01b08874a64584d722853dafdef
diff --git a/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.21.0-r1.ebuild b/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.21.0-r1.ebuild
index b82b192b05c2..c9a0413d9dcf 100644
--- a/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.21.0-r1.ebuild
+++ b/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.21.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,6 +10,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php:*[xml]
 	>=dev-php/PEAR-XML_Parser-1.2.7
diff --git a/dev-php/PHPMailer/Manifest b/dev-php/PHPMailer/Manifest
index a8db674efcad..d14891611e0e 100644
--- a/dev-php/PHPMailer/Manifest
+++ b/dev-php/PHPMailer/Manifest
@@ -1,7 +1,9 @@
 DIST PHPMailer-5.2.27.tar.gz 159227 BLAKE2B e5ff2dd62cb12396bee58f0dce2fec3148dcf425cd91d69b76659ded7c38d8d5dea4830649dbeaa4732e098deecfe7ee77e338497b080997a44fbcf28d0833c7 SHA512 5a466133feec323d3739b9a1bde36731f5e65ecf61aa3f2fa6cc4ed0bd6f9280f8e2a17b6b7ac481846509ba3e8b0b97062f0dbbd644ccec3884b7a03f489a1b
 DIST PHPMailer-6.0.7.tar.gz 91706 BLAKE2B 1d3d22dea463040840c1259cfbdbcf2da59cd31e915ea8a73bb9981844e9ae6e32ca1e9a40a576fedcd8c0a049f92f9b5422040e12dcc66b2c555dbd36126c67 SHA512 0d00ff177fc82c3cc54ed04cfd333739c9346f89dba1ccb8bdcccc01abd3de4c55c96dbd51cc0f4cc76d6690acd22c6bb4f632dcfb785ec1d0a32a8751ddf6e9
 DIST PHPMailer-6.1.2.tar.gz 93635 BLAKE2B f8a12415a0e24697c84de06782f78a1cc37785ad0a1764dfd53470ca1ac5a8d4dffc418794b7627d2702b16f68ea83a93b362b7659a95e0c0a84e1a9b66b7b9b SHA512 3192f77f7d0158f30c7ea4484c86c279e0563e629702901f66901003c384101c57f7482feb14fc61927afaae8adea5d8fc34bd07c7058f68f6144303ce235fd5
+DIST PHPMailer-6.1.3.tar.gz 93690 BLAKE2B 08f653520a2b7819470cbb5cf1f43480cdcab51fe452f4831df47269f4223cfeb7016e41e8de75c11b15a04fa278fe08439f3c022af9088a5c8f5e4259ae7ebb SHA512 195155e49b29740422e75d7dbcf082cf8b26c87dad7b5473b9d55267e31af3847cb65a1c79f73225fa79080428d8c7516f5cd4d083824fa42f3b22a3bec8c34e
 EBUILD PHPMailer-5.2.27.ebuild 1959 BLAKE2B fdb6c9c625a9c71b8dd824c7861ffcc6f083c57498a2dc3077253ed420a8c58dd248fdb02f4b0becdc8183984ac247575505f3c44b03b067fcc4579c030e323e SHA512 ebe6ed844a2d20eaf3096e389cd3981aaf034dc13b360578745c6b798be11bcdff3f0ab540c2ea5fbadb1c0c6fab67ee46da63c4e1a51ff0bb60ce8773ce4c46
 EBUILD PHPMailer-6.0.7.ebuild 2216 BLAKE2B e666a411cae84eace13eba49ea2c9d02b2db1514efea96047c8ff455cf03b4a5e6fe2617527a71183d738677dbdb7d5739d9d3a2ca0a5106fe8c4aa295474413 SHA512 fb035831fd806686834ba2b707a6aa62bc846c218d8c6792e0826bc6a3d05a2be4a86fc140928df4a06afbb036a12c0b69f58baff6291e7c4d2fedd408403bca
 EBUILD PHPMailer-6.1.2.ebuild 2216 BLAKE2B e666a411cae84eace13eba49ea2c9d02b2db1514efea96047c8ff455cf03b4a5e6fe2617527a71183d738677dbdb7d5739d9d3a2ca0a5106fe8c4aa295474413 SHA512 fb035831fd806686834ba2b707a6aa62bc846c218d8c6792e0826bc6a3d05a2be4a86fc140928df4a06afbb036a12c0b69f58baff6291e7c4d2fedd408403bca
+EBUILD PHPMailer-6.1.3.ebuild 2216 BLAKE2B e666a411cae84eace13eba49ea2c9d02b2db1514efea96047c8ff455cf03b4a5e6fe2617527a71183d738677dbdb7d5739d9d3a2ca0a5106fe8c4aa295474413 SHA512 fb035831fd806686834ba2b707a6aa62bc846c218d8c6792e0826bc6a3d05a2be4a86fc140928df4a06afbb036a12c0b69f58baff6291e7c4d2fedd408403bca
 MISC metadata.xml 446 BLAKE2B 178ea98081e664641c7a8632a1c7dac9b5cac8992b0b945208f5ef654633340daced2473bbdc342b70d8b168ac2206ba132f7ab9601f61b5436f3eb3e0441ca1 SHA512 3dfce858cb0e00b526f04a5764a6173d4711db4f21f52b6d827b82f1cddea4e33f533e645dae95d0bb6a69699b00520a414f2e322c76b56aee1e4ea047bb4bb5
diff --git a/dev-php/PHPMailer/PHPMailer-6.1.3.ebuild b/dev-php/PHPMailer/PHPMailer-6.1.3.ebuild
new file mode 100644
index 000000000000..d753eb1c174f
--- /dev/null
+++ b/dev-php/PHPMailer/PHPMailer-6.1.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Full-featured email creation and transfer class for PHP"
+HOMEPAGE="https://github.com/PHPMailer/PHPMailer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# To help out the Composer children, the tests and examples are missing
+# from the release tarballs.
+IUSE="doc idn ssl"
+
+# The ctype and filter extensions get used unconditionally, with no
+# fallback and no "extension missing" exception. All of the other
+# extensions are technically optional, depending on how you use
+# PHPMailer and whether or not you're willing to settle for fallback
+# implementations.
+#
+# The insane dependency string is to prevent the ctype and filter
+# extensions from being provided by one version (i.e. slot) of PHP,
+# while intl and unicode are provided by another.
+RDEPEND="
+	ssl? (
+		idn?  ( dev-lang/php:*[ctype,filter,intl,ssl,unicode] )
+		!idn? ( dev-lang/php:*[ctype,filter,ssl] )
+	)
+	!ssl? (
+		idn?  ( dev-lang/php:*[ctype,filter,intl,unicode] )
+		!idn? ( dev-lang/php:*[ctype,filter] )
+	)"
+BDEPEND="doc? ( dev-php/phpDocumentor )"
+
+src_prepare() {
+	# OAuth.php relies on a (now non-nonexistent) autoloader. We remove
+	# it early so that we don't generate documentation for it later on.
+	rm src/OAuth.php || die 'failed to remove src/OAuth.php'
+	eapply_user
+}
+
+src_compile(){
+	if use doc; then
+		phpdoc --filename="src/*.php" \
+			   --target="./html" \
+			   --cache-folder="${T}" \
+			   --title="${PN}" \
+			   --sourcecode \
+			   --force \
+			   --progressbar \
+			   || die "failed to generate API documentation"
+	fi
+}
+
+src_install(){
+	# The PHPMailer class loads its language files
+	# using a relative path, so we need to keep the "src" here.
+	insinto "/usr/share/php/${PN}"
+	doins -r language src
+
+	dodoc README.md SECURITY.md
+	use doc && dodoc -r html/*
+}
+
+pkg_postinst(){
+	elog "${PN} has been installed in /usr/share/php/${PN}/."
+	elog "Upstream no longer provides an autoloader, so you will need"
+	elog "to include each source file (for example: PHPMailer.php,"
+	elog "Exception.php,...) that you need."
+}
diff --git a/dev-php/PHP_CodeSniffer/Manifest b/dev-php/PHP_CodeSniffer/Manifest
index 53d3be375d4f..97c25cfbf137 100644
--- a/dev-php/PHP_CodeSniffer/Manifest
+++ b/dev-php/PHP_CodeSniffer/Manifest
@@ -1,5 +1,5 @@
 DIST PHP_CodeSniffer-3.2.1.tgz 554343 BLAKE2B a43e253e7cdf6085ff1cfdec110878c99b61a69d80415a40cf670b7ce9ddce82f7254c34995c67084d5aa7aef8d775e6cfef5e9fcab90771f09244c1442e319d SHA512 69a4d70c6a567d262142f7f3d42507a7501ca3d5213f5b90d5893863e3d75e947a7b41e8bb08e85975677b606522b8f73df33dd35cde85c28016389f3c2ae63c
 DIST PHP_CodeSniffer-3.4.2.tgz 637880 BLAKE2B 1c919f92f0b3532f3568014a923bb644a845950587972d12c5e02885b3e8e4b2c334bd7ee8412ebc84527072b64737ea3c59ad3ba145a597ef8cfd71360717e9 SHA512 6236e3f9899d8f4637314f359a8db44835140d0292ea02b56b5e2e55ea8739841648ee03c3f25bf4df64577237b6bc1c3d0999d5452b9f292ef019347ecd41f5
-EBUILD PHP_CodeSniffer-3.2.1.ebuild 1406 BLAKE2B d8d5e47a52cadf8855c982913344569bf39ec3f6d0c92bcac3da4a1c873bb9b539b5dda228c4cbe3d054bd6711f13025b6df8a315e9dc15b1d6b7a75b8050c7b SHA512 3f351f529e8f32824c1026447c6631b0f58e9f14b48463f6e9417a90728ad776f4e8077698b8fcbdf45cf169c1614af8c03631366de8e2902d3fa75f290aad13
-EBUILD PHP_CodeSniffer-3.4.2.ebuild 1414 BLAKE2B 14540c85a291902b7d2f3178c1a6c23361b60dca1f13ae9cea393160c3fe278a729795b62473b052b21e03e26f8f53ef4fb7d3e87ed1d2fe3d85d1c371b25793 SHA512 9746225779ad444a51bb788639edc55d771d2800f17fe93778b4cf3ef3050cc7bacdab0ad1b19a27c8b9517f1e93f62adde2198c829e95a81dca374b56b09f9d
+EBUILD PHP_CodeSniffer-3.2.1.ebuild 1430 BLAKE2B f613e7c088a69d4b1c0ce8e19a3c60264135dd61f0e801563a9a8f30d4df084c6e412339240a83af49f39b1228af7abc678c638bc264da6790c17067c944c159 SHA512 5212076e9fa490972adecef7f90662ba63d264f6ee555a18f71c67ded6dd160209877f628e3b1a30f20a6a085f593e5dbd06aacb464d85cb4cf62936c8cfdd41
+EBUILD PHP_CodeSniffer-3.4.2.ebuild 1441 BLAKE2B 751179c730d93f2bac891940b1c6df859c635e4668548f5fc91786cc66bde2705d7a6f87c375cbc75533d71710683b14af04c757706a4659eee30aaa902b49b2 SHA512 097e3b81fb08d34694192ff18e2ac29393448d9c9aea9fb3e18ed81448e7d683303199221203d8e32712a1a4304ab6d438753658cb54fad0734a16a85c3f7213
 MISC metadata.xml 329 BLAKE2B 786efd240520e1b8b5ec8fde8fe4772defb0dbae2bf69358710c227454f5de1bc831600eb81d605053163d78e0129cd657b3229a74d30bcec7ffe6ce960d87d8 SHA512 5a983e0b393c626d49f7b3b8757cb68e73a7f292ebc861ca5e6f83c20b5c6f79918422aee7830ad3dccacda719c6d42d6bfcc5eb7ddca7ed29785ef1dd9e0f30
diff --git a/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.2.1.ebuild b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.2.1.ebuild
index c460fcdcb741..d993d514bb77 100644
--- a/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.2.1.ebuild
+++ b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,6 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( >=dev-php/phpunit-4 )"
 RDEPEND="dev-lang/php:*[cli,tokenizer,xmlwriter]"
diff --git a/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.4.2.ebuild b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.4.2.ebuild
index 1db0183b7492..792602dd38d6 100644
--- a/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.4.2.ebuild
+++ b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.4.2.ebuild
@@ -14,6 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php:*[cli,tokenizer,xmlwriter]"
 DEPEND="test? ( >=dev-php/phpunit-4 ${RDEPEND} )"
diff --git a/dev-php/SabreAMF/Manifest b/dev-php/SabreAMF/Manifest
index 3f8680182542..9ccb383b70e0 100644
--- a/dev-php/SabreAMF/Manifest
+++ b/dev-php/SabreAMF/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 236 BLAKE2B 3d91e2d8a6103438262ca06aa8f1821cccce8edf4bfbe0007b2468e37ab0546284929fd91e8ea665636e6dd1b793508f55a2aacb9cf6bb653d650dd237621088 SHA512 f2a9c8e16ea3aaa4cbc1edfc7876a9ffe3e87a78a66a490d56093158f99ba5d15413ecd0f22344385d24b6da40c5ff5c1061f835193483fa43d3e11a325845de
 DIST SabreAMF-1.5.0.tar.gz 83408 BLAKE2B 2df210f9a42e00de0adfac94ff9b89ccc918796c79e7df5602ba71bf8cf44ebea7374557d1062e1f95c9578cc95451daf36986e98042f2bdcb17e43581096cfe SHA512 4c0eead7f3adb64001cb4f40f680ade4cd0259d8b24d57970081e19447a69269753c5c5adecef327ba3a9f0cb2c14ff05575c289694bee752007f03e14af4d0f
-EBUILD SabreAMF-1.5.0.ebuild 680 BLAKE2B e0b7b4989d716a7bdfb517308c92c85e3b182172231f8bc12ce9add1576fd0a01ae10104ae9da8062a9fae19a86d18580a8faa07a6e23f5c25b35d9bb3309d2d SHA512 9faa7c162ccee4d60952e403602512cc9c2782d70599c5af4d0faa7c1be57ba16b95752ef7d1931109bf90e6d862566d9bad3d58c1d53fb2768179947d7ab168
+EBUILD SabreAMF-1.5.0.ebuild 660 BLAKE2B 0f81348e52511bebc9ac173a5613b463c9bec61aa9f8db6b241950d44f58a9c982abdc3c75d67288b01a811d4c66a82d1165d0e19bef82d5758d195147a88c85 SHA512 a7f9d1e9923223e61d60abbfeb307f13bdead77c75f9ff953a18460d9ba06242393634b89bbddf5e7758b2d37e5911438347bab22c38af92322a5a3fc46db052
 MISC metadata.xml 318 BLAKE2B d4d80e308bc8a9f06155aff1e51a13199d16e706ede69ffe8a1fd1e7b576b616a3ed4b416ecacc599e2d2c04eace343de0a766e37f1a152ee02e88ad4846d080 SHA512 0e738941b2ec5b9ab2c948dfbeaeb6f66391069058668e580701ac1302b39f8cd65463712ca861d7eb45ba3929e288cb73a1c032c3d77efe73f7dc6134305bc3
diff --git a/dev-php/SabreAMF/SabreAMF-1.5.0.ebuild b/dev-php/SabreAMF/SabreAMF-1.5.0.ebuild
index ce985ece45a7..3ebc02a49c50 100644
--- a/dev-php/SabreAMF/SabreAMF-1.5.0.ebuild
+++ b/dev-php/SabreAMF/SabreAMF-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -22,8 +22,8 @@ src_install() {
 	doins -r lib/${PN}/* "${FILESDIR}/autoload.php"
 	einstalldocs
 	if use examples ; then
-		insinto /usr/share/doc/${P}/examples
+		docinto examples
 		docompress -x /usr/share/doc/${P}/examples
-		doins examples/*
+		dodoc examples/*
 	fi
 }
diff --git a/dev-php/awl/Manifest b/dev-php/awl/Manifest
index 8ac829e56960..3702ca76bc92 100644
--- a/dev-php/awl/Manifest
+++ b/dev-php/awl/Manifest
@@ -1,5 +1,5 @@
 DIST awl-0.59.tar.xz 124652 BLAKE2B 45b6271c175c23597c56f3d2ecc906ffc7d32feb4d8d51529e8ff861791b901f7076a1ed2aaa2309101c7d0e8aa1a48327f2d2cc4fca2738fffc55fe7665c310 SHA512 98a7bf336d5677146e06d3d8f320b67ae2a034d2b7ad32d64998993ed29431fbcf8f7c8f972ccfa55d81af32f1b413e265850181a505022e9ad350a8a670e6b6
 DIST awl-0.60.tar.xz 124772 BLAKE2B d24dcaa34f65720e76d8304f990c22fd0bab836b92a60e05acac39ced0924b6ce881328ca5fc5368ada4aee6b647e75406cbf07b96582ca03dd3bf0b3532e039 SHA512 b2a44c02cc3a8c0d4fef3ae1f9bbc121a6f4a25607c47c0b45625b272a754ce645443a95b074f89319877221e8b74bd0101c5a0ec741d80b7ea37f193dc1af42
-EBUILD awl-0.59.ebuild 640 BLAKE2B f76253fa5f15dde5a9db55eae8790c07d4d2aa2c938d33850d042e92a1b7b6a05166a75fbcdd4c0fee0303b5782964e7044e47865b7039cc27af67f312e71740 SHA512 bf679a3fc9384a962e659f2df19ad55ba788bc1256df9a2c73ac8ef483976dcff7f128b6da4c707d6bd22810e76eb5ed16469f461f8dbd36f605cd43d55ecb49
-EBUILD awl-0.60.ebuild 641 BLAKE2B ed44aaa709754fc45eee9ca1900e0f21ef072fe8add8f0c431000a4da6325e5af0046bf20ac1ddd31a6695266346fac9164d3850d14fc130e13acbe179a07071 SHA512 f0c480e02773f6a85c08d29dffca9e95757c01b2c5db8fb8be31b0ec75d33025432036a3bc30adbe2149724dd5da75c0f5615f2b751f4bd133953bc7397a2b3d
+EBUILD awl-0.59.ebuild 667 BLAKE2B 8a2ee9172261d663e458c212a6a25ce5211f3a98bcb2d55f8141111a33a29f2d6a465f660bc87fbc345827e0a00fd7a587009b55c4d5586040fe2989b6874ac3 SHA512 f2a75a0c4bed202f83e54ff1b19dea5b6c022ed18ba88d97340d5edbe0111aec6c8195498f965270648647d0df47338e68c5f7e16a00926319991b840f765750
+EBUILD awl-0.60.ebuild 668 BLAKE2B a98565e479487e42120e291b259bde5dc4e1d400e4507be90c333071be50d921c702beb69ad36c92d24c6c11de1d96d41a93b1d35c216ced93c3cd68b97c10bc SHA512 c8d4b18179bc08a2e90e1538d58330f71f88edccde18ee3756a7d133b607e65d9cea8344f4610cda3660dc3739dd4981414f38eaf0740f681ceeaaeec47ea7a6
 MISC metadata.xml 476 BLAKE2B a082768fe63887996c15e2736d62a055692bc4fa0ad815f201bd9301b73dab3b084e10915e65d5443ffbab66d70ab9b42e12b2ccaf18e2f1a909879c3aa6bcc2 SHA512 e8607666ba3713a2484d18bbdd9387fe20705903f6688b0209a32f97d6c3cedb9d02ca8f205c7499aa431cad2b2ba2fb017e7cf2ff8b8970dbe10664d5c0eebb
diff --git a/dev-php/awl/awl-0.59.ebuild b/dev-php/awl/awl-0.59.ebuild
index 0214a035bf3d..bc69ce04890d 100644
--- a/dev-php/awl/awl-0.59.ebuild
+++ b/dev-php/awl/awl-0.59.ebuild
@@ -11,6 +11,7 @@ LICENSE="GPL-2 GPL-2+ GPL-3+ LGPL-2+ LGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-php/phpunit )"
 RDEPEND="dev-lang/php:*[pdo,postgres,xml]"
diff --git a/dev-php/awl/awl-0.60.ebuild b/dev-php/awl/awl-0.60.ebuild
index 80df3028b308..ab257406be35 100644
--- a/dev-php/awl/awl-0.60.ebuild
+++ b/dev-php/awl/awl-0.60.ebuild
@@ -11,6 +11,7 @@ LICENSE="GPL-2 GPL-2+ GPL-3+ LGPL-2+ LGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( dev-php/phpunit )"
 RDEPEND="dev-lang/php:*[pdo,postgres,xml]"
diff --git a/dev-php/doctrine/Manifest b/dev-php/doctrine/Manifest
index 769dd9a6908e..8f2c16bd8137 100644
--- a/dev-php/doctrine/Manifest
+++ b/dev-php/doctrine/Manifest
@@ -1,7 +1,9 @@
 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-2.6.4.ebuild b/dev-php/doctrine/doctrine-2.6.4.ebuild
new file mode 100644
index 000000000000..10bd6546bbf1
--- /dev/null
+++ b/dev-php/doctrine/doctrine-2.6.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="orm-${PV}"
+DESCRIPTION="An object relational mapper for PHP"
+HOMEPAGE="https://www.doctrine-project.org/"
+SRC_URI="https://github.com/${PN}/orm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/php-7.1:*[cli,pdo]"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/share/php
+	doins -r lib/Doctrine
+	insinto /usr/share/php/Doctrine
+	exeinto /usr/share/php/Doctrine
+	doins bin/doctrine.php
+	doexe bin/doctrine
+	dosym ../share/php/Doctrine/doctrine /usr/bin/doctrine
+}
diff --git a/dev-php/fedora-autoloader/Manifest b/dev-php/fedora-autoloader/Manifest
index 41b77ea7ebe0..afa248bb66b3 100644
--- a/dev-php/fedora-autoloader/Manifest
+++ b/dev-php/fedora-autoloader/Manifest
@@ -1,5 +1,5 @@
 DIST fedora-autoloader-0.2.1.tar.gz 7634 BLAKE2B e2827ac332a7b50f94383a11b33f25625d67984491fc46dce6ad01d6e4b986c489062464d09ff5ed32f29c2d623ff9d59579fc007eceb1279f660695feea72a0 SHA512 81501dbc0668c1cc6d6fb030e0d9ee91d31db8fa32b3348a0215dbf20a3ef1d41bc398124e1d7f0c1d5ffa8fce8c33e60a3182eaba6ba740d78b4a7f6db2aea8
 DIST fedora-autoloader-1.0.0.tar.gz 8504 BLAKE2B ada69f3f3126b2c233b0ab933e52468d8303dbaacfc27364f490ce7b093043f92913ecc55180b460828573f0f204f5e7f4d10b3149ef6f5b3cee1d645fa6ac58 SHA512 a8e3330d961a9415a817d41ad9feb91018aa398607a2adce1f8386d491581773226f6819ac3d90827344898fbbdb32c0881af3f122efdad021f7ce70a07cc66e
-EBUILD fedora-autoloader-0.2.1.ebuild 699 BLAKE2B 28e6a199e4c35482c7a8708b2ff4ed8618dbcbbd3e10782eddf652eb36fe68694a8c74668beb2ff2905554fe8a6c567ce612939bf00a6f1d5b2b2f5799cd07a2 SHA512 4f34720be9eabd9def72189f84d6d4fb405fbb16edf3b9dbe483431220181f31f15cec63879500e3f92e0cd56666782328532a02fadb75cc51fec8b60ae7a610
+EBUILD fedora-autoloader-0.2.1.ebuild 723 BLAKE2B d487b5974089f9241b28d5cdd21b641595c574484657ecb8cd396cf4f44d0788d25533450ddafb24059b163881db45450bd3ae517bea7a6eb1d3b2be03dac2e4 SHA512 878bc7c8a11980bcdf6ee5fcc91d4971a2836f2eccd040992a5bd0cd5118bc02d0567cf1a801268785663c9736c36b102ffaf75a3dcf725ffb117824644324b1
 EBUILD fedora-autoloader-1.0.0.ebuild 725 BLAKE2B 1d62af67d44179653f28bcd252646afe844da36d4674c52de3d00bc73a3ede9b03c16e2c820bef3eb2d5b9212689ae31474490603c4b7945b4b828b973be0943 SHA512 badd2cd94a6c51e7723932736ac8d66f251b5bd68d3c2f88c1aa803583bccc9d0bb1aa852d6529c353f89834f2bfb41623de2ea35ef0a1d96108452152c44c4d
 MISC metadata.xml 710 BLAKE2B 8ce6437cfec2d52048b7107c177bc025ea7770ac3aea2c86782f9b61ad6ba05b9c3df2f377ef97291356f97822721bda247047577383374252170f5835ee7f10 SHA512 f12b4505ad34c9171cb4547793c17406e4bee91f6b97efc39825d981d426fd729304ee72ac51471e8b4fea8cf6d194bc32990bec2206d661e510847729fc3819
diff --git a/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild b/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild
index a25eab65f5bc..fd25bcc763e0 100644
--- a/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild
+++ b/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php:*"
 DEPEND="
diff --git a/dev-php/geos-php/Manifest b/dev-php/geos-php/Manifest
index 42a5894d436d..77d36827be74 100644
--- a/dev-php/geos-php/Manifest
+++ b/dev-php/geos-php/Manifest
@@ -1,3 +1,3 @@
 DIST geos-php-1.0.0.tar.gz 40870 BLAKE2B c6d526470bdb7e4aecce6ce5f2132f90a6c40e5a2b3a8169bbb7ae101394340aad8a23309130c7f1421e19162b5559f9e87e58fb704e91b1fc03b612543551e8 SHA512 4ceb9e1152d0b534bc3a5e372be0b98770b1883ec4dda1177c9399d95d947b9feee412accf003d27b55b1a901c90259a9b38792b453dac11cb8af26af3cd91ec
-EBUILD geos-php-1.0.0.ebuild 724 BLAKE2B 5e0a1b8ee71ccb88c72dfde4f2d59d2380d14f4434f2e9e1ec5b13936ea1e93e59eaaefce9036598f0ed8b7d825179790b36d1b5a88a7fb40933c70d11ff1e22 SHA512 7b0e3399f6c606b906ce28debc3d695c541d1d8a8861686b4ef41ecbb31d6eaeea04c9390c45edde2c0e7e8ad3257134aca1493396c584e77d8ced0aafbbeea2
+EBUILD geos-php-1.0.0.ebuild 751 BLAKE2B 8cc873b64b5a17a2fde52832098fd831b1db35ac6fb1a7706adaa38252028fab1971ac54f876f1c0147538da31536cf9879eff4224bb77f3e419263f82a04ba0 SHA512 3984a482e24f696acbe7951f492a96ffce041ce99bf400e9dd79cb8c5c0b822a53e813f6134c69cbec39df6cc8412fb22e65ce9f73c1052937393a4b9ade4b5f
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/geos-php/geos-php-1.0.0.ebuild b/dev-php/geos-php/geos-php-1.0.0.ebuild
index b126efe75093..bcd0bc9fe03a 100644
--- a/dev-php/geos-php/geos-php-1.0.0.ebuild
+++ b/dev-php/geos-php/geos-php-1.0.0.ebuild
@@ -23,6 +23,7 @@ SRC_URI="https://git.osgeo.org/gitea/geos/php-geos/archive/${PV}.tar.gz -> ${P}.
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="sci-libs/geos[-php(-)]"
 DEPEND="sci-libs/geos[-php(-)] test? ( dev-php/phpunit )"
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index 0c771737fc96..27d3e2e828d1 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -1,6 +1,6 @@
 DIST igbinary-2.0.8.tar.gz 189726 BLAKE2B c4691cda07095c3907fc1caf86b1ba5a066a4d3cc4ca7274b9c825e1dd299ec6240bd703152510428cff8b7ca59571bc478a8679033c6fb852e54bae697d3180 SHA512 0161e05b246a3b749213fffafd74265e337fc657ea5e1390507a48865e9434aa3ac7e73bd9d04bfef0d8ceeae222a95cb9490d4705ad2b4607b3eaf2d05962c6
 DIST igbinary-3.0.1.tar.gz 170957 BLAKE2B 2250ef228b059d5d87615412ffae3242cd757df25dc9a1bfe2a4d1dc33a417a4389abb2ab613359537a6ee3947526caded0ec584049e3d42669532b4a930afc9 SHA512 4930670ecdc1796fa73184e8f12bf570f7b1a43cb422cede056ccd1ca28fc950b00a9418519c59a9c07e346a89153b6b105e873fcfccb1365d43d4abf98804da
-EBUILD igbinary-2.0.8.ebuild 594 BLAKE2B f02be79165c82a0d047be04c6dbd3444e09cf6c936b8cbcbfe27a3e4ea47c4cb924c713148a0d1472ebf533823d33f2ab66874a1c962129233e2effbe6702de2 SHA512 9438e82b05b08b1b998fdefa084f1fbf30da0330fb8a4c61ff98a601b454d9a8daeac9597d8d6015ebeb57f6883b22c12feb89d9c43381f5997471eb16c49e6f
-EBUILD igbinary-3.0.1-r1.ebuild 592 BLAKE2B d92cca52b5487c24097738862bf236f25fef325eb8e9ab3f3e87b5b2cee0d8ec1d03c7a4ec8ea687d6b31310af7f5272340556b58b5facf49b994cfddd891a7f SHA512 56c069c778da0698df58f8edbaa2753185108535344c4dd53e236a2c96a98b5caee72353447d6c2cd23bcdf0a7c0d9ea44622f88ef1b19eed5c619cd0a72996d
-EBUILD igbinary-3.0.1.ebuild 580 BLAKE2B 83b2a011041ed6519b749d12003056b91a99c7a16c918e9f39ff96b1dc3c22231f8ec36d5dc6babe8d83ec7640d97c80b35be3f595235c6e6537d2e047e11d19 SHA512 ca1c80f61cb14c4e07578a3bccbcd8dca0fec70879a56086ce2fcbb10c5564184bf13feb34b687303bacd44cc98362011876fc3a18f03f03b708f5b6c96080ab
+EBUILD igbinary-2.0.8.ebuild 601 BLAKE2B be19ce53c022c99316a8b58d4094689359de8616cac2ba89a28358d1e30923f29ac3d4e5e019a757eb60e94ff01ccfab156372658c3c741b5708f56747f76e2f SHA512 c7def1965ca0b8eea4f787ba6c72fc728aa4570aa44245052c70821f6e9dbec802d352f3700ce9e3756f7273183fe6591adc732cd1447f0ba93fc48c837f2340
+EBUILD igbinary-3.0.1-r1.ebuild 599 BLAKE2B 436b3d1e411a78fa4eef6a748053b099518b18e1b3bd23e83710c2994bac9f3d0a109d795b252bda500f0c3b13a39f6b52a6df660102863bc38986ab19d53135 SHA512 bfa32a3041fef61a754224b95ad997bc8ff9bbda66a030d1ef76e94f0ce91023dcfaf09f1cdb69d6ab21e588a5988e6501f28d54e3d847073ddf7b08f26cad37
+EBUILD igbinary-3.0.1.ebuild 587 BLAKE2B dab9e2e17bc509e6b0d393df5c04c6bb8e5213cc8548c7936d5ecad8f115a95cf426166163fc2ad4b7d92af5f550c9a666eee3bbe30fb39ea110af83a9fc6602 SHA512 7b7f68a8c261c7304f8ad056c275912d95938ff2c5c29823c21e13c757eac4ce93fc4078f404c7329e38406548e191f3b122df9365f089198b0dae0451fe3e07
 MISC metadata.xml 331 BLAKE2B 4187300236aa128879679c7cb4a8ddfa19dfd512a76466e835224c30323f2fafd55189228bdced507ababd5b90f561f6bb44c1554392eb0682b6ba5c7a20b681 SHA512 86f467f549b36915940e45a4e151742f2925293106dd3da2958e6153aaa8fed378b2eb563bf69da0d38101409858a4abe308f608bd94de6b4517daf9da092405
diff --git a/dev-php/igbinary/igbinary-2.0.8.ebuild b/dev-php/igbinary/igbinary-2.0.8.ebuild
index 526e9960947e..3fc5e30a289f 100644
--- a/dev-php/igbinary/igbinary-2.0.8.ebuild
+++ b/dev-php/igbinary/igbinary-2.0.8.ebuild
@@ -12,7 +12,7 @@ USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
 
 inherit php-ext-source-r3
 
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
 HOMEPAGE="https://github.com/igbinary/igbinary"
diff --git a/dev-php/igbinary/igbinary-3.0.1-r1.ebuild b/dev-php/igbinary/igbinary-3.0.1-r1.ebuild
index 34cd861a88b5..d0b2edbed8a5 100644
--- a/dev-php/igbinary/igbinary-3.0.1-r1.ebuild
+++ b/dev-php/igbinary/igbinary-3.0.1-r1.ebuild
@@ -12,7 +12,7 @@ USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-source-r3
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
 HOMEPAGE="https://github.com/igbinary/igbinary"
diff --git a/dev-php/igbinary/igbinary-3.0.1.ebuild b/dev-php/igbinary/igbinary-3.0.1.ebuild
index c00d3b4866db..67fde3809285 100644
--- a/dev-php/igbinary/igbinary-3.0.1.ebuild
+++ b/dev-php/igbinary/igbinary-3.0.1.ebuild
@@ -12,7 +12,7 @@ USE_PHP="php7-1 php7-2 php7-3"
 
 inherit php-ext-source-r3
 
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
 HOMEPAGE="https://github.com/igbinary/igbinary"
diff --git a/dev-php/libvirt-php/Manifest b/dev-php/libvirt-php/Manifest
index b9ca922ed8c0..988502fe4ddb 100644
--- a/dev-php/libvirt-php/Manifest
+++ b/dev-php/libvirt-php/Manifest
@@ -1,7 +1,5 @@
 AUX remove-imagick-check.patch 331 BLAKE2B 2d9c164055c3f54baf259326abe22d5aa478141df7f6ea05ba33f040701947038490c1898e89a7019cc1e41008fde5cb43c338730ef7ec3020f5005edd612d9c SHA512 1e949f8c704a2e6b541a276b8cb53e9cf09f009dadc01f4f50ad02e92258cfe30130b2d22b811e0b5b07e1bad4023fad05040c6031bd0063999212c2d6483bcf
-DIST libvirt-php-0.5.3.tar.gz 778604 BLAKE2B 40fe4bb2f1e3fd81f1aaf09b8b92c509e79186a1a6c0dc97aa55c7164ed36cc0088141ed46c3d82cf277e25eaf3b017edac9466684e1060b5a22c18aaa7a576f SHA512 b4cbfd8840d8f114fde762b5d6ada155ebdb231b554e28e8526a7af45a802a18f28e90fa52f3d7ca9f616996fe0a8289b70c2d14dca51a52a7bf8a501c3ff44f
 DIST libvirt-php-0.5.4.tar.gz 780793 BLAKE2B 8bb4577c26cc0ef8f2a0ae813ade7f5fdea9a2a7d70c97cab1033fde21d9a1c27b8c2ad7a8284096e143e955202bb564767b4d7e1a4bb9e15993895adc119288 SHA512 b5b204549e6810668203d1df8404a5cb71f646ae7e01ea223c6e9b9eec9b1f6500cc5bb4559859959d821a213ff992f22a97e4b683da2c683be3732710943487
-EBUILD libvirt-php-0.5.3.ebuild 1395 BLAKE2B 647e79ece9175fd70fc2dbecc0de440ac4db17e5ff4a19621d78d1c1e508047233fd2311df550d2da492676b97d328cef3e92aaa66cbfc924a0c97ce01afb8a2 SHA512 aa855f216e4a71fc69be4214a70cbe2dabcc5871100c0e90a3911de1a88958ed40a53a19584d406ce7777911889166535d838ffe9d25dd8596f170e8e6bd1f0e
 EBUILD libvirt-php-0.5.4.ebuild 1430 BLAKE2B 03a918a8f68b1a6cdbb0b5947497c6af1c8d94de78bd92c6444e57acd7b47a48c6faf4e4d4e0e6737659c8b5276c378fae8d710537031f0c9a3b620fece3de8e SHA512 73025d7466fc468dc74154ead58ddd8149e4c8d0dd8358512a565ddddfe873e16ba066ce943a4a8e383e15f90a6700242ab9ee4e73fc82d828e9667fc154bb01
 EBUILD libvirt-php-9999.ebuild 1408 BLAKE2B 062400c1e7bbde79f96886ca109132828c42ef0cef05cc736932d356570df9c6f8afe31b4f71c97f4984f49dc7115130ef07d414831a7d72f22461f7a1b5505e SHA512 fd8cb6510188be21be61e2399bf1edbd2aca3a9945ddc1f63f4aae6bed4977d46659ae5cdc1b79dfa8d5eae041f857a5713e1beef9ae7c416e5624b4fe6f42e4
-MISC metadata.xml 482 BLAKE2B cc2209c8b662f3b122bcc87896f43a37767539e7cb4c2d4f5aa6dfceee8104f63b4af24a17cc05e0775e3dd2bddac36a341a7b0f8044821cc888dee594bf75bb SHA512 a1a8469c2e56cb1d32673057a3919a8f4799a921b67568a6109c60f5bacf61b879e7c07055d6b8d1b0c67faa5f7c1b468080875b7b2ce857b8e1af199d193547
+MISC metadata.xml 371 BLAKE2B a19266222702c53095b36860a4be3dcacd9808273258ec4819f23fd792226d7c3b667e169c69b91419defd64569fc4c9f2e8bf9fb69361fb68bfb5945467a897 SHA512 0d2df32d913253928112d928dbccbb42b19bb62e6d76334966f87fc6df8378a2cda0b057df17bd565976006da61c9fd3a30425b153852c8389557fe85dd3115b
diff --git a/dev-php/libvirt-php/libvirt-php-0.5.3.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.3.ebuild
deleted file mode 100644
index 4c6eda7c043c..000000000000
--- a/dev-php/libvirt-php/libvirt-php-0.5.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="libvirt-php"
-PHP_EXT_SKIP_PHPIZE="yes"
-USE_PHP="php5-6 php7-0 php7-1"
-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"
-DOCS=( AUTHORS ChangeLog NEWS README )
-# Remove the insane check for pecl-imagick which is only used in examples
-# and is not called upon in any build
-PATCHES=( "${FILESDIR}/remove-imagick-check.patch" )
-
-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/libvirt-php/metadata.xml b/dev-php/libvirt-php/metadata.xml
index 7ac4536773b4..5fb3e7c1f33e 100644
--- a/dev-php/libvirt-php/metadata.xml
+++ b/dev-php/libvirt-php/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dev-zero@gentoo.org</email>
-		<name>Tiziano Müller</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>virtualization@gentoo.org</email>
 		<name>Gentoo Virtualization Project</name>
diff --git a/dev-php/pecl-apcu_bc/Manifest b/dev-php/pecl-apcu_bc/Manifest
index cb620c1202e0..74cafa8f2a53 100644
--- a/dev-php/pecl-apcu_bc/Manifest
+++ b/dev-php/pecl-apcu_bc/Manifest
@@ -1,6 +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 1156 BLAKE2B 7fdf5cd9441b17f937644a326f6039d25c7fea9f651a7959d51fc1adb1b92c00a404c2c531e885b0f3e288150c5cabb73b67ca67bf9c9741b9222ff6a72cabae SHA512 9458838b228b4b0cfb7930b4d2f288dd40a1c0613ac5a8e12a1d41348b6d34dead4c7b8f80cffb5d0e132bda8a47080dc38d55bf0e0b9ee9496d414b8b73d6d1
-EBUILD pecl-apcu_bc-1.0.4.ebuild 1154 BLAKE2B 1cd0dde4480b764156c1ce0dfbf43a8ef9854301b403047a720b4408bcbb12b189623766f76d315c5c1326171e0ee121e78884f9ab3cbad348c1f61bfeb4d7ba SHA512 8624329b8c1bf082c2bfd5f9f4e4f04230d995fd46a6f0adf801e40152a2a550f3c2a962cf77274a271b8f7a2dbaab74aedc6ff4bda54ac48ddd7445a225add6
-EBUILD pecl-apcu_bc-1.0.5.ebuild 1158 BLAKE2B 5b7cda1440ebfa3d4e4ce3cc7f6c926bf3e8bb3c8184a00da69057203d4f8eb3e53f9b505ed4ec73bc4ef4c4f1be53680bff9c9aab9b13904fb22cd870e7aa9c SHA512 a775215e281c38f44c715a546e12ce5c1217e5063db2f731bd7d079efd3ffe3f142666499db7769175aaf0d702bc0cbdb13c1289b7965edcc7472675ab03de9d
+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
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4-r1.ebuild b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4-r1.ebuild
index e9ed00d7cc4e..4841dd913dec 100644
--- a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4-r1.ebuild
+++ b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4-r1.ebuild
@@ -14,7 +14,7 @@ USE_PHP="php7-1 php7-2 php7-3"
 
 inherit php-ext-pecl-r3 multilib
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="Provides APC backwards compatibility functions via APCu"
 LICENSE="PHP-3.01"
diff --git a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild
deleted file mode 100644
index b3444d3692b5..000000000000
--- a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_INI_NAME="bc_apc"
-PHP_EXT_NAME="apc"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_EXTRA_ECONF=""
-DOCS=( README.md )
-
-USE_PHP="php7-0 php7-1 php7-2"
-
-inherit php-ext-pecl-r3 multilib
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="Provides APC backwards compatibility functions via APCu"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-php/pecl-apcu:7[php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?]"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# This fixed version is necessary to have apcu load
-	# from the install before the tested apc.
-	# It is intentional to specify phpoptions twice.
-	# This mimics the Makefile.
-	local slot phpoptions
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		ln -s "${EXT_DIR}/apcu$(get_libname)" \
-			"modules/" || die
-		phpoptions=( -n -d extension_dir="${PHP_EXT_S}/modules"
-			-d extension=apcu$(get_libname)
-			-d extension=apc$(get_libname)  )
-		NO_INTERACTION="yes" TEST_PHP_EXECUTABLE="${PHPCLI}" \
-			"${PHPCLI}" "${phpoptions[@]}" \
-			run-tests.php "${phpoptions[@]}" || die
-	done
-}
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 2e08b7e24a57..79ea5781e4d9 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
@@ -10,7 +10,7 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_EXTRA_ECONF=""
 DOCS=( README.md )
 
-USE_PHP="php7-1 php7-2 php7-3"
+USE_PHP="php7-1 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:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?]"
+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?]"
 RDEPEND="${DEPEND}"
 
 src_test() {
diff --git a/dev-php/pecl-crack/Manifest b/dev-php/pecl-crack/Manifest
index cbf29e1a87a8..c3511144c646 100644
--- a/dev-php/pecl-crack/Manifest
+++ b/dev-php/pecl-crack/Manifest
@@ -2,6 +2,5 @@ AUX 0.4-php7.patch 8435 BLAKE2B 11b9d076a684fb1e3e4bef9cd733e7675909282a5e571b3d
 AUX fix-pecl-bug-5765.patch 375 BLAKE2B 6664659603006d260b578fc1169465007a600eb1b5ba4551339fc87488c7f94ac1ca49ebc829895ef2e6673fccbae2881e6f06a6cce4dfaa39db1350f2f4f0c6 SHA512 21f7d76242c630334e88c8bf1f6e4fe9718943c36c6886f8de6503c9c616beab7007e31127b40b1df66763893d692a65f20483addb1607e0cfc7ec7b92ff4500
 AUX fix-php-5-4-support.patch 674 BLAKE2B 5b2ce7a76aca15d6ff626ebced6e8844bac3d1fb959903c9882e1e59bdfc06027c6993431552deceb09df8d35e57e338818fa9b5ac11b31d4484369d3bd9d1e3 SHA512 ca2475557dc1d2f23a1e5745e7f3bac70855d0916a9d37d1a7efcd04e3bb973220b87aa2cc7ba8315473a2fd16dfd142c5c01608e94c595541ff15838c1e1d44
 DIST crack-0.4.tgz 25524 BLAKE2B 99e2289413a672d4dc3d8f9d70866efb499902a0d27379ac7b59d2873013c918d535851d8c3dbf2592596d6483f2abafe2f7bbd31fff40ce9827c7a97e16b8bc SHA512 0dec64d1ce859bb3d7e2b834e4bcc4ef8c6f3e88e5b61884e40dddc366a992a7c85bfad4227224d4401aad7f26843678709f29acd2dcc75563658040b8067d7f
-EBUILD pecl-crack-0.4-r6.ebuild 581 BLAKE2B 04f52129dce7e4ec373a17fd4a68b256981743d568723f428dbae41883e511ca8adad3dfd155ebd3f56feb04162b8cecde4b9619814a990ab50870be7fc9764e SHA512 7d305dc22b4972335d32906f25582b35bedaef94b0b9b53d69683f41f5f9c4011b6c5aa75f23f4f7b1eba5c8f277c77a8fc78b013669a7a96d0922e2bbdc0a27
-EBUILD pecl-crack-0.4-r7.ebuild 598 BLAKE2B e5beb88c4c530e7a031eefc2e94d24ed0b360df3497c10d22a626068b32d9b0be88b7cdd89a5b3390187288af2162f5b574d059b3fa6664dd5eca163e08b8644 SHA512 764614c418e68fc4504258093f2d6afc401b9c22d505003d4aeef576781f7068c6426b21b87b0425019937c8eeae071160e737d89dc3a5ea7f0a57403bfac8bd
+EBUILD pecl-crack-0.4-r7.ebuild 605 BLAKE2B f8d48c373151abe572512e8a038792350e611b8f638c96b31c64b310f70de5d8c127b9a75cdc870320aaba70d0b62fdac6de0cc958cc92f5b504a29f84e2bf48 SHA512 fe5adbc671be84f65232d1505b42e97616f612bfb56e8244827dce91f13fdc691180f5e17fa092023e750c46eb3ecb250922e8bd6447268129b4ebf51cce8830
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-crack/pecl-crack-0.4-r6.ebuild b/dev-php/pecl-crack/pecl-crack-0.4-r6.ebuild
deleted file mode 100644
index dcda4876842a..000000000000
--- a/dev-php/pecl-crack/pecl-crack-0.4-r6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="crack"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_EXTRA_ECONF=""
-DOCS=( EXPERIMENTAL )
-
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="amd64 ppc ppc64 x86"
-
-DESCRIPTION="PHP interface to the cracklib libraries"
-LICENSE="PHP-3 CRACKLIB"
-SLOT="0"
-IUSE=""
-# Patch for http://pecl.php.net/bugs/bug.php?id=5765
-PATCHES=( "${FILESDIR}/fix-php-5-4-support.patch"
-"${FILESDIR}/fix-pecl-bug-5765.patch"
-"${FILESDIR}/${PV}-php7.patch"
-)
diff --git a/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild b/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild
index 841669f34fda..9001623cd8a7 100644
--- a/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild
+++ b/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild
@@ -9,7 +9,7 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_EXTRA_ECONF=""
 DOCS=( EXPERIMENTAL )
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-dbase/Manifest b/dev-php/pecl-dbase/Manifest
index fab988a8e977..5113240e302b 100644
--- a/dev-php/pecl-dbase/Manifest
+++ b/dev-php/pecl-dbase/Manifest
@@ -1,7 +1,5 @@
 DIST dbase-5.1.1.tgz 20751 BLAKE2B 36b7f3e0d03cfd3852333b2ed062dc5c408c29db7c5c05b1f6e57744ea651e291d958ec6216804a4328bb344b8188f6db29ffdcf9134ed7938640a08885c4a71 SHA512 52dac3e253f88de898c43864e8aff62990b33eb770fb27534bd25896c3eb330ca05e0205a1f387296637e553cf6de16a3f7b3eff082e1403a56c60decfbce33f
-DIST dbase-7.0.0.tgz 32845 BLAKE2B c3a0e838b365fb998de8ccd47f5849fc41f8a9fc4b6acebd82e8823be252f52e9b730d1fd558f0d0db5e9c4d0794ebaf727a03d0ba4e53e2d2bfe86eaed0f3aa SHA512 3e092cd641220228313867d3e7a9ec95f89ccb73d13267509fb30657f95d661f81bb1ecae0d3a86618d453a41e2f727bb7740ad25248721d0144d1ce11548bb0
-DIST dbase-7.0.0beta1.tgz 16206 BLAKE2B 3921257aacb915deaad854ab54c8263646561dc2593bb4c5706fd9f27659cb1d22c0df9f88cbc7acf115d3358c25b366e5c3d1ef48eee2af17049094808113bd SHA512 623222e826509fa9b3f65353a66479fe4a5924de1b6dd4e73c106f2179f8af59740c758cf90ed8d0e9c61c31a7e5bef434cd858cde074f983b1dda69927442af
+DIST dbase-7.0.1.tgz 33588 BLAKE2B 50cc5b4e0096dbdd7067e9c05cb7b580ff5a9d548ec6acb8a777fa3ba62ac4fa06b30e040bdec2a77b87736cdd0684a662aab344db11806e6ca2c6824cee6908 SHA512 8aa743545e807773be6a3f74cd9ae686a982a5455e494ff2bc0e3fe6f1fdf25574702054253eaefc55a6e9529b3e70c8390a02bd317b74db17bfe6b7797d4ba2
 EBUILD pecl-dbase-5.1.1.ebuild 775 BLAKE2B 35a3ab094b0a14a33c672d59ef605803bbbf5e18d09b65030107f1c79dce4bdbcbf4b5c6556639e3289c4c90cb2f6315da54e8784a42e252aef0d1cb1883aa2b SHA512 7d431710fe8a380d085bde23b49c10906677d3444ef9af999a269c371296f3396df7ccaa5d52cac9bf571f6ae4477445587ceaab4abd8c457dae6bbd10db11d8
-EBUILD pecl-dbase-7.0.0.ebuild 1161 BLAKE2B 0e29015161cfb237e602551a9ab0b87639be6dc727c314ff5f142d48f1ae679c16c210bf7d412f54accfe3bca2f2a7a29ad6fd1b3ef26ab5ec818f1801f57b58 SHA512 7277612dba51c2a717990dbd14425dedaddcf07afba170c1c89842fe42348b11a7a50b359ee2a08bb7c07e613701bbe40ea07a6bef4715c15ed50d930aa27f96
-EBUILD pecl-dbase-7.0.0_beta1-r1.ebuild 1070 BLAKE2B 0cb69e3a4bf7f1c06fdb7967690cf74a97852568b2e55856a84c2ab8a9292dc5b200d827eec4e1d3cf6b04cf585318362fead248023bdee7bd8438f86d034abd SHA512 7eef9511bc14644ab5cc4b81a4a5bcd424a12f53a251c2a464c0aae00c8e9e9b6207fa398dd9f56d1f651a340bb789894f539e05404f9299c589459b1a16deb4
+EBUILD pecl-dbase-7.0.1.ebuild 1253 BLAKE2B 9f4a54c11fd4d308d9db68e33556aa8fd418c46150235c4e340779ec4bfac9104fbc4361ea47661145a7a58d4bd107f3173f2f2f1f615bd70aaec4bd00f45766 SHA512 24041868a3af76468991bc27145cd715248da6a1c8144e6d4e26a97a47a438d01e31ad49fa7e0e2a191e0c2c27148eda8e88754933b6f6c38acf3e2caa948592
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-dbase/pecl-dbase-7.0.0_beta1-r1.ebuild b/dev-php/pecl-dbase/pecl-dbase-7.0.0_beta1-r1.ebuild
deleted file mode 100644
index 72bf7b340134..000000000000
--- a/dev-php/pecl-dbase/pecl-dbase-7.0.0_beta1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# 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"
-
-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"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="dBase database file access functions"
-LICENSE="PHP-3.01"
-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 ; 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 ; 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 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-dbase/pecl-dbase-7.0.0.ebuild b/dev-php/pecl-dbase/pecl-dbase-7.0.1.ebuild
index 0eecaf7babb8..43d998a62c33 100644
--- a/dev-php/pecl-dbase/pecl-dbase-7.0.0.ebuild
+++ b/dev-php/pecl-dbase/pecl-dbase-7.0.1.ebuild
@@ -5,12 +5,12 @@ 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"
+USE_PHP="php5-6 php7-0 php7-1 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"
+USE_PHP="php7-0 php7-1 php7-2 php7-3 php7-4"
 
 KEYWORDS="~amd64 ~x86"
 
@@ -23,7 +23,7 @@ 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 ; then
+	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
@@ -31,14 +31,14 @@ src_prepare() {
 }
 
 src_configure() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	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 ; then
+	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-dio/Manifest b/dev-php/pecl-dio/Manifest
index 36f3137bc2c6..040338f789b7 100644
--- a/dev-php/pecl-dio/Manifest
+++ b/dev-php/pecl-dio/Manifest
@@ -1,3 +1,3 @@
 DIST dio-0.1.0.tgz 36960 BLAKE2B 0a2c1fd6289cc9606c44c81216ce8d0f63d4bbddfae554e65499f586f5aa17f419a048e97723ff365407260740d28e36ec5dae8a45e18422a7bd900ec88b60fd SHA512 6fca1c3f2d6247f5e0c52a27b49d80a6d13f9630772956ff7aa73ad45e445686502edd956346c43955cb2f858c0c0259af86c3f92b6f93309a2b90583ad8ea05
-EBUILD pecl-dio-0.1.0-r1.ebuild 424 BLAKE2B 66dcdf3274edbbb820949fa82ad9037476f7b422372b7973df3d5eb3dcbf65cd0dc06e8a12939bf5974ae6a1aa54a53dd731806377b058f86c35a6aef8a1f7c9 SHA512 bcd6275af1a216332bcf0fdd3a050668566e9b607e40f969f9e6d8291612f79fbdb3eef2adcb4d0d139f4c2a50e602eb65c587e43fcc8a519c82e39c93a930c8
+EBUILD pecl-dio-0.1.0-r1.ebuild 431 BLAKE2B a4d1d6a8908455204590b684ef376cd10b4afe6fbb93bf94620bb1a88e579f73f77ed8f4a695d80c31e7ad9874d224f8b291923725bb71a7442ef13f74dccdb7 SHA512 37f8af13d6a940b25b7ca0c457ba30d6231e372c10310bf7c12da0551a95b67eed1c8b624bbe785b12e0aa53d23578995bf8427515a8b9f9947887c6bb5e28be
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/pecl-dio/pecl-dio-0.1.0-r1.ebuild b/dev-php/pecl-dio/pecl-dio-0.1.0-r1.ebuild
index 323457f98765..7d9f4db0e722 100644
--- a/dev-php/pecl-dio/pecl-dio-0.1.0-r1.ebuild
+++ b/dev-php/pecl-dio/pecl-dio-0.1.0-r1.ebuild
@@ -7,7 +7,7 @@ PHP_EXT_NAME="dio"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php5-6 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
 
 MY_PV=${PV/_rc/RC}
 PHP_EXT_S="${WORKDIR}/${PN/pecl-/}-${MY_PV}"
diff --git a/dev-php/pecl-eio/Manifest b/dev-php/pecl-eio/Manifest
index ed5879683ad6..b584508ccbe3 100644
--- a/dev-php/pecl-eio/Manifest
+++ b/dev-php/pecl-eio/Manifest
@@ -1,5 +1,5 @@
 DIST eio-2.0.2.tgz 74005 BLAKE2B e09f540753f2c607b95de9c3f390fc0c31ad2a34fda99aac86f057b2e664e49aded0b5f3e491138af60d00828ee9ff13f09958177e9cfed2b254473b1f814da9 SHA512 9b5ab80e6a76a1a2e99dfa641b404d0b52cd79b54267a8ded622930b4cc99f3ba1e39a70fc2d8f5c4ed50fbd67d97bc78655cd17958f0c8a2314b3b6ac1c6384
 DIST eio-2.0.4.tgz 74118 BLAKE2B 0228f0ca91ed6410614242e7ea1ddadaa1d1aa8211b3ea6f730c0711e4339bc158d661c5addee685d750a51e654874d35a04cf011d2a02ad06ab3f249b893753 SHA512 a74464752af5792c527b9149a7edff574952cac0b5b09e1e7ff3b7c0a2cc88ab171d916d94d508b9f92aa40bd5262a5b9f8d4ba239908f13ebcb89c6513da4d0
 EBUILD pecl-eio-2.0.2-r1.ebuild 505 BLAKE2B a111e8ec1dee97e11e0766490b8fb320c529e2abf862f3c8466eddec45a2102d751a091cfa88f8242491d2d8178b23d96b6ce1ed1c36624560b9844ba7d64325 SHA512 a0444dcecf3ee753e82d6ee3b3463e5fa56bd484a01d120b3827010f43ea09ee2c50babce2cb072c8b14d5f1b1e62fbfd0155f1aca3de7168e18c46716c549de
-EBUILD pecl-eio-2.0.4.ebuild 512 BLAKE2B 77c57ccfb71d2688e297983be6dbf4769fcaa2259ee1fd754703c93f4dd22a8540dbcc4b26fe39d780fada001f0cbc33daa85e7c708006e3ad037298a44d37e5 SHA512 f290db7202414e29e053fc7bbc126a061c90b64d54861afc0dad5cbcaae5476e97678f09de87ebd5b6842531a861b05f9028d5785e2e6a66846d9c4781456d40
+EBUILD pecl-eio-2.0.4.ebuild 516 BLAKE2B 1a379f35e56480cd0966a17ed7c27c6c1a9f76e9085559354a90daa8b09d89412d43b0587b22dc2e8ed2803c1a1aec51b7a1cbc34b255ec08a5c7150031f9fa8 SHA512 4de1a8e3402144a6ee0e130e95dc515555bbf8fa7f423878f1efefebe80e8f0d75b9c4eb5f5cf5d6989a400c6d557e4602f5ec08226513d2535ca02293597e6d
 MISC metadata.xml 354 BLAKE2B 468d2c00c6aa9335b37ad1cfe50547fd620182f78c04d924309b429f9a05475a8e023c69121ac0d47243a479d80d891956d4e8ca0edfacc3a82f05be74a6d046 SHA512 de8f034f4f5b9891d46191e0960bd7cf53c3b831908f70beb6b164d062462dab78ba5c3de85509c3b616bd0ad3a9231e991e370b674b694708afca0736e8a60b
diff --git a/dev-php/pecl-eio/pecl-eio-2.0.4.ebuild b/dev-php/pecl-eio/pecl-eio-2.0.4.ebuild
index 571ac16c43fb..2c0e722da89e 100644
--- a/dev-php/pecl-eio/pecl-eio-2.0.4.ebuild
+++ b/dev-php/pecl-eio/pecl-eio-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( README.md )
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
 inherit php-ext-pecl-r3
 
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-php/pecl-event/Manifest b/dev-php/pecl-event/Manifest
index f0a91bd6afdf..b54fc12b753a 100644
--- a/dev-php/pecl-event/Manifest
+++ b/dev-php/pecl-event/Manifest
@@ -1,5 +1,5 @@
 DIST event-2.2.1.tgz 133147 BLAKE2B 909892c937843821b34cb4d450b06698b23ed8aac59915ef96c72ba08e4afe84856e913527e9b0197d28ebbe5cac8ac45174d8e3fbeae33eae0619e3b3e21959 SHA512 a331e0cbb923b2efe95a366c842929e9ffcdf15d4b95dce83f5d1e9bb33045477f278672835ffc087df89aa3614106cf504f4e6a779a620b94c20d83449e95f2
 DIST event-2.5.3.tgz 140913 BLAKE2B e9b1886b65d1c307bf4a40ebe20e19f33d9e422ce98fb704c7174e953c2488b87f941fc5615bfee07e7d51e1775a0256349e023e6d8921fdd237e527ab108151 SHA512 359eee2f501444f444904ee1960d85af0b77259e59a06d9c6ae1ec008f7bda9bda5bf999d437d84416150a965466519c04e4c2f36dbca44367075fcbb46cd917
 EBUILD pecl-event-2.2.1.ebuild 915 BLAKE2B 5b6435f56c7ed7df0d8dcfbe7eccd905526c43e28dd34720629c5bb5fcfe4c02b56f7805c2f9851eb124aa598fbd63d0822b1cc66d25e71c1129a85d7048819d SHA512 1dcc83dc283e003318630d2515a8b41e1719f245880be62fd931630f07a689bc72f4f401a4744f78e24e7983886b710811bb807d3fb2b04ed9f3db49e76112d3
-EBUILD pecl-event-2.5.3.ebuild 1171 BLAKE2B 5cf58e87e7d2697014b9f3cbbd8fba3ea782b717d1516961b21408c7802de9ee57b3d9cd12787f968c089d78acd5c021ccec5249a516f37f78bb592e04ae7726 SHA512 ff52d16376ce60d2fb35be76e9f7fc76d746e25c9f16db13e2f035dde1a4a2a1b42ace58d10dece45e5c1c0bad54b33f6d847dea1f52056797bb7304e1a6b0f0
+EBUILD pecl-event-2.5.3.ebuild 1227 BLAKE2B 1559dda6c8d99bce99d0983f547aeb06ac3d230e0edb1ae0d66b73d29c4394ded587c5985acb5d9cbb0c546b29170eda9437d3b88c1f81a769834167cff21e97 SHA512 9251964129944e2cb59888aef1b7a37069527a91672c0875cf6e3bd64d0aa3a71e4776b0939bec06edb23df17da6e1dc53dc16dcb5805c4032c812bab412e780
 MISC metadata.xml 431 BLAKE2B 25421824761cdcc90c610236ac4acfd85e18fb63e4f92ff3fa5e51698a7e2004812a7193ced70646baf02bacd0bc896a5959ee88bd88dd5de68db729661ad02f SHA512 6349913306ea30f9ee6cd5ad862e0323d143815f4db47da14e5d54d0dcfb604118e3845f664f2a9b8527797b262c9567bbf5f189426f9becbd169be0ec111056
diff --git a/dev-php/pecl-event/pecl-event-2.5.3.ebuild b/dev-php/pecl-event/pecl-event-2.5.3.ebuild
index 2c5099e330ae..8e0f7b205017 100644
--- a/dev-php/pecl-event/pecl-event-2.5.3.ebuild
+++ b/dev-php/pecl-event/pecl-event-2.5.3.ebuild
@@ -8,11 +8,11 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( README.md )
 
-USE_PHP="php7-1 php7-2 php7-3"
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="amd64 ia64 x86"
 LICENSE="PHP-3.01"
 
 DESCRIPTION="PHP wrapper for libevent2"
@@ -26,7 +26,8 @@ DEPEND="
 	)
 	php_targets_php7-1? ( dev-lang/php:7.1[sockets?] )
 	php_targets_php7-2? ( dev-lang/php:7.2[sockets?] )
-	php_targets_php7-3? ( dev-lang/php:7.3[sockets?] )"
+	php_targets_php7-3? ( dev-lang/php:7.3[sockets?] )
+	php_targets_php7-4? ( dev-lang/php:7.4[sockets?] )"
 
 RDEPEND="
 	${DEPEND}
diff --git a/dev-php/pecl-geoip/Manifest b/dev-php/pecl-geoip/Manifest
index 739a2219b77c..0b4cfb2af656 100644
--- a/dev-php/pecl-geoip/Manifest
+++ b/dev-php/pecl-geoip/Manifest
@@ -1,4 +1,4 @@
 AUX fix-failing-tests-1.1.1.patch 1250 BLAKE2B 587561ec400fe54b21333d09d2ad721b66c321de5a9c1823c0cb9706e63c41a24f81e53eb9fb92bc1f33bc867e141e8f29c26abc1452058dc387d29a53b0c7bc SHA512 9e3c93b337c38feaec29001a5a5b243f376bc7a32caaafa848b51daa3f0efbdecf407de6c8f304801ad106aa0e4906513588c42aa19bc6d5b261ccd6cb00b652
 DIST geoip-1.1.1.tgz 13004 BLAKE2B fe073b9459c434751ea0291ce6802041db47254f9d2d5b930db51751b3a66ce5cf925dc4bd07764920748b1735f26ba8bd136654e08ed9c24ac3b520e842f45d SHA512 395715297726aa8e7ed71297d403bea9cb08417a03adfca29dc6ea68bbc738c176f71ea621f9026109e07cd5a2adc647e2af8e140e18a6af1c8f0fe4ed1a9c6b
-EBUILD pecl-geoip-1.1.1-r4.ebuild 453 BLAKE2B fe91ec1b0e11a751afe482b5410950cebae109f7a003de6be87e00905a423fe40d340a4974e9ea81e7545d5072eebe57b2d37b9fa1447e011ad0ec1c385bcc0a SHA512 802d3256fba8a8ccb34442b5f287d2ba616a0bd683fcc0ba5f5bf6511ea39c04c3d2454a68dab68a7ece8cb4dc051387a20e497b90a1d3010083dc8fcb54c6b1
+EBUILD pecl-geoip-1.1.1-r4.ebuild 460 BLAKE2B f3e510fde3b552397efce311d83db0a2a78433408831f63778efbf01994baa2e45ce6f4e68424d5b775f21f0748476c67aa7957c6fe4ae4a98a86c462ded7b2d SHA512 9c32fc046bb9cf433894faee4ff537566df9c543a5af42ca0d3e422dba92789db9daf317a886cf81d25b5cd215898541860e5221ad495d5b4497b894cbcf8c06
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
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 bc68f7d98675..956d2192df64 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
@@ -5,7 +5,7 @@ EAPI=6
 
 PHP_EXT_NAME="geoip"
 DOCS="README ChangeLog"
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-gnupg/Manifest b/dev-php/pecl-gnupg/Manifest
index 79c48a3ebb12..bda9f28e9c2d 100644
--- a/dev-php/pecl-gnupg/Manifest
+++ b/dev-php/pecl-gnupg/Manifest
@@ -1,4 +1,4 @@
 AUX 1.3.2/01-large_file_system.patch 260 BLAKE2B 21c52e406ee1d28c8ad0fef1cac7a4c7bb486b856a55423108daca9113416b2e906ae398ac081ce2b813f110e9cc4ce5a20ec04646c4247fe3427aa7440988f9 SHA512 095c5dc8e321c771c8a62054255f3616f3651dae470b78d47cd6032dd8ac76450a366b6a2988ca2cd510102dcedab86c05cd8cd84dbe65d6eca515e487d6dbb5
 DIST gnupg-1.4.0.tgz 28349 BLAKE2B d023746b104db38bcf7617d79570aa3c38d318879d34b1d4df7fc0c28b4e435deadc2a1a4827922cc14a8068b578896e297c8fe8461afebd2768ffb63ddc502d SHA512 70fa1d2956bc5caedbeadf556f9f40a7b963d3b519d6574b0c7695d9fb4c7f9d612306f475a90a1125661407c11de97040e54b158f38d71f239c1fe436d48018
-EBUILD pecl-gnupg-1.4.0-r2.ebuild 748 BLAKE2B 47fc28a6b74240f5affd6a064f9c5ee0132e21b9408aca1ea7dd8ed342c53979fc6a2720d2091214fae5316221315f83aea9392d97db3facabc6bd4d38104a71 SHA512 b2ece0027c9ba18a242b4e17dfd6b182044315127e0bd0a7921400ab3607491aabb11929240d7b1c23cd28fa03bb76b76d16c7dbe2839e0ed8a79c98cf5dea32
+EBUILD pecl-gnupg-1.4.0-r2.ebuild 755 BLAKE2B 13790a952d22a9393781e3dc86366b403c19e1e60af0202a4989f9b20ca4fb07cd3ad08bec2a8e34d415fb129abf4be1ce8b334853867f98d7c2c16deac322f2 SHA512 01c23d7e62f8255c27417a805741538d85f0af23b8ed4fec6cbade6d3a1e7d8937fa938a87a83f42dc203741b24abb373ce57699bd3218c4dfcbfc6ed80bb99e
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/pecl-gnupg/pecl-gnupg-1.4.0-r2.ebuild b/dev-php/pecl-gnupg/pecl-gnupg-1.4.0-r2.ebuild
index 3c0bcd3c7384..ce3a3f298456 100644
--- a/dev-php/pecl-gnupg/pecl-gnupg-1.4.0-r2.ebuild
+++ b/dev-php/pecl-gnupg/pecl-gnupg-1.4.0-r2.ebuild
@@ -10,7 +10,7 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
 PHP_EXT_S="${WORKDIR}/${MY_P}"
 
-USE_PHP="php5-6 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest
index bdd31513121c..e772b3ff0b64 100644
--- a/dev-php/pecl-http/Manifest
+++ b/dev-php/pecl-http/Manifest
@@ -1,16 +1,9 @@
-AUX pecl-http-gnutls.patch 1061 BLAKE2B f57588e2c8a7a285a68aab931e0df55cb69cb06c8753afb784542fac1ce757f7ae4e244d49b06ec33e233d01b36b3c89c82e7af3e3d73221ba65ef58ea11dde3 SHA512 a05b39188a66ed9a328f9b864008390e4703db15d15416168e31eed78e2da5239db25d98fe3f4d62c26db6a5dfae83f84db2a6f3fffce39b768a03261c308a90
 DIST pecl_http-2.6.0.tgz 217673 BLAKE2B a7147924cfc018c3e273d85666d9792ea614955d0aa20ac43171266d91d139dccdbf2472dec4d145b798ce99a541dba48f7bed6009fbdf2a7ad81ab322963788 SHA512 12d18049411a4133008449a1e7458a3055322dc337f421e0e2be126ec965f15b0189af6fccd9ca4537c48819c763b9e020906ac6d09d87ead92f4436fac595ad
-DIST pecl_http-3.1.0.tgz 214166 BLAKE2B 2f84fc9f5f7d465142e3482a9ee46b9dd80dd2b5ec58ad1d8d4fb18a665ebe70e4f872b8915c3a84484a3b1cd0709b39bf6170c6f1c6175aef7d43bac44aa3df SHA512 1c272aa476106bb61848f175f0ba6715b3d8928f70cdac1a673cc87c2dc780dff5434a3bc595d5e8a1ef7b847a1d2e214f9e9ae80b8b5d1f80a299febc85b0ea
-DIST pecl_http-3.2.0.tgz 218829 BLAKE2B bbd6f9fe8afb4324d928496e1fbcdd455e8bff5e45312ba65e5e9263719b098763203de055ea8a8ff6202ae4a434d37db25bb0975faacc956af4a0c6e8bfe8a1 SHA512 59738ee52370c68f7e74349d52738da845cfb83ae27b51a2caf3b048ba0b37c897702d7f5f8e0517df5612fd2e904d02e8e24c9e649a9e7cfdcdc04e9d19b113
 DIST pecl_http-3.2.1.tgz 221244 BLAKE2B b6581829fb8a800e24ccedd4d0f3efbaf558850bdc356d27a6e1d1097a8e2cfc61963a1daccd1d0f269a7cef5b243d45cdfaff5138321fe20df615dde44d19e3 SHA512 e67d4b32ba6f524e3fcf65f5497b94275e1a4a14fce97c57afe366369f368b3acdbedf364ed73cf983fb2c5f57f498adaa1100e7c936f11cbc5de1caedad7b51
 DIST pecl_http-3.2.3.tgz 220204 BLAKE2B 2a712dc8f69a8a80f6f8c306883df580fdff4a0d4cb0ac06cc004f8622b30b8e2f5d373276381fd3ad67657a80cc929be81745f200a98b6ed5e475de5639dfc5 SHA512 e955e3246db9a9172081dd9a077154139c585bfce546e91839052bbab4d0db9d0695122574a66891ceba5c0b7e8a8f0768274e1516521ccb95cd19504dc13666
 EBUILD pecl-http-2.6.0-r1.ebuild 1920 BLAKE2B 82a6059834c91e0128a8f37d22e69619bf8f40fe61251f4b7d577e68cd698eca0854f1e43e463420be008d63e35d0aa4dc2c30d391ddd47cfab60a758686af6c SHA512 027af36906cc4f2763a5b8328b5ce2b2705a2c62a86b30cf8f160965ef8a5635971cf7135adde5afe8a72a48abfc29f338b3cd442797a347e15cc9bb9faa64a1
 EBUILD pecl-http-2.6.0-r2.ebuild 1903 BLAKE2B 6063b2a23da518f5806250798949951e3a8668cfd4bd0c517987e8d9f20ff6606f8f4e72c05d982233a095c1c43bd422057c028e35b75860ab4d5a74253f35b5 SHA512 913fe6b153f964e52389424158cbcb945227eae652597cb5e178256ea48410aaaf72fd15509a39fb074d7313a24ca324dde1808e831a3f677a4c3e471ec5b934
 EBUILD pecl-http-2.6.0.ebuild 1384 BLAKE2B 8731362ad89d7289d2c623cc49112727fc65737fed80c92e172b5618eecca4ff38ff49a798210b4b89925d333184135aabfdbb5a71fed76c2702d3267cda418f SHA512 56afa6c46fa8a95d5fa74dcc56527f82b51aaa01d187bb2cd21f8d8a135eb139635eb8a3f298beabd95e89e9c112dffe19a9f2e8ef34acf3dd4908c6d10ee6f1
-EBUILD pecl-http-3.1.0-r1.ebuild 2123 BLAKE2B a7b5367adac7f83908f8f4bd3efc828b64e570e87cf187e32a852d566c0bb34250cb08a7e91c729ba4f4210feb2d1a1da573faff04d56a8238f18d13ea3767be SHA512 e9d1bc26b6cb8eb453f8faf1520ee7fef6ec66780d3d9d81a5f787e244b04abdd9734a73f0c47ccd717ffea20a3511cc57651c4960299ced1636129ddd17d92e
-EBUILD pecl-http-3.1.0-r2.ebuild 2141 BLAKE2B 1d7995c97a5d3b7060d7f2dc118af8224e41d9e7c50c46e9242b700e5145b7ddbbae4b5bbec9e14011fd4cfb944a44103fce4a4b03b29b7026ff30372ce0dc47 SHA512 bd399cc7134919e5b1c0a5f495901408a1957cf88185c7918300556b3bfd1c52651ca5a1a749b874b48e0797746fdb9c2fa533f1edc76e0fcdf751a806fb165f
-EBUILD pecl-http-3.1.0.ebuild 1587 BLAKE2B 1347611d4ad7f0ce44ef23370797cb37faad0d6261527fe8c28d935d9920c94ee06905396be0122f68a2ae4541169d10e8600bea3691a7d82090b8131f2275ac SHA512 f5d7f29153359c1a4a6991165e42a674c086e544c37fbdc23e580e2a6714734acbccb15081eedf92be3df79a21298ad5ee81032b75278c5ffc2bbfc59b0c6215
-EBUILD pecl-http-3.2.0.ebuild 2278 BLAKE2B 116dabcfe280aa6493c26b27839f3aca896f53eb1a31d888b37ac9fed4465fc5bcc90fd53997172946be531ad8ffcd40546150ca12364e8b2c6822d802b93024 SHA512 254a844d59183d63de091c19b2df2d318b965cd49d8a236d8ea68c0c7dd57d6b16a03377ad5eeed9544b886a679c089fb8ce710cdd4960e0a2f663478b3b5817
-EBUILD pecl-http-3.2.1.ebuild 2278 BLAKE2B 60c7b681cee099c96937487432dc929da276f2da70a05a0d6650204323cbacb26c677f5cc1f7cfeaeb5a8f5f4ed98b2ffad21433079792bb7d7f58eabf8ef7cc SHA512 4c64162b73cca6d2f89eb40da5c42d19b2da6bb4ec55d636729e311a42acf31c9f6c91f536d86cf6ff08d2c5a0d716f3df080dafb12399ea4e69d9f7801d65d3
-EBUILD pecl-http-3.2.3.ebuild 2278 BLAKE2B 60c7b681cee099c96937487432dc929da276f2da70a05a0d6650204323cbacb26c677f5cc1f7cfeaeb5a8f5f4ed98b2ffad21433079792bb7d7f58eabf8ef7cc SHA512 4c64162b73cca6d2f89eb40da5c42d19b2da6bb4ec55d636729e311a42acf31c9f6c91f536d86cf6ff08d2c5a0d716f3df080dafb12399ea4e69d9f7801d65d3
+EBUILD pecl-http-3.2.1.ebuild 2300 BLAKE2B 60e5a929270af09032e8494a55d90ef56b7a82821c4fb20a3ed8b03e08aa8ef77cc2d101ddbc31b095ec8b051acf9ebf2d0506a195e6f1aed4124eb54c6564b7 SHA512 0e2d36bfea79ec4662aff2425dae4193eff07864c2ef8c25bd087b56cba02c4c0eaa2af9c8449e64322ce0e42d75fbcfa8381e737172bd59c3e8a7d4dd90e0e0
+EBUILD pecl-http-3.2.3.ebuild 2471 BLAKE2B 1ffdd3704cf738741f61dd0370995530b32404d49d3bfbfd517612c11e27dbe8456786dc018d5cc03bd59cb03437bc2629ff775e52eb58cf4f1b14ac9e77bbdd SHA512 aaeb45f27eb7815b8fd4708ad7741a96fbe6050c01fc5465db364679f3224321e647d56a7b5e66bb87bbc960b674b453467baa7db7324e9b41974af155cbd97f
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-http/files/pecl-http-gnutls.patch b/dev-php/pecl-http/files/pecl-http-gnutls.patch
deleted file mode 100644
index 4b58805946dc..000000000000
--- a/dev-php/pecl-http/files/pecl-http-gnutls.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -aurN a/autoconf/pecl/libcurl.m4 b/autoconf/pecl/libcurl.m4
---- a/autoconf/pecl/libcurl.m4	2016-12-12 04:04:21.000000000 -0500
-+++ b/autoconf/pecl/libcurl.m4	2017-01-06 09:07:17.575660038 -0500
-@@ -87,7 +87,7 @@
- 	AC_REQUIRE([PECL_HAVE_LIBCURL_CA])dnl
- 	PECL_HAVE_LIBCURL_FEATURE([SSL], [
- 		PECL_HAVE_LIBCURL_SSLLIB([OpenSSL], [openssl/ssl.h openssl/crypto.h], [ssl crypto])
--		PECL_HAVE_LIBCURL_SSLLIB([GnuTLS], [gnutls.h gcrypt.h], [gnutls gcrypt])
-+		PECL_HAVE_LIBCURL_SSLLIB([GnuTLS], [gnutls/gnutls.h gcrypt.h], [gnutls gcrypt])
- 		PECL_HAVE_LIBCURL_SSLLIB([NSS])
- 		PECL_HAVE_LIBCURL_SSLLIB([SecureTransport])
- 		PECL_HAVE_LIBCURL_SSLLIB([GSKit])
-diff -aurN a/src/php_http_client_curl.c b/src/php_http_client_curl.c
---- a/src/php_http_client_curl.c	2016-12-12 04:04:21.000000000 -0500
-+++ b/src/php_http_client_curl.c	2017-01-06 09:09:01.631772852 -0500
-@@ -21,7 +21,7 @@
- #	include <openssl/ssl.h>
- #endif
- #if PHP_HTTP_HAVE_LIBCURL_GNUTLS
--#	include <gnutls.h>
-+#	include <gnutls/gnutls.h>
- #endif
- 
- typedef struct php_http_client_curl_handler {
diff --git a/dev-php/pecl-http/pecl-http-3.1.0-r1.ebuild b/dev-php/pecl-http/pecl-http-3.1.0-r1.ebuild
deleted file mode 100644
index df1e34b5a7e3..000000000000
--- a/dev-php/pecl-http/pecl-http-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PHP_EXT_NAME="http"
-PHP_EXT_PECL_PKG="pecl_http"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php7-0 php7-1"
-
-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"
-
-DEPEND="dev-libs/libevent
-	dev-php/pecl-propro:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?]
-	dev-php/pecl-raphf:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?]
-	net-dns/libidn
-	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] )
-	php_targets_php7-0? ( dev-lang/php:7.0[hash,session,iconv] )
-	php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] )"
-RDEPEND="${DEPEND}
-	php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] )"
-
-PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn2-dir )
-
-PATCHES=( "${FILESDIR}/pecl-http-gnutls.patch" )
-
-src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; 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 ; then
-		php-ext-pecl-r3_src_install
-
-		# Ensure that the http extension is loaded after its
-		# dependencies raphf and propro (bug 612054). Some day
-		# this should be possible through the eclass (bug 586446).
-		local slot, file, oldname, newname
-		for slot in $(php_get_slots); do
-			php_init_slot_env "${slot}"
-			for file in $(php_slot_ini_files "${slot}") ; do
-				# Prepend "zz" to the ini symlink name. This is sadly
-				# coupled to the naming convention in the eclass.
-				oldname="${ED}/${file/ext/ext-active}"
-				newname="${oldname/${PHP_EXT_NAME}.ini/zz${PHP_EXT_NAME}.ini}"
-				mv "${oldname}" "${newname}" \
-					|| die "failed to rename ${oldname} to ${newname}"
-				einfo "renamed ${oldname} to ${newname}"
-			done
-		done
-	fi
-}
diff --git a/dev-php/pecl-http/pecl-http-3.1.0-r2.ebuild b/dev-php/pecl-http/pecl-http-3.1.0-r2.ebuild
deleted file mode 100644
index 3cdfdc24b15d..000000000000
--- a/dev-php/pecl-http/pecl-http-3.1.0-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-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="php5-6 php7-1 php7-2"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php7-1 php7-2"
-
-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"
-
-DEPEND="dev-libs/libevent
-	dev-php/pecl-propro:7[php_targets_php7-1?,php_targets_php7-2?]
-	dev-php/pecl-raphf:7[php_targets_php7-1?,php_targets_php7-2?]
-	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] )
-	php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] )
-	php_targets_php7-2? ( dev-lang/php:7.2[hash,session,iconv] )"
-RDEPEND="${DEPEND}
-	php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] )"
-
-PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
-
-PATCHES=( "${FILESDIR}/pecl-http-gnutls.patch" )
-
-src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-1 || use php_targets_php7-2 ; 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
-		NO_INTERACTION="yes" emake test
-		# Clean up testing links
-		rm modules/propro.so modules/raphf.so || die
-	done
-}
-
-pkg_postinst() {
-	ewarn "This API has drastically changed and is not compatible with the 1.x syntax."
-	ewarn "Please review the documentation and update your code."
-}
diff --git a/dev-php/pecl-http/pecl-http-3.1.0.ebuild b/dev-php/pecl-http/pecl-http-3.1.0.ebuild
deleted file mode 100644
index c262cbac8549..000000000000
--- a/dev-php/pecl-http/pecl-http-3.1.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PHP_EXT_NAME="http"
-PHP_EXT_PECL_PKG="pecl_http"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php7-0 php7-1"
-
-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"
-
-DEPEND="dev-libs/libevent
-	dev-php/pecl-propro:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?]
-	dev-php/pecl-raphf:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?]
-	net-dns/libidn
-	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] )
-	php_targets_php7-0? ( dev-lang/php:7.0[hash,session,iconv] )
-	php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] )"
-RDEPEND="${DEPEND}
-	php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] )"
-
-PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn2-dir )
-
-PATCHES=( "${FILESDIR}/pecl-http-gnutls.patch" )
-
-src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; 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 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
-
-pkg_postinst() {
-	ewarn "This API has drastically changed and is not compatible with the 1.x syntax."
-	ewarn "Please review the documentation and update your code."
-}
diff --git a/dev-php/pecl-http/pecl-http-3.2.0.ebuild b/dev-php/pecl-http/pecl-http-3.2.0.ebuild
deleted file mode 100644
index b17e8e396289..000000000000
--- a/dev-php/pecl-http/pecl-http-3.2.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-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="php5-6 php7-1 php7-2 php7-3"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php7-1 php7-2 php7-3"
-
-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"
-
-DEPEND="app-arch/brotli:=
-	dev-libs/libevent
-	dev-php/pecl-propro:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?]
-	dev-php/pecl-raphf:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?]
-	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] )
-	php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] )
-	php_targets_php7-2? ( dev-lang/php:7.2[hash,session,iconv] )
-	php_targets_php7-3? ( dev-lang/php:7.3[hash,session,iconv] )"
-RDEPEND="${DEPEND}
-	php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] )"
-
-PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
-
-src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; 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
-		NO_INTERACTION="yes" emake test
-		# Clean up testing links
-		rm modules/propro.so modules/raphf.so || die
-	done
-}
-
-pkg_postinst() {
-	ewarn "This API has drastically changed and is not compatible with the 1.x syntax."
-	ewarn "Please review the documentation and update your code."
-}
diff --git a/dev-php/pecl-http/pecl-http-3.2.1.ebuild b/dev-php/pecl-http/pecl-http-3.2.1.ebuild
index 564462685ed2..bb652b2134f2 100644
--- a/dev-php/pecl-http/pecl-http-3.2.1.ebuild
+++ b/dev-php/pecl-http/pecl-http-3.2.1.ebuild
@@ -15,7 +15,7 @@ inherit php-ext-pecl-r3
 
 USE_PHP="php7-1 php7-2 php7-3"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="Extended HTTP Support for PHP"
 LICENSE="BSD-2 MIT"
@@ -63,7 +63,7 @@ src_test() {
 		sed -i \
 			's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=propro.so -d extension=raphf.so/' \
 			Makefile || die
-		NO_INTERACTION="yes" emake test
+		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-3.2.3.ebuild b/dev-php/pecl-http/pecl-http-3.2.3.ebuild
index 564462685ed2..df14e937eb77 100644
--- a/dev-php/pecl-http/pecl-http-3.2.3.ebuild
+++ b/dev-php/pecl-http/pecl-http-3.2.3.ebuild
@@ -9,11 +9,11 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 PHP_INI_NAME="50-http"
 
-USE_PHP="php5-6 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
-USE_PHP="php7-1 php7-2 php7-3"
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 KEYWORDS="~amd64 ~x86"
 
@@ -24,22 +24,23 @@ IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl"
 
 DEPEND="app-arch/brotli:=
 	dev-libs/libevent
-	dev-php/pecl-propro:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?]
-	dev-php/pecl-raphf:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?]
+	dev-php/pecl-propro:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?]
+	>=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-1?,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] )
 	php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] )
 	php_targets_php7-2? ( dev-lang/php:7.2[hash,session,iconv] )
-	php_targets_php7-3? ( dev-lang/php:7.3[hash,session,iconv] )"
+	php_targets_php7-3? ( dev-lang/php:7.3[hash,session,iconv] )
+	php_targets_php7-4? ( dev-lang/php:7.4[session,iconv] )"
 RDEPEND="${DEPEND}
 	php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] )"
 
 PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
 
 src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
 		php-ext-source-r3_src_prepare
 	else
 		default_src_prepare
@@ -47,7 +48,7 @@ src_prepare() {
 }
 
 src_install() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	if 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
 }
@@ -63,7 +64,7 @@ src_test() {
 		sed -i \
 			's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=propro.so -d extension=raphf.so/' \
 			Makefile || die
-		NO_INTERACTION="yes" emake test
+		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-imagick/Manifest b/dev-php/pecl-imagick/Manifest
index fc69e15af7dd..78ca3c15439e 100644
--- a/dev-php/pecl-imagick/Manifest
+++ b/dev-php/pecl-imagick/Manifest
@@ -1,3 +1,3 @@
 DIST imagick-3.4.4.tgz 253434 BLAKE2B 73ce21547881b60733dbc19ae83cd2e60135dbb4052ea723f1ee10b3759ce12065a0cab2a7e4923b78e9e68b12fd7b875c7d1bd7b2a14ce4e4d7ff5b9c7fbc06 SHA512 73145a1f095849c32760db2dfc4acc13c57d99a037d65eca9b0ddf8f8e81cf6d28a50f2614e44bae1d90b4f881a2e9a64926e0e3b9403e491fd903ffeb30c4b7
-EBUILD pecl-imagick-3.4.4.ebuild 711 BLAKE2B d1b18971d212e95abdd1f64d52af967b48e0544ad3bbbc0cce6883c2faac6faa2ccbc2536a8e8334a0487d7bcf0874f90e4478dde5e16e49352780940623c148 SHA512 41eadbacb9ae157303ff79067aba8333a73ad32eccfdd000591189a41bc43c141378766dd96a233973a8d1687b231f1936db58fb312b4cc27df318ae42fd0bf4
+EBUILD pecl-imagick-3.4.4.ebuild 745 BLAKE2B 7e753b3f1fd62a106d3823520a9e7e410686d410330af657895f64edfd94dd5d9ca82b51a0fae73da4e4d888b89a5aa2070200a9bf924aac67ece5cfa0235698 SHA512 fa8ee43dd4de12df29909b182f6e8d480399fecabcbb242dbf52e74e35cf02320afb41827cdd2e3a2412e18810f2a3b13ec659141dbb98f0e1da5c8070d4adb6
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild
index d786ba92b582..217848a2c012 100644
--- a/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild
+++ b/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 PHP_EXT_NAME="imagick"
-USE_PHP="php5-6 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
@@ -15,6 +15,7 @@ HOMEPAGE="https://pecl.php.net/imagick https://github.com/mkoppanen/imagick"
 LICENSE="PHP-3.01"
 SLOT="0"
 IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 # imagemagick[-openmp] is needed wrt bug 547922 and upstream
 # https://github.com/mkoppanen/imagick#openmp
diff --git a/dev-php/pecl-lzf/Manifest b/dev-php/pecl-lzf/Manifest
index 1f68422982e0..f2970aa683c2 100644
--- a/dev-php/pecl-lzf/Manifest
+++ b/dev-php/pecl-lzf/Manifest
@@ -1,5 +1,5 @@
 DIST LZF-1.6.6.tgz 17603 BLAKE2B 8aab6327234b590e3b1bc22d3bf9545cd41d79ea260f73c8c6599fd88de8963e556cd71bdccdc6dfce825e24f4e1b2af477476acc1f6b184586ace7e15b28104 SHA512 a049ce5df065eb9c4d3046822f659f929ff4f270c4d80c5d0bcd44679d69524e7ee23e98931fca9f36a566ae023827eb47b66ce651ce6d0f6fbe0643692e7ef4
 DIST LZF-1.6.7.tgz 17999 BLAKE2B c7ee3049d7bcc862a400edf56e19745667052c32b2d3faaa26cb55f811e6721b7140446e676467fa5cee3ea87a751b6b0a2a9c6df203227d1bd29f31842e8514 SHA512 920a7d3bd0f0c9f1019a3180e38482ead24610a4a235d967d1f4010101e6f777a2450d517f2d3440edb45bb6a7f6d1012124b1b59aa7c34f9a17fdc93613acab
 EBUILD pecl-lzf-1.6.6.ebuild 372 BLAKE2B dc6212b1c1010db7b391504e55b432fb2923e32072e8faf9f8eb3095a8c16de59fb0732f070e51bd5c18b126f6e70906349ea28dc719ba993c31dfd500ca479b SHA512 b096f4fdc980a82e9dc8e40ee138b1777b0d58970456d300fc6fed50a22aa21c41549ed40f96069b1360c29ce1284cd210dd4edad57d9fbf3467ec2c9f56175f
-EBUILD pecl-lzf-1.6.7.ebuild 369 BLAKE2B 3b99c5cf1018f914eaffbe9db1294b9536502647f5ce60c81ebc0ee542bce96254e3a570c39f7e544e52565487a19acba26a849350a3ca6aa3902af82ccc1ac9 SHA512 e745c652be0b79aaded27ec34e0f0eb5bb7ed70d4324988085fb84a7d2243a9a2c9e79a9921c3844f6bb1110f2ae0a6e2d1a41c631de97afd78e0d8a183ca086
+EBUILD pecl-lzf-1.6.7.ebuild 376 BLAKE2B 2ea8c09d2fecc4f87a80f9f5e0dc765fef749f8bd62a93535eaa1fe50c7713dfe9216dcace62ad642ff691e58d6bbaa672e9390665caff53afd32f02e81c9f5a SHA512 f03134f1ea92ab38dbcd5efc9b5fda6c268f470431a04c6ad144ffef52231c765e63c3be639f5d90fc3fc4dcbdb43a2fdc2a4791a692fdde3fb3308374e8f58e
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/pecl-lzf/pecl-lzf-1.6.7.ebuild b/dev-php/pecl-lzf/pecl-lzf-1.6.7.ebuild
index 042a510621e4..192a06e95b05 100644
--- a/dev-php/pecl-lzf/pecl-lzf-1.6.7.ebuild
+++ b/dev-php/pecl-lzf/pecl-lzf-1.6.7.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PHP_EXT_NAME="lzf"
 PHP_EXT_PECL_PKG="LZF"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
-USE_PHP="php5-6 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index 33bbe73a52f7..6f339ca2fc90 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -2,9 +2,11 @@ DIST memcached-2.2.0.tgz 70449 BLAKE2B dca76bfb993c647860ae2ce648580e6131c6df30d
 DIST memcached-3.0.4.tgz 78776 BLAKE2B ce2539e2e4960217d9ee3b50ed5625214d4b22c4d7e64595fdbfa2d130bce0402a67561f76a50690991996d84f16f926f27a057722bfab66ba3c388772ed77a8 SHA512 d0a0f9e99cbcc6829528554551dfacf0d943d54d4be60c9da708de82913a2a0bed7c51d594ae3ecf0c13b56064739f074ce6ada5d7433bdc7e26e8caf9cf5ca2
 DIST memcached-3.1.3.tgz 82673 BLAKE2B ccb9267cbd974337b7cd8836ab6e35c4fd9398d731dcd333bcb664b91037d1775651e6bb5d00b602767834681289064ede678ea2e6e3641631bba4990a380dee SHA512 9c09648c26011c5e749bee1a556c976e6e5e648dc65580e7caa296dab79e3764edf1408f96edcaca5efb0229320c86fcfa0422e55d486beb6466892f7e08c4a3
 DIST memcached-3.1.4.tgz 82920 BLAKE2B 67eb2a26453aa3253ab0d1327023da9318d7af6eb4d935f2c9f1d3da0b1590c58dbcbbea24c491eed6161a9e0462651c749a6e333e98a8cb26432c360ce805d0 SHA512 df1d2c2182c6d3565b929bb55e25a5285c0d5cf8b0fbb75417d756898970abc2b9c4d87e8bb8382d9d4fd62227de3838996c971525fb8a90bf503f025fc6f9f7
-EBUILD pecl-memcached-2.2.0-r2.ebuild 1328 BLAKE2B 9329ea2cb375e689a85a6f3642073085021871c5411ceb39407221779a588138a7c9f6c7f38d30bb360a3e900ba4ba7e0f3beba65be14242d4e69d024a2de941 SHA512 7bde32cce2bd022b7c351b93d099880662089531ef3ee8b2265a1e54bb57fd5e4d95e83d44160ffe4082df32e883017ade1978170aa174b0c0172fac048bac9c
+DIST memcached-3.1.5.tgz 83015 BLAKE2B 80f5cbed8e34f867962792d95d242015690f64ab3b462e09813a11b8b86234b0b05b0f6a78f7c6184482b66ba8015064b37f77bbb816a3aee2edd0ce97ab0cbc SHA512 87d5fd079fcaad81139785d6766da71b23a1a0fe907d4b22f3a787af148a20412c11df11c4d98c165241658baf0d87c8a6b29de15db07a0f9d1fabc8aec8f0e9
+EBUILD pecl-memcached-2.2.0-r2.ebuild 1335 BLAKE2B 8115bc7e0678e74a71a4238d751ffd077da6bc966c17c2922ee044082d7c0da7e74f333d3b9c83f3f4e334881e92914543b3bf02f00a061eaf42485f898c2755 SHA512 53a8cc1ea2bb9cc970dc4283d92173de9d430aa2d45245265a138d9559550d9b5c077333873a76e9e12afd5d97f23564ee7395e834c3ba316ff3a3d1c4da042c
 EBUILD pecl-memcached-3.0.4.ebuild 1576 BLAKE2B cb1e70517c9470e28826a52819c0f4fe99905e3b46eb2f18120206ae8e111d41b83f0d09064f2a7c8dfab150884ae9137fcbecc74bf3020300b7e6a1ec1e8239 SHA512 de5d39a48266e9f393daaa88844b29d923e5bb3d58053b097023fd79045b5958930b3d8beb7b987a87d6460b2db2a0a14ddacafc7b80400806afaee612ee8701
-EBUILD pecl-memcached-3.1.3-r1.ebuild 2152 BLAKE2B abc8ded50f93353de90d9094a6817971b6d88e4b975e02d496a070094cbde42fb0baaf6704d42a0fdb60eca8ab16d1eb2c19975b1ebda00ce93ab8e72305703a SHA512 78adbd643ffb23ac2d5ea909330a22669eb492dab9b1551b3039d299a32ae2c7d0a739418c863a7a2f489b96f4d42a25fd7f0c03ee726c67a1496b2034a093a2
-EBUILD pecl-memcached-3.1.3.ebuild 2361 BLAKE2B f244c38640a95786ae9c28e042921888b5f4aa7ff7b24eae130591306d1279ba9d9abac56b402188b1cfdfbcfdddf4d414c4148e637050d7667eb39aeec0de2d SHA512 38d3fb0c6f66e88844b31a41b8683193b27d1115b829f54681e51f28c2eae2ac2c8687a45205acbd6fc30de18d8dcbcb47a6bbafea6cc505356a7531b43da664
-EBUILD pecl-memcached-3.1.4.ebuild 2182 BLAKE2B 08c12113ee7db5a1c63bd174a1db3f21f46781adb984bbee459bcd1eac20d903de30002103b212af9328039cfc0fe3c3a8167f9767526f4983f0a64c171ab615 SHA512 2714fe53769314c6bb8e2cb4b7d33e2d5fc9aff731ff98fb7eea50eb53b3a41155509900424f3b7bbd091d152daed865a2f46970946f55741e69069f1fd25878
+EBUILD pecl-memcached-3.1.3-r1.ebuild 2186 BLAKE2B edd9106a503c8d59f79e06c2113958d919cbbc8919c8355e6194be422d2a9558d387ba07254c85ee30134dfabd8f2fb8fccd11a01639500250dc2fbce320ae52 SHA512 1ee36279e7b83ec66ae72b97296f1fd3e52bd79cb9cfc0da51956a0daa72240e89714d1a92efcb1e1bd35fd19aa4ab466ce2457e6ec2ea91d452944fba33064e
+EBUILD pecl-memcached-3.1.3.ebuild 2388 BLAKE2B 416e01a1a4224ac62480ef9f4b18960fd6ce398026347a5883ba60820d156c35ed5b2bcd3edcb0e51f043647cb41f130c123c8cd1b01af44f8df196b20e254a4 SHA512 4152a192f578f236a3d37437f42859129c0949a9f8b0fe7dbf0cdb8123cb6caaff33c16e05ede6320e5f7882126aac7dd03dad231c916b612445cec06e14688e
+EBUILD pecl-memcached-3.1.4.ebuild 2414 BLAKE2B 2d5f6311eb6478089701d13d92cb7b80f3dd8e08a2adcb366be784abfb11fd76269c9592ed1600d07cfa4da85312c48f7493be9f2d5f13d27a4cb3c7be544212 SHA512 49f68f0972d9f881365a7267909ef8b5a5ab15b9babf8253082fdceb9f2b1b54aaf339087506a77083b29c54285e1948275a916117fd3b59bad0e2fd355fcf09
+EBUILD pecl-memcached-3.1.5.ebuild 2414 BLAKE2B 2d5f6311eb6478089701d13d92cb7b80f3dd8e08a2adcb366be784abfb11fd76269c9592ed1600d07cfa4da85312c48f7493be9f2d5f13d27a4cb3c7be544212 SHA512 49f68f0972d9f881365a7267909ef8b5a5ab15b9babf8253082fdceb9f2b1b54aaf339087506a77083b29c54285e1948275a916117fd3b59bad0e2fd355fcf09
 MISC metadata.xml 568 BLAKE2B f99b2eb530ffd87100256bb477bfbd50e48b28283bc01147b0cb1e3dd7dbfb940cd8e16e24c68723fe764df0cbdb1ecb0b995e151c67a37673a19a2cfeb1bcfa SHA512 9fb2c3ea2dba6b4b1cdda8acc02afa006a95651b4fdb5011b15e4046bc44742cc5306d20db070f4f1977352873576040a34ed24a660ec2c640e118115359f2c6
diff --git a/dev-php/pecl-memcached/pecl-memcached-2.2.0-r2.ebuild b/dev-php/pecl-memcached/pecl-memcached-2.2.0-r2.ebuild
index fd4145a89f90..b9ba25217752 100644
--- a/dev-php/pecl-memcached/pecl-memcached-2.2.0-r2.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-2.2.0-r2.ebuild
@@ -13,7 +13,7 @@ inherit php-ext-pecl-r3
 
 USE_PHP="php5-6"
 
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 DESCRIPTION="Interface PHP with memcached via libmemcached library"
 LICENSE="PHP-3"
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild
index cd2d27c34ea5..7be1e62cbff5 100644
--- a/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild
@@ -12,8 +12,9 @@ USE_PHP="php7-1 php7-2 php7-3" # But only truly build for these three.
 DESCRIPTION="Interface PHP with memcached via libmemcached library"
 LICENSE="PHP-3"
 SLOT="7"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="examples igbinary json sasl +session test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl?]
 	sys-libs/zlib
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.3.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.3.ebuild
index 29089ab19505..2a670cd01ef9 100644
--- a/dev-php/pecl-memcached/pecl-memcached-3.1.3.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-3.1.3.ebuild
@@ -14,6 +14,7 @@ LICENSE="PHP-3"
 SLOT="7"
 KEYWORDS="~amd64 x86"
 IUSE="examples igbinary json sasl +session test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl?]
 	sys-libs/zlib
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.4.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.4.ebuild
index 88fd7a424994..f9b01c82b993 100644
--- a/dev-php/pecl-memcached/pecl-memcached-3.1.4.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-3.1.4.ebuild
@@ -5,14 +5,14 @@ EAPI=7
 PHP_EXT_NAME="memcached"
 DOCS=( ChangeLog README.markdown )
 
-USE_PHP="php5-6 php7-1 php7-2 php7-3" # Pretend to support all four targets...
+USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4" # Pretend to support all five targets...
 inherit php-ext-pecl-r3
-USE_PHP="php7-1 php7-2 php7-3" # But only truly build for these three.
+USE_PHP="php7-1 php7-2 php7-3 php7-4" # But only truly build for these four.
 
 DESCRIPTION="Interface PHP with memcached via libmemcached library"
 LICENSE="PHP-3"
 SLOT="7"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="examples igbinary json sasl +session test"
 
 RESTRICT="!test? ( test )"
@@ -33,12 +33,16 @@ RDEPEND="
 	php_targets_php7-3? (
 		${COMMON_DEPEND} dev-lang/php:7.3[session?,json?]
 		igbinary? ( dev-php/igbinary[php_targets_php7-3(-)] )
+	)
+	php_targets_php7-4? (
+		${COMMON_DEPEND} dev-lang/php:7.4[session?,json?]
+		igbinary? ( dev-php/igbinary[php_targets_php7-4(-)] )
 	)"
 DEPEND="${RDEPEND} test? ( net-misc/memcached )"
 RDEPEND="${RDEPEND} php_targets_php5-6? ( dev-php/pecl-memcached:0[php_targets_php5-6(-)] )"
 
 src_prepare(){
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
 		php-ext-source-r3_src_prepare
 	else
 		default_src_prepare
@@ -56,7 +60,7 @@ src_configure() {
 }
 
 src_test() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
 		local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 )
 		[[ ${EUID} == 0 ]] && memcached_opts+=( -u portage )
 		memcached "${memcached_opts[@]}" || die "Can't start memcached test server"
@@ -71,7 +75,7 @@ src_test() {
 }
 
 src_install(){
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
 		php-ext-source-r3_src_install
 	fi
 }
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.5.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.5.ebuild
new file mode 100644
index 000000000000..f9b01c82b993
--- /dev/null
+++ b/dev-php/pecl-memcached/pecl-memcached-3.1.5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PHP_EXT_NAME="memcached"
+DOCS=( ChangeLog README.markdown )
+
+USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4" # Pretend to support all five targets...
+inherit php-ext-pecl-r3
+USE_PHP="php7-1 php7-2 php7-3 php7-4" # But only truly build for these four.
+
+DESCRIPTION="Interface PHP with memcached via libmemcached library"
+LICENSE="PHP-3"
+SLOT="7"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="examples igbinary json sasl +session test"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl?]
+	sys-libs/zlib
+"
+
+RDEPEND="
+	php_targets_php7-1? (
+		${COMMON_DEPEND} dev-lang/php:7.1[session?,json?]
+		igbinary? ( dev-php/igbinary[php_targets_php7-1(-)] )
+	)
+	php_targets_php7-2? (
+		${COMMON_DEPEND} dev-lang/php:7.2[session?,json?]
+		igbinary? ( dev-php/igbinary[php_targets_php7-2(-)] )
+	)
+	php_targets_php7-3? (
+		${COMMON_DEPEND} dev-lang/php:7.3[session?,json?]
+		igbinary? ( dev-php/igbinary[php_targets_php7-3(-)] )
+	)
+	php_targets_php7-4? (
+		${COMMON_DEPEND} dev-lang/php:7.4[session?,json?]
+		igbinary? ( dev-php/igbinary[php_targets_php7-4(-)] )
+	)"
+DEPEND="${RDEPEND} test? ( net-misc/memcached )"
+RDEPEND="${RDEPEND} php_targets_php5-6? ( dev-php/pecl-memcached:0[php_targets_php5-6(-)] )"
+
+src_prepare(){
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
+		php-ext-source-r3_src_prepare
+	else
+		default_src_prepare
+	fi
+}
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS="--enable-memcached
+		$(use_enable session memcached-session)
+		$(use_enable sasl memcached-sasl)
+		$(use_enable json memcached-json)
+		$(use_enable igbinary memcached-igbinary)"
+
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
+		local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 )
+		[[ ${EUID} == 0 ]] && memcached_opts+=( -u portage )
+		memcached "${memcached_opts[@]}" || die "Can't start memcached test server"
+
+		local exit_status
+		php-ext-source-r3_src_test
+		exit_status=$?
+
+		kill "$(<"${T}/memcached.pid")"
+		return ${exit_status}
+	fi
+}
+
+src_install(){
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
+		php-ext-source-r3_src_install
+	fi
+}
diff --git a/dev-php/pecl-mongodb/Manifest b/dev-php/pecl-mongodb/Manifest
index 19502fcd1051..cd583088b270 100644
--- a/dev-php/pecl-mongodb/Manifest
+++ b/dev-php/pecl-mongodb/Manifest
@@ -1,10 +1,8 @@
-DIST mongodb-1.3.3.tgz 925476 BLAKE2B 845abd4c7cf5dbb1fb3b04c5fc4070f0a360874ac566f1988025701258141a89afaa0e60c3d7166484fa37eda4ef08d94deeabdcc2ebe2a4f221dcf83aff20df SHA512 16c82ada278eac6996065d3c594237fbb8c1a7fe4e21828aa8af9ef98033cf6dfaf0fee90095e8116e946e620b551a6122238f85865a6c47d4d087f784cd54ea
 DIST mongodb-1.5.3.tgz 1059580 BLAKE2B 23bd5f6b0f218cf55bd5713a770f3990d5c1492925623712583356d8aee42a1b47519b93ba64036aaf98f97ab4b1b30de9d8aa39659f2575c4f4dba3892d574d SHA512 35704e75bd7867a436d953c00c7560c9a08a4fa8f3555d7cc00aeda34e87c6c7aa7ecc1d7f674747e34f4f8dac35d320f6317e60229528ea9782bbe669bafec0
 DIST mongodb-1.5.5.tgz 1060017 BLAKE2B 475ca0f6a1cbd5270c9bde0f195d6092ef25441e0cee0a45ed378a868bd1ad27c7a77c4f4702b6f82004433805563cdaa728cbc11bb5beff83b982122cad339b SHA512 1eefc8f8e359a979082dc7808e89ff5418cd2dc73d4250638e33dc32cce40ef42502e9dbbb07303381e0062b84818568034f4e4cda8c8bf905513d00bf008392
 DIST mongodb-1.6.0.tgz 1096156 BLAKE2B 16c3b1d07d31d29a214aba320347f8e40cfc4f0dae8b0713b02cd0e3ff98fd54b09217472f333722228efdfcae755bbdbfe58da7db89d4dda2893ba7b3b0e8bb SHA512 e75dc607bf41bb71a0fce3b73785ef4203af97a3e8b21bf70a80c2216e9530463a6aaca55b013a4fa2f3c4eb72405a25209935ea1a238475f990763af54aa641
-EBUILD pecl-mongodb-1.3.3.ebuild 956 BLAKE2B 7de929ccdb22c32bd99bf35d31a3e4d491092957472b7771b866ac3c17cce14ba3c3bb593d0fc395bef0ab7c079a32ff2ee89a049f33984d4b3628d2b3f87abe SHA512 571b4af8ec1da33375b4cf609d37982fa920cf9afa97bc8db79219e1a200f3f4035bafb0aaab2419b958c9831af2a88e32a06a613c8f10afec484f6a55d327e8
 EBUILD pecl-mongodb-1.5.3-r1.ebuild 1009 BLAKE2B 4c1e9184619bc2f90558608f5ab5e2413c969e99bab0a8fcfb50b5a6fd6e5cbbf7f05f1a5155e2805a22aecee5f3a09e7e1c80d17b79cfcbfcdfaadeae6c13fd SHA512 7cf1a6fca2ce421abfd4f5509c585eff0627bd638749c2fda2be9be0fe12044ace79fab604cba54ba153d24cb8bc677ecb7c64c5cedd2af2e2361950e87a4b7e
 EBUILD pecl-mongodb-1.5.3.ebuild 1019 BLAKE2B cf4f6615b0d70b685817105fb53227bddc4b85d9ef60000eed1a48b5f8601d3868ed5e7af096b7df7c4882d2fbdf22c56d21bf512c5b267a8893443e14ca7c3d SHA512 ddba025e9e91ab5fa2b065ebdef36b61510bd589afa09611dafe4e5b27f1af35019f3dc0ef7a6915d035225dcd13ef5e6cb91c2c0a9e6b0699f335d6b8d211b8
 EBUILD pecl-mongodb-1.5.5.ebuild 1009 BLAKE2B 4c1e9184619bc2f90558608f5ab5e2413c969e99bab0a8fcfb50b5a6fd6e5cbbf7f05f1a5155e2805a22aecee5f3a09e7e1c80d17b79cfcbfcdfaadeae6c13fd SHA512 7cf1a6fca2ce421abfd4f5509c585eff0627bd638749c2fda2be9be0fe12044ace79fab604cba54ba153d24cb8bc677ecb7c64c5cedd2af2e2361950e87a4b7e
-EBUILD pecl-mongodb-1.6.0.ebuild 1408 BLAKE2B 99edc9e95c5c887a01d47a01339d5fd872aba201ed99a17be041b56a230344bc06d56e662087f56daaf3840465039861bd5acd5ebb6f29f53e925eabc13b3652 SHA512 128269890ed84b8bd68675384b3c918b7bb6c7ebfd9f845e768027093c5fb549470b7379d1577f69162a8064ea9ab20d59409ebe17fc308a8358240413875bfc
+EBUILD pecl-mongodb-1.6.0.ebuild 1426 BLAKE2B 4b32da42a4141f6db317f0f77b5207f623e17560a6964d27700dbccd13caee470e29005fc97b2b1c3c1e5b59b40c5a84bb8d399b8d4b6f4c43db6bc972314675 SHA512 b185eb19982a9acd6a49b9be5f33da6106ba452d9402bd4b514f56eabcfc63637e111bfe4d0042483f826a4d5a8fb71714c900b9f398ab4c1d0611643bfdfc5a
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.3.3.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.3.3.ebuild
deleted file mode 100644
index ad063c40f913..000000000000
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.3.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="mongodb"
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="MongoDB database driver for PHP"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libressl sasl"
-
-RDEPEND="
-	php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] )
-	php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] )
-	php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] )
-	>=dev-libs/libbson-1.8.2
-	>=dev-libs/mongo-c-driver-1.8.2[sasl?,ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-# pkgconfig needed if system libraries are used for bson and libmongoc
-DEPEND="${RDEPEND} virtual/pkgconfig"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-mongodb
-		--with-libbson
-		--with-libmongoc
-		--with-mongodb-sasl=$(usex sasl)
-	)
-	php-ext-source-r3_src_configure
-}
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.6.0.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.6.0.ebuild
index 18b9f1a79d6d..6dc6dd1ed288 100644
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.6.0.ebuild
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PHP_EXT_NAME="mongodb"
-USE_PHP="php7-1 php7-2 php7-3"
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
@@ -18,7 +18,8 @@ IUSE="libressl sasl test"
 PHP_DEPEND="
 	php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] )
 	php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] )
-	php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] )"
+	php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] )
+	php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] )"
 COMMON_DEPEND="${PHP_DEPEND}
 	>=dev-libs/libbson-1.15.1
 	>=dev-libs/mongo-c-driver-1.15.1[sasl?,ssl]
@@ -46,7 +47,6 @@ src_configure() {
 	php-ext-source-r3_src_configure
 }
 
-# FEATURES="test" emerge dev-php/pecl-mongodb
 src_test() {
 	local PORT=27017
 	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
diff --git a/dev-php/pecl-ncurses/Manifest b/dev-php/pecl-ncurses/Manifest
index 868a42598d71..0ea960b958e5 100644
--- a/dev-php/pecl-ncurses/Manifest
+++ b/dev-php/pecl-ncurses/Manifest
@@ -1,5 +1,5 @@
 AUX pecl-ncurses-1.0.2-php7.3.patch 4739 BLAKE2B f12e64c0f3615ee9b58ca7d410031fdde63d08cb8221e71826136fdb98005f6ee4552e9e46ae4085cd00a563e47807728d93c20f4b03277d3a8f866af1b3504b SHA512 731ed4e80f248dffffb675f96b9137abc7734fa32540014e0660810f95a82c4b785ca4c01628705556b7516be942da8ce37d66f6f4abf1788ce9514b881430ac
 DIST ncurses-1.0.2.tgz 16226 BLAKE2B 2b50fb953594f71e8ba2c93cc8ac1443168ea360c5c752eb4ebb941cdbd4e576bd6d5516722bbe06f31a5dd4732bf47c6fd740599af161cb33cbcb45493bbc5d SHA512 e1f684dcab2aa4dd3fded79fed02c78de1525f0384027fe64ad08759617f13ca6fb11742e3407723eecc431ed99847c0c98ae559797dc98ce373a01ba8413bf2
 DIST pecl-ncurses-1.0.2-php7.patch.xz 5096 BLAKE2B 8034121b97cc1769534923570c929444c0cd01238615e51c47845b9b10db4b62353a853a17d8ddd44c8ad47e68c44363321f7d08c2dfdd0e2948ddc7d33b2b9d SHA512 1f1dcaaa61033d7db55048f97e48029a335d5d191447038324eb170c9877da62a7b03cec20ea7496c073b76d7ba1009b4374b088c87e1838ee2dc433749c41fa
-EBUILD pecl-ncurses-1.0.2-r5.ebuild 536 BLAKE2B ec27a61d9bbc8e946357cc720b348a1182134946610a5b5a7e87d672782576dc9cc4e126f7bdb92f4142cef1c8289f2a12f536ca69405b107ca1c7b117b59b3c SHA512 fd900683d8199365c9c5fcec2993d25e85cd1374eff1548e42a36738ce74e57c083febf2701e134e796f359f2cf303728961ee458e635f9c35e7713aaa5e9974
+EBUILD pecl-ncurses-1.0.2-r5.ebuild 543 BLAKE2B 5091dd0de2295b7417c9a3ed64c0ca7eef88713a0a518a963ab324140cd2fb3081f27358c2238059b6c71449d9f36dafaf46ba880e75e4b8157b39ed5861921f SHA512 01a00314d028b5812219a34c9b0ea9a6efecf1d24d057d9a7cfd8d3cdec9b9700e0f0ae86052be852d24537fa24cdd90632d358400411b90146faf096f8dfec5
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r5.ebuild b/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r5.ebuild
index 929d4af52969..87adfe2ff31d 100644
--- a/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r5.ebuild
+++ b/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_PHP="php5-6 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-oauth/Manifest b/dev-php/pecl-oauth/Manifest
index 9a3d2603612c..106561b86b07 100644
--- a/dev-php/pecl-oauth/Manifest
+++ b/dev-php/pecl-oauth/Manifest
@@ -4,7 +4,9 @@ AUX 2.0.2-compare_segfault.patch 1664 BLAKE2B 099aa3f78002d734306673d817e21d75bc
 DIST oauth-1.2.3.tgz 45531 BLAKE2B 10fb5a3d1a46ee17fef7b129b3c29d67d565d296579aff63d8309f4efc5b881450249fb8e6d25703a33ad53e336775abc73f3d8e489f78c00c8988219b02ae1b SHA512 ca61dbec8fa51679accb31eab90b8699c7780f2d60a83566ce05667148ee44b7dc70fd8235414d6a3a996b252ad4a236b3e8a549685fd7e890e0874029c455e1
 DIST oauth-2.0.2.tgz 49115 BLAKE2B 292c8c2d7fa3728aa6a73cdb65ee1c603f341cd24596d64b910f495ef649adb1f90ba4dfdab5ce1802dee9e8a0e3a6af502da340ed467de6e8c5d83df18abc7d SHA512 b7aa9459542ec390a5420127d75607702ae6df6254f4e39acb62d35c6a39b8b7990499c279df07ce681081e455b55219c51df42fd516321f317465badf6d459d
 DIST oauth-2.0.3.tgz 49413 BLAKE2B 581ba50a3add230364ed5c161b76073b1dd7c301eaf4cd048ed97039deb45fea73da56f0d0b69186d8f6fb20a55724ba5892d80bd7aae343b15534d3c82b6346 SHA512 3e0ce5ce01533bfd304c0c34465cc184fbd0af1a25f5192860e6394c86dc948688cc8d4b419b48676481cef3a685ba70ac612a8c516da26d0dfe9efdef7e98d9
+DIST oauth-2.0.4.tgz 49359 BLAKE2B d5fb23293fc03f40e2b3a5c5ad51bce1b06a6004e1f20d1563b3db7bb79a71f70bca467348d68b4f6d2393003b4ad23debbe5877192d9e189056e86f9fc00b3e SHA512 269b579f87a9f3f229433c74937f74b9b6df453a6e05f7751ca12fa5f24c9ad62d1ebe5cdb370d33d774a0f2e244c1c685a53226dcb35c0005b5532a00c137d4
 EBUILD pecl-oauth-1.2.3-r5.ebuild 1147 BLAKE2B ccab8eb759914ca9d30e73e8d23a829f3ab0ef120f7c9ecd70466f16658ef8e02763ffb64ed33b7cb4b797c3dbbbb9e3980bc93e3bb08d349dda02930545a48b SHA512 2b30cde4d028f636becc2f1d61e0c56a55c021910567fa78bb387ba0c83949d3d104026d917fbe63836850b374e8a1c1bc1f91bbaf102029a1ffb60e469a9e3d
 EBUILD pecl-oauth-2.0.2-r2.ebuild 1407 BLAKE2B f048f3a75f5511e0ef9efc9a5e0428f0d30ae98e3ffb3664b417a87e9725f6db34ac9b959cad9b12941962849f03199525022d119d768722769340ecfaa92567 SHA512 08f2136c40fbe88a7ca94a27ca09ccd8fcac6a0367c32a28272b472243ff036192202adec19bb401b7274c65e2b1eb63911a07ab5ca76741d15b0e24a937aaa8
 EBUILD pecl-oauth-2.0.3.ebuild 1648 BLAKE2B 377c5db54a94a6bcaf6b53b5f0015d0d6b4ae10e70e5d3b8d10377f788b7e9fa05dd7edb79109a9673c0c6f323cfbdc09adcf8e72550e6094aa3c339c6209a7d SHA512 136b3fa2dd4b5d5f216902ba37cc6bfbdfa4e8db6afec1b6d214cffef179259bb10581d5a973c9436d1f165cb2885f486fb8129fd0ddcd9e3ac384804fdbf02a
+EBUILD pecl-oauth-2.0.4.ebuild 1814 BLAKE2B 5db2f5f7065b30d42e2db2099082f6aa3b1a6c3e8c3802cc75f17729faa6277e21197737077e34921adff7ff0901e9e9bfe831e5509eccf5b6cccc187988706e SHA512 8dd687b3531b19f6f6ca16cb50af9fd38d14c45fcd787f41bdfce288e18ac638054d1042a7c2777b5d2977588a2af0db17ac80a62de55121c05e4ae1d28909fc
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-oauth/pecl-oauth-2.0.4.ebuild b/dev-php/pecl-oauth/pecl-oauth-2.0.4.ebuild
new file mode 100644
index 000000000000..076b3f695e02
--- /dev/null
+++ b/dev-php/pecl-oauth/pecl-oauth-2.0.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PHP_EXT_NAME="oauth"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
+
+inherit php-ext-pecl-r3
+
+# Really only build for 7.0
+USE_PHP="php7-0 php7-1 php7-2 php7-3 php7-4"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="OAuth is an authorization protocol built on top of HTTP"
+LICENSE="BSD"
+SLOT="7"
+IUSE="+curl examples"
+
+DEPEND="php_targets_php7-0? ( dev-lang/php:7.0[hash]
+		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
+	php_targets_php7-1? ( dev-lang/php:7.1[hash]
+		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
+	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= ) )
+"
+RDEPEND="${DEPEND} php_targets_php5-6? ( ${CATEGORY}/${PN}: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
+		# Disable tests that depend on header order
+		rm "${S}/tests/bug16946.phpt" "${S}/tests/overflow_redir.phpt" || die
+		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=(
+			--enable-oauth
+			$(use_with curl)
+		)
+
+		php-ext-source-r3_src_configure
+	fi
+}
+
+src_install() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4; then
+		php-ext-pecl-r3_src_install
+	fi
+}
diff --git a/dev-php/pecl-pam/Manifest b/dev-php/pecl-pam/Manifest
index 23259394df80..861404728b9d 100644
--- a/dev-php/pecl-pam/Manifest
+++ b/dev-php/pecl-pam/Manifest
@@ -1,4 +1,4 @@
 AUX 1.0.3-php7.patch 3519 BLAKE2B 649f278a88e12ecbf895ab372aaa97c9f1f7cdcf4724eeda63368daefc89e89c3e5aae9e09cb7026058ca18aa4569423d75ee125795b56d8e2d372ccc93123f1 SHA512 9877b6bede71f402166253521aec667e4f9da99fbbf4fc0e74b9a5c48e498df717f869969b5d7a6432427a50030370771774f77ecb876ef133288eab174c9289
 DIST pam-1.0.3.tgz 6671 BLAKE2B f416fd0e47d3fda6a1d86e44a7ca17fc9a0428f976f18e2b663a2fd1e09b790cd069ca16d930d6dca6554762ca59bda987929e52365ed813949c1a93291c1dcc SHA512 3580582f1456b31be30a713cadaaca106527f2d4f3f12032b5d3617cc361aaf49539a9db3dd27221ce40320187abaac0f6ad4e23cdfe5eaa94436e3eaef3fb9c
-EBUILD pecl-pam-1.0.3-r3.ebuild 826 BLAKE2B b1bbc8467fca0bc7a8aa9177e7981f39d99dd1e048189b87349ec5e20411d4f86ad9615ba7a313f04eac8f79a36eca4a216247f16c9d8ae90781e1e4e5c563c7 SHA512 edec7dc70b1c2ae736995670e2afadc553d0d34c7882cd0b5c9562c6a12617bd9436378456d011ff95ba5148f54b13d54e1051261b32f864b17935d44b00eea4
+EBUILD pecl-pam-1.0.3-r3.ebuild 833 BLAKE2B 3cabb429d9fb5880469c214fec01ff107c565b920f792569bf838d1051e7e86e27969c6de66459b065ef80ca1a1f15cfc51eb770e3c4eda343dca64bfa751a03 SHA512 10f8222ee709026e526a0885fde1628a7f668bfb7924f2f05b60be856096afb16111b23a2ecc586a766218f4bce006566247ab89c7b7e7b32a1211269a5e63b9
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild b/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild
index b01c985412fd..233b87e332c2 100644
--- a/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild
+++ b/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild
@@ -8,7 +8,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( README )
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3 pam
 
diff --git a/dev-php/pecl-propro/Manifest b/dev-php/pecl-propro/Manifest
index 2480fee7f843..0f6239892a48 100644
--- a/dev-php/pecl-propro/Manifest
+++ b/dev-php/pecl-propro/Manifest
@@ -1,8 +1,6 @@
 DIST propro-1.0.2.tgz 13393 BLAKE2B c451ad6e1e0f93308497514de22a949dfbbea54e326c18688d6883aeb4d6adb920c42adfa458faf4c350755da72c1db06f77efc408fbc182fbb950e2f8b33302 SHA512 a4a3216d13c412051c063e0370c5f0badb65aa7054a43b0f6eb387a7a5fbbba1800b7f5f5113ba68ca8c7fe19932184a069864d1362239c71e0f55466c9cc8eb
-DIST propro-2.0.1.tgz 13399 BLAKE2B 88b099602ed19da96570c6b65981158d1f8f335470e6cd7afa517844a71258b04d9cb294bf91c15a23bbc016b303b2e42a2dea263808e0ed92905ba9ba47247f SHA512 c5a5f7c1fdf042d49597df789dc2b2e4e1512e7320a3a39cad344a9dfa3b9253b4a98d2f33e10e04ee608e5b8d1e1b50238787510db0a0f99d8f8b45b91c5c22
 DIST propro-2.1.0.tgz 14253 BLAKE2B 44c9bde831486fa41520ce75b313865b90a057acd0d566ae7e5c2aca97240e089580ca79ef04842a57a5d8eb76a179e57c505e977913567c1e97260f87fe2165 SHA512 94fc97f7bf17661ec7ecbe4d13b4fc98b8381469140d121fef49d32a4b767e956ed87b9f5bbb794f27ca47ce4b7b3125ea2b9091eb9d1f0a52b5c8f9df7ee145
 EBUILD pecl-propro-1.0.2-r1.ebuild 735 BLAKE2B 7dff63db99c42ef41175493c6b2a754ec2b5ced16ca5594161a0ddaa20317be54e00c08ae04fc16337582c79403986e84c395b1740a95930dc3e7344b0c96aa5 SHA512 1333f462b538f9cd7f2b3ed27a7c01741bff390fb63dcd94238c5af75d0ffc247fb1485fe2aaedb3e984f7fb01aba5cb68d59100e0e5d734f02ae1d090c40a43
 EBUILD pecl-propro-1.0.2-r2.ebuild 836 BLAKE2B c8be1849bebd99025649f1758ab1d12484b53b6f19b2b51a379fa11030bc208b8d1a2f78533eeafac1c9c0c3dc058f94ef339ba852146b52494600691a7bb093 SHA512 7df406dd15a07b47b449c70559f2645eecb65fe62f46b4528805b2e02eaff51444d37373ae30689ebd852583c0e04fd1e4acca36fdb5fc097f961271af01f0ed
-EBUILD pecl-propro-2.0.1-r1.ebuild 750 BLAKE2B 36855ce79ce527a94d0e7177e5c1ca98723078713be9351a8cb38364f0091988b11bfe96afe6d35bd7870fe268e1998c5c794b3206bf25ea38fc5033f674622c SHA512 842c94056e314877518f017231827f74bbaee853e1c69fbdd7e74a1092a196a07c174cfa1e36f7934b8f881573e5c7de859c3ef212fd1eb165ca74969d982f25
-EBUILD pecl-propro-2.1.0.ebuild 849 BLAKE2B 9b23c1403f62b889dabf371b576d7f9750b218aabaac63eb2fe4de86062b1584e76857dd92430b45f524fa572339576e609152c65c295e5eac82c673a334ec97 SHA512 02dfabc0f134382d9e91eaabc784b00476a95f5f4c5cea7b5d2e04271294602562510942710b559e7812b146bc83fcf723ef4081a2097a033aaf2463b79487eb
+EBUILD pecl-propro-2.1.0.ebuild 913 BLAKE2B 548b68c4786747befd8bfb143d7406851870afdee8df88217a7a37c849f20a139f258d5c5d01079c19bc759429c4aef441296edebabb2ed03322fae2569b35ac SHA512 f1b96c94504ef9a11951039ede5df4d4228b9a919e29da3192162aa1f99626c989f9228c6433e8073944dc1c514ad3d90c8c981f674d98b4a263d56195d4cf20
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-propro/pecl-propro-2.0.1-r1.ebuild b/dev-php/pecl-propro/pecl-propro-2.0.1-r1.ebuild
deleted file mode 100644
index 4f22d4dce0c1..000000000000
--- a/dev-php/pecl-propro/pecl-propro-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PHP_EXT_NAME="propro"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_ECONF_ARGS=""
-
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-# Only really build for 7.x
-USE_PHP="php7-0 php7-1"
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="A reusable property proxy API for PHP"
-LICENSE="BSD-2"
-SLOT="7"
-IUSE=""
-
-RDEPEND="php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6] )"
-
-src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; 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 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild b/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild
index ba645a7a2b18..cf9bab8e4729 100644
--- a/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild
+++ b/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild
@@ -9,14 +9,14 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_ECONF_ARGS=""
 PHP_INI_NAME="30-${PHP_EXT_NAME}"
 
-USE_PHP="php5-6 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
 # Only really build for 7.x
-USE_PHP="php7-1 php7-2 php7-3"
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="A reusable property proxy API for PHP"
 LICENSE="BSD-2"
@@ -26,7 +26,7 @@ IUSE=""
 RDEPEND="php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6] )"
 
 src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
 		php-ext-source-r3_src_prepare
 	else
 		default_src_prepare
@@ -34,7 +34,7 @@ src_prepare() {
 }
 
 src_install() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	if 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-ps/Manifest b/dev-php/pecl-ps/Manifest
index 663740d4eae3..1b0d296d10d5 100644
--- a/dev-php/pecl-ps/Manifest
+++ b/dev-php/pecl-ps/Manifest
@@ -1,8 +1,6 @@
 DIST ps-1.3.7.tgz 634024 BLAKE2B 8007922cf4ed8c98fbf9524f66deda7136e2e5788f60e4647253545091cc30c4ee3a7de30adb06b470d18d96874afc58d5251c9342e9aa7db0491fa3daeac269 SHA512 cec6ecad27d35787a92453482f0e45fdcfe4bf79aab9cf1f7f6bc4468cf626343ed2b33d52d2ec48302a2ede9ecca3b397fb2d56fbc088997f39014f3dc47770
-DIST ps-1.4.0.tgz 634272 BLAKE2B 07928ac1ea77c3d634496e0a4e6e434b51b9d9938a40b9eb54622ade97c0cd8bb2197e5d544c9051d726a3cb51f67a43f4047974f588361734688fb6c1f12c92 SHA512 c268bc8d675d7082690d892448a458d69234b504b3be2408d2744224c356e7444fe1320af1256b974a2ee0fd6e0eca48fe0fa633b1df84da2e9532cd953bc306
 DIST ps-1.4.1.tgz 578991 BLAKE2B 549fae78ffb6e91f39b6292d969b9b80adba1a5911fb52e99c5fcbc940b9470205556e3e11c2940fadc7cc084400bc08ae7255b79e175d705c9bacb8eb3d6e71 SHA512 e9eeb5ad1c9314af0fcfd33e461b560f6cc599a679bc0a5541994fa698e3da63b7cb523f617647bdb2ac1c8fc090263e314ddf956a1e6126f8813de92e49f3af
 EBUILD pecl-ps-1.3.7-r1.ebuild 360 BLAKE2B eaec0c769677b48b4676606004b950f477b0c4b6d208111bffcceb9b785bad45c9a1a6e316e286bd8cf464f96925ef1f9fd8b1a9b9b3b3b53f05232249d8b232 SHA512 60096699ced3e3b021827c5e0c866b8466ad21a99daa72028e5191d06353081e6ee338869bfa3aabb05972155fa1f85592ee994ead0144c21b62c7ffeea84149
 EBUILD pecl-ps-1.3.7-r2.ebuild 878 BLAKE2B 2db2c23d2c933d2e48872dd1799e06ccf08bb1702c4149390a71c6b09e5c4284803df36cbf6f47768234f14c1b0ed2472f4352db4f5c0626849fe9f2d1baeacf SHA512 c5b73568c4aae62ea5a46d936ba40a93062cfc2ff8d9b02e937091256d2d2d28d65a9d829c0a1ce6ce64a26aa340792042dabcafe68c71ab310c27a69ee7488b
-EBUILD pecl-ps-1.4.0.ebuild 614 BLAKE2B 8279b0d1eb3c38107771e49b130600c2d3dad22060878b8d287677dbd8db56f43739673fdf88579e558103ea55bfb3bbbe70ed2cf14990698a73c185545efa01 SHA512 b0ceba0358fbf105ecaed96ff76e69cdba3014511af83f9dfd8791e714b6a775b9d01d98ae4087f8ed4042265b9b9f2cf2f75f7a2a0c2902e54f8b6531be00b8
-EBUILD pecl-ps-1.4.1.ebuild 936 BLAKE2B 9bd57a944f991c6bad2d41171b2f89e257db0bb199057cfccdd12071823123fec5afd9fd6ee24c4e058fbef4b8c2ac4444d89ac454e31dcf8512eff80229e9bb SHA512 8433c6ff7dd4b20c6d148680171d351184b7c0d839abeff3f706916a21ebe24e95f69111ca20e2c083be55c555b842e691b96327bb1ebf2a2d4ff169ba3c2738
+EBUILD pecl-ps-1.4.1.ebuild 1259 BLAKE2B 80274d9d01ecf1ea502bf512e7ada18887fddba3fcd5f33a6ab82ccd6e495d7583bf8bab37d3290002f0b33476952c67df21a988f6776140620899263efe81b3 SHA512 bcb5b6ad87e547a0afe005f1fa46683a37c117d157fe5b2d77942948a9ea1410daaa846c7c34be6221667cbac28d94939603d97459823254c26c46ef97edf827
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-ps/pecl-ps-1.4.0.ebuild b/dev-php/pecl-ps/pecl-ps-1.4.0.ebuild
deleted file mode 100644
index eed300a35e25..000000000000
--- a/dev-php/pecl-ps/pecl-ps-1.4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="ps"
-USE_PHP="php5-6 php7-0"
-
-inherit php-ext-pecl-r3
-
-# Only really build for 7.0
-USE_PHP="php7-0"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DESCRIPTION="PHP extension for creating PostScript files"
-LICENSE="PHP-2.02"
-SLOT="7"
-IUSE="examples"
-
-DEPEND="dev-libs/pslib"
-RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-ps:0[php_targets_php5-6] )"
-PHP_EXT_ECONF_ARGS=""
-
-src_prepare() {
-	if use php_targets_php7-0 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
diff --git a/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild b/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild
index ed4909097c9b..fd04378b47c9 100644
--- a/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild
+++ b/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild
@@ -4,12 +4,12 @@
 EAPI="7"
 
 PHP_EXT_NAME="ps"
-USE_PHP="php5-6 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
 # Only really build for >=7.0
-USE_PHP="php7-1 php7-2 php7-3"
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
@@ -22,12 +22,13 @@ DEPEND="
 	php_targets_php7-1? ( dev-libs/pslib )
 	php_targets_php7-2? ( dev-libs/pslib )
 	php_targets_php7-3? ( dev-libs/pslib )
+	php_targets_php7-4? ( dev-libs/pslib )
 "
 RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-ps:0[php_targets_php5-6] )"
 PHP_EXT_ECONF_ARGS=""
 
 src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
 		php-ext-source-r3_src_prepare
 	else
 		default_src_prepare
@@ -35,7 +36,14 @@ src_prepare() {
 }
 
 src_install() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	if 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
 }
+
+src_test() {
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
+		# tests/004.phpt depends on set numeric format
+		LC_ALL=C php-ext-pecl-r3_src_test
+	fi
+}
diff --git a/dev-php/pecl-radius/Manifest b/dev-php/pecl-radius/Manifest
index 5371b1f2ae58..0b8204c478b1 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 765 BLAKE2B 528d655a9ec455460a283bcf9aa1b15fbb9d43db094df533f38f9fbef0eadc12388608389a05bee9dada5b9a2bca7f5724cfafca037c0b65cb39c3650a4e4d79 SHA512 ee8a5bb86cfcec12b3342a3ee9f8b07bcee817e1f9a14093ee3f9cb1125b9ac8476675cedc8b52aace45665c5de6377d24a20262e5399c2cd985864532ff128d
+EBUILD pecl-radius-1.4.0_beta1-r2.ebuild 829 BLAKE2B da5781ed23af8292df6bb9f40589130e10cb81cdf7e5c6996f9545f286c94969a0df0715b8bc0e995b578d66c70cb9d3d5260f13bdd440353b781623504ac50c SHA512 26d4c42a1cef310af9a940b9b82deb1b6163f2a3949b08494557c21077e977b991c4f1656ab88510481461faef197d040e82b2af4536f719aa078c88e6ad0eb5
 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-r2.ebuild
index 12aaad4b9dd3..a18ff95d221c 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-r2.ebuild
@@ -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"
+USE_PHP="php5-6 php7-1 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}"
 
@@ -27,4 +27,5 @@ RDEPEND="
 	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] )
 "
diff --git a/dev-php/pecl-raphf/Manifest b/dev-php/pecl-raphf/Manifest
index 3c17083ea5e4..640fca8bfaa1 100644
--- a/dev-php/pecl-raphf/Manifest
+++ b/dev-php/pecl-raphf/Manifest
@@ -3,7 +3,6 @@ DIST raphf-2.0.0.tgz 15715 BLAKE2B bab2997d9ce8358efaa69f2e633f49e4dd16f640e8d30
 DIST raphf-2.0.1.tgz 16003 BLAKE2B 4eaf9f89e6572e17e0df347543dc99221f68d45103444f89e59862b9078574722278fbb1e2841b0a5952ffd6dfc4ea0fa81298f2014ffbe8a6b51ed6887f6692 SHA512 0a609fc21a62880963e7afb75297eb75a2598aab2c816cb61e84d665b0453e4952aa9bf25fe2c818cc94492a4b94aed965053c67899fdb984d88661364fffb1e
 EBUILD pecl-raphf-1.1.2-r1.ebuild 748 BLAKE2B 062779c09b82c1145df97742a6d970ddc0c687248b336995217f93c7c3ed7d7eaa500888e4818cfa8176dae10f7b74fa6bd90f9688bfc1d2f0744b49d0b90a0f SHA512 5d9a4f730c469b06822e7af96db120a28f4353d59b2200c2b68849c956999a574592326594749533c5d3ddb423d206822d7c8eb157ffae541cd7117c20537400
 EBUILD pecl-raphf-1.1.2-r2.ebuild 857 BLAKE2B 45d170823d7f9bcd8944f56241c17a6922ee813deec961c5b2dd7e0c659f08d56295e28ed3d187ab21b3c50d0d641c104ca19fc6f329a887cae4c4345bb82b55 SHA512 b2b4994345835fa4c68b07eb0102b0e041d0b7c4c7adea6da13fd5a7bd20cd998defcb759f91690776d81be00f8df0e8ef6bf022d0cebaf2b88de9e7348413dd
-EBUILD pecl-raphf-2.0.0-r1.ebuild 766 BLAKE2B 58af3a334c323199b9494c17bbb119aafcaa53e7b7d98f98aa42837777418bd3d920c6422ff35546a45b1aad84943e21c2eaebddf3af89e4726d578e4d1c2955 SHA512 9d12d7141ce035e9d8a901ee847d313b580192b4d71f441aa77d0ac501113eefada26186696ee9ab820b64eb635fb529b025e72a0400914f5085f0263514659e
-EBUILD pecl-raphf-2.0.0-r2.ebuild 870 BLAKE2B 6c77a40ffbec3f51cc787bd889118910197f0829927bb66c97e465aedbfd83800e78f202e9a1474dc1d62fe089e6264f7e9414136c8f48a2b2a461fe9d98b22f SHA512 c1f6fe551f063d69b39cc1e22a19749001639005a295e0111c4cc9480cfe20ad237288dae5593776d1db3d67b5dfd80f3deb10b854b292a6e55bde1843e98633
-EBUILD pecl-raphf-2.0.1.ebuild 870 BLAKE2B 6c77a40ffbec3f51cc787bd889118910197f0829927bb66c97e465aedbfd83800e78f202e9a1474dc1d62fe089e6264f7e9414136c8f48a2b2a461fe9d98b22f SHA512 c1f6fe551f063d69b39cc1e22a19749001639005a295e0111c4cc9480cfe20ad237288dae5593776d1db3d67b5dfd80f3deb10b854b292a6e55bde1843e98633
+EBUILD pecl-raphf-2.0.0-r2.ebuild 919 BLAKE2B 14dfe1232c27311d3606cb8ae7c7719db41a62d379dd22573868c208e1507958647d3132c31d71aa67c3402cf6baab00daed248e4fcb046e4e92ed4b48d5e4c9 SHA512 5af2ec4f69bd7d5ae63199bde5cdb486af2685b6e9174d7e83b1d5547f87e3852b98d22f3f7c4c07cc69c760f1aae864053fe87be89749accd7130fc2cd6eee6
+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.0-r1.ebuild b/dev-php/pecl-raphf/pecl-raphf-2.0.0-r1.ebuild
deleted file mode 100644
index 2883d3f333e7..000000000000
--- a/dev-php/pecl-raphf/pecl-raphf-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PHP_EXT_NAME="raphf"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_ECONF_ARGS=""
-
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-# Only really build for 7.x
-USE_PHP="php7-0 php7-1"
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="A reusable, persistent handle and resource factory API"
-LICENSE="BSD-2"
-SLOT="7"
-IUSE=""
-
-RDEPEND="php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6] )"
-
-src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; 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 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-raphf/pecl-raphf-2.0.0-r2.ebuild b/dev-php/pecl-raphf/pecl-raphf-2.0.0-r2.ebuild
index f28c7a6bb551..e594718f2c51 100644
--- a/dev-php/pecl-raphf/pecl-raphf-2.0.0-r2.ebuild
+++ b/dev-php/pecl-raphf/pecl-raphf-2.0.0-r2.ebuild
@@ -9,14 +9,14 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_ECONF_ARGS=""
 PHP_INI_NAME="30-${PHP_EXT_NAME}"
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-1 php7-2 php7-3"
 
 inherit php-ext-pecl-r3
 
 # Only really build for 7.x
 USE_PHP="php7-1 php7-2 php7-3"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="A reusable, persistent handle and resource factory API"
 LICENSE="BSD-2"
@@ -25,6 +25,9 @@ IUSE=""
 
 RDEPEND="php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6] )"
 
+# Tests need pecl-http, which needs this
+RESTRICT="test"
+
 src_prepare() {
 	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3; then
 		php-ext-source-r3_src_prepare
diff --git a/dev-php/pecl-raphf/pecl-raphf-2.0.1.ebuild b/dev-php/pecl-raphf/pecl-raphf-2.0.1.ebuild
index f28c7a6bb551..9923b1d0c97d 100644
--- a/dev-php/pecl-raphf/pecl-raphf-2.0.1.ebuild
+++ b/dev-php/pecl-raphf/pecl-raphf-2.0.1.ebuild
@@ -9,12 +9,12 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_ECONF_ARGS=""
 PHP_INI_NAME="30-${PHP_EXT_NAME}"
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
 # Only really build for 7.x
-USE_PHP="php7-1 php7-2 php7-3"
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 KEYWORDS="~amd64 ~x86"
 
@@ -26,7 +26,7 @@ IUSE=""
 RDEPEND="php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6] )"
 
 src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3; then
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4; then
 		php-ext-source-r3_src_prepare
 	else
 		default_src_prepare
@@ -34,7 +34,7 @@ src_prepare() {
 }
 
 src_install() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3; then
+	if 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-redis/Manifest b/dev-php/pecl-redis/Manifest
index 932194d6410d..467896a0bf18 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -6,6 +6,6 @@ DIST redis-5.1.1.tgz 245205 BLAKE2B b7177be5282b081562a446b1b37c7b46ba0ef382e55f
 EBUILD pecl-redis-3.1.6-r1.ebuild 1504 BLAKE2B 39cd4e0402cde5507b4de802e6ec1a9855f293ea1710f1987690c9c4dca507c72045b87b423c89950e76facff3699ec782df904904c4f361f304f9a3f0095f2f SHA512 6588808380496dbf7f46e85483393a1c2fbe10720959a113cdf19e527a43e72e11fa948a168d965d3dbd1c1d3809051246d2a1ed504fb0958a728b20191b2ec1
 EBUILD pecl-redis-4.2.0.ebuild 1747 BLAKE2B d785de1e3b9e85782a7af70a6ee3382ce8531a54d27577abd8f06c8d6e5ede63469445ab63b6a2024abbc83dde9b0f3575e7dcf4fe0fcb3f31d542f706d3e4f7 SHA512 569786473550db55ea8f4361f15441f009d6b120a97a76a17006b644f49dfe0889c0e6e586d831bd62de6935fa18ebec78c3232da03a19254a23c68b7a7dc024
 EBUILD pecl-redis-4.3.0.ebuild 1638 BLAKE2B 91c61e08270fbd775be92db55362cc4e3938ab1119ff65f5b38c4d73a7c39deba7a19673ec611baf1a0b425205fce4a04d04e4478d96c063959b36789487cecd SHA512 e00b2cef43e844256e4fb7de433b3f545d8c184a8e2eeb3cefc1bda672d56b2df17c6762ad3960ee0ee8bd44f735b498a10e83af2118dbe544f30474dc1cf409
-EBUILD pecl-redis-5.0.2.ebuild 1277 BLAKE2B 6842fbde2fd906e0e0ce0ed414e16bbbb52d41fa8d4f8c6a40a4959b3f91987f3de19004dcb4314a42313b3ef8a128b0339915617f8d48bd8f26d102c2a7dbe8 SHA512 3bf23b848f21eebe9153aecb7d92c06860cc8d3606bbf1e0a0a89bc118bf382798a20c24b59afb70197e12ab9d9197b5ae240fcc0f58c37a21bce8544bd06958
-EBUILD pecl-redis-5.1.1.ebuild 1277 BLAKE2B 6842fbde2fd906e0e0ce0ed414e16bbbb52d41fa8d4f8c6a40a4959b3f91987f3de19004dcb4314a42313b3ef8a128b0339915617f8d48bd8f26d102c2a7dbe8 SHA512 3bf23b848f21eebe9153aecb7d92c06860cc8d3606bbf1e0a0a89bc118bf382798a20c24b59afb70197e12ab9d9197b5ae240fcc0f58c37a21bce8544bd06958
+EBUILD pecl-redis-5.0.2.ebuild 1288 BLAKE2B afc0a2af14d7e07646feaadca86f8ce030509bae35932d39c7dd396ad59e08198adfd86c3dddea6dcbe9045987238479f6f20f941c828cc1a0893c0803f67a8b SHA512 672cac0af28c9daf4c1acc2602690a1f65862825bd15cb9731e6691cf05763b5cd16a520e35165d1b7215fc5c7276605d5f9cdcec030846b00e493308450fb5b
+EBUILD pecl-redis-5.1.1.ebuild 1288 BLAKE2B afc0a2af14d7e07646feaadca86f8ce030509bae35932d39c7dd396ad59e08198adfd86c3dddea6dcbe9045987238479f6f20f941c828cc1a0893c0803f67a8b SHA512 672cac0af28c9daf4c1acc2602690a1f65862825bd15cb9731e6691cf05763b5cd16a520e35165d1b7215fc5c7276605d5f9cdcec030846b00e493308450fb5b
 MISC metadata.xml 383 BLAKE2B b7a47896565db2f132479963a5479262864421a8388bd262ba9aa8eb6445e0d351478530475b5dba12cc9cbbc33089a904f9945816d3009c75f09dcea9c4cfdc SHA512 da5c3918a6652f1f3ae58a5bcd2c5eb3308d764df1a14bae1658f5f2022ee364b6cd288c4a3c700cf27b70b2f967f66668c17ea9850fc48910005310d16125b0
diff --git a/dev-php/pecl-redis/pecl-redis-5.0.2.ebuild b/dev-php/pecl-redis/pecl-redis-5.0.2.ebuild
index 61a6320308de..77a59f7f0899 100644
--- a/dev-php/pecl-redis/pecl-redis-5.0.2.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-5.0.2.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm"
 IUSE="igbinary +json +session"
 
 DEPEND="
-	igbinary? ( dev-php/igbinary[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] )
+	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] )
 "
 RDEPEND="${DEPEND} !dev-php/pecl-redis:7"
 
diff --git a/dev-php/pecl-redis/pecl-redis-5.1.1.ebuild b/dev-php/pecl-redis/pecl-redis-5.1.1.ebuild
index 61a6320308de..77a59f7f0899 100644
--- a/dev-php/pecl-redis/pecl-redis-5.1.1.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-5.1.1.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm"
 IUSE="igbinary +json +session"
 
 DEPEND="
-	igbinary? ( dev-php/igbinary[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] )
+	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] )
 "
 RDEPEND="${DEPEND} !dev-php/pecl-redis:7"
 
diff --git a/dev-php/pecl-rrd/Manifest b/dev-php/pecl-rrd/Manifest
index 6b86f96710bc..300a1b0e44e0 100644
--- a/dev-php/pecl-rrd/Manifest
+++ b/dev-php/pecl-rrd/Manifest
@@ -1,5 +1,5 @@
 DIST rrd-1.1.3.tgz 19229 BLAKE2B 14bbc97ec52be8f1b99471380cc1408c81056841d932818681868e31badc1a0abefc0d155e594a05492b86b826f21b8dadb0a0dcb43313f48863c64fd8e88a71 SHA512 356264de1b967af0f78e25e3c0afcbec704dd3e49d828e08d21d744d5fcdc46f4cd7f7c118b4e283c20bcaf2a4c29e0ac9437c7f66ca0d260a76fddf7b9d3242
 DIST rrd-2.0.1.tgz 18880 BLAKE2B c3fb65e95aece39690085830ec1c43ba173e173591215d6a66145ac71079f8d5ba5b097acd9018c86d2342550001334f8e1c98e22204d94a24aee5cc086295ca SHA512 b6f7173f54fcf49bf014cc6c78263c169cdf53dac66c12f5f88db7e01b49ea74da84a55f61deb25c866e6e2e74275ec48fc4a3d1b46719f66b5b7b7eb000b6b3
 EBUILD pecl-rrd-1.1.3-r2.ebuild 792 BLAKE2B 6ea7717d68feaf96d919f4d7e29cf10185588a29a687e068ae768555f340deb8bd93fad6111720248d8fb389fab95f6a8235af50736b54928067cbfd8f8dcdf8 SHA512 b00f02cc0ed6678df78eed5fd0a2417daf2423cf04a524429b1da116babc0baa2d45c90458ec26e71bbb5b843c1a86eee6b34ae410706f5e3fe85e4dd2580dfd
-EBUILD pecl-rrd-2.0.1-r3.ebuild 1366 BLAKE2B cdf8b4986acafb26cb3d768177be1297c6a8436eb37c2e592b580f356bc8c6d6f88e07eae5c73b15b5d1ef97a4fcae417159e64ac9ca0043afb05bc32a79a7df SHA512 2d9abcf47452d5a820bb28ef303756fccbe217422c58c83b2b03f4dcef5b848a0ded367629627147ee785ade44d6a5db7d3698fb8a1a92053ddbd2a67b864f2a
+EBUILD pecl-rrd-2.0.1-r3.ebuild 1615 BLAKE2B bc514bf53d9e03ac778a5a91151ca70bf501d671f9de82b4a0f8623a4106df22d549855f7607b15b305a36ced11553b89cff32da206c06bcd2191dd5c4dea437 SHA512 3176ee9520fd9fa7c5748c2dc3c2920ba2ac2a87b303a6cc79e9ae65cd14fd55039201baeb13a08479f06db1cacef9e2bc2718814911b7e1691396b978ae9905
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild
index 19278bc6f6d8..16e4bc484026 100644
--- a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild
+++ b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild
@@ -4,12 +4,12 @@
 EAPI="7"
 
 # Define 5.6 here to have the {I,REQUIRED_}USE generated
-USE_PHP="php5-6 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
 # But we really only build 7.0
-USE_PHP="php7-1 php7-2 php7-3"
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 DESCRIPTION="RRDtool bindings for PHP"
 LICENSE="BSD"
@@ -20,11 +20,12 @@ DEPEND="
 	php_targets_php7-1? ( net-analyzer/rrdtool[graph] )
 	php_targets_php7-2? ( net-analyzer/rrdtool[graph] )
 	php_targets_php7-3? ( net-analyzer/rrdtool[graph] )
+	php_targets_php7-4? ( net-analyzer/rrdtool[graph] )
 "
 RDEPEND="${DEPEND} php_targets_php5-6? ( ${CATEGORY}/${PN}:0 )"
 
 src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
 		php-ext-source-r3_src_prepare
 	else
 		default
@@ -32,21 +33,21 @@ src_prepare() {
 }
 
 src_configure() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-3 || use php_targets_php7-4 ; then
 		local PHP_EXT_ECONF_ARGS=()
 		php-ext-source-r3_src_configure
 	fi
 }
 
 src_install() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-3 || use php_targets_php7-4 ; then
 		php-ext-pecl-r3_src_install
 	fi
 }
 
 src_test() {
 	local slot
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-3 || use php_targets_php7-4 ; then
 		for slot in $(php_get_slots); do
 			php_init_slot_env "${slot}"
 			# Prepare test data
diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index da308b37c3b5..c65cea74566f 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1,10 +1,11 @@
 AUX 0.13-parse_url-fix.patch 1777 BLAKE2B db7f6bd23cbe6552fce870044b1839eadba5c9089ffee2da52c1c998856083636c221d7386f52ba689f9796807e2abce447541dfb247c6d20f7898254e0f0dc7 SHA512 9628c0cd1d09d64be3824485ec54ad9bb477a18b9178a120b8fc17ca5e5f2055d23019495741d7e85841f9e0b5f7dc991fb14ead04cc60f95127099e3e5fb205
 AUX pecl-ssh2-1.1.2-fix-php7-port.patch 27860 BLAKE2B 23054187608bdcf79f53ce638e37c646f44297aa7d1e8f7a7c85fd922977ab835b915d541fbae327a30d2e863b503ed4822a82c1b242346290ceb94d49c97020 SHA512 1c2ecc990323a77fb2b69be0d6649f96dd7ad2d06c62f4fcb79a9ef4f89e066d463301668a044d37d717c99837c5d7d3f621f61119543445bd05c3229d9270e9
 AUX pecl-ssh2-1.1.2-fix-php_url-fields-usage-for-php7-3.patch 11461 BLAKE2B 62b07aa1c70c14ed3a1bebb633c47a39f39be120df29ad85e6abacd276fef214cfd85ec07d8504b51c423cc7971fe4eb293e9fb6c8423a3505323f6535a01655 SHA512 86f460c280a83718e195bb255ef686a3632e98ab598ebcb7fa05b5e5727800729c91de9efd60dc19884f015c06d0a7675beecc296d259f493b2f697aaf143e34
+DIST pecl-ssh2-1.2.tar.gz 32447 BLAKE2B 3a9d0f205097a381d07fb9dd5ab4dcb8e361f555dbc633abb8fa895c83024b70e85cd87602da1ceeb1018a7b07c474720b02810ef0689e9294fc33b129b6c738 SHA512 7b7d311cd5f88835e124d70a0295468f75d0fa6936a58808c936d1a185bb630b9e02c21f49b4bd777194a7b104aa3ff85c4fbf480f43d5906787e532ba2d3e04
 DIST ssh2-0.13.tgz 28984 BLAKE2B 3c18cb7aba146801325eeaca3ffb6e3780675a7ce6d78aea5fbc16f75662284f7773de2161789f68af0b5499e9cb813f4046d674758c138849eb6735344249f9 SHA512 c031e22853bf5cf8ee59dc5b99d9e7e60af1507a22e7d0a9e2f54b8f1758a03a6cea91c539e0f667d48ec66185fdc8a28c47e5a1e10a72220c0cb16b3948e1d0
 DIST ssh2-1.1.2.tgz 32057 BLAKE2B 88ffb3fb608687a086bbe345677982e944210791acc100312ba56ac7c35188a52cde5529d78caf473d19710e9965fba853ea9ff046715413a0b488ae2d8b690c SHA512 36793191448745b8a9b3cc628fe9fb431480792c7a2ff0bf2eccd58cda1cf944933be1d301c455d4a6f3dabf7e04ffef248bc402a8ff99bfafcba0deddb25c36
 EBUILD pecl-ssh2-0.13-r3.ebuild 707 BLAKE2B 9a32418bac7fd95bbc56f316ff4b8a09f61aa009bc5ce6262b52224672ef2ec6ccef102e1fa6ca15982c736ac1640b57c912d33e555e71f4eeafc17b1e002b5b SHA512 05ee3824bb54b54940f982d4b96bfb9ceb546f40b55067bfb1df24123c662786f87faf12905b58cc24188160f0af4f06e0c150a6c32f5e0b93f1343ea64b179a
 EBUILD pecl-ssh2-1.1.2.ebuild 807 BLAKE2B cf68352b3b686837294c7996b0684b27e640f1b24eab513de1134fef0a8597db65a9ccb8867a8e245a75b8a5825bbf0570343532d06e1f2cd9cc07eecf9da99b SHA512 1fe74ed851795f46ae3832ff2b54005846d9c33df6d38946414e82c6f2136854167c005931b030ab6f825494d5c4322b41c2be87da80afa387422e5a26268030
-EBUILD pecl-ssh2-1.2.ebuild 743 BLAKE2B 88db431941cd00131aa45ff2ef274bf44eea972fb4ddc1ef215b3dd74dd7980782bbe5373e34da5cacc777586bf25eefc60caa013ef59b59f0111d207fc113b8 SHA512 d118bcd807d2dffda9bd29bc021d9357d4d2c0b6ade7c05b9e2e0e18ae8048b36cf8c7061222b2d113a3ed7cc7fe078d998232ce53067418cbf8e8006579bfa0
-EBUILD pecl-ssh2-9999.ebuild 743 BLAKE2B 88db431941cd00131aa45ff2ef274bf44eea972fb4ddc1ef215b3dd74dd7980782bbe5373e34da5cacc777586bf25eefc60caa013ef59b59f0111d207fc113b8 SHA512 d118bcd807d2dffda9bd29bc021d9357d4d2c0b6ade7c05b9e2e0e18ae8048b36cf8c7061222b2d113a3ed7cc7fe078d998232ce53067418cbf8e8006579bfa0
+EBUILD pecl-ssh2-1.2.ebuild 866 BLAKE2B caa168d611c4ce00afee58568ef3ae39a19e81b978f9c49d9eab58b300ce30b97650bc88145a4b4dd1e532de6a4078b2e53d785519ec054f731a28453ce864da SHA512 0e873df6151fcbd7892b85ed8681c1a5da398e5fe5a11e9bf5b179046aeaa5195efb72cdc320656c80b4e82826020a0c5d8829d26bf851c3522177d904c194c8
+EBUILD pecl-ssh2-9999.ebuild 783 BLAKE2B 4b0805ec28107e36cba7eb053689f6de71833c758ab6a78720278afc38c8cb3543ecd8bc435c05457f8132f398007494b6a16558b366be4f9c09452abae7dc85 SHA512 757eb022b349365c2ec42deb098f0d24cb90c8a6bd3698becbc5637279e2da05c2962cfdc01b7bf9abe6f42caa357b98003155f670e77b357f393ee13e8ecebb
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild
index 72ef46fdff15..ffc132c93745 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild
@@ -5,25 +5,27 @@ EAPI="7"
 
 PHP_EXT_NAME="ssh2"
 
-USE_PHP="php5-6 php7-1 php7-2 php7-3"
-EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git"
+USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
 
-inherit php-ext-source-r3 git-r3
+inherit php-ext-pecl-r3
 
-USE_PHP="php7-1 php7-2 php7-3"
+# https://pecl.php.net/get/ssh2-1.2.tgz isn't work for some weeks
+SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.gz"
+
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="7"
 IUSE=""
-KEYWORDS=""
-DEPEND=">=net-libs/libssh2-1.2"
+KEYWORDS="~amd64 ~x86"
+# Upstream notes say there are errors with gcrypt backend
+DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
 RDEPEND="${DEPEND}
 	php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )"
-HOMEPAGE="https://pecl.php.net/package/ssh2"
 
 src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
 		php-ext-source-r3_src_prepare
 	else
 		default_src_prepare
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
index 72ef46fdff15..583c2bfcf037 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
@@ -5,12 +5,12 @@ EAPI="7"
 
 PHP_EXT_NAME="ssh2"
 
-USE_PHP="php5-6 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
 EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git"
 
 inherit php-ext-source-r3 git-r3
 
-USE_PHP="php7-1 php7-2 php7-3"
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
 HOMEPAGE="https://pecl.php.net/package/ssh2"
 
 src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
 		php-ext-source-r3_src_prepare
 	else
 		default_src_prepare
diff --git a/dev-php/pecl-stomp/Manifest b/dev-php/pecl-stomp/Manifest
index 28067424e938..0f050260c302 100644
--- a/dev-php/pecl-stomp/Manifest
+++ b/dev-php/pecl-stomp/Manifest
@@ -1,5 +1,5 @@
 DIST stomp-1.0.9.tgz 23166 BLAKE2B 804fbe2703f5035a8faa744cddc84de5249b74186c22ab5e26c075a2f241262cadd237c7f566262fcdc25def846968a7788d80817743cdf53eb255cbc25053e1 SHA512 e3ab5bfb03c29edde63de4006b448e0204efbac5817b1443ee5b1a0249c2f96d58443847b878e838108b66e5307f6e803f807aff7430af748af4994bfca5199a
 DIST stomp-2.0.2.tgz 23609 BLAKE2B b6ed89b5b8fd0bb501b2337e87107797eedc6ac53c81ba86d2e755cfa2dd716bf4e409cee623430791e0b4854833ef44ed7f6f9e1d89fcd2250d598af0dcaea6 SHA512 577a781b45ef394cd833fb69c808da9b8a8ff69b31b1093c5eef3f7b5d1b37cd0b45c32a03883f56f86213e32bb18aaf0a80010c6bec7efa7239ea48bc57b4b4
 EBUILD pecl-stomp-1.0.9-r1.ebuild 1005 BLAKE2B 98473ef5890ecf1951761b121bdc00f8358715c6de68775d46aa06216b34a49cef4803557d8a9e809fb04ccc94a30c27479d4e63743e17632a6a5a06a0a1ab1c SHA512 d25c2a4227b7e5276f0f57d3083e534dd39eba1fe32bf6e977ec4fd8ba9daa2240c4340135023a911d72d2077d0b6f17614719edb81ac86bd7687294ec2bd386
-EBUILD pecl-stomp-2.0.2.ebuild 1231 BLAKE2B 6a2e3ba8f0754c42516595abe56a7999f8335c1bc0a6b7b8cbb74056b630568963c08368489e996a5d27a8d7b834feed7570e6f9ed437e5246b3746cb26c68df SHA512 1eb0349aaf228a9ac60a5613f6b5fdc50da45338f0cd125b91f8a27f5f0625ebb826908bb5cd84d36f9331cda2a7a443814f1569054bbda971bf46376e5fde8c
+EBUILD pecl-stomp-2.0.2.ebuild 1258 BLAKE2B f6fbfb7f5ef066b69880e44714c575bbf05740b7e9442f37b8e95729cb7d1a50fd47df7197ed89c5c9f348a89a4737ce9d7be9f7c5b5af1fbf8898d6f3c0c846 SHA512 867ff41dff254251b76f892f3d3826fe5301a2fe3e06fe1f9da38eb915379891168d6a6692fef26dad47aeafd18283f36e0160f6d2905a5e4d7c483b59e9c4af
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-stomp/pecl-stomp-2.0.2.ebuild b/dev-php/pecl-stomp/pecl-stomp-2.0.2.ebuild
index 99522e6709c5..b4813f56c437 100644
--- a/dev-php/pecl-stomp/pecl-stomp-2.0.2.ebuild
+++ b/dev-php/pecl-stomp/pecl-stomp-2.0.2.ebuild
@@ -17,6 +17,7 @@ DESCRIPTION="PHP extension to communicate with Stomp message brokers"
 LICENSE="PHP-3.01"
 SLOT="7"
 IUSE="examples ssl test"
+RESTRICT="!test? ( test )"
 
 DEPEND="${DEPEND}
 	php_targets_php7-1? ( dev-lang/php:7.1[ssl?] )
diff --git a/dev-php/pecl-taint/Manifest b/dev-php/pecl-taint/Manifest
index 11687b25aa69..318ef6ce3429 100644
--- a/dev-php/pecl-taint/Manifest
+++ b/dev-php/pecl-taint/Manifest
@@ -1,7 +1,3 @@
-DIST taint-2.0.2.tgz 18550 BLAKE2B 70bd0425ab179c5313108a363b24310ed0c438a208ec15158d8c760cc8e2514b1031554827ced569c71cdb5109634463f75ca583fcc5cad56946947ab569fe25 SHA512 fe1375062f716a32b093942d173cf78024ed457fb5980ec8b50852ca922d8e15ec82696be2478cbbf8b9cd0620be0c2f88b18de55dec4dacec5be664b95c7108
-DIST taint-2.0.4.tgz 18063 BLAKE2B 1ef1d44cc3dac5e25aeeac86b04d491e050174ed9ced1424729b29531917baf0776c8a6d78bc2d7b42bc768ba6744833d08c8df525d5fdd962b590b2d4c2a009 SHA512 d1c265e0fa4293b2aeb0f7413b852e85c6c321c67e31ff8fd51afefd157af4b733dfdf1452f50bcf3b05c1b5f26de9ebabe4ebe862657a05c4b6abc6770c2c7f
 DIST taint-2.0.5.tgz 18203 BLAKE2B 1e7d31f5a4eee810923420606892f2cd672d4fdcaf6decda1966d0ad44f779cf019a624c0f5971a44e8ceadf37159359f41ff52f523157eace26d7335405bad6 SHA512 625809e553d782dc6bb41b4dace1a32bf47157e3438430b3717e0ca692959625b293011220e47f95f4b484558e39454138b0760806fcd1e4ae42f608ab290b31
-EBUILD pecl-taint-2.0.2.ebuild 425 BLAKE2B 229e8816bd226a259ca73d97a3796cb5f1217fe059333dd47bf961bae498582d04ec1888895610fda229513b8e02f373b36e752330838f0c098ef6ec67e87d83 SHA512 bc62f5828f98be1bbfad72e58aac0a7d6f12bb21fd632b684841231879b0726db19d47cc9d488318e13ffa035863915d5e743976ec7404c54496d5f83988b0b9
-EBUILD pecl-taint-2.0.4.ebuild 432 BLAKE2B 3af9a1e629f986dc10764a5fb1c39cc41862c2998fd88ca51009adf0978f6a26d6343bd1abc8081d487398e1e31172dc238451bc592762900744ec155b61086a SHA512 50d97b6e65260e210bc457a668d9a25766d3496591ca4456fddb87a97e09669d7459c1bbc51043aadc58940feea221383b2ea06a039f4d1d045e33ac5ae51768
 EBUILD pecl-taint-2.0.5.ebuild 431 BLAKE2B 9bbaa821a7f976b4548bd2f516b6fd948e2a7e96baf33dd8344a36e69ff677ade9ae050accfbd339d190dd58e956d9e2f26045c2c304ee13071ddaa26912b97c SHA512 beb8c6819462f93efa3a22931f18ac128ef3fcbd6f33bf0d69d4236b74b2b019a6ac978f0b2bb7d2e5e906830f7ebb5ba76bba2e56fb3325213f1fd52259f898
 MISC metadata.xml 345 BLAKE2B 1bce954b00c4fe92867211caee4fc891eee89ebea7550eef40e775794fd13b285f3b00e1ad25f5b8c967b946bf3545a661053068a2c077e8051bd30915b55049 SHA512 f6c8ba5b96f05f24c3e2b7245fc72b9ee34ddc61a335081cf50d4e0f9915d3891599ff9e086d52f7d19a44c633d9a880941d8a18c5a583659c410de2086b6717
diff --git a/dev-php/pecl-taint/pecl-taint-2.0.2.ebuild b/dev-php/pecl-taint/pecl-taint-2.0.2.ebuild
deleted file mode 100644
index 281e7a24dfb8..000000000000
--- a/dev-php/pecl-taint/pecl-taint-2.0.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_PHP="php7-0 php7-1"
-inherit php-ext-pecl-r3
-
-DESCRIPTION="Extension used for detecting XSS code (tainted strings)"
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-pkg_postinst() {
-	elog 'To enable this extension, add'
-	elog '  taint.enable=1'
-	elog 'to /etc/php/<sapi>-<slot>/ext/taint.ini'
-}
diff --git a/dev-php/pecl-taint/pecl-taint-2.0.4.ebuild b/dev-php/pecl-taint/pecl-taint-2.0.4.ebuild
deleted file mode 100644
index d040e2ceac50..000000000000
--- a/dev-php/pecl-taint/pecl-taint-2.0.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_PHP="php7-0 php7-1 php7-2"
-inherit php-ext-pecl-r3
-
-DESCRIPTION="Extension used for detecting XSS code (tainted strings)"
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-pkg_postinst() {
-	elog 'To enable this extension, add'
-	elog '  taint.enable=1'
-	elog 'to /etc/php/<sapi>-<slot>/ext/taint.ini'
-}
diff --git a/dev-php/pecl-timezonedb/Manifest b/dev-php/pecl-timezonedb/Manifest
index 8e5022689f7e..faaf6a5cd9dd 100644
--- a/dev-php/pecl-timezonedb/Manifest
+++ b/dev-php/pecl-timezonedb/Manifest
@@ -1,3 +1,3 @@
 DIST timezonedb-2019.3.tgz 413166 BLAKE2B 99542a2c0dc50d96316dc14b22c8a2404db07a88d3f46050a954f10bfb501cd81fb7161805a91336075d607ac106208285e6d2281a9ed68b344fd4837fabcb49 SHA512 8342a0ed83a52ade0415430751d4efeaa84fb72e7da3aec8921338e9dfbf37ff1f098f6b6e1ed9c8f1c9c62017a0fe9c14f86a53be72f8b9f1ec137fa45d057d
-EBUILD pecl-timezonedb-2019.3.ebuild 454 BLAKE2B c3ebd7cd1f0299aacf633f08b6dc6364161f0f24307815833c92facba41b24c9969b93512c67cb5d5467ed16016a734c5e32a70bb6c80fbd9a610e6e9becff5e SHA512 b05fe3563b0cdaaf875a8671dcce9289c96254ecf8e443b49aef93f1c7b03d18a7c5664f46a7a07e632224b7a33af29f6f4d7c702e9e07f87e9e0ebebd8fe913
+EBUILD pecl-timezonedb-2019.3.ebuild 461 BLAKE2B 4b7f7c5c3798ed0848f27b86896fba98241c0cc89606c5eeb990d4c73a4b321d40f6c7c05b903857416168d749eced8dfabf194e30716f598a8bd68b208345b4 SHA512 b6d09de437db07580eb2ef534ac9562bc4c4cdd098c318e06095225f942f95e2c0714c5a6399a2748846ff7860a4a6db847838fb1b8cd59542eca5c781d4932f
 MISC metadata.xml 635 BLAKE2B 9c3fa685e184fdb85fd630b9bbbd69bfc20569455f1fa84f147b2d2404739077f5bffbe2c4e5d1a1ff28a9f2ec36bb04d7d55952c7cee4cc5ee3dbc1b11bbc40 SHA512 3b06142a7f995b5859650fa156973deb5cf783be8ee123dc2820f1c4a0d8588d6c73a739a3fe547a3b450ee544a0a69abd260c44d53c87ba0c9911cd68e539dc
diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2019.3.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2019.3.ebuild
index 415e14ad0f0c..94ab6de33e60 100644
--- a/dev-php/pecl-timezonedb/pecl-timezonedb-2019.3.ebuild
+++ b/dev-php/pecl-timezonedb/pecl-timezonedb-2019.3.ebuild
@@ -7,7 +7,7 @@ PHP_EXT_NAME="timezonedb"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php5-6 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-translit/Manifest b/dev-php/pecl-translit/Manifest
index 82bb7c1e3b03..f4713dea15ea 100644
--- a/dev-php/pecl-translit/Manifest
+++ b/dev-php/pecl-translit/Manifest
@@ -1,5 +1,5 @@
 DIST pecl-translit-0.6.2.tar.gz 226445 BLAKE2B c5fbf99134b7f933f1d8209ebffa97a28c927b8db917319a9308debfa4275d8e6e3e0c261cfb0661c8202f25c0cdf5a888bc90f356cd80a2ab788366c4c3cb85 SHA512 1d5229ceb2c06f5e4a9e3f7e1e760fc2974c01b732f8e220b9b1ddd49a82c932f4237fb6a19c82017270614881156f9637cffbe7896132e4a07e7a6547915ebb
 DIST pecl-translit-0.6.3.tar.gz 227419 BLAKE2B ebff291a00d61bb4f8e2c47e26baef4278f317be8acd7e5265d3056f8992e6b7e792718c86633277c4a0af5403e253b317241a71aba9b73079a8efb53389ab30 SHA512 5b5e3097a972e45424696abea4d4698fc6c7b6598f1a76754224a4b66776752a01b3bad52bc14afb8cc6e75d36c4558677e609a379898cdd91a5b0a652155cd1
-EBUILD pecl-translit-0.6.2-r2.ebuild 774 BLAKE2B 0721d8d612cf3326fc3975cb350bfcf435eaab1d5c2154c006e3b9db70a419017040a5dbf816400a7ce5cef9880e1b019bccd1ea3a5fdf00ff6d431aab73ab2a SHA512 a59ef148f8a099b043df99d0fedad0a8f2e5eb5d560a722165365c92366d0eff71724e1e7b67ee0fbe71571a4e5bdd1a24abda69c8456cc1312f4f3f0c5cea7f
-EBUILD pecl-translit-0.6.3.ebuild 697 BLAKE2B b6026afc2fde1479aa86e8802579e8c77410c9068c050c0368a02749cc93dd87b9b2509671ef17e514231f31663f04f5ae82e06e89e8e5972125f26c32ed9271 SHA512 6e7559b18f73e91a485cc06280ea98f4b00809be26300c09f19e95e311ece8c9041b615b39e23739fe0c63ccb48f8592bb226a88eec1b66b9ad3b6cc8454da46
+EBUILD pecl-translit-0.6.2-r2.ebuild 730 BLAKE2B 123038c06cb654fc338f911b3b810ca54a193760e3f4dd7a1b9bbbc409be466eb9a530ae4cffef615362e92c77e1c957002fed6ac14c956a739a6445be193416 SHA512 81395e0a3c788ababbc5ceb1fe454b749dde74968a3aa25da333b4f07e8dcff3011c19b9ebaced2f8d4d5a2cf0ce3bcbecec7ef1a51a1e6321738ae6877600ba
+EBUILD pecl-translit-0.6.3.ebuild 660 BLAKE2B 025a34d8f2f676e5bc0141d34f8a466af159b491d97112e404f7fbb1b186b7fed1531e462b3bdadfd4b52e0a704ded5e6208e27cc5fc4109ac89654ebae298a5 SHA512 735fb8350f7dbbddd1fac5f5cd7a1204d276042901c2c9b502b1357055afec113b75b72c92bc884ebf7b54773d87eb5f98645dba5ce1416635658052b4ff8f1c
 MISC metadata.xml 325 BLAKE2B a089699f9d6ab5df97554c8ff39057077aa28eb48f636adf1d2f85eafb3a4952d7c1dc5b86e1bf1e147bf020ed27119a3567c23b7fcd562ca44966970addbbc5 SHA512 b81117beceea889e292daa2bfad712b51f40a2e12e826388bc0d0f2ae2455dacbcdb4a041fdc72bdbfcc123af11c87346643fd0298b0c2bc726c13ede3a2ea5e
diff --git a/dev-php/pecl-translit/pecl-translit-0.6.2-r2.ebuild b/dev-php/pecl-translit/pecl-translit-0.6.2-r2.ebuild
index 82fd86110534..f97d236b0bc0 100644
--- a/dev-php/pecl-translit/pecl-translit-0.6.2-r2.ebuild
+++ b/dev-php/pecl-translit/pecl-translit-0.6.2-r2.ebuild
@@ -28,6 +28,6 @@ PHP_EXT_ECONF_ARGS=()
 src_test() {
 	for slot in $(php_get_slots); do
 		php_init_slot_env ${slot}
-		NO_INTERACTION="yes" emake test || die "emake test failed for slot ${slot}"
+		NO_INTERACTION="yes" emake test
 	done
 }
diff --git a/dev-php/pecl-translit/pecl-translit-0.6.3.ebuild b/dev-php/pecl-translit/pecl-translit-0.6.3.ebuild
index b0b109824d15..767d97480c0e 100644
--- a/dev-php/pecl-translit/pecl-translit-0.6.3.ebuild
+++ b/dev-php/pecl-translit/pecl-translit-0.6.3.ebuild
@@ -7,7 +7,7 @@ PHP_EXT_NAME="translit"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php7-1 php7-2 php7-3"
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
 PHP_EXT_NAME="translit"
 
 inherit php-ext-source-r3
@@ -25,6 +25,6 @@ PHP_EXT_ECONF_ARGS=()
 src_test() {
 	for slot in $(php_get_slots); do
 		php_init_slot_env ${slot}
-		NO_INTERACTION="yes" emake test || die "emake test failed for slot ${slot}"
+		NO_INTERACTION="yes" emake test
 	done
 }
diff --git a/dev-php/pecl-uploadprogress/Manifest b/dev-php/pecl-uploadprogress/Manifest
index f37a865017aa..3d3fb0853226 100644
--- a/dev-php/pecl-uploadprogress/Manifest
+++ b/dev-php/pecl-uploadprogress/Manifest
@@ -1,4 +1,4 @@
 AUX 1.0.3.1-php7.patch 4948 BLAKE2B 12ee139944a17989429e696e7457a3926d18f4300bf5bc2f9bfab2a036be88a47ea03ca64f06e378bb2811fdaba390e29a905eae87362c4a979c17407de53f3c SHA512 5b913ac4c006cee917ddb7140dd2e34dee6da9fac11001e6ee9f41ac0b65e3caa493c81612b05ef8ff99fec9c9a4cd4a2c2c275fc6124223d04648d43cae4fe4
 DIST uploadprogress-1.0.3.1.tgz 9040 BLAKE2B b926ee0cc7d40276425ea8eed86c5934c35ff2436b5785888394927a145620caa335d4eae87fd85bd754f8a67c1562f3b8d23a2c626f0d0ca4bed4bf4872e465 SHA512 c317a30ed81430184b643e2755867cdccf9848312aa31a5527e4fe229ac19ee3099121de8e253207b55dd7e788c28720bd3c477663c4ca15100478647a6dc1bb
-EBUILD pecl-uploadprogress-1.0.3.1-r4.ebuild 567 BLAKE2B c9b42950b4ba8007c3ac5bbcc0ea4cac02a5a15cf36184eb4cf4d223af6ed160a33c1322d9e17fcc00840fa6609daeeff51de5219473b7fcd2d1f009c939cb0b SHA512 67bc7efe35098a542f2728010bb814540a4652377346ea164079b880726bc5a3807b6f1fd73968d5ff216c3be51e4e00e989fad785ad0feb7b66792a5716005c
+EBUILD pecl-uploadprogress-1.0.3.1-r4.ebuild 676 BLAKE2B f8e74b00e3aa1b6358b9cb390e828b584dc15cd6fadf46700811f52be62629b5647d74a29b968cddc24ad61b741f294cbfd7c942083c7e7c6ebe3b6826be74a5 SHA512 a2989c7597e2a522dc3f2e813c383f3bd9f59a8a9a0baed0baabc422b6d53fc53fe17e1c41228daf812e4546666a59a08183e823b25f915049d89fb16cf8c75c
 MISC metadata.xml 526 BLAKE2B 719015d4f11e9af4765f71ca1b8706fdf93c214ac7390f72579068151adebe0c39a29019201323aff6668ca2c7b31daeab247a867262138358a29034238a875a SHA512 18d72c569825f9dfd79a69d4ad1bc824f99001f2b1545aaaf6777a67050d9812dd81737c9e74bc9520aa5b375db4d94c5219f359eeaa5c8d7ae0a6437c96ec56
diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r4.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r4.ebuild
index 2567eab87ec1..a11f8d2eeeac 100644
--- a/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r4.ebuild
+++ b/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
@@ -18,5 +18,7 @@ RDEPEND="
 	php_targets_php7-0? ( dev-lang/php:7.0[apache2] )
 	php_targets_php7-1? ( dev-lang/php:7.1[apache2] )
 	php_targets_php7-2? ( dev-lang/php:7.2[apache2] )
+	php_targets_php7-3? ( dev-lang/php:7.3[apache2] )
+	php_targets_php7-4? ( dev-lang/php:7.4[apache2] )
 "
 PATCHES=( "${FILESDIR}/1.0.3.1-php7.patch" )
diff --git a/dev-php/pecl-uuid/Manifest b/dev-php/pecl-uuid/Manifest
index bafe51b01887..da47287f98ac 100644
--- a/dev-php/pecl-uuid/Manifest
+++ b/dev-php/pecl-uuid/Manifest
@@ -1,3 +1,3 @@
 DIST uuid-1.0.4.tgz 14900 BLAKE2B d653329fbac1bec66d842e048b290ac6b0382f78e6ccd6f2158bafaaa375ae4e951f794d4b70c139b23a28d6ddbc1f44be47cf2af0bd2fd09de33beb17b0f837 SHA512 989d993f8158a13026b8e5c02f4aa50489b1a946d12da81dd1fff6091839a45b180562f74c8af368a498c495477374ec9e1d536e7de0178c1f288e3abe360164
-EBUILD pecl-uuid-1.0.4-r2.ebuild 429 BLAKE2B f3b29ba51fbab965afb4d1116a2f232428e2646c78c239cabdef25a3ac5a65052a19a1f887de02f21e49ab08425f740b902f0f35f0d4124e5c5a4d8fc0506f3c SHA512 36c1dec21c6709ba2ad8a73b54d3a6bdd5464150eac9b5c44c74cfef9f486f47cb6f98ff10613a4be603c641416719544df677ef398eb1ae9f0d1f6f1ff8f4df
-MISC metadata.xml 362 BLAKE2B 013c34069d2045f4a178b6f9bfbb4eed8ce99d7a9776ab75fc6004827108079a9ee7f844d49df36459118b3c3179d19b0f97073ce4bcfdbbb2384759d01de4fa SHA512 05766bb146f375f58fbb7d3fa384e7da07be02502f3958fc0141e7e4da622d59212af71a8fd89c24304e8b2c2ce517b51851875e5d58b9a080dab4a3a002a873
+EBUILD pecl-uuid-1.0.4-r2.ebuild 436 BLAKE2B 717097531095519f887f0e4b69a5e6ef160f93534247f0d4772dfd3dac4010ad89ba56f14ca3adb82d02f8222a3b094c90e477e90cdb22d352e1de82b00db9ab SHA512 fc172fe056960e705eb50280391ff01511a5dbd3d637ec78683166913af03cfff67fc6815e3773212c1a2f1afd63b2bc6acdcbb9e0b06ec5c778f5f4e51caf59
+MISC metadata.xml 245 BLAKE2B 7d88a41bb224d6e6c8bc6ed766d24c4141ff7079307fc4e2dadd0d2300b565f5d8332f5a61ad49896af208f136f102bbfedb7b1f61241a82f21cbb6b0d9cc7e9 SHA512 81a613ac5d1bbcb88aad55e16c2b878dcc3a985a8c0d3b802a302067d94c3f878fa8b10aa4804a799a4180464b523eac2ee1bd6547d8baca8647e1e5cce38897
diff --git a/dev-php/pecl-uuid/metadata.xml b/dev-php/pecl-uuid/metadata.xml
index ffeb9c617b08..04d9b1663bd1 100644
--- a/dev-php/pecl-uuid/metadata.xml
+++ b/dev-php/pecl-uuid/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>dev-zero@gentoo.org</email>
-    <name>Tiziano Müller</name>
-  </maintainer>
   <maintainer type="project">
     <email>php-bugs@gentoo.org</email>
     <name>PHP</name>
diff --git a/dev-php/pecl-uuid/pecl-uuid-1.0.4-r2.ebuild b/dev-php/pecl-uuid/pecl-uuid-1.0.4-r2.ebuild
index 9a414430df37..30a210cc37e1 100644
--- a/dev-php/pecl-uuid/pecl-uuid-1.0.4-r2.ebuild
+++ b/dev-php/pecl-uuid/pecl-uuid-1.0.4-r2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 PHP_EXT_NAME="uuid"
 PHP_EXT_INIT="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( CREDITS )
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-xdiff/Manifest b/dev-php/pecl-xdiff/Manifest
index 474795e38dbb..8893064920c3 100644
--- a/dev-php/pecl-xdiff/Manifest
+++ b/dev-php/pecl-xdiff/Manifest
@@ -1,5 +1,5 @@
 DIST xdiff-1.5.2.tgz 9275 BLAKE2B c22ab9e6263392251f6465e2f7583da0f6b5de430ba82b7e3df1949b77b727c01e84e6d405bc09f931e14094f72d915f47002014e8a1c3d6790a7eda821c3548 SHA512 738d9624155b6d77b01fdef59eb0d34de6b4a8f757d2c0ccb6dd0140d021b6c88388312d6a43197dc5c24f8e643069c3a265fc0d17246e25e8104b00facf2dd0
 DIST xdiff-2.0.1.tgz 10418 BLAKE2B d80afd629db788343e5804925fb8a9971cb0df2db6462be5adcace7e15e9b7fb2bf52cbb49f900878659fcf5e91c69b721c01e01f04876e8245ecc8094f0be61 SHA512 43f2bddac82ac19ac688ae7dad3fef65b0d8887c0e6adefd1fc15236582c31d78a54538903760270dee294ca8b8ba3def48bfa9b1d44160bcc450f5c6516402a
 EBUILD pecl-xdiff-1.5.2-r5.ebuild 897 BLAKE2B 9d8ae6c86f8dbb6dc016f803011cd6040203dff50243b9db5319a15f0081c27d4770a7a4c35ad6b248aa98050a649669d90db00c178d4e90eb4cfb8e57038e3e SHA512 0c51ffd14bf599e5d28857597044977acbec8bcc06b9b94fa16a1519a58368534df40b6a77c40b4d6f793ee7a5b3c878a59e9c98cd335c3a2dae4753828684a5
-EBUILD pecl-xdiff-2.0.1-r2.ebuild 1218 BLAKE2B 8f94fd817877faee6a5c3293c14679936c10b5a414a414857479298178a95fa085c30def9f79c1f37ed371b0b8b683bb7a3412741b10e5ef083cab6cc1ea3d46 SHA512 7daae986a6e22de05bf3737d38e1936f2c7064d3e9c893c4810eddbb0bfe8a53ba923ce7cef63fe2c9c2196d30f15b375fd7510d8edfe640464929853cde4d71
+EBUILD pecl-xdiff-2.0.1-r2.ebuild 1353 BLAKE2B 69ff93c8d5a6c6feb884bba0bd243c134073b70743954e590f320c9324bca85a90ed80497870ae83354451dd14d82e390d5ab9ef1b012690b9598315a843458f SHA512 b5c3b774e12f546bbde22a632404788d7ce3c1c321b1c35e175ba4d48bbbe0179b1efb283d8166318d7015ff3128da680f8667a6c0cdc2edee59533cca4bb5e3
 MISC metadata.xml 333 BLAKE2B dd00945bd203358c600ca21b80034f9d42bf71a8ecc2fdef73bcd871a87addd962e82357f274e35bbc31bc3debf329283adff20870f56f54116800df5d6ca7d4 SHA512 c91d330b2363fbc4286bd17dfdf5883e1cb3c111a68c0f7cf795967775b4a45a00907c7c85a8ff70f59d379c7ccd2d4ad909235e0b4ace619602cc068e99a599
diff --git a/dev-php/pecl-xdiff/pecl-xdiff-2.0.1-r2.ebuild b/dev-php/pecl-xdiff/pecl-xdiff-2.0.1-r2.ebuild
index f8bd2e2c845c..4acbe27c4126 100644
--- a/dev-php/pecl-xdiff/pecl-xdiff-2.0.1-r2.ebuild
+++ b/dev-php/pecl-xdiff/pecl-xdiff-2.0.1-r2.ebuild
@@ -7,11 +7,11 @@ PHP_EXT_NAME="xdiff"
 PHP_EXT_PECL_PKG="xdiff"
 DOCS=( README.API )
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
-USE_PHP="php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php7-0 php7-1 php7-2 php7-3 php7-4"
 
 KEYWORDS="~amd64 ~x86"
 
@@ -24,11 +24,12 @@ DEPEND="
 	php_targets_php7-1? ( dev-libs/libxdiff )
 	php_targets_php7-2? ( dev-libs/libxdiff )
 	php_targets_php7-3? ( dev-libs/libxdiff )
+	php_targets_php7-4? ( dev-libs/libxdiff )
 "
 RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-xdiff:0[php_targets_php5-6] )"
 
 src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	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
@@ -36,14 +37,14 @@ src_prepare() {
 }
 
 src_configure() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	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 ; then
+	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/Manifest b/dev-php/pecl-yaml/Manifest
index 1b4575db3b75..6981f791cc87 100644
--- a/dev-php/pecl-yaml/Manifest
+++ b/dev-php/pecl-yaml/Manifest
@@ -1,5 +1,5 @@
 DIST yaml-1.3.2.tgz 37354 BLAKE2B a8124b0b24ba0686e028b27d9659f7c273435861cba23da321a650813aca28394659fe3083ae08f992f9813912352d0f198d3348dded58a465275b7de4c227d6 SHA512 d1761ebda34b48894a50b831969c928d8a1d3a8577c5213bea92a3de97ec4cf908ffabcc269b2cafae29e49143b8403c3b370c3bfc6d20548c4093a3cb132263
 DIST yaml-2.0.4.tgz 39071 BLAKE2B 3a5dba0f6a16087909f4673543d64946e5929a5ef4cc616df6a4225aa2d274b2b5492b00ab0e95ed93f808bc2a4dd0a2f6d60c8c2ded078af35c4499042488d6 SHA512 138e5b4566800fc7d624baf71bc585d6d432755046e598ae9f4099fa565727e04d79bb171289a53eb9e5daa416ffee1b0fb4967c84976ac6cd6fc01b0a05fbae
 EBUILD pecl-yaml-1.3.2.ebuild 1079 BLAKE2B bfa33f6a71df2226587f23f74d43fd0ad2e2c79acc027642638ef317fc692ad890d1cd3524b60010f45b0d754652d7f7a4481dc877d249d689905193faf45866 SHA512 0893605cbe310d653076b0139daafeff061324e0cffbd5c2761bdf0456254b4a3f45dab90a3a04bc7ac8ff29724ab57f50e52fc9d811354f7cbcd29cd5589223
-EBUILD pecl-yaml-2.0.4.ebuild 1046 BLAKE2B fef163f4d8f00a5eac23cdc2ff4221f6160d5cf090a96fbba66d6c8c9a5b752c8d2c12d1bc30949aa5ef8154920ee66dc6af1341f4fa5b86ed6b2c8619f89aff SHA512 078605cbf1f3f602c18b498a9a09e9f4b915a83ab2c0f2c9c1bd0acffe76a2d6c0b4c5cd209ce42e8570886d760085ab2d020edefc42fa3ba091e0472eec4e95
+EBUILD pecl-yaml-2.0.4.ebuild 1112 BLAKE2B 84a00a78f00c4a74bc1dc305835bd03452d9631e2644f72c4324e2f94cbbe5d1e7b24a8be62d4156e4a1bba9b0c55492867c122d06b024d187ddde0873f2f43a SHA512 b97fa3b263b1492eeb08c2d3f643d19f560e022b082f23fc38028e9e321ef25453ec8b3c3856335bc2122694e2ec5f66019606253428a268969e6f568648d90d
 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
index 804cd88748e5..3a1a1abfdb9b 100644
--- a/dev-php/pecl-yaml/pecl-yaml-2.0.4.ebuild
+++ b/dev-php/pecl-yaml/pecl-yaml-2.0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PV="${PV/_rc/RC}"
 PHP_EXT_PECL_FILENAME="yaml-${MY_PV}.tgz"
@@ -10,13 +10,13 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( CREDITS README )
 
-USE_PHP="php7-0 php7-1 php7-2 php7-3 php5-6"
+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"
+USE_PHP="php7-0 php7-1 php7-2 php7-3 php7-4"
 
 KEYWORDS="~amd64 ~x86"
 
@@ -30,7 +30,7 @@ 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 ; then
+	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
@@ -38,7 +38,7 @@ src_prepare() {
 }
 
 src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	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-yaz/Manifest b/dev-php/pecl-yaz/Manifest
index 2a71ef703a30..f62bc97e7b5b 100644
--- a/dev-php/pecl-yaz/Manifest
+++ b/dev-php/pecl-yaz/Manifest
@@ -1,5 +1,5 @@
 DIST yaz-1.2.2.tgz 20131 BLAKE2B 7aa0729ba6033870099ed7c0d4961eac02d74d5aed6c7a58c0ccf59f57401cd7b438594c388ffc7c7b9d73cfc9f1c466c718ad685cc638651a9ac4e605b38ed5 SHA512 cb90d4ac9fcdadcb9215f7b795657dd3fdff69f2b2d399beb2afa6327a0be733d2a563863e2ca861182eadcc2faccfbe64e72d108662afc68d393a6bc5cc4bb2
 DIST yaz-1.2.3.tgz 20059 BLAKE2B 3fbf6d57e8519f6d363dbf308cb6ba259098521ae352f8886e8e12ca2a0d8119eaa31fc30301aea6979b32c6c321c4de0ad63ebe72e8f52cbb630d7f136f3e60 SHA512 5e6ebccac05fa44b0758b6817530e8cb436e45ead659f6a5029383515213bcce8c8cc7ceb8ef5ff4ec2335ad5c3009c6ccf8786116b115c24a013329d107bd7a
 EBUILD pecl-yaz-1.2.2-r1.ebuild 536 BLAKE2B d5071f9fd78642010d196167d47e502b840ec7be81e3e2ebb146d5168804a5c1b8dca24c10f6985bfd96b1a4fd9bf5dffcb50ef6e17a53df8e058904eea6ccb6 SHA512 fa6b20c9e37a963aba3c23f4a333c9ebafda2e5c6d8f14d403b5119fcaaa7943f91b47ffc01d2b84244f10d609df8ab81ba24c0421d30a571ce31c1ddcab1620
-EBUILD pecl-yaz-1.2.3.ebuild 581 BLAKE2B 982743446a91413fd00073eb4be8c45a60238a27800cf7602de561461995971133f59f9702950cf4b8d532c0276242eb19a5e819efbf7cad2bca1c57c185c53c SHA512 cdc09f9b7fbf5e6bd16a6fde1e7d0f5d84926e819a0542ba077a4c19ae5aa8df26b4afc0366b9030f37847568127394f9d75103e4a6a78bdaeb0bb512dbcbe59
+EBUILD pecl-yaz-1.2.3.ebuild 588 BLAKE2B 4a43e17df50613ca83eba08d8852e8fece5c765a59cbd8651b56ad05c79dd0cb498664556af62f5e4a1b868e14f5ce69f0071bc7a1e9c7752f7a54880200123f SHA512 ae121f6b794a8fa8be779c8245c9f79614b15cb867365d2aafa8e64ce9fcb76687fb84e5418e67930901aa20cd625fc3768290c66e1f96e5b8339e203df8c7da
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild
index 5a052101b9a0..9f0cd35777ae 100644
--- a/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild
+++ b/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PHP_EXT_NAME="yaz"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( README )
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-zmq/Manifest b/dev-php/pecl-zmq/Manifest
index fec24be3d181..e7c62a5eb6ed 100644
--- a/dev-php/pecl-zmq/Manifest
+++ b/dev-php/pecl-zmq/Manifest
@@ -1,6 +1,5 @@
 AUX pecl-zmq-1.1.3-php7-3-compatibility.patch 9970 BLAKE2B af8c1d546da1786bef6564b42afd731f0ceade8c2d425dfb5910748b4248cc910aa41f5f53fed7ab65394d7da201cc6d3a47b065e45f3f362c9968ab9b229f8f SHA512 d39ab0cce3397a851aa7662664e1f09fbd4096a4942e2172ed66d53292043f808c82d8f13ea8b5bf918ccdcdef9f254324b318e36150a6d76dfb7d051da3fed4
 DIST zmq-1.1.3.tgz 82397 BLAKE2B 5c221abf614bcc33c4c69e64308508d544f790371549c421fe2fcdedd67f2e843b2b82d96f517ea9413ffedd128838725e9afc18f0d4048b270d4982571874d0 SHA512 0f03016e315a6c6a1e1d6eca1e20564834d2a924cef06af1b38693933f1e5a094c37e9c432705a64f61d95e82655f61358fc7783e7a6f06c7dd9ad84fc6f7bbc
-EBUILD pecl-zmq-1.1.3-r1.ebuild 480 BLAKE2B 93811446ab4f8a932491441f33a5a7766c36d9c95de8bd8616e5e35a57e702a01862cf0cee3c6834a3767110d68e7573c8eacbd8fd3d812fca814c919aeecdf3 SHA512 f7a9f300d5869334ea00e7cef1747420ebd5941aab24dd522e7061d6ab9f79d81cb8504a01de6165b2927aae787fe588ff6a35cf13c4680fd717d72d19201954
-EBUILD pecl-zmq-1.1.3-r2.ebuild 545 BLAKE2B 82bb46499d914d9437cb40c46baa67161ab5f1e6c30befb4e19cba85a112ac8d02ffd30a5745af8e2eef7109569a59b75463cb3d4111ead33eea08dc5fe2689e SHA512 2f9aed9759f81ce2c49ef1e6389d72d38b3e27841e3c6384703d6fc876caaa379579491cb8d5dea0c7ca489ec03385b6bec17449902e54448761b2c186d72785
-EBUILD pecl-zmq-9999.ebuild 583 BLAKE2B 2a41bd55c4afdcf9b62c424f9823f28a0aa6cbc7839eac42d8acdbf10943ef888409312f0438910f66e3af18f8de61b527cc5966d374268dd76cac636451e4f0 SHA512 1e1185ab181d32c6960fe9e216da2accbf077daa5ba041aa694036d6afd849861f0318fb3ab82cdde380502d2c75f14b8bab2d5b2982379aa18f8a8d76ea52ab
+EBUILD pecl-zmq-1.1.3-r2.ebuild 552 BLAKE2B 072eb762debd8c91fe814553990010a89dd7245fc6471ffcacdde2f2c537b9d16f880ad93695725e1800c995b7cf455d46dfb4343481be435474d04564368305 SHA512 05820df04de70e5aba04d64095fc979440c46e813543e9a0fefafea85ca426240b8d083accbd7a3cb2b6f67c7da3f5e46534b9e21130690e99a3383f77c006f5
+EBUILD pecl-zmq-9999.ebuild 590 BLAKE2B d84e0633a45ca2b319a668343aba07cb6d083d7363d83ff21e1f9019f2a73869db19aea747efd3e3984bf3abeb32f1003d192d35de6b77d100f08b550ef83153 SHA512 ad332a47feb0d59c97d8ec6eb5bdd986189c36e7d61a67691f1472cf720daf3826324c63cdeed9db000fbfa81f5237d08a7dbe4f97211636256215b4eca44b62
 MISC metadata.xml 314 BLAKE2B 91b4ef1c9615ad2dac01ed638378dc0de90a173047cab6f9ec0875bbd66b97c8c6442a305ef7ff9791a5ccc67ec789440a26b3e65b05b3b76052cb8ba06c39db SHA512 40085d291b0f504d6253df236db0e3d3a0886e9a49b39330130c9578e25290cb11aba524b383186ee72c60f2adb0cea18d27bf3523d7651ba5f711f5cc2b1853
diff --git a/dev-php/pecl-zmq/pecl-zmq-1.1.3-r1.ebuild b/dev-php/pecl-zmq/pecl-zmq-1.1.3-r1.ebuild
deleted file mode 100644
index f11a7b1e8df9..000000000000
--- a/dev-php/pecl-zmq/pecl-zmq-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_PHP="php5-6 php7-0 php7-1 php7-2"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP Bindings for ZeroMQ messaging"
-LICENSE="BSD"
-SLOT="0"
-IUSE="czmq"
-
-RDEPEND="net-libs/zeromq czmq? ( <net-libs/czmq-3 )"
-DEPEND="${RDEPEND} virtual/pkgconfig"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=( $(use_with czmq) )
-	php-ext-source-r3_src_configure
-}
diff --git a/dev-php/pecl-zmq/pecl-zmq-1.1.3-r2.ebuild b/dev-php/pecl-zmq/pecl-zmq-1.1.3-r2.ebuild
index 32a8fed8aad3..d8afdd68c131 100644
--- a/dev-php/pecl-zmq/pecl-zmq-1.1.3-r2.ebuild
+++ b/dev-php/pecl-zmq/pecl-zmq-1.1.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-zmq/pecl-zmq-9999.ebuild b/dev-php/pecl-zmq/pecl-zmq-9999.ebuild
index cafe2beba8f5..2c4f8e58f714 100644
--- a/dev-php/pecl-zmq/pecl-zmq-9999.ebuild
+++ b/dev-php/pecl-zmq/pecl-zmq-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3 git-r3
 
diff --git a/dev-php/php-redmine-api/Manifest b/dev-php/php-redmine-api/Manifest
index 65cc9f9dad1c..d936e949e3ad 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 895 BLAKE2B 7e5e6b0e717e1114e5516457085d58d9da269d7d2c16c63df9eb2785ebcca5fb4248aa72451610ca2658799bd80e690bee2998c6bc3068e894054b2b8a53e65c SHA512 3c4f066801dbd8f8ef0efb73f854b4b2a6cc4cfbaee836e4ee0e1e28289c69642a4d6708940782344d98ff62034a83cedf3b7ef2a976112d323b9f7ca004a9ad
-EBUILD php-redmine-api-1.5.9.ebuild 895 BLAKE2B 002086e4b38a22aba61f309aa17f2d6d3457b176030da9d28835e387964e76fb76b682887e8e75b33f88699d3b044918719333eefe0e1163eba633698caf77b8 SHA512 7aed8f5b78d51d3d6e865680ac7172e426f814de0087d2161a6fe479ba81bc7641eb580c9c6adffcc59efdfba8bde7e994cb49dfd0f1dedee3b482257c458146
+EBUILD php-redmine-api-1.5.16.ebuild 922 BLAKE2B c1380f5b7f36ff4d5cf129775c2b88e173b3af116cd11fc23d9a9c5df59550ceeecaceb4e33af35680b7519f30a5e1a49716eb3550fb3f50876e9df101fb3cf5 SHA512 ccd9e7f41d185f94f765b406e659fb5b9d07a42c22bcb36c0910942ddab4727551196c06d56d0f7818c8e307d2995500eeaec774386e54df91901d3c0e5d4620
+EBUILD php-redmine-api-1.5.9.ebuild 919 BLAKE2B cd45404af80c195da44b9d90c2d50a7e77321ee839aced9b2f2f60ff994b2c3af3757e312252a61f845e9933c7c079e7b3a5fdb317df1152f6df09339f11ad1c SHA512 7b56ebad300a3f0aced1ccc99ca375260f4ad85f0b9c9eaf9e2d9591ea718ad291fa76dc93fe86cc6af43dd387221cca665f334d49f7215b58dc8326266680b0
 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 8325488aea33..78a322edae68 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
@@ -11,6 +11,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php:*[curl,json,simplexml]"
 BDEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-4 )"
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 d17187da48ac..feca4c001439 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php:*[curl,json,simplexml]"
 DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-4 )"
diff --git a/dev-php/phpspec-prophecy/Manifest b/dev-php/phpspec-prophecy/Manifest
index 8f9db9d7ac79..921e4242a7df 100644
--- a/dev-php/phpspec-prophecy/Manifest
+++ b/dev-php/phpspec-prophecy/Manifest
@@ -1,6 +1,8 @@
 AUX autoload.php 544 BLAKE2B d6ec873ca93869028f105eb90480031805bf2a377ca73824ae363456388d0ecbebcc5a736ec0e9ba507f7bb00e2843aa6cb3a1cad15ea849d825080ff0c6cb09 SHA512 4c75d70b199ca708d6dbd8975df0fe1e73db9b91bbce1f4360dca7405e3bc782f10331e83399a09fe2ea7373064f70538ba0b7525be008614be75b52ee7267fb
 DIST phpspec-prophecy-1.7.0.tar.gz 60338 BLAKE2B 8171120d8407f2e554150d5e3ea1972c54d4e2ce0e6698763f0b3c7e1645340ce22404da7844fed8412579c46f372852b4553c6d8a65c8094ef3065b0dbbd80c SHA512 e8efb3882d869f10fe39dff7c2185e1ec6f044c794fd6a5785e1c1c69c71b91dc3997f61bd2566d3243dde0becce568beba9a18fa0fd152e6ce74ca43a9a0fb0
 DIST phpspec-prophecy-1.8.0.tar.gz 37907 BLAKE2B 4bdd55d7fc14604c9fade23c60bf51f4c03accc182d7c5ad445dc6212a1e41b1bf392fe8f4a29768ecfcb2af479c0db3e29d5787d12e1f3222b032ba7e64dbc8 SHA512 992673f7cd148cf0b8752bbad614bbe34175a761cd4bf8849625794b505342d1bd918212a0f1463d94513f9e805d3dd127ba129d6622bcda29ea2b5c57a5582f
-EBUILD phpspec-prophecy-1.7.0.ebuild 812 BLAKE2B ac1aa995a8aa7eb4afe5745c8484eab6d2272a0550f9720f2c6cefd233919279242d0f3982722d6503e5cc002d09df4f17686921f4dce79c4beeba619c9953c0 SHA512 ced96d14999dbebe3048d614e36d0a1edbacbc33f3984104721273d7ef4ac4cd715597ea07296bd1ecfd97d93ff0c9f6b426df854738f4b5e1945f8a6a7d24ab
-EBUILD phpspec-prophecy-1.8.0.ebuild 818 BLAKE2B 4021104d41ed4e82a082b79cec8b06be0fd853a8e148e443e9468ea4aa890feb8f640fe677af1476f1ea4a14920f4a809d0cc56bd64a6fadf058659b95a7672e SHA512 02e0d8fb79ac8114c36fad7c1806927e2765dded49d068706dbc7a598c7140f6196d459e6c38ddd4356fd85dda0628f695f1bdfcde1f88a43a7a2c31a95a5442
+DIST phpspec-prophecy-1.9.0.tar.gz 38262 BLAKE2B 1642d38afa368be504da73c0bcf34921fe167dff5665651af23142f33979a35d8d10112e3d1c5b1b38448b92b4741ebda2c183dca10473dce833090a603f95f6 SHA512 d0ba1840ca84cf4b0642083858326c593086f35ba3a6d83746956efbe5d538910efc01655eaa14b4e2b7e17e7bd19cd2494cdfad0dd5bdfb43cdee2402a55b05
+EBUILD phpspec-prophecy-1.7.0.ebuild 804 BLAKE2B 654aa9b3f0ee0b74948ccbc032c4e7cb397a3a62127250aaa1922a13c1f76540e1925e22117c6733039003402d6a10a95d0ad755e52099d1ca140e0c8aaddcd9 SHA512 6b93221d188bac75c4e3290335245c1918a494b9adc6259556af604d57ecd3272db0b7c6e8ac08f0baad41e9322047c059be88c11d99136602894faaeb7cc1db
+EBUILD phpspec-prophecy-1.8.0.ebuild 813 BLAKE2B d6273c8ea1b67ab7d57efa1dd95318f3fe579f4052fb3cfefaa5933537de985d0cf2eac356dfe6b8b03a71ac45a4428b0756839b55f8cf7a003e0148ffde8c27 SHA512 dfe5cc0f952053671ca11df8be66e8f786492031b082d233fb6eecfaba8d34813d485081da204dc1bb1107a173edfa59dfd6b493316e20b72ad88d54fbc07b47
+EBUILD phpspec-prophecy-1.9.0.ebuild 813 BLAKE2B d6273c8ea1b67ab7d57efa1dd95318f3fe579f4052fb3cfefaa5933537de985d0cf2eac356dfe6b8b03a71ac45a4428b0756839b55f8cf7a003e0148ffde8c27 SHA512 dfe5cc0f952053671ca11df8be66e8f786492031b082d233fb6eecfaba8d34813d485081da204dc1bb1107a173edfa59dfd6b493316e20b72ad88d54fbc07b47
 MISC metadata.xml 320 BLAKE2B 52dc068f02b6134f5fb38c8a527e6c2cd4f47e260654e0558377fa7b188d5beebcc1c503137014842ff6081f576986e8b1585f61047e019facf4261d54437c6f SHA512 1772f2d920e747cc7e4b1bd32dcc503f72f17c7bcb964e01c74df781a114e0c4879d6018bab9c9244be3adcdc52a5f36e0de9b4ea34743fa9b64313a6a691ad3
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild
index e7b12b374fef..ea30e9b74742 100644
--- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild
+++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ MY_PN="prophecy"
 MY_VENDOR="phpspec"
 
 DESCRIPTION="Highly opinionated mocking framework"
-HOMEPAGE="https://github.com/${MY_VENDOR}/${MY_PN}"
+HOMEPAGE="https://github.com/phpspec/prophecy"
 SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.8.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.8.0.ebuild
index 846a5675c108..cb4ce58cf354 100644
--- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.8.0.ebuild
+++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.8.0.ebuild
@@ -7,7 +7,7 @@ MY_PN="prophecy"
 MY_VENDOR="phpspec"
 
 DESCRIPTION="Highly opinionated mocking framework"
-HOMEPAGE="https://github.com/${MY_VENDOR}/${MY_PN}"
+HOMEPAGE="https://github.com/phpspec/prophecy"
 SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.9.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.9.0.ebuild
new file mode 100644
index 000000000000..cb4ce58cf354
--- /dev/null
+++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.9.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN="prophecy"
+MY_VENDOR="phpspec"
+
+DESCRIPTION="Highly opinionated mocking framework"
+HOMEPAGE="https://github.com/phpspec/prophecy"
+SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+	<dev-php/doctrine-instantiator-2
+	<dev-php/phpdocumentor-reflection-docblock-4
+	<dev-php/sebastian-comparator-3
+	<dev-php/sebastian-recursion-context-4
+	>=dev-lang/php-5.6:*"
+
+src_install() {
+	insinto /usr/share/php/${MY_VENDOR}/Prophecy
+	doins -r src/Prophecy/*
+	doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/phptal/Manifest b/dev-php/phptal/Manifest
index fa28599243ac..f938d27de2c0 100644
--- a/dev-php/phptal/Manifest
+++ b/dev-php/phptal/Manifest
@@ -1,3 +1,3 @@
 DIST phptal-1.3.1.tar.gz 272883 BLAKE2B 4914b8bb40464f22417fd7ed7dbf88709b95b69a69a905a5152ff640dd5af6af2be7c7d67a622d78029e4075b6b19d8d1bf537a4a6ccc0c97260e5183a961ecd SHA512 74856cbeab3f8d9d552bcb7275a0180fd25e7703230c90e4343fbe9be4001118b091fabbace89efa98a8bf0344f46edf36c4ba709ed0e9b040b82204ea3b7290
-EBUILD phptal-1.3.1.ebuild 808 BLAKE2B 28f94a4cfbef459c5a6b4cd2362529e358f692c346c46481f37757fd5d9d6112a6528ce77bde166e87d02242c19e73ed997bcdeb80c6b082e07f0ed84e4658e3 SHA512 cbc0477ffd9e5288df3bfcd374fcc9f4187730cf284fbc4d930be38134d34a201302abec8fc1d9f2428ef6d0af36c21d96df2811b1d150c88a8c171513dc52ba
+EBUILD phptal-1.3.1.ebuild 832 BLAKE2B 41a21562fa0f4ae29b0b1c9588a0d5d92c8f309b89c3277c5e0b9fb69798f1ff851e4015006ee9bbd279c3b318a461d3f274172fb40cf2b0b296a75378e20181 SHA512 779ddec874a0cbe983d1628e0e3863eb173fb41835c95d7eb2e7648469db8923d394fdbba4c81d244be1e9806783d6a1f900c929e9c343d184eb0db425f00faa
 MISC metadata.xml 245 BLAKE2B 7d88a41bb224d6e6c8bc6ed766d24c4141ff7079307fc4e2dadd0d2300b565f5d8332f5a61ad49896af208f136f102bbfedb7b1f61241a82f21cbb6b0d9cc7e9 SHA512 81a613ac5d1bbcb88aad55e16c2b878dcc3a985a8c0d3b802a302067d94c3f878fa8b10aa4804a799a4180464b523eac2ee1bd6547d8baca8647e1e5cce38897
diff --git a/dev-php/phptal/phptal-1.3.1.ebuild b/dev-php/phptal/phptal-1.3.1.ebuild
index f5ab86bdfd82..041baa9a91d1 100644
--- a/dev-php/phptal/phptal-1.3.1.ebuild
+++ b/dev-php/phptal/phptal-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php:*"
 DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
diff --git a/dev-php/realpath_turbo/Manifest b/dev-php/realpath_turbo/Manifest
new file mode 100644
index 000000000000..e866cf62719b
--- /dev/null
+++ b/dev-php/realpath_turbo/Manifest
@@ -0,0 +1,3 @@
+DIST realpath_turbo-2.0.0.tar.bz2 9106 BLAKE2B 3275397ab72def1b120d2df1bfe6c233283754539b2ea7dfd558a0773d2f094f9f6b31850a516b883af470cd04d4ebb9d5a7d8492608169a797d1562c7236d11 SHA512 03a03d4a3a067ffac61222c4d71031ab9e289b745fd3b158b5b723f3abf1ad7bb1f691904e3f7b53a98c970f1b0f7c4fe558a4de696aac77d0f9a0f99159fb30
+EBUILD realpath_turbo-2.0.0.ebuild 620 BLAKE2B c837665ca1c5cd1c1cea567092ffe00f416a6039bd3e342e9865a6c711251e132ade0965d5e7ca5b8256388349960dde55acdcd331b7f4af6ae506f9a981f7e5 SHA512 221f2142723449a20e216e24c73a91e43fbaa5152057066bdb5be04e40923abc1ce2cbf884fb037a4b8523355d5ea4614eb632bb1403d89bde0461949ddd80ea
+MISC metadata.xml 453 BLAKE2B 053276e8d453110d9342cad1e6dcbbd51bba0e80b1c5c9c21be7f95b1ae5a64362f9f88f087d5eec7029fca8ca1537040b31cbf9d4c9d3574746abd5148a4de0 SHA512 e0e099f03622b5d90026ca07ca6cfc2277b19c01e414a6fac9994c3f2fcd9db386abe5f9d29c827fe4a75953ad2dcac1f64dd851a6d7d1a0deb60c420bf49008
diff --git a/dev-php/realpath_turbo/metadata.xml b/dev-php/realpath_turbo/metadata.xml
new file mode 100644
index 000000000000..9c672a724777
--- /dev/null
+++ b/dev-php/realpath_turbo/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/Whissi/realpath_turbo/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-php/realpath_turbo/realpath_turbo-2.0.0.ebuild b/dev-php/realpath_turbo/realpath_turbo-2.0.0.ebuild
new file mode 100644
index 000000000000..629ec768de12
--- /dev/null
+++ b/dev-php/realpath_turbo/realpath_turbo-2.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="realpath_turbo"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
+
+inherit php-ext-source-r3
+
+MY_PV="${PV/_/}"
+
+DESCRIPTION="PHP extension to re-enable realpath cache when using open_basedir restriction"
+HOMEPAGE="https://github.com/Whissi/${PN}/"
+SRC_URI="https://github.com/Whissi/${PN}/releases/download/v${MY_PV}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+DOCS=( ChangeLog CREDITS LICENSE README.md )
diff --git a/dev-php/recaptcha/Manifest b/dev-php/recaptcha/Manifest
index 48532d336947..78aa10a123a7 100644
--- a/dev-php/recaptcha/Manifest
+++ b/dev-php/recaptcha/Manifest
@@ -1,3 +1,3 @@
 DIST recaptcha-1.2.1.tar.gz 19935 BLAKE2B 43077b25d484940951bf070fa440b5d13c6992c2a157e06b81961b9692683a277d9507e44102dd0ba0cde66c892fd4736ed34cae4b001bdce0d4ab619828b432 SHA512 62df22a6f4b05006a6051db689994e455ada43f76406dd62c5c13f1d90ae64401e9d75c6a92f2c620a14c070d2b49199c20e70eb6284e42e676d37412a98abe4
-EBUILD recaptcha-1.2.1.ebuild 928 BLAKE2B 2fcac7913917b287b3fa539a630a84793439a42f9076b8d01a66b6c89aba9101fbf5782a67d9ad55c412e6486f43ae59847e3ff97c437a52bf27569e913019c4 SHA512 0acc54e12fe90f0b26ea5b9b7fd0456ce056da03e0c743d4382237ea3143304a51f3b1994691c3a7f6e8916c819ac0426a29309b2764828ca981fd89d45696ac
+EBUILD recaptcha-1.2.1.ebuild 955 BLAKE2B b2e694b6da4a55ec8155a4c3c176ef5e0807c167b545d346e5ca70e324cd5d18587155a741aab27f2b87f42060fef0f8f0d58b3ad54bb891c6ab4b8533679b3b SHA512 d44bb3f7443a100a6c27d1f41ee089d14110adcd3e31d85612d3bfec44a7115f82ae9ff8016ce1386277eae11fde54acce667a5ab9d8baf6078b0dc7644943b0
 MISC metadata.xml 337 BLAKE2B f5bf73fb4a4f700d08f240f2f5fbf629322ab2f8db346085d09331b69958545dbbf53973a6f04d105edc070901b2cc82ee7800f6be134f159bd7b6587631119b SHA512 abbe5982149863ee6b21edcc5299238a1449ec2ff4088b86453ef4196a2903c1d6fe38cec785562904369944fc6231b463cc1c4914e3eba8e6744bbe2a8ed520
diff --git a/dev-php/recaptcha/recaptcha-1.2.1.ebuild b/dev-php/recaptcha/recaptcha-1.2.1.ebuild
index bcba673ab3c4..8e2eb09e7b8b 100644
--- a/dev-php/recaptcha/recaptcha-1.2.1.ebuild
+++ b/dev-php/recaptcha/recaptcha-1.2.1.ebuild
@@ -11,6 +11,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php"
 BDEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
diff --git a/dev-php/suhosin/Manifest b/dev-php/suhosin/Manifest
index 489e1ffd4a84..84f81faae8da 100644
--- a/dev-php/suhosin/Manifest
+++ b/dev-php/suhosin/Manifest
@@ -1,4 +1,4 @@
 AUX suhosin-0.9.38-libcrypt.patch 590 BLAKE2B db02346c66f348fd0be16fea1647deb1a6e44c2b10077f410ab919e7800e160439780d7b1c807f455cd3efb115765288c869cd96d719f4315150edfd73693085 SHA512 fa834f26803e2f623a269bc1cc81e305e081397717e0058315cac8087f04c33ff7f2eeee2052dada75559e5b35dc85c55499d74635dacd0f08fcc226ec3d0de3
 DIST suhosin-0.9.38.tar.gz 122800 BLAKE2B e016091e370bbcfdaad91d10858541cd730951be1032e95b4d372b5a77fce719e300cfa0638bf3ebde68e91d76b95c94ca56ce239997da69fc7ce5068b26ab49 SHA512 cc4eb38b5d6673cc3f2dc395e5a8b5461d3221019ac9849b747b6d5bae423cd5bd01a75b9432414dc7c26c78bab9f2381a5414712a6906a999f3ec9dc77ebc45
-EBUILD suhosin-0.9.38-r1.ebuild 1330 BLAKE2B bee0345e89d02138a9d79b5c91cf4c75fad99626e42a503034c2047910bf96f00941a066518633e4c84f6cede39bff9fe3414ede6c38ceb3dcec944b75e68058 SHA512 79341927c5c6351514d9ef257be38884c27beab3a91b3d873d52b2b1c34b6977296a499fc226c0b3ecbe5b7ef49d1d3f1e5f00acd834d1372babca6b7f9ef53f
+EBUILD suhosin-0.9.38-r1.ebuild 1286 BLAKE2B 7175dc9f5f1d9ea59582e0df122335beef486091be8b8244d868fbcc756b3ed21f989058cf319f6f1626139a4abb7682d0a2349612664ec589d8c69fd8ca2c3f SHA512 ad18a145a0e3a7773d900813b70f782c29686cbfda931c57d93d779e76a926460123a195fbf95f484288490507401d0b2bda7800296dddd477acff339deade7d
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/suhosin/suhosin-0.9.38-r1.ebuild b/dev-php/suhosin/suhosin-0.9.38-r1.ebuild
index 3372f3abe755..3f2162f1716d 100644
--- a/dev-php/suhosin/suhosin-0.9.38-r1.ebuild
+++ b/dev-php/suhosin/suhosin-0.9.38-r1.ebuild
@@ -51,6 +51,6 @@ src_test() {
 	# away from there in src_compile
 	for slot in `php_get_slots`; do
 		php_init_slot_env ${slot}
-		NO_INTERACTION="yes" emake test || die "emake test failed for slot ${slot}"
+		NO_INTERACTION="yes" emake test
 	done
 }
diff --git a/dev-php/swoole-async/Manifest b/dev-php/swoole-async/Manifest
new file mode 100644
index 000000000000..429235fd59e7
--- /dev/null
+++ b/dev-php/swoole-async/Manifest
@@ -0,0 +1,3 @@
+DIST swoole-async-4.4.12.tar.gz 417674 BLAKE2B 77a96f53b1b159b558eb4759fe172e4a3b8f2648cd9f49252d89508eb56b4d342b178fa3c84d6a425c300a286063b4d32a05d09a3da4f3769be4c25a9800783c SHA512 adfb761803e5ec93c30aa2a4bbc312a2f43287a54cd237c0a87237dfcbfe1e6daa3d57ec2cdf15720202aa9a7830ed67ab2efdf2f7dd81989c3693e91bc22143
+EBUILD swoole-async-4.4.12.ebuild 1057 BLAKE2B d27170880db3dd533f0bf66b08e2656bc4694a4ed38a3e45b7aad1db5ed94b205633ce4041486c87697a29eed857c930d77f208fca94d5e29ee29de51c5e57a7 SHA512 edb52f3826228bd5a20d316f62467bef487792ed081934d9dd71d02a411bfc7ddc61fc696e4f70d3cf99f2a182b6033e8242f9553ed2b365a009f121b8a2686d
+MISC metadata.xml 247 BLAKE2B b04f62f80c1381c62e7020a89486538dd3b4968a281721cf8213e25782a6e5bdf1a7199b2ae675bdcfbb954bc429f2b8af387d78523abe990ac881effbbfe67b SHA512 910677640181b5d854b46c6808d68ab56d826998ef3806d3915a98183cdc05cc81aebb02c8e13cbb26ba5c56c6db7020c97e7ba058e472e00a5530cf341c4012
diff --git a/dev-php/swoole-async/metadata.xml b/dev-php/swoole-async/metadata.xml
new file mode 100644
index 000000000000..d355171f926f
--- /dev/null
+++ b/dev-php/swoole-async/metadata.xml
@@ -0,0 +1,8 @@
+<?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 Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-php/swoole-async/swoole-async-4.4.12.ebuild b/dev-php/swoole-async/swoole-async-4.4.12.ebuild
new file mode 100644
index 000000000000..845bfc568cc0
--- /dev/null
+++ b/dev-php/swoole-async/swoole-async-4.4.12.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="swoole_async"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_SAPIS="cli"
+DOCS=( README.md )
+
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+
+inherit php-ext-pecl-r3
+
+SRC_URI="https://github.com/swoole/ext-async/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/ext-async-${PV}"
+PHP_EXT_S="${S}"
+
+HOMEPAGE="https://www.swoole.co.uk"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="An extension of Swoole, including the async callback style API"
+LICENSE="Apache-2.0"
+SLOT="0"
+# Tests will require pre-configured endpoint
+RESTRICT="test"
+
+DEPEND=">=dev-php/swoole-4.3"
+
+RDEPEND="${DEPEND}"
+
+IUSE="debug"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-swoole_async
+		$(use_enable debug)
+	)
+
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		[[ -f tests/template.phpt ]] && rm tests/template.phpt
+		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
+	done
+}
diff --git a/dev-php/swoole/Manifest b/dev-php/swoole/Manifest
index 6028abb2f020..5e2a288a2e8a 100644
--- a/dev-php/swoole/Manifest
+++ b/dev-php/swoole/Manifest
@@ -1,13 +1,5 @@
-DIST swoole-4.0.1.tgz 899395 BLAKE2B 7e7320905cb83794115280977031cc5254a4947781fde05db6e7803f34ff0f5c0ecad84f8aa86adc3c21320b031fa3104fb6c953e9060791dbd9d5c497edbcfc SHA512 0df6ae1bf28ec52abebf1a597c0774e7e5de4bb8378c916a46896c7f84822c8466bbb0d3d188e671e7c39faafa94d2dc2245a468dacb2711c7f0fa617dc42aa8
-DIST swoole-4.0.4.tgz 907216 BLAKE2B f078f712c61c7ec9c1a98d94370c892fedd7d1efee7de34438a19d96fea9d41a0553d53fdd34c3d32138c6685045bf45be5fad533b0430b07cb7e60d183433d5 SHA512 b448abeec1fdfe94e0fd5d05b9c2abc7cfc2bb9477d6847adc35cba051d38acfb9ff3bdfaeb10591a50f5a6238f21cef4e0b614e1ff53c71f62b0bcd846d785f
-DIST swoole-4.1.1.tgz 930623 BLAKE2B fb4fa99b7b687aeaf4473983659cc2ceb7d8ba9ba6e198b49bea175b28918ebf8316c51f3ab7b4f75a9b7566941ddbba698c0d57f6ee752767c416e68fa68ca1 SHA512 4afc986f6ce362e28085d4ce07c534867311d65be487a66edfb0c01df7cf6e6d2df92abb2aba22b72f2840daade82b5bc3a12883d9cb54fd8ed9e6b0cdf0870f
 DIST swoole-4.2.13.tgz 1305634 BLAKE2B bb30180f7ca7b024a2aab8aff1149f6b19035315c9518dfc9e9e2e02acde09aa4cd09fbe146aefd39fc09c25af68347a5c188ca8a21677926b1adea5b549858b SHA512 f2438ce761766d20a24279a2d6f2094c718324585b1d396344f64e8a4facc1cc025a3afb2deff3b1accd5266763bdaa0a2b15e831ea4b9bdb107c83b0046636d
-DIST swoole-4.2.3.tgz 1127669 BLAKE2B c99b540bf2f5c8757ae8e1b88de5db60bd2fcef0a14faebee3032419645f61c3c54c81f0ced7a4d67701bd1932d962592ea695fd4460d4d5bbb6849a2bb13674 SHA512 37758ff2c8e2638bdd9c5c7ac26ec86e71d71a75c4af0a8ac2c68c81eb74fdbb31e70489b94c50488d25ceeed1731e5f8f74316d5cce3f6e6db41623200416f1
-DIST swoole-4.2.9.tgz 1220045 BLAKE2B 752d00ae6a61c0592f308fceff205be68f55eb9918288fcfa3f2ed29edaf8e3e8682a28e2c783f1eb6df097e5567690cfa88a056b1078ecbbb809e4bd81c5bb6 SHA512 5fbc7c2d5a797074ceaef89d4b5f81440bc7c911e2feda9ded4183069cc9e98bac1ab2acdc6e7788a8c7e379dc0d7b07aaa3c5374c8b20b1ea7c327bc13c87d9
-EBUILD swoole-4.0.1.ebuild 1695 BLAKE2B 7720c6946b04a5c35c012187873a351919f02a4c9b8cf041b20f4777b57db65e8f2376a1cd121af0203d802227bedae046fd1aa3b3ea3c0fecc6c677f9f029ce SHA512 fa2a870086d261175ff9ed262bd3051a62bd12ba979a384d8fbfca121ba9cba74ffe55cf8f84c687eec4b449d57904d73232c637d87fb6cd5d42e7d1bff19ee5
-EBUILD swoole-4.0.4.ebuild 1818 BLAKE2B 94bfc9d9802443718edef78fdfa3b86375e822b6ee5983b97c3a001e04fd15ae42b94c7dfd12b8439f976a6c035ccf0f7055a21a44107c0cf1e50b7dede89aef SHA512 cd256d3486b92e544db3ecf8a55c994b0305c1be747c7cb1497977a6b9ae6c1a242ceb6978c5f7a57cdef2fe57c0f04af596df5a74049a56eb788a996b6c6bf9
-EBUILD swoole-4.1.1.ebuild 1947 BLAKE2B 1b1d9303354b30520a39e48713548324bfac21fb0393452a056ab69fd02e886d487cec5bd7fff7029426e7783aa4e23310b2f5ec526b0fa5898d0485fa4e98db SHA512 db7f7032d2ef33a1610c5fea8ba314616715f0ba8d2e0ba8cf7fbdc2a8139a96b89e1352dcc66abbbe1211ac9c6f154a9c108715c4fa3b5c839ff86407e08972
+DIST swoole-4.4.12.tgz 1436554 BLAKE2B cc9e64e108aa9b393265708a6922f53824c2e9941c0f47f4f6aacf93239829381cdf4625af8f30e2ca8ceb1663047c6be8b2d7808dbc29d27100135288f7ac85 SHA512 8899bb048b85c048903c80fe1af045ea4f82a25b3b4fd9995d51c8a2ab144306f9f5651276776e3f6a29c83322fb0aeee2822d131247070fe9e2e87b26f2e0e9
 EBUILD swoole-4.2.13.ebuild 1789 BLAKE2B 043b1bf3d91ef7f60c7a659c7c9ba0795bd3d8cbfdb8abab88e5ea78234368ce2c793684f18b537831c34ca02148c58e27b253794398470bb9ba8de4a8a4889c SHA512 ccba3090b0f05821e5c8784672c787545774e138b5ad94098be81d535158f551648c81dc790846106caa690417a3d7480c2f709e740dd3e5c8b2760f235e822a
-EBUILD swoole-4.2.3.ebuild 2025 BLAKE2B 0d9d150ca64a572d4e6a401dfa5196125bfb5a3026a7f5468fd0919d642b808612d7d96d3e21e928825b24f3e06861b0138a5a963defcac234473a6d82dfdae0 SHA512 e29ab7df2116ad30abcccdb45a7b225d35a97f6107b2aec6aa2a28837dbd0c4326842666ad5fa806ce8f63bb26cef22f1621cfe1b357659da3928e5fca2b8a9d
-EBUILD swoole-4.2.9.ebuild 1914 BLAKE2B a342c2377dfcaace8ad212c92b62a4cf69b4b7c126120a85ea9f511382debd3dbb567502421323012ee50e91f7f6eb9ff31c61605728a6d0295121a017be6408 SHA512 d6b82a342a95e29148e32fe8443507072ef4d55f3793e0c7ca0932d4d16e8a407582cc61f3a2ae1f25a18e924c3d8198d4642c8d258c236f0a1bae5df427d4f0
-MISC metadata.xml 424 BLAKE2B abaaecb73dd8caf77e25775dc2b3307efa430399d197b24f3ade567b93989108c70216949327677f5c9540e6aaafaf2f77d9af17b01f99de2ac6f04a95abb03b SHA512 52dc7ac48b61458b810ba467bbe5cfaeaef808ae7db72f58ba4ad4dd8723c7149995e43e94c8b4552e7dfc38cd1c3e627dd5c9854652ee656f421f345dd72471
+EBUILD swoole-4.4.12.ebuild 1872 BLAKE2B fd616184c677b17df98f51216296eb7d0bf3e1262ead010c18da737638a8bc5a4709117770148a5fb361cff41e26df075ca1573d92e3d58f4c2dce37a3c50471 SHA512 35c05d7c7719498e1056af08ab9ab0d76ebdb38632836447294709feb0201a3c4adac45f7b4ce94e653afaa90afa1f9df9c56a1c0dcac1e85d16348a0dbce54e
+MISC metadata.xml 344 BLAKE2B b6bba613a547a33d17c214859118a6f8c499b65763a8373dde96b955efc9609ddb2f2de6cf678a5f0f1552ac1b054661d2771b68cc007327950721b9e36417aa SHA512 8fe672a189916bf935ff0bc312b617658d3fd789bceb0305dbe9745600690cc2b9d93d2bf60b1bd517c1824c5cef2ea8ebe4eab69716ecba5763742b15cf61c0
diff --git a/dev-php/swoole/metadata.xml b/dev-php/swoole/metadata.xml
index 067ddccde379..6384a235e856 100644
--- a/dev-php/swoole/metadata.xml
+++ b/dev-php/swoole/metadata.xml
@@ -7,6 +7,5 @@
 </maintainer>
 <use>
 <flag name="http2">Add support for HTTP/2 protocol via <pkg>net-libs/nghttp2</pkg></flag>
-<flag name="redis">Add support for redis via <pkg>dev-libs/hiredis</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/dev-php/swoole/swoole-4.0.1.ebuild b/dev-php/swoole/swoole-4.0.1.ebuild
deleted file mode 100644
index 8a332f5938d2..000000000000
--- a/dev-php/swoole/swoole-4.0.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PHP_EXT_NAME="swoole"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_SAPIS="cli"
-DOCS=( README.md )
-
-USE_PHP="php7-0 php7-1 php7-2"
-
-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"
-
-DEPEND="
-	dev-libs/libaio
-	dev-libs/boost:0=
-	dev-libs/libpcre
-	http2? ( net-libs/nghttp2:0= )
-	redis? ( dev-libs/hiredis:0= )
-	ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-	php_targets_php7-0? ( dev-lang/php:7.0[cli,sockets?] )
-	php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] )
-	php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] )
-	mysql? (
-		php_targets_php7-0? ( dev-lang/php:7.0[mysql,mysqli(+)] )
-		php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] )
-		php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] )
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-IUSE="debug http2 libressl mysql redis sockets ssl threads"
-
-src_configure() {
-	# PostgreSQL disabled due to Gentoo's slot system
-	local PHP_EXT_ECONF_ARGS=(
-		--with-swoole
-		--disable-coroutine-postgresql
-		$(use_enable debug swoole-debug)
-		$(use_enable http2)
-		$(use_enable mysql mysqlnd)
-		$(use_enable redis async_redis)
-		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${EROOT%/}/usr")
-		$(use_enable threads thread)
-		$(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}"
-		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
-	done
-}
diff --git a/dev-php/swoole/swoole-4.0.4.ebuild b/dev-php/swoole/swoole-4.0.4.ebuild
deleted file mode 100644
index 5a00e34be3f4..000000000000
--- a/dev-php/swoole/swoole-4.0.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PHP_EXT_NAME="swoole"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_SAPIS="cli"
-DOCS=( README.md )
-
-USE_PHP="php7-0 php7-1 php7-2 php7-3"
-
-inherit php-ext-pecl-r3
-
-HOMEPAGE="https://www.swoole.co.uk"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Event-driven asynchronous & concurrent & coroutine networking engine"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="
-	dev-libs/libaio
-	dev-libs/boost:0=
-	dev-libs/libpcre
-	http2? ( net-libs/nghttp2:0= )
-	redis? ( dev-libs/hiredis:0= )
-	ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-	php_targets_php7-0? ( dev-lang/php:7.0[cli,sockets?] )
-	php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] )
-	php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] )
-	php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] )
-	mysql? (
-		php_targets_php7-0? ( dev-lang/php:7.0[mysql,mysqli(+)] )
-		php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] )
-		php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] )
-		php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] )
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-IUSE="debug http2 libressl mysql redis sockets ssl threads"
-
-src_configure() {
-	# PostgreSQL disabled due to Gentoo's slot system
-	local PHP_EXT_ECONF_ARGS=(
-		--with-swoole
-		--disable-coroutine-postgresql
-		$(use_enable debug swoole-debug)
-		$(use_enable http2)
-		$(use_enable mysql mysqlnd)
-		$(use_enable redis async_redis)
-		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${EROOT%/}/usr")
-		$(use_enable threads thread)
-		$(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}"
-		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
-	done
-}
diff --git a/dev-php/swoole/swoole-4.1.1.ebuild b/dev-php/swoole/swoole-4.1.1.ebuild
deleted file mode 100644
index 8dfde46c3406..000000000000
--- a/dev-php/swoole/swoole-4.1.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PHP_EXT_NAME="swoole"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_SAPIS="cli"
-DOCS=( README.md )
-
-USE_PHP="php7-0 php7-1 php7-2 php7-3"
-
-inherit php-ext-pecl-r3
-
-HOMEPAGE="https://www.swoole.co.uk"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Event-driven asynchronous & concurrent & coroutine networking engine"
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests can hang.  Disable until this no longer happens
-RESTRICT="test"
-
-DEPEND="
-	dev-libs/libaio
-	dev-libs/boost:0=
-	dev-libs/libpcre
-	http2? ( net-libs/nghttp2:0= )
-	redis? ( dev-libs/hiredis:0= )
-	ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-	php_targets_php7-0? ( dev-lang/php:7.0[cli,sockets?] )
-	php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] )
-	php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] )
-	php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] )
-	mysql? (
-		php_targets_php7-0? ( dev-lang/php:7.0[mysql,mysqli(+)] )
-		php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] )
-		php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] )
-		php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] )
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-IUSE="debug http2 libressl mysql redis sockets ssl threads"
-
-src_configure() {
-	# PostgreSQL disabled due to Gentoo's slot system
-	local PHP_EXT_ECONF_ARGS=(
-		--with-swoole
-		--disable-coroutine-postgresql
-		$(use_enable debug swoole-debug)
-		$(use_enable http2)
-		$(use_enable mysql mysqlnd)
-		$(use_enable redis async_redis)
-		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${EROOT%/}/usr")
-		$(use_enable threads thread)
-		$(use_enable sockets)
-	)
-
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		[[ -f tests/template.phpt ]] && rm tests/template.phpt
-		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
-	done
-}
diff --git a/dev-php/swoole/swoole-4.2.3.ebuild b/dev-php/swoole/swoole-4.2.3.ebuild
deleted file mode 100644
index a5b3c7d3cfb6..000000000000
--- a/dev-php/swoole/swoole-4.2.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PHP_EXT_NAME="swoole"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_SAPIS="cli"
-DOCS=( README.md )
-
-USE_PHP="php7-0 php7-1 php7-2 php7-3"
-
-inherit php-ext-pecl-r3
-
-HOMEPAGE="https://www.swoole.co.uk"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Event-driven asynchronous & concurrent & coroutine networking engine"
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests can hang.  Disable until this no longer happens
-RESTRICT="test"
-
-DEPEND="
-	dev-libs/libaio
-	dev-libs/boost:0=
-	dev-libs/libpcre
-	http2? ( net-libs/nghttp2:0= )
-	redis? ( dev-libs/hiredis:0= )
-	ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-	php_targets_php7-0? ( dev-lang/php:7.0[cli,sockets?] )
-	php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] )
-	php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] )
-	php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] )
-	mysql? (
-		php_targets_php7-0? ( dev-lang/php:7.0[mysql,mysqli(+)] )
-		php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] )
-		php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] )
-		php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] )
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-IUSE="debug http2 libressl mysql redis sockets ssl threads"
-
-src_configure() {
-	# PostgreSQL disabled due to Gentoo's slot system
-	# JEMalloc not included as it refuses to find a ${EROOT}usr/includes/jemalloc subdirectory
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-swoole
-		--disable-coroutine-postgresql
-		$(use_enable debug)
-		$(use_enable http2)
-		$(use_enable mysql mysqlnd)
-		$(use_enable redis async_redis)
-		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${EROOT%/}/usr")
-		$(use_enable threads thread)
-		$(use_enable sockets)
-	)
-
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		[[ -f tests/template.phpt ]] && rm tests/template.phpt
-		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
-	done
-}
diff --git a/dev-php/swoole/swoole-4.2.9.ebuild b/dev-php/swoole/swoole-4.4.12.ebuild
index 253ee6973880..7df45e4948c0 100644
--- a/dev-php/swoole/swoole-4.2.9.ebuild
+++ b/dev-php/swoole/swoole-4.4.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 PHP_EXT_NAME="swoole"
 PHP_EXT_INI="yes"
@@ -9,7 +9,7 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_SAPIS="cli"
 DOCS=( README.md )
 
-USE_PHP="php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
@@ -23,20 +23,25 @@ SLOT="0"
 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-0? ( dev-lang/php:7.0[cli,sockets?] )
+	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-0? ( dev-lang/php:7.0[mysql,mysqli(+)] )
 		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(+)] )
 	)
 "
 
@@ -45,16 +50,14 @@ RDEPEND="${DEPEND}"
 IUSE="debug http2 libressl mysql sockets ssl"
 
 src_configure() {
-	# PostgreSQL disabled due to Gentoo's slot system
-	# JEMalloc not included as it refuses to find a ${EROOT}usr/includes/jemalloc subdirectory
+	# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory
 	local PHP_EXT_ECONF_ARGS=(
 		--enable-swoole
-		--disable-coroutine-postgresql
 		$(use_enable debug)
 		$(use_enable http2)
 		$(use_enable mysql mysqlnd)
 		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${EROOT%/}/usr")
+		$(use_with ssl openssl-dir "${EROOT}/usr")
 		$(use_enable sockets)
 	)
 
diff --git a/dev-php/symfony-config/Manifest b/dev-php/symfony-config/Manifest
index 293db88ded8a..1d5a942afd0e 100644
--- a/dev-php/symfony-config/Manifest
+++ b/dev-php/symfony-config/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 577 BLAKE2B 4a36bd333f27a143517c8e81c4749dee06a4f6ef228f6b0af7e94d544118b2345aa6860abeb9386998df5c57e2689d467f075344cf7ed0882baaa8f0d6a29f85 SHA512 ef699576d866c6a2c8893f8ca5c74d6b019b0cd554e3dfb2946d96cf20c9117e7a6b966c3386f6e1294dcd55feb05df437166711008242cc52bcb1a94ae5e8c6
 DIST symfony-config-2.8.20.tar.gz 52587 BLAKE2B 540ed96ebc9d3c5e6d460003c47e2d0612037acc2e40ff413d4195a1f7d48e7e7edb2b0bbf17f982d9ea48242439d819f2b6b442dcd22fa7cc9fa0b29ef2b6e7 SHA512 f515f9886be8daa85a3cfe70935b4586ee749a62c3c73c6f2c934af16d4a81f9e49445bdae85329f88fa4dacaf87c56b9b599793d7926e712242bd1fc9dc0675
-EBUILD symfony-config-2.8.20.ebuild 854 BLAKE2B 4b59a655ec4a3e8f6f1a6a6fa36d95f7d8cfd2d95173e4da97f2fdd9dc688fee8b679873339e2de2abe583136cf25f15086a56f701629276e07f7cd9cf9e3f87 SHA512 8d52044d63b2927dea7901f0fe81789a02498f7fcb1ccd6f2cbabf05b9a7b1800e7261efe16c00cb855fb37d2b874bc86ddc732de6e87f617bd20cd2710a7d42
+EBUILD symfony-config-2.8.20.ebuild 878 BLAKE2B 54aceba1691d4a8eaf6d0d7f87f266c4eee6930e9eed6ea31e8347bd8a9a58c9362fcfdad62084ba835169add5cef488ea3f13c9756dbe04bf61745fd601dbc9 SHA512 60347a0f90834ac36b56cf5901e1ea6d81c887ec9b542b4590f76379dc99656ccf745edcd1fdb2eb19fb9632252716fc51e905ffe0240539e1f498e487026f0d
 MISC metadata.xml 825 BLAKE2B 0360fe3b9d09d22a1a2511ba9632137f06bbed62ecceb5da51a0f634fa603c8bc4cba95cb66cf35a9024b6a7f01502234fba33ee8f4f092a1b32a20b7f2628f1 SHA512 3feeb922f4e961b192ecc9581b468a10121bf522ff51e48ad2cc61e358b2f994037ca1cecb603c5543f74f5753963e8a2a3438de1602b18efe9b0175ee2d7b53
diff --git a/dev-php/symfony-config/symfony-config-2.8.20.ebuild b/dev-php/symfony-config/symfony-config-2.8.20.ebuild
index 0daa831d25f0..9fe027e06223 100644
--- a/dev-php/symfony-config/symfony-config-2.8.20.ebuild
+++ b/dev-php/symfony-config/symfony-config-2.8.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-lang/php:*
diff --git a/dev-php/symfony-event-dispatcher/Manifest b/dev-php/symfony-event-dispatcher/Manifest
index bc8ef4833b46..e585192cccfc 100644
--- a/dev-php/symfony-event-dispatcher/Manifest
+++ b/dev-php/symfony-event-dispatcher/Manifest
@@ -1,6 +1,6 @@
 AUX autoload.php 469 BLAKE2B d86604375d82bf06cf1a50404d9218f7c73a9b08b3b1add7b123fdf82d199ea757259f5f4d8c4876b3537022a35a0a5dec627b5e94df596cfc19cc7f8801639e SHA512 742d6a7be50fcf6f07d5b23abd7aa965986d8effde182769ce46894370d0d05e8cc0c7d62c0ec0bf2f8c2f33e3253a5381952e3b36434027219dcac7b4fe1f14
 DIST symfony-event-dispatcher-2.1.0.tar.gz 10271 BLAKE2B 0fcb3fd95643a24ff31d4e60c31e801e488c323358dc723be95471dc01df9d052fc6cb19ce5401ba4512cc4e308fd149975f969cf89406b48d11e48ef6313ee1 SHA512 2430e0955322aa938635b34cfa151166218da51bcc7ac1ff52789fc16aef9eeaa5c504f9d03daa819f47652e5207703314c8695e5023369fe8edf88af06bc54b
 DIST symfony-event-dispatcher-2.8.50.tar.gz 15682 BLAKE2B dff817cc540074caabef6bbcd24fedee8bc377fbd688ead9d7a95df9987c79446bac630f806dfa190572a214393676042682b84bed58a6e0d5bb47d0dfd64986 SHA512 ecb5e17d5f0639c49fa35e9dc33d3b7d6a7792c95d9020ede9ceebe0de5e0192101607ac6f797e35a7ea5ced36231e616d76fe4f8ab74c0d42014782de590a35
-EBUILD symfony-event-dispatcher-2.1.0-r1.ebuild 900 BLAKE2B fbfb113a55195326e8d8ec72dc79856f80fc12db43afd17c6f3a46f815495477d307f1aea03ef1e7ca5bc765a4c4c0ac20649065b331bb22d88c0c01cdfb1144 SHA512 1ff87aca4eebe3628b105214b531c472184f403260ef6b57a9ceffacaae433375c08fb688d6c816798d037d19348eecc344c5e4b686dc6776ef315e9ed71e5d3
-EBUILD symfony-event-dispatcher-2.8.50.ebuild 897 BLAKE2B 3a4066091680daad0945b29b610d67b81385e16c74ed8e07f4dbb1c1a81854edf36b7d623affe8a17d691a8bcbd8138087023da7a79f23ab8d7e4d194a39d6f5 SHA512 11ce492699e08157445dfa7de1c90024ba769707916fb6b3225f1e50154daf13aee36b28eb1e25602603bba497c4f2b379d4c19dd46b075d16bc9b0708feca89
+EBUILD symfony-event-dispatcher-2.1.0-r1.ebuild 924 BLAKE2B 0762359c76570d8372745e26cf343ce0465c71084c2cc62cc263edf4f95deebd7319f8881f51942bfa9e179927396895015d0b41e7f9d1ecbc49fd8886c2df1f SHA512 8131fbbe4c13d18ac4fa4f78acf9ba1e9e9c5f0aae58ac2149f009edbc311ed8498b79f48042f024ae622cbb446b918a141dc0c57f6cbb2de2396e991055e940
+EBUILD symfony-event-dispatcher-2.8.50.ebuild 924 BLAKE2B 0762359c76570d8372745e26cf343ce0465c71084c2cc62cc263edf4f95deebd7319f8881f51942bfa9e179927396895015d0b41e7f9d1ecbc49fd8886c2df1f SHA512 8131fbbe4c13d18ac4fa4f78acf9ba1e9e9c5f0aae58ac2149f009edbc311ed8498b79f48042f024ae622cbb446b918a141dc0c57f6cbb2de2396e991055e940
 MISC metadata.xml 775 BLAKE2B e25fad462227e8d7ae05cfe82044f57c9f8c5de7dc8d88d8151c549a2e040dbeaee82866919dda13efe6d8574e3160725fbd9d42019593177d03ea352cadce9a SHA512 11095327870ea93690d14782556a5c28fa6cf2a099ff63b9f8d0ced042f79e4fc96d4b7b33b9fe4820eaf8159385a6b8056ddb32309d376675646dc1e262fe00
diff --git a/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.1.0-r1.ebuild b/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.1.0-r1.ebuild
index 9ec88c6a4770..43e947bc1128 100644
--- a/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.1.0-r1.ebuild
+++ b/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-lang/php:*
diff --git a/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.8.50.ebuild b/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.8.50.ebuild
index eb7534b30305..43e947bc1128 100644
--- a/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.8.50.ebuild
+++ b/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.8.50.ebuild
@@ -11,6 +11,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-lang/php:*
diff --git a/dev-php/symfony-finder/Manifest b/dev-php/symfony-finder/Manifest
index 05f0451eb451..90b8cf693978 100644
--- a/dev-php/symfony-finder/Manifest
+++ b/dev-php/symfony-finder/Manifest
@@ -3,6 +3,6 @@ AUX skip-file-time-sort-tests.patch 1211 BLAKE2B 84e77e610c1c57e54063d50e7ed4fe7
 AUX symfony-finder-3.4.28-skip-file-time-sort-tests.patch 1026 BLAKE2B aab5d755792961baf53217710f9d196663f5dbcf96cb524a5850cf681abdef6c0b60e2af08e4c7e01f135f95d750d3c0532e190dd009f7c9213adc70085b2da2 SHA512 836689dce3d9ae230a0d2d8ae7df6f9cd592853f14c6b56f0daffe9ee474fd3ecdedbd05bd9a1e344d6af5c2ec6ba04c1fb5fdbc60e70a843e6e02ae3de922c1
 DIST symfony-finder-3.2.8.tar.gz 24452 BLAKE2B eed88ea672381fa3a0fef9390109fa7b89b8de87f4e0174fcb24c009044818b7c56846eec0b3240eed1c05fe7d682713fdd41c84e5d766cc2632e5576b38b741 SHA512 7eff457c6c70bf58b4af7e9adbeeb68a1ad684b95510d929f137545be6b755ece37949687f4de27c7fb4d5f208e30c6b0b3a32a804f7a6a6b8ed0d4ed7dfd9cd
 DIST symfony-finder-3.4.28.tar.gz 25618 BLAKE2B 592a10a5e8d7f1782242d79bc11ebfde6d528025a65bb18d5c36b238c418a3df10e637a285d0859bb79ab152aafdad5d61d32396efed6f6fe0e800aff03fae69 SHA512 5b1754e47eb484fddfb1d29f181efaabb371e62c2afe5c7c1d0552ac82de81aff0fbc6594498b859b64cd34cf35e57cf29110d59e5f376263f1b136a4d184b69
-EBUILD symfony-finder-3.2.8.ebuild 936 BLAKE2B c291d2c2b89cab1a8d498e36a2cb7e313512a7914afed8f20c220714a1badca4c0bebbec06040f7776a4425ec9d9e1450e89acefb03377c6d77b8c3790b1be6b SHA512 0bbf0ec089f3c9772324bcb0a67644ea6a5ab9df95b6350ca000483b9d0bf59ffda0bda34d5a68b73e302480e9d4dfa2d2f1dc592a80e1cd2210229f613164c5
-EBUILD symfony-finder-3.4.28.ebuild 946 BLAKE2B ad129b07fb9bf98f235c7e70d71632e989a27f615148c7a185f43a8a3c8b8456490afbbb9cd5e94aef60166a3dfc4f98c23c3c1cb6d55ad28bf40fd8ed208058 SHA512 b43d8e1b0e73deadd7b5f6b344c05663de370a0a57ef6939b660afcd8dbd8e471962404ac4abc577ce790af61c4c1a2716fee55aaf4a244c9e068b45054c7b42
+EBUILD symfony-finder-3.2.8.ebuild 960 BLAKE2B b9be05dabce7f2b73f61063d51b69ac6b48825113c9f5c72e77a09489a76686ef3cbaf410a0fb6fa5ce189d9e339a0b855668b56eb08e3ca58fc18b3bd71fcbf SHA512 55c995258c4405fa2417ed1d14d19cb9a15716e6e8489b682f8f96cc54f1cc864bc9e7f277f53a0947b6c52c438ab3e7e4b35e4e6f1b371b95a6ba34c71784c8
+EBUILD symfony-finder-3.4.28.ebuild 973 BLAKE2B 8feee88ca9bc72477f719e5c0182905116f8ded4bca3e678c6241833604559e22963fe5e26ce1e2b2134b06177e775ae3127a65d695bb767755636724ea34b69 SHA512 8745fdeb25cfa360259bd7d7477a3db2cd5b898738739aed7b0f7924963aa95da8502ffc1cafa6d2130f97c8f513847d4fbe1821251d9576fa716d42f47a8bca
 MISC metadata.xml 685 BLAKE2B feba013286ccce28abfb477e4c32c105bced39a175c00aab8c2413144100758914f93380418fbf9acce9c44ea9887b34b77cc674240edcac687449b1c5a7e36c SHA512 664abc5b0e4894c547f4d39ed3cc3c4f4b6526e0ad9dec4a83f43410121b2aaeccc969bf4393a899d309e71c21fd6e06df7f4547927a8ae1ee0b1382a8c5dc92
diff --git a/dev-php/symfony-finder/symfony-finder-3.2.8.ebuild b/dev-php/symfony-finder/symfony-finder-3.2.8.ebuild
index 2d435d348b79..e23f14897771 100644
--- a/dev-php/symfony-finder/symfony-finder-3.2.8.ebuild
+++ b/dev-php/symfony-finder/symfony-finder-3.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php:*
 	dev-php/fedora-autoloader"
diff --git a/dev-php/symfony-finder/symfony-finder-3.4.28.ebuild b/dev-php/symfony-finder/symfony-finder-3.4.28.ebuild
index 40b3be06d7a9..a798357e9391 100644
--- a/dev-php/symfony-finder/symfony-finder-3.4.28.ebuild
+++ b/dev-php/symfony-finder/symfony-finder-3.4.28.ebuild
@@ -11,6 +11,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php:*
 	dev-php/fedora-autoloader"
diff --git a/dev-php/theseer-tokenizer/Manifest b/dev-php/theseer-tokenizer/Manifest
index e0b9630034b0..b4429648b990 100644
--- a/dev-php/theseer-tokenizer/Manifest
+++ b/dev-php/theseer-tokenizer/Manifest
@@ -1,4 +1,6 @@
 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
 EBUILD theseer-tokenizer-1.1.0.ebuild 838 BLAKE2B 7330514a58ed439162ba8e4673ecf1bb9c2a754cd9279ee457b5667ba91222ca4bb79c756501e5cfcaf378e816931fffb80eb9242c36a3106d9498cb720a4f29 SHA512 45cf1d3481aeb6950dcac62c378c10af0ffcdbd6e0a412310008b0fa2095704adeca25e90c0e62f312f5b055ef368ef52c5f8ffbfeb6edf34511ff33f877ff45
+EBUILD theseer-tokenizer-1.1.3.ebuild 838 BLAKE2B 1e960b74da6e8dd886dcd57a1c3796ea11db25ac2e1bcaa33e788bf42362c3f06512a2f49b88c6266c4e5536ff69098dbfc64850a728ca6e5b17881060818cd6 SHA512 a354444d077638e3b2cb810684b3635bfb19e1f0ab8ad7d9e4dc1db22d8854cd12baead07a60548d73299b31a1172a11bbc2fa649625a38085f015435c07c94c
 MISC metadata.xml 321 BLAKE2B c4c16164af66494e41a3bfe90f4943c905560440eaea9de1a4f82148e1cdc353f9b6871efb618af4ab7ddb8c9fa1dfd931e0610b79c41750744aa6e5dd70580d SHA512 75a4155fe11d88a9d1bde7d46f68954c175c2b8d89872bd53496f11ffd22aa4cbf9f487e36217522e7201aae85c089422a3c7bea3fdec21fc3048b20aad6e5a9
diff --git a/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.3.ebuild b/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.3.ebuild
new file mode 100644
index 000000000000..5e52b63d58ae
--- /dev/null
+++ b/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 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 ~sh ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/tokenizer-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+	>=dev-lang/php-7.0:*[tokenizer,xmlwriter]"
+
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+src_prepare() {
+	cp "${FILESDIR}/autoload.php" src/ || die
+	default
+}
+
+src_install() {
+	insinto /usr/share/php/TheSeer/Tokenizer
+	doins src/*.php
+	dodoc README.md
+}
+
+src_test() {
+	phpunit || die "Unit testing failed!"
+}
diff --git a/dev-php/twig/Manifest b/dev-php/twig/Manifest
index e1a0cc0d83bf..16a16ca3ffe7 100644
--- a/dev-php/twig/Manifest
+++ b/dev-php/twig/Manifest
@@ -2,5 +2,6 @@ AUX Autoloader.php 503 BLAKE2B 57679179226098eea818df53154b98afd3249f12a219fc894
 DIST twig-1.40.1.tar.gz 274081 BLAKE2B 0e73bd9fff58677446ba03ed560bff17c1879192b79cca9f718ccd330e1eac64ee1195d7034fa52ec009e323868d1cc1bedc182e90f0a77c8b54d6aa16022554 SHA512 de174e5dd14562a155515a3238aa07ef5a22c3bf0eff8ecc320f1a972e56f1ec759a53ee24579c6434e286b3775044e88c753fd08930037314b45c9577b310b1
 DIST twig-1.42.3.tar.gz 278164 BLAKE2B 4bff9f7f85ce8ca00871e9342ec11a68d4b930f7761bc7404f504322483d328570e9e540e2518b5e1ad513002ce95686b7a1a47ff7aa4b28c16b2871ba759b01 SHA512 9dc892d80445f9fa9a3bde5cfdc49f2975a43f36123c1f4bbbb40740269e9aa4355d0d8668552e535f74a8ff27cc8ee1dc6983b50567993c1deab09569a7c5e3
 EBUILD twig-1.40.1-r1.ebuild 1369 BLAKE2B d0cb11c5eacd37538ad94097a5c2db78c351893140df5f025b82a8f3b8ec57ebadfee4ecafc2be5c527955656315e20ea9b404ecdaf374a92864c6f66edcb421 SHA512 e4243f710ed4287c8bd8ebb74bba91e534c1b6ec3b898706dbbd2cc7920682bc0c78e92472ad33257696df1031acbcfdf5a67036f7ff0a050cb3ccb49e30106b
+EBUILD twig-1.42.3-r1.ebuild 1378 BLAKE2B dc1556d8ff902b66933291ddfc87412c72bd32ecdbb71feda177b82467e08466dcc154064a009a86035d64093326bd8f1fc4b59487e4a01bdaa8caf4465ba9fe SHA512 ba447650c544b22dc7d88b91b61213018ed9ef8353e1edbea056b30f28b3bd4a50982b08812d65313ae5d786ba64c1ee72412b03168d3eb38f449bbffb43e27b
 EBUILD twig-1.42.3.ebuild 1369 BLAKE2B d0cb11c5eacd37538ad94097a5c2db78c351893140df5f025b82a8f3b8ec57ebadfee4ecafc2be5c527955656315e20ea9b404ecdaf374a92864c6f66edcb421 SHA512 e4243f710ed4287c8bd8ebb74bba91e534c1b6ec3b898706dbbd2cc7920682bc0c78e92472ad33257696df1031acbcfdf5a67036f7ff0a050cb3ccb49e30106b
 MISC metadata.xml 438 BLAKE2B 412d85f4f682c6c8e279082834468d3a59cbe2d9fbaaef1f7674903a59e68982d3ec6059f61517383a05488d7bff960ca36dbc869f588388c98511fca5662e5b SHA512 849a7ea4878de239a4454b63f63ecf3ac959ba7fb49d83b0cb60891974bb1cf2c330d27188f6b2ca7cee2f2ad5aefebeb4b914f3eb50eff4e09c973d8ca80339
diff --git a/dev-php/twig/twig-1.42.3-r1.ebuild b/dev-php/twig/twig-1.42.3-r1.ebuild
new file mode 100644
index 000000000000..6e54e7688809
--- /dev/null
+++ b/dev-php/twig/twig-1.42.3-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="Twig"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DESCRIPTION="PHP templating engine with syntax similar to Django"
+HOMEPAGE="http://twig.sensiolabs.org/"
+SRC_URI="https://github.com/twigphp/${MY_PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-lang/php:*[ctype] dev-php/fedora-autoloader"
+DEPEND="test? ( dev-php/phpunit ${RDEPEND} )"
+# Test fail due to missing Symphony dependencies
+RESTRICT="test"
+
+src_install(){
+	# The autoloader requires the 'T' in "Twig" capitalized.
+	insinto "/usr/share/php/${MY_PN}/lib/${MY_PN}"
+	doins -r lib/"${MY_PN}"/*
+	insinto "/usr/share/php/${MY_PN}/src"
+	doins -r src/*
+	insinto "/usr/share/php/${MY_PN}"
+	doins "${FILESDIR}/Autoloader.php"
+
+	dodoc README.rst CHANGELOG
+
+	# This installs the reStructuredText source documents. There's got
+	# to be some way to turn them into HTML using Sphinx, but upstream
+	# doesn't provide for it.
+	use doc && dodoc -r doc
+}
+
+src_test(){
+	cp "${FILESDIR}/Autoloader.php" "${S}" || die
+	phpunit --bootstrap Autoloader.php || die "test suite failed"
+	rm "${S}/Autoloader.php" || die
+}
+
+pkg_postinst(){
+	elog "${PN} has been installed in /usr/share/php/${MY_PN}/."
+	elog "To use it in a script, require('${MY_PN}/Autoloader.php')"
+}
diff --git a/dev-php/xdebug-client/Manifest b/dev-php/xdebug-client/Manifest
index 87cffd551ae3..35438413a1f3 100644
--- a/dev-php/xdebug-client/Manifest
+++ b/dev-php/xdebug-client/Manifest
@@ -4,10 +4,12 @@ DIST xdebug-2.6.1.tgz 283961 BLAKE2B 4478d591591102a9efa248820831e4d43d89eb9b803
 DIST xdebug-2.7.0.tar.gz 411943 BLAKE2B d01ad4f84a93356d0ce885cd0b3fb4e72bb55c7df0cb264750f91711e25955c3c5941ca40d5374ead6f4a0c2c70ec30c4133e626d5a925fe0c539541567692de SHA512 44ba3a1e7ca111250c53369df603851d84cb1ea91b691ef9f7695a6565369bf20a30e8bd2b9398ecc4440df4a566674876dd47ad8e60fe116c6784167461d5db
 DIST xdebug-2.7.2.tar.gz 416082 BLAKE2B c84e8a7b5e2fbc0989c47d9dff8c8d52d6e44a9fea1f7be483cec60b8b75e8665c71a536d0ca0c1b835990f747cadb29900d64b5ab0f47a4be172e7e1c0d38b2 SHA512 b099904b552750b9ff09181f068deddb155c820d20f6a4dcc37579771607e4e9c43af1cf226e74c012abd188b240c46b13207b9e55bdf010a696b739f1ea5e88
 DIST xdebug-2.8.0.tar.gz 440563 BLAKE2B a90fd84a56635fe4c7036b517da8c980affe5307d0f27c471e792d75c1fae45effabb4fff4954340920cb259baae7d8268274a3f2eec7490a9b84920438e6a49 SHA512 ec97de4c092a9256cc0c22ed87c59ac41b60103c82c7e57d1be66c4e6b098dfa82bedde9a9a0856cce34b83711f2d6719154aad45a688e9eaa5ad014abeff58b
+DIST xdebug-2.9.0.tar.gz 434220 BLAKE2B a537438dcd45d55521cf5f12ae9ca864d02dbccb3e971134d415b14deb69b366cbe55f1ec9e12457570ef7ef46e83a5ba32c6d63f80d7787e407d1fb9b9c1a4f SHA512 07719e58f637e9957ea92cde67c680d030ad5647b364061ba229c88590fbbc823b33f7b368913d213d64cea8c0ca92df59118df48b93c20e649c650b3333ce51
 EBUILD xdebug-client-2.5.3.ebuild 590 BLAKE2B 389fed0cf51727d612749239904af1a245bc46e5f40c6217b500133088019a6669718e9d87a63538d3fc60232c71f2f2579667c7b7d49cb12dba94d489b34be5 SHA512 31af43a9a78289e95185b71e58fa83b61ffda0f6bdf0c7c4597b307a65a1742eb0840904d8c02f2d1ea5997c50bac1cfb1d809880199efbff7f3ecbf765f4012
 EBUILD xdebug-client-2.5.5-r1.ebuild 613 BLAKE2B 8f768a6cb784e74dec4f686adebaa20ca718997a3a1c127c1c46e5c4a2014c5f26517b6bd74eb10a4b0547432286c74bf003f3e36430f54f2f9a6c1ebfba6cda SHA512 d0881929e891f0c0452780a0d84e572b67d85bee27e99789f7370be1e7458071f465df2a69b1d16922297adb99d1814fdefc29223246eb958547160736e2d7e9
 EBUILD xdebug-client-2.6.1.ebuild 606 BLAKE2B ed52f2ee0fa29ad7c1d6eded2a57c4461e0bce96017084c82ce04f334bc7df458f9a343191969e71f37eabb6f7e30522241942548e388ed516393f6844311cb2 SHA512 e6fa101dd1a18fdd60de9ca6c246a62956c766ceeeb87a11f4f6d7a0f5700137e7dca8c4057a30467a39cc227bde15d4eabf1260effde54b460086b6292bb7ab
 EBUILD xdebug-client-2.7.0.ebuild 818 BLAKE2B 308aa6a2f2be4a7bad1fc4176598ba2a19df48da73e9ec2c53f332827476acc1091552b2135d569686ebdb6b2e3727aa8d8e6da462c9350e4ac788b4159888ba SHA512 d855107da8bf9ad7210989395dc76dec93e2dc7d069416f89f47ea4813ed544dc7fc416e886312a040475a4de0e4ddd12bb5b21a27c96c35e31784b7dfae9270
 EBUILD xdebug-client-2.7.2.ebuild 818 BLAKE2B 308aa6a2f2be4a7bad1fc4176598ba2a19df48da73e9ec2c53f332827476acc1091552b2135d569686ebdb6b2e3727aa8d8e6da462c9350e4ac788b4159888ba SHA512 d855107da8bf9ad7210989395dc76dec93e2dc7d069416f89f47ea4813ed544dc7fc416e886312a040475a4de0e4ddd12bb5b21a27c96c35e31784b7dfae9270
 EBUILD xdebug-client-2.8.0.ebuild 818 BLAKE2B 308aa6a2f2be4a7bad1fc4176598ba2a19df48da73e9ec2c53f332827476acc1091552b2135d569686ebdb6b2e3727aa8d8e6da462c9350e4ac788b4159888ba SHA512 d855107da8bf9ad7210989395dc76dec93e2dc7d069416f89f47ea4813ed544dc7fc416e886312a040475a4de0e4ddd12bb5b21a27c96c35e31784b7dfae9270
+EBUILD xdebug-client-2.9.0.ebuild 818 BLAKE2B 308aa6a2f2be4a7bad1fc4176598ba2a19df48da73e9ec2c53f332827476acc1091552b2135d569686ebdb6b2e3727aa8d8e6da462c9350e4ac788b4159888ba SHA512 d855107da8bf9ad7210989395dc76dec93e2dc7d069416f89f47ea4813ed544dc7fc416e886312a040475a4de0e4ddd12bb5b21a27c96c35e31784b7dfae9270
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug-client/xdebug-client-2.9.0.ebuild b/dev-php/xdebug-client/xdebug-client-2.9.0.ebuild
new file mode 100644
index 000000000000..76b7388ac4ab
--- /dev/null
+++ b/dev-php/xdebug-client/xdebug-client-2.9.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 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 58ccc3618322..655a0d80c69d 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -1,15 +1,12 @@
-AUX 2.4.1-xdebug.ini 1285 BLAKE2B 830f55244b0ccece6f3123cef1489440372468aa3d4f02115e8695ff610505b91e36fb65e7f110b46e3fc5888d6c366eeaa5592dd7f40e2eb2133bb0711dd8aa SHA512 1eff8bc1e3cf9a3fae2ff2bc33e7ea47636e15496aa2a8efc039974fc2734632890d1da8bd6b07db6402c38c8e07631be38916f16a54d66068d0fad15d446bfc
 AUX 2.6.0-xdebug.ini 1623 BLAKE2B 6d8c3352dc55778e29cce92794ae36421a6e696244e3c7e1dd4e98d2ff0a6c86ce91e4e4ff2749cd58135e838ff61e2cad5bca8879caf9928d82e2f4bf17af80 SHA512 fe715f986fc5fbc0b92f8d708281feb5b9f6e0a054537ad7883c11acd035d0ddfc20812d64b35a616e0e8048b6332a097a0103329e2c96221571eeecbaaa963f
-DIST xdebug-2.5.3.tgz 279085 BLAKE2B cbbfb15e92c3f80cda502340396a6137e2234442fd98bc3fe4b2e08e76cba6292fb5176992aadba7193308ec4c9ab32356922a4416a21b23603e9b48a0d73c06 SHA512 b301a5abb92e123bbe2b36f7838b56d370a0f2c0c4d3c350b5014f4b86d31daa66e9bff995eed67a570558f6a72ca46a097266e6ab94c413f1dcb99c0fbd4f22
-DIST xdebug-2.5.5.tgz 279491 BLAKE2B 2492911db7afca2bc96761788c4ec7eac92cb22a6d65b69070b74f702df2bae1ba7dff9f5edfe83542229dbb7ebb3850b6ed1cf19a5e5969413aac3f2d39fc73 SHA512 9faab421bd90c03734c047d8c6dcc021c8bc665eb36781c692f194d04c7dca24fe1eb920ca8dc407e5bf4ae0912c4b917587f940f34b07171a8881d4cf8695d1
 DIST xdebug-2.6.1.tgz 283961 BLAKE2B 4478d591591102a9efa248820831e4d43d89eb9b80379c92fe85c888377a31d855ac4ea98c13ad87da68f7e7f659483cfa36fd4651f245d5603fcada2e2fcf73 SHA512 31f26e592b3888d7cc74c6a7c51e0cc1151cf8a32100dda78098fb5b3e307cf8d0445b97247986c75b303a787f89b3937bc042dc52f19ca995753a6843bbd80b
 DIST xdebug-2.7.0.tar.gz 411943 BLAKE2B d01ad4f84a93356d0ce885cd0b3fb4e72bb55c7df0cb264750f91711e25955c3c5941ca40d5374ead6f4a0c2c70ec30c4133e626d5a925fe0c539541567692de SHA512 44ba3a1e7ca111250c53369df603851d84cb1ea91b691ef9f7695a6565369bf20a30e8bd2b9398ecc4440df4a566674876dd47ad8e60fe116c6784167461d5db
 DIST xdebug-2.7.2.tar.gz 416082 BLAKE2B c84e8a7b5e2fbc0989c47d9dff8c8d52d6e44a9fea1f7be483cec60b8b75e8665c71a536d0ca0c1b835990f747cadb29900d64b5ab0f47a4be172e7e1c0d38b2 SHA512 b099904b552750b9ff09181f068deddb155c820d20f6a4dcc37579771607e4e9c43af1cf226e74c012abd188b240c46b13207b9e55bdf010a696b739f1ea5e88
 DIST xdebug-2.8.0.tar.gz 440563 BLAKE2B a90fd84a56635fe4c7036b517da8c980affe5307d0f27c471e792d75c1fae45effabb4fff4954340920cb259baae7d8268274a3f2eec7490a9b84920438e6a49 SHA512 ec97de4c092a9256cc0c22ed87c59ac41b60103c82c7e57d1be66c4e6b098dfa82bedde9a9a0856cce34b83711f2d6719154aad45a688e9eaa5ad014abeff58b
-EBUILD xdebug-2.5.3.ebuild 1035 BLAKE2B 33b476351fde796721bf602b127488496a65ad078cf2f6a2c49ba1d8f80252f08416b6c73c8424dd8a31d1ee4950dae9aa12c651c303db1c14a219c07ff25a96 SHA512 d6ba05f536ce9ab502ac4a0008b04544f37755b007a3c2efea9e75cc5e9d5b7f9c2f2bc58d76b682addef1681d747af8c6682cbf7073bee234c1571d99836081
-EBUILD xdebug-2.5.5.ebuild 1039 BLAKE2B 1e6a6b488a3e8041378d044646831021f047bbb3e923e8f5587540f35fb2234e5be4ff2017a2c293d1b3b2656d7161e1474daa724df5c0dcf1658ebe8686d38a SHA512 13d6f35f02f8869dec0c46283a8ca5c198d4d87d0be0e374c5f355c94f4e84f176713199733df72bb4eaf06a042c43c8037c2cb4a58eb621c9d14362185aa7f8
+DIST xdebug-2.9.0.tar.gz 434220 BLAKE2B a537438dcd45d55521cf5f12ae9ca864d02dbccb3e971134d415b14deb69b366cbe55f1ec9e12457570ef7ef46e83a5ba32c6d63f80d7787e407d1fb9b9c1a4f SHA512 07719e58f637e9957ea92cde67c680d030ad5647b364061ba229c88590fbbc823b33f7b368913d213d64cea8c0ca92df59118df48b93c20e649c650b3333ce51
 EBUILD xdebug-2.6.1.ebuild 1032 BLAKE2B 71cd322d334d47194e8fa317e5f0722fa944f4612c2bd45cb1d56241495c891702ca2ad5e647e1356af0d51307f7e752c1e37f57b5044ea8f085209332091cb1 SHA512 b0ffe7473f0c0e79d470fd6f7ab9526918817bb6256a88b69e1f53e99d2e8270530174e991093b8be8af3ef54d6f85e3d5a5affd9fe703e51babeaaf5c431aa8
 EBUILD xdebug-2.7.0.ebuild 1155 BLAKE2B fc9630f3e3bc442702447fbc152608a8af8e169a7e7508d6b79e1b06c02db2ac749eb49707470eb0d2a68384417b5f92a281e61eeb88acd63e7bd61165babcfe SHA512 5bb3d8f9e131b328990b78991f377fe7230394d3a1395beaf8ca57410d6960919bf3b914e84442c4ce6a1a8af8e75a6cc49e1609be9131be86f601a7a7360973
 EBUILD xdebug-2.7.2.ebuild 1155 BLAKE2B fc9630f3e3bc442702447fbc152608a8af8e169a7e7508d6b79e1b06c02db2ac749eb49707470eb0d2a68384417b5f92a281e61eeb88acd63e7bd61165babcfe SHA512 5bb3d8f9e131b328990b78991f377fe7230394d3a1395beaf8ca57410d6960919bf3b914e84442c4ce6a1a8af8e75a6cc49e1609be9131be86f601a7a7360973
 EBUILD xdebug-2.8.0.ebuild 1162 BLAKE2B 52d56fb3b8976d67c81136664082dd29d66623f31f039db6cbcc2eb3ea776f64f6bb929c2a1ba396f991a7aaf0e935bbab58360d734539d0d7ce3e331f43d0b3 SHA512 fecb4d764e55e7ee68075da0cfe1dfb5051cea6a9b13835398edd34a41e5d39b8051780bbb0c48bf459130626d12abd249b95257458d36564f4354a2283dab4d
+EBUILD xdebug-2.9.0.ebuild 1162 BLAKE2B 52d56fb3b8976d67c81136664082dd29d66623f31f039db6cbcc2eb3ea776f64f6bb929c2a1ba396f991a7aaf0e935bbab58360d734539d0d7ce3e331f43d0b3 SHA512 fecb4d764e55e7ee68075da0cfe1dfb5051cea6a9b13835398edd34a41e5d39b8051780bbb0c48bf459130626d12abd249b95257458d36564f4354a2283dab4d
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug/files/2.4.1-xdebug.ini b/dev-php/xdebug/files/2.4.1-xdebug.ini
deleted file mode 100644
index 62042aee217b..000000000000
--- a/dev-php/xdebug/files/2.4.1-xdebug.ini
+++ /dev/null
@@ -1,46 +0,0 @@
-xdebug.auto_trace="0"
-xdebug.trace_output_dir="/tmp"
-xdebug.trace_output_name="trace.%c"
-xdebug.trace_format="0"
-xdebug.trace_options="0"
-xdebug.collect_includes="1"
-xdebug.collect_params="0"
-xdebug.collect_return="0"
-xdebug.collect_vars="0"
-xdebug.default_enable="1"
-xdebug.extended_info="1"
-xdebug.manual_url="http://www.php.net"
-xdebug.max_nesting_level="256"
-xdebug.show_error_trace="0"
-xdebug.show_exception_trace="0"
-xdebug.show_local_vars="0"
-xdebug.show_mem_delta="0"
-xdebug.dump.COOKIE="NULL"
-xdebug.dump.ENV="NULL"
-xdebug.dump.FILES="NULL"
-xdebug.dump.GET="NULL"
-xdebug.dump.POST="NULL"
-xdebug.dump.REQUEST="NULL"
-xdebug.dump.SERVER="NULL"
-xdebug.dump.SESSION="NULL"
-xdebug.dump_globals="1"
-xdebug.dump_once="1"
-xdebug.dump_undefined="0"
-xdebug.overload_var_dump="2"
-xdebug.profiler_enable="0"
-xdebug.profiler_output_dir="/tmp"
-xdebug.profiler_output_name="cachegrind.out.%p"
-xdebug.profiler_enable_trigger="0"
-xdebug.profiler_append="0"
-xdebug.profiler_aggregate="0"
-xdebug.remote_enable="0"
-xdebug.remote_handler="dbgp"
-xdebug.remote_host="localhost"
-xdebug.remote_mode="req"
-xdebug.remote_port="9000"
-xdebug.remote_autostart="0"
-xdebug.remote_log=""
-xdebug.idekey=""
-xdebug.var_display_max_data="512"
-xdebug.var_display_max_depth="2"
-xdebug.var_display_max_children="128"
diff --git a/dev-php/xdebug/xdebug-2.5.3.ebuild b/dev-php/xdebug/xdebug-2.5.3.ebuild
deleted file mode 100644
index e7772abc27d4..000000000000
--- a/dev-php/xdebug/xdebug-2.5.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PHP_EXT_NAME="xdebug"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="yes"
-PHP_EXT_INIFILE="2.4.1-xdebug.ini"
-
-USE_PHP="php7-1 php7-0 php5-6"
-
-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="http://www.xdebug.org/"
-SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
-LICENSE="Xdebug"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		~dev-php/xdebug-client-${PV}"
-DOCS=( README.rst CREDITS )
-PHP_EXT_ECONF_ARGS=()
-
-pkg_postinst() {
-	ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
-	ewarn "installed as a dependency, and not all users will want xdebug to be"
-	ewarn "enabled by default. If you want to enable it, you should edit the"
-	ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
-	ewarn "call xdebug_enable() in your code."
-}
diff --git a/dev-php/xdebug/xdebug-2.5.5.ebuild b/dev-php/xdebug/xdebug-2.9.0.ebuild
index 2f3ece25477e..a95298dda05b 100644
--- a/dev-php/xdebug/xdebug-2.5.5.ebuild
+++ b/dev-php/xdebug/xdebug-2.9.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 PHP_EXT_NAME="xdebug"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="yes"
-PHP_EXT_INIFILE="2.4.1-xdebug.ini"
+PHP_EXT_INIFILE="2.6.0-xdebug.ini"
 
-USE_PHP="php7-1 php7-0 php5-6"
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 MY_PV="${PV/_/}"
 MY_PV="${MY_PV/rc/RC}"
@@ -19,8 +19,10 @@ inherit php-ext-source-r3
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 
 DESCRIPTION="A PHP debugging and profiling extension"
-HOMEPAGE="http://www.xdebug.org/"
-SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
+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=""
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-php
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)