gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-php
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
54 files changed, 545 insertions, 92 deletions
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 7abf80f560bd..578fc783eecf 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Crypt_GPG/Manifest b/dev-php/PEAR-Crypt_GPG/Manifest
index 58f12da037fb..cff8d524637e 100644
--- a/dev-php/PEAR-Crypt_GPG/Manifest
+++ b/dev-php/PEAR-Crypt_GPG/Manifest
@@ -2,7 +2,7 @@ AUX fix-unit-tests-with-new-gpg.patch 2090 BLAKE2B 7cc3b79bfd29244eec6e0152130d3
 DIST Crypt_GPG-1.6.2.tgz 346709 BLAKE2B abced2fe8c909f06690c38884506ce03df4c5ef3ef460aafce65ea9405c6974f8af320fd5a07a7967b45421a9a67aa27026c28ef7eb1402ffefba527007a33ae SHA512 9d954d96b4e461c75f79ce9bc701d062e3f19671690228e6e0ce5265733ac1de9c06520f9f750348f3c37f01ccb79720574b2d2f371e69c8a25ae6e1bc18aabd
 DIST Crypt_GPG-1.6.3.tgz 346999 BLAKE2B 8402ef382a6393972a3fda7370fbd37dec19d0ebabb6b316d35783538dbc01746476977d7dc3da487876201cd678964d9572dc67a43911319b1b614004a3c909 SHA512 f1ad2560a43a1e8f5a33269bc4ae4067e19e5325fdbd8d2fc55f6cb8aad89258df45fbecedd93a21749f33024c819f07399580b1a4760f5740f26043109dc396
 DIST Crypt_GPG-1.6.4.tgz 346390 BLAKE2B 22e9e9d893f96bb3c3dc538b168a35366d2b699e92bf832370223879e90e8018cfd3b736e099807fdcc897b7569a40af66e72f011eaeb7400477053b7838409d SHA512 3eee39702abe97fc322e5976ebe8a7f7ba07bc950d22aa6636cadf38b0bd9c6c6316d7be35f21a8d0e8dfdb66a76db33121edb34736869d31ae89b03468cf470
-EBUILD PEAR-Crypt_GPG-1.6.2.ebuild 1170 BLAKE2B 437691fd331a1c589a256764c9d441f1b9a8812ce4c7b435ba73de7a3aecbc4417c1e9e52a61e1b3ecdfc26b8cd37c14ae3a7bf0683ddcd4eeefb0a516b3f753 SHA512 51cbb2871f7093b20962ec8726ec59aa333557c1b2fc843ca28bdf1896b5b4bfeca2002fd906af2c0607e22ac25108ad373c17cf75e1576d98d5b3049870c554
-EBUILD PEAR-Crypt_GPG-1.6.3.ebuild 1117 BLAKE2B e79952729e05686e9915b4ea3baf6089c52ee55043d79fc5826a29a3028e2cdaf82b42f087c169a50eb06694482a61c284bc9313b12ccf23c8bf14e556d85238 SHA512 2316799e3357d240a23a4020bf0c971abaecdde9792745f38bd9fafa26f78bc94eae9845ee1c1ff1d959d954bab1dc6ab09f92496c2497335b1fa42f6a49c562
-EBUILD PEAR-Crypt_GPG-1.6.4.ebuild 1117 BLAKE2B e79952729e05686e9915b4ea3baf6089c52ee55043d79fc5826a29a3028e2cdaf82b42f087c169a50eb06694482a61c284bc9313b12ccf23c8bf14e556d85238 SHA512 2316799e3357d240a23a4020bf0c971abaecdde9792745f38bd9fafa26f78bc94eae9845ee1c1ff1d959d954bab1dc6ab09f92496c2497335b1fa42f6a49c562
+EBUILD PEAR-Crypt_GPG-1.6.2.ebuild 1173 BLAKE2B 2e3fff835befd3bc2d24f252527379b6c93e6e13cee38fa4e2a1c2c6cc778425597321e38abcbed86d32cc1003fe4715dd4b514d103679062db39009f41c03a8 SHA512 80490b7c7b036681e2fbe69bb9b364b6ce6c092bd600544ab2ce4ca80e3509a1e747a739c116d894a566ac4e9bf99be878b4c3fc3b5ee72973014ac27701647e
+EBUILD PEAR-Crypt_GPG-1.6.3.ebuild 1120 BLAKE2B e91c8b18e150d98435b792ea12c84dfd171d63e7963b9b073156d1b4b49c86ce68734606211cc1340aa66ddba675456d153f3da4465f3c1c4d3b4df7949adf36 SHA512 7b8246c9ef8257bb14a3b4378b69d7dda5a022247c9f94162954be9b9f06a3173d67365387927f7a0a875b4882deaadcb5111e98b097f984739a9319dcc233a9
+EBUILD PEAR-Crypt_GPG-1.6.4.ebuild 1120 BLAKE2B e91c8b18e150d98435b792ea12c84dfd171d63e7963b9b073156d1b4b49c86ce68734606211cc1340aa66ddba675456d153f3da4465f3c1c4d3b4df7949adf36 SHA512 7b8246c9ef8257bb14a3b4378b69d7dda5a022247c9f94162954be9b9f06a3173d67365387927f7a0a875b4882deaadcb5111e98b097f984739a9319dcc233a9
 MISC metadata.xml 490 BLAKE2B ae0122e23babc3353357016c47707d7a9ec6cf92d2a981c25eaebcc13713c676cd6c283b2810d6f337071651546085db6a4de56e6decd22275de90da88181f08 SHA512 21423e113024e94c04f245071ecc0a0308672387b92f42c7f57b0d716b0d681d2008fab84cec1bf0b0d37981d5548515e5f3997e76e288d9aafee678b5411ab9
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 dfc934dcbed9..53f4edf909e4 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
@@ -20,7 +20,7 @@ RDEPEND="app-crypt/gnupg
 	dev-lang/php:*[posix,unicode]
 	dev-php/PEAR-Console_CommandLine
 	dev-php/PEAR-Exception"
-DEPEND="test? (	${RDEPEND} dev-php/phpunit )"
+DEPEND="test? (	${RDEPEND} <dev-php/phpunit-6 )"
 
 S="${WORKDIR}/${MY_P}"
 
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 46eb948e97d4..e0cea4ce1b04 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
@@ -20,7 +20,7 @@ RDEPEND="app-crypt/gnupg
 	dev-lang/php:*[posix,unicode]
 	dev-php/PEAR-Console_CommandLine
 	dev-php/PEAR-Exception"
-BDEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.4.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.4.ebuild
index 46eb948e97d4..e0cea4ce1b04 100644
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.4.ebuild
+++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.4.ebuild
@@ -20,7 +20,7 @@ RDEPEND="app-crypt/gnupg
 	dev-lang/php:*[posix,unicode]
 	dev-php/PEAR-Console_CommandLine
 	dev-php/PEAR-Exception"
-BDEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-php/PEAR-HTTP_Request2/Manifest b/dev-php/PEAR-HTTP_Request2/Manifest
index fc64bbf90579..6c882aa33741 100644
--- a/dev-php/PEAR-HTTP_Request2/Manifest
+++ b/dev-php/PEAR-HTTP_Request2/Manifest
@@ -1,3 +1,5 @@
 DIST HTTP_Request2-2.3.0.tgz 119717 BLAKE2B f12972b2423258016f4f4ef8888b5aa1d56bb47146cc6e21f74edfd2e3cd8ae69a1830b4a203990e1346554f2a6e9538e8d5feae27cceadc8465b018dd34ff37 SHA512 52fc2768f3c5afe6fd4505d427255e467b5b7cac8a4116cbabc3f1c0ffe6f1bd061a9c9b31de2ebbd4a7844ae73085ab0d52adf905dce28eb31197117657d77b
+DIST HTTP_Request2-2.4.1.tgz 125380 BLAKE2B 0037938211432be52af8851b015f8c8ef73225fbbc1727e6e647d2e9632fa471a73ae14c4f8c0ea636fb97339dfd53da91bd391543bc855dc9a123ca7a707965 SHA512 9a65aee4c4f724a84815d683522225d36a8e30fc1f5dbbe6b4681ec264b4fb711573bd6d2ec6ddc228c9e259ffbeeb6816aadba155530e969c7bfac4e0617e2b
 EBUILD PEAR-HTTP_Request2-2.3.0-r1.ebuild 747 BLAKE2B 1b4e65931c219d62a939d98def1303fd6f94572ef8c37297f81e4a66802d9760ed10780b0c659f25bd20006aec9f76db9e1442b26810dd3bfd0b51ccb7788f20 SHA512 6d715ebef3a7ca2238fa9be01fa37dc37fa617a521833886b9248e683faf98b92999082893a8c6d9f2cfcfb5867eab151b248df20a26dffd8ba3bfd3227f3886
+EBUILD PEAR-HTTP_Request2-2.4.1.ebuild 751 BLAKE2B 86fcc0f813e1c16087ea92b29b83f560477500cca8c965c49f2ec9bc3ab680c2718ecfb78e4fa76dc57a22543f3a067773b3987213e9cdcd72378591fd3b382f SHA512 17a44ec6535910f7ccd32c2133dd8c984f2e0c31b4a4d49fc5b8cdf80799f536be080d452ce5d7572653a59398c05aaf876b12aca06fba591fb9bc421ac570fa
 MISC metadata.xml 719 BLAKE2B 82195b1905bf7b954b7a62502ef524628a05a509e551bdeae9dec1d157579ca6520a8173dd5cfe2eb677f8d26b5fce9195d9312027f6a50d063f0a77acc6152f SHA512 38a38b6d73d885e7222812f54cc4bb67fae6d05c5647b123c00c7676a3feb8fc2cf33a2d308058431e00865a1dc198fd978614c652e614a1058e0319abe72704
diff --git a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.4.1.ebuild b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.4.1.ebuild
new file mode 100644
index 000000000000..b1f6817200a1
--- /dev/null
+++ b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.4.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit php-pear-r2
+
+DESCRIPTION="Provides an easy way to perform HTTP requests"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~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"
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+src_prepare() {
+	sed -i "s~@data_dir@~${EPREFIX}/usr/share/php/data~" HTTP/Request2/CookieJar.php || die
+	default
+}
+
+src_test() {
+	phpunit tests || die
+}
+
+src_install() {
+	php-pear-r2_src_install
+	insinto "/usr/share/php/data/${PHP_PEAR_PKG_NAME}"
+	doins data/*
+}
diff --git a/dev-php/PEAR-Text_Wiki_Mediawiki/Manifest b/dev-php/PEAR-Text_Wiki_Mediawiki/Manifest
index c702413baf7f..f068ed10398d 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 786 BLAKE2B 6521a3f522d4584fa9aa152c149eef6fe891fd9bb7f91a31b8d0bf3c9021e5cd34cdd56000399d684732b3ad73cee90af4c6a9746266bfa45d3a2d2b230801b6 SHA512 a7903ebc2ceaafa5010ca20f2ac6704d45b86a1923e9c696876be762fdee3a4c6854d38fc409a01594f5fff8ab81fb5729aeb5cf7777670c37f485cd315d57c9
+EBUILD PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604.ebuild 794 BLAKE2B 255a26171035756a41b92150d22fbbc8c7292a0ba066f33d09d1bee019ec4aff16f96d8a4e2b3384e304d2df84ea237116538e26db683bbe7db7d6de6aa0105e SHA512 a403fd73651ecabaa841bfddf813bdaea30b45a96682a71ba7be91b55bc2685c5c12ec03a42ed5506ea5d6dd349a26947646f2ce49327221182948a55b7fc941
 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 a83c1f9779ec..ef46c5c3e253 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-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,10 @@ 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 )"
+DEPEND="test? (
+		${RDEPEND}
+		<dev-php/phpunit-6
+	)"
 PATCHES=( "${FILESDIR}/0.2.0-constructor.patch" )
 
 src_test() {
diff --git a/dev-php/PEAR-VersionControl_SVN/Manifest b/dev-php/PEAR-VersionControl_SVN/Manifest
index f29b8aa21171..5c00b49f834e 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 962 BLAKE2B 9bafc3dd06fc35e2b85e280633f3d68b73585aa5be176420fe1d183df5f8adcfbf3bbc6d627b98e0a36ae7f98429c9ce7b790baa7271b2fee10623feb270aa78 SHA512 da3bca5d0fbe98cf053a5a5b9cbf799b14a9ac83ecf7911a104aa181427793b47842ba5a4c78b764ecb49090cc3a5a045c42e71ac4384685fdfa09c26ae5098f
+EBUILD PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild 965 BLAKE2B 72beccc5044c03c88d58f0575e1dada39292e4ea5d29ead31707ec4d1b9cee4a38dee55826d144bb924ae2bc50c8e628fddb35ebbd8b847692a1d25eb7b195c1 SHA512 bf52d4ed345cf970e1569a70852650a41e474609d3628335b858cfec61fd9d6b3f2e1d9b04821d308672dd5b4c99eb8377415a93fbf6f7ccdfa67df2804e9887
 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 87a974669e13..d1a06c8cfbfd 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-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND=""
-DEPEND="test? ( dev-vcs/subversion dev-php/phpunit )"
+DEPEND="test? ( dev-vcs/subversion <dev-php/phpunit-6 )"
 S="${WORKDIR}/PEAR-${PHP_PEAR_PKG_NAME}-${PV}"
 
 src_prepare() {
diff --git a/dev-php/PHPMailer/Manifest b/dev-php/PHPMailer/Manifest
index 5f16be4d64dd..a9d34951dee4 100644
--- a/dev-php/PHPMailer/Manifest
+++ b/dev-php/PHPMailer/Manifest
@@ -1,5 +1,7 @@
 DIST PHPMailer-5.2.28.tar.gz 159284 BLAKE2B 866a38c60ac55cbd8aefec5ad82211575e672578ddff1af435e676c7058b0a090884f3e5f2c1e6f30c94b01e393f982f644e578ea22c931ffb8a93be717e379b SHA512 c2dd762b8958d1dc68fec52d7daae7337e05cadcbcf9e67c27247c808877cf3132e80cf6d4c9c577f8ad9203e433282e45f2166bccce025bcc4477724eb7036f
 DIST PHPMailer-6.1.6.tar.gz 94769 BLAKE2B 6689f4429c0847de41016325553d58d544f78d5f8a94d9014841435a3cf161e4e10b14fe2cbb61c737bf75d87f2dc4cde66885c06a0b6992a472f0f46fe5dd6b SHA512 25530e6c5513e89729a5b253565143a5a9a35ee5f7813637eee18ca1d604cb83625f7beb106e56536f681d7ec4332fcd3cddcac5da7c73f730db1b056ba5b2e4
+DIST PHPMailer-6.1.7.tar.gz 95102 BLAKE2B 8a1a09aa8f1c82900d881cf82e4a44705afbabc2f38b7bcf8b069a23c426f690dfbebd30c27a30dfbd8a3ad10e75e88fab4fa064bd44308b837455b84a41cad9 SHA512 4b37e11bb99966b8151b64a469125f249091c9b57ef729549735f37869fbaf1a1fb1a3f9d19822c824e909e8b53b696d3cb0d5180683e94968145a968622c2e8
 EBUILD PHPMailer-5.2.28.ebuild 1962 BLAKE2B e5386bf9d75ae81df44fa8703e2183ff79b39054c14bf49a1b57774d148aa5d460c7f5310a98d447a114187844c0453e4017eb5cfb1f679e4910ad60b83cd6d7 SHA512 b6eab2bf9413f7af3083f92a0d8f3252a3773526711c724786df3b3c056472f6a0d7a0725ae58adc3860cff8c5ee9707a7198e0193a7fedf31c878408d385b85
 EBUILD PHPMailer-6.1.6.ebuild 2219 BLAKE2B 08a599591d6bee673c5df6b47d9c9aea0db8e7ba8d46d7568afbb3d72ee65d0e23215d5f77ac3ac04e70ca26a98847323b9a54dd4adef8f453efc90e89d52a3f SHA512 c69da2436be943fb96828db9268f73d34ac129b21521800f510ef79db257b090627f8bc5c384708f38bc9aec024116461b1a9bfce2dc9b0b7e20c23fc41dad27
+EBUILD PHPMailer-6.1.7.ebuild 2219 BLAKE2B 08a599591d6bee673c5df6b47d9c9aea0db8e7ba8d46d7568afbb3d72ee65d0e23215d5f77ac3ac04e70ca26a98847323b9a54dd4adef8f453efc90e89d52a3f SHA512 c69da2436be943fb96828db9268f73d34ac129b21521800f510ef79db257b090627f8bc5c384708f38bc9aec024116461b1a9bfce2dc9b0b7e20c23fc41dad27
 MISC metadata.xml 446 BLAKE2B 178ea98081e664641c7a8632a1c7dac9b5cac8992b0b945208f5ef654633340daced2473bbdc342b70d8b168ac2206ba132f7ab9601f61b5436f3eb3e0441ca1 SHA512 3dfce858cb0e00b526f04a5764a6173d4711db4f21f52b6d827b82f1cddea4e33f533e645dae95d0bb6a69699b00520a414f2e322c76b56aee1e4ea047bb4bb5
diff --git a/dev-php/PHPMailer/PHPMailer-6.1.7.ebuild b/dev-php/PHPMailer/PHPMailer-6.1.7.ebuild
new file mode 100644
index 000000000000..e27c5fd93328
--- /dev/null
+++ b/dev-php/PHPMailer/PHPMailer-6.1.7.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 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/adodb/Manifest b/dev-php/adodb/Manifest
index 0303d49b7645..46ba9a542f38 100644
--- a/dev-php/adodb/Manifest
+++ b/dev-php/adodb/Manifest
@@ -1,7 +1,5 @@
 DIST adodb-5.20.14.tar.gz 465896 BLAKE2B acd8494141584b0c02c2e30aa59b3916ae811b8095ca724d22f44ed2cb1456b8e8afc7ff9af41e7476f4a93809e762c44a175fd3775b69654107813342b3a47a SHA512 fa9b764742f3edf15e79da7a34ca52b19f51454fa20bc963cce963cdd40f7e78671e993cd672a21e9917aa2440c63601fbf768b5259dccb64b458a5be6f4b0eb
-DIST adodb-5.20.15.tar.gz 466749 BLAKE2B ca232e15094eaf728dd82b449cfded4f84fc773e5dbe1a06b7bb15fc18487080131c52d7ae9d77e6a401bfd53baa7875810c94b6bda615d0a836a715914de9d7 SHA512 87c6f508f49a54e436b56d47d3c0b2801f4f022876013a2ffa23e751cc4c7aa83aa359e51acc4f8351fd596ad4f5d71326204ae3d57514c4354f68669e412c73
-DIST adodb-5.20.17.tar.gz 466901 BLAKE2B 86e6cc7ae383c698e889925679d1a1f8ace181fe82a178e527ea169f1d21e83844563707e707968522de8bdc180eeb103793fa0468a38f924f29ac4b96310c50 SHA512 c8850f4e330dc058564b59c8a73e0687e1c9d1c56f617b4bbd99aee83e7047626d436c903caf913b11784be1528bb55e442e6365732f8d4bec82edb029831bd6
+DIST adodb-5.20.18.tar.gz 467003 BLAKE2B ea0b007359a4fdada0fface3d5af82c335f2e7efeacdbb66be37914d76bff2783b58b2318531c527d13c3c358800803385c660c8f9372cf4a49269ed7e0c7d51 SHA512 09b04987e20a674a202be3889523b3bada578ea01f07830fed15afafb046687004b4e305a6abf2af795a7b0e3563f6e8afec5b0189f21e5c74b5e84bfbee1cd9
 EBUILD adodb-5.20.14.ebuild 1445 BLAKE2B 7beb52ccfc3211800b38230d5699e446cf95c263a49971065cd62944aae9c6aa9b612508af0b1c186edb9fb0be45115a10910214d019ca97fe90db50183f7bf7 SHA512 41f97b3992ba0898746d321a3b099f1309794bd38ddaf4ff15c7567bf97ee74e71da73179e1b21afcd9ad73f0f62d960fe4429d393cb1eb65ae52eaa39c07650
-EBUILD adodb-5.20.15.ebuild 1452 BLAKE2B e5286f48e8bdf5fdae03893ea87292ed6da2dffae801140e2dfcd31c1a5994f205d2a17b1f58bcf757f14f1bc6230d367a4deb007facfd097f298982529fac98 SHA512 20efbbea0b7a1db0aae61b433faab6d4ec222c8082c37a5a34875cf214794e1a104a4b5e47e84f822b43576f64233ecea9a1a19e5759c98cef28c80aac4b1444
-EBUILD adodb-5.20.17.ebuild 1452 BLAKE2B aa01cdfbab7c732279973480c2524c8c13668b54c85f8396e205d54f849f8e43a553b6a8325743dc8a17f088317397457a4a3f8e3a3bebaade4515965123fbf1 SHA512 9af2be6f93b6c9d1610393c3fda939b30993ac7121c286541d2e52035b4c084c2034f2bb9c45db1affcbd0f194974276464679c808b3c6d7895b6d16cbea1ccf
+EBUILD adodb-5.20.18.ebuild 1452 BLAKE2B aa01cdfbab7c732279973480c2524c8c13668b54c85f8396e205d54f849f8e43a553b6a8325743dc8a17f088317397457a4a3f8e3a3bebaade4515965123fbf1 SHA512 9af2be6f93b6c9d1610393c3fda939b30993ac7121c286541d2e52035b4c084c2034f2bb9c45db1affcbd0f194974276464679c808b3c6d7895b6d16cbea1ccf
 MISC metadata.xml 490 BLAKE2B fe6674acd3eb6a1c95ae4deb6f4215b0c31251918cc96eef1d6c784914d8e3c7eb273b868b90d7b8585421acb58172b7ce6a54d99b6b41abfed923b6e34abfd3 SHA512 c81b170a7a9532e27707f6bccea90be62a8504228571eae8b5564eea37c6789bafcb2681e4de8cc99916e1304056121575c3d8487cc1102f13909d14a7565fcb
diff --git a/dev-php/adodb/adodb-5.20.15.ebuild b/dev-php/adodb/adodb-5.20.15.ebuild
deleted file mode 100644
index f16a3af534d9..000000000000
--- a/dev-php/adodb/adodb-5.20.15.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="ADOdb"
-DESCRIPTION="Database abstraction layer for PHP"
-HOMEPAGE="https://github.com/ADOdb"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-# If you want to be picky, we should require that PHP be built with at
-# least one database driver enabled; otherwise adodb isn't going to be
-# able to do anything. But, the database USE flags for dev-lang/php are
-# a mess. What we would *like* to do is have a set of USE flags for
-# adodb that then propagate to PHP itself... for example, adodb[mysql]
-# could require php[mysql]. To do that would require that we duplicate
-# the database USE flag mess for adodb -- not desirable. Instead we punt
-# and let the user install adodb unconditionally. If he doesn't have
-# database support in PHP, it just won't work.
-RDEPEND="dev-lang/php:*"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	DOCS="README.md docs/changelog*.md xmlschema*.dtd session/*.sql"
-	DOCS+=" session/*.txt session/*.xml pear/auth_adodb_example.php"
-	DOCS+=" pear/readme.Auth.txt"
-
-	dodoc $DOCS
-	rm -f $DOCS || die "failed to remove docs before installation"
-
-	insinto "/usr/share/php/${PN}"
-	doins *.php
-	doins -r contrib datadict drivers lang pear perf replicate session xsl
-}
diff --git a/dev-php/adodb/adodb-5.20.17.ebuild b/dev-php/adodb/adodb-5.20.18.ebuild
index a1cd6765bdcf..a1cd6765bdcf 100644
--- a/dev-php/adodb/adodb-5.20.17.ebuild
+++ b/dev-php/adodb/adodb-5.20.18.ebuild
diff --git a/dev-php/awl/Manifest b/dev-php/awl/Manifest
index 755cf7f55de3..ab8793c58362 100644
--- a/dev-php/awl/Manifest
+++ b/dev-php/awl/Manifest
@@ -1,3 +1,3 @@
 DIST awl-0.61.tar.xz 124340 BLAKE2B af5d9c063280c93deb55929acf4826b6ba003676a15fcda48019a2a7788d8913d20a05c4aae98f2345d931b8f593bd32622a033fe421b55d0c687b10c7e1be05 SHA512 3492512ec04e523a30562d49aac1be617a2cee80fa363b0fbf13b25b44818a4c85af018193f79a6442419b1f7022cd7ec417e3c34641eb8096750441dcbd22bc
-EBUILD awl-0.61.ebuild 668 BLAKE2B c88023c6ead521c77705cf27d516c4b6db7fa6340da7933cc3b399acba382324237d026be97c5df4d8f2e5720ac3747f0a486aa1d862688df66a6729cc30e10f SHA512 0a094638b648624915c7f56ea957c2500becd5664e9dc383b5c5e685e4ec2b0780594990cfbb2e0f712ff577c151a2d9e85845839c9cd90814fcb85f886e39d0
+EBUILD awl-0.61.ebuild 671 BLAKE2B 8626a05d5b521fa6e8ba2f794e536f02227c9e0140147fee6b1acbb7d8e50647e219e900903fa994c0f7d5f208407f9b0d2ee3a72031ea40bfb247d2ef56319a SHA512 135b6727c128ccc40400311bed424e2e0ac68f2689e4877241af2a96c3da7b599bf4c2bda2c4b69ac7bbbbcd4e512e0f361c0533f05b52742c5284749248f3b7
 MISC metadata.xml 607 BLAKE2B 7dbb1cbff742ad363e2ceba2259f44ca5de4abf9d77b61fc6e67b427b9c065589f0bbdb9ef0c2a998c0fa5d2dceccc37b9f9f07b9abea983e961ca9c32e3860d SHA512 329e26d79c646dee99fb39942b7f3e4c754fbee5b747d1575537c5b177ac6d0cbc6711a468630d6f15d0b31fd531c75b1b7237dbb54249ffff3ac8b63a53dc84
diff --git a/dev-php/awl/awl-0.61.ebuild b/dev-php/awl/awl-0.61.ebuild
index 52ae69f3df6a..7cdc7c288e25 100644
--- a/dev-php/awl/awl-0.61.ebuild
+++ b/dev-php/awl/awl-0.61.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="test? ( dev-php/phpunit )"
+BDEPEND="test? ( <dev-php/phpunit-6 )"
 RDEPEND="dev-lang/php:*[pdo,postgres,xml]"
 
 S="${WORKDIR}"
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index 34832f677e52..11943d9c59a4 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -1,14 +1,18 @@
 AUX autoload-r1.php 973 BLAKE2B d01d694be6f50af0e995dc24da1545b666609ce0098b4206a1843b249fedcbf983f1826a3158e98ad7cfe675057b12fe52ff82b6b66e2d582ccf983b929c2f90 SHA512 06f9e2862521c54b765f55fe1c1e02728befd296916d0f41357d4e6004f2d00ddaa533ed5210e92e4642eb548a2d5fabf80604fc09ef7e871742716f4c02d112
 DIST composer-1.10.1.tar.gz 421852 BLAKE2B a40f59ab0af5eba777f1926bab78e55fd1973e53b324eec73fdca70678fc1cfe6f892790a61a66dbdbe07caa03343bfd109318daec99c2c18707785c6bf149e0 SHA512 ebc3ee48bf0d2597e7221e9ac0ab7188e7a99096d5dacdee4176b4c7b4d252d079c117b5bd9131ff38d8963f95930fa9c83fa51ed542d4f7d58276561de1f2b8
+DIST composer-1.10.10.tar.gz 426836 BLAKE2B 46266e0338e4bad201d6f025ffb3ae6a4441543cb6aeec27502e43127cb6e109a2824960f774d2996b231e469639a6fa6f58f831e82f6a7313364049ddb626e7 SHA512 a859026dc2b6dc5f3bf8a03f305b7eb59339bc13148036c3b23c24a1136cc53c50217277d8877987e441e3de80d97d771d014f2a60e76bb09513827be2ce71e7
 DIST composer-1.10.5.tar.gz 423065 BLAKE2B 0c8595f3583a692f89294455984aeff2ad9cbf2a39541355cbb736e717baacae8245fa81e6b9fde11dd5bb56ad3a074262f6f8ecb65b4bef9c782ef39887deec SHA512 cdadb2d146afcc140316b83d3b4f4c018d79e8222f6a6207cdd52db75ae9c78e787a509d88a3fe113f8218df2ace56ba2dd043e1b6e6c3dbb5129fd51d8e9925
 DIST composer-1.10.6.tar.gz 423789 BLAKE2B 74d93e769c660f2c74e0ad5dd3ed5e5279c217552eb6d342ffd43d7fba10647865ade7b284c811f63504e0335e5655eae681cf14ae4d876eb56ff6a306c61268 SHA512 fdc209a82d3adda2728190282327b02d2b71bb9b1a80cbcda3699a826ee56451c997edac13d76e2784ebd4297d413bd46dd47b9538accd4bfe6c569464696779
 DIST composer-1.10.7.tar.gz 424264 BLAKE2B 9939e4d1f29071ca4467076c13e0ceab32d10282876ebb0a76f41dd3efbd9c40a50dbf278dd0a12b2119d40ff9424c171f07381fbaadb94218b1fdf69f403fdb SHA512 81ece3314cddced101b0be491e40b60d42ef503cef4b1d5598c32f3378f10524004a7a8ef4360453a4cdaaf9d3b986ce07696de075dc424deae7703945f6d577
 DIST composer-1.10.8.tar.gz 424875 BLAKE2B 5ce0e9f6b2345900640808df5233a8dbc959ba7421eda038d939e426ea5af67c236acad21d15c392bfc413187ea2611d3c587bd6f25b4e7de503b4832e4da54a SHA512 a891dca203667a63b722cd0fa8c05dfe12b07b17addad7ee94ae1db0d0887ce5fccf35985fb8fa3af5f98d2bb8df9cb2e4b9ce386c07617cf8a413b21621983d
+DIST composer-1.10.9.tar.gz 426433 BLAKE2B 160540a589469a41d470ad455a450ec5424548d1f215adf3ac71a629226fd2432a10fb0d9146dff4797a714e32ba276777f4db86f3ea86019b9792df6ba0da39 SHA512 e8dbdba3b1130a594703c74e6f12d30028247d54e1f08b5ddd904186645da2bbdbfb5b39fbf3098488f413b2311fee101bbbe9fb5ea02b7363a6ed1c28422b9a
 DIST composer-1.9.3.tar.gz 412212 BLAKE2B fc293a38baaf87cc2581304e1438d48e94a85ca2c5da4eff388b1307dadacb67327d9612211af70f1734872c7a377b8713492839c2d330c9e0e7226206cdc1f6 SHA512 42a37b2187895e06f2dc8c5225a1328377afc408ad28af12d9ef5d15fe083dcf22459ce0f482abfd528683113af5f9fd1a19758294c59c69b59a5bb32e65f2cc
 EBUILD composer-1.10.1.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
+EBUILD composer-1.10.10.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
 EBUILD composer-1.10.5.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
 EBUILD composer-1.10.6.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
 EBUILD composer-1.10.7.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
 EBUILD composer-1.10.8.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
+EBUILD composer-1.10.9.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
 EBUILD composer-1.9.3.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
 MISC metadata.xml 774 BLAKE2B 8a1f75c0c7da6f0d193a981c6db3888d62e2223b6368c4a7dece62ae33cc9a2a8c0b34714170462f262569954e70cc9b976012ff864ccfa36a46da3c719169ae SHA512 1a17bfae65923a3bea593c57d7ecf4fb2aeef43d0537636105e52294de295cbfeaed4b3c36ffb8675a563f657f4f969e62096cee20b9ab178c962acf2f68ac3a
diff --git a/dev-php/composer/composer-1.10.10.ebuild b/dev-php/composer/composer-1.10.10.ebuild
new file mode 100644
index 000000000000..29915836e3cf
--- /dev/null
+++ b/dev-php/composer/composer-1.10.10.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.1.3
+	>=dev-php/psr-log-1.1.0
+	dev-php/fedora-autoloader
+	>=dev-php/json-schema-5.2.7
+	>=dev-php/jsonlint-1.7.1
+	>=dev-php/phar-utils-1.0.1
+	>=dev-php/semver-1.4.2
+	>=dev-php/spdx-licenses-1.5.0
+	>=dev-php/symfony-console-2.8.48
+	>=dev-php/symfony-filesystem-2.8.48
+	>=dev-php/symfony-finder-2.8.49
+	>=dev-php/symfony-process-2.8.48
+	>=dev-php/xdebug-handler-1.3.1"
+
+src_install() {
+	insinto "/usr/share/${PN}"
+
+	# Composer expects the LICENSE file to be there, and the
+	# easiest thing to do is to give it what it wants.
+	doins -r src res LICENSE
+
+	insinto "/usr/share/${PN}/vendor"
+	newins "${FILESDIR}"/autoload-r1.php autoload.php
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
+}
diff --git a/dev-php/composer/composer-1.10.9.ebuild b/dev-php/composer/composer-1.10.9.ebuild
new file mode 100644
index 000000000000..29915836e3cf
--- /dev/null
+++ b/dev-php/composer/composer-1.10.9.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.1.3
+	>=dev-php/psr-log-1.1.0
+	dev-php/fedora-autoloader
+	>=dev-php/json-schema-5.2.7
+	>=dev-php/jsonlint-1.7.1
+	>=dev-php/phar-utils-1.0.1
+	>=dev-php/semver-1.4.2
+	>=dev-php/spdx-licenses-1.5.0
+	>=dev-php/symfony-console-2.8.48
+	>=dev-php/symfony-filesystem-2.8.48
+	>=dev-php/symfony-finder-2.8.49
+	>=dev-php/symfony-process-2.8.48
+	>=dev-php/xdebug-handler-1.3.1"
+
+src_install() {
+	insinto "/usr/share/${PN}"
+
+	# Composer expects the LICENSE file to be there, and the
+	# easiest thing to do is to give it what it wants.
+	doins -r src res LICENSE
+
+	insinto "/usr/share/${PN}/vendor"
+	newins "${FILESDIR}"/autoload-r1.php autoload.php
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
+}
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index e6c466098a1e..dc75658692ef 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -1,5 +1,5 @@
-DIST igbinary-3.0.1.tar.gz 170957 BLAKE2B 2250ef228b059d5d87615412ffae3242cd757df25dc9a1bfe2a4d1dc33a417a4389abb2ab613359537a6ee3947526caded0ec584049e3d42669532b4a930afc9 SHA512 4930670ecdc1796fa73184e8f12bf570f7b1a43cb422cede056ccd1ca28fc950b00a9418519c59a9c07e346a89153b6b105e873fcfccb1365d43d4abf98804da
 DIST igbinary-3.1.2.tar.gz 212162 BLAKE2B c88de3abc274d0fce20a13604b51c30dcb4259a1bbfd6b6bc15abbec5b48d9c4735cd023575b9f9f2b1c81a6188676bb39032d72165eb872dc83b6daf27d16da SHA512 617442e1fc437d12666b1172ca2ae34a4d7377bff8b1d00194a159260213179e65e7e2f755a1583d2b299e3b0e90374b9021cd61ec7ac67e64018153e77af8c5
-EBUILD igbinary-3.0.1.ebuild 587 BLAKE2B dab9e2e17bc509e6b0d393df5c04c6bb8e5213cc8548c7936d5ecad8f115a95cf426166163fc2ad4b7d92af5f550c9a666eee3bbe30fb39ea110af83a9fc6602 SHA512 7b7f68a8c261c7304f8ad056c275912d95938ff2c5c29823c21e13c757eac4ce93fc4078f404c7329e38406548e191f3b122df9365f089198b0dae0451fe3e07
+DIST igbinary-3.1.4.tar.gz 214469 BLAKE2B 7bdab344c4cc90a1b2e1040be20af8e8d756f63515d7ddb20f5fe56cbc5bdfe19db177c07e36ffbb8a101cedb55c175d47e8ede8bcc384b7c6c8ef7c52d3ccfc SHA512 a46f822ee77877705485c58ba5286b9b74889d51509f90d46c5d4ece82f12a15e0e7b84cdb4ddcd1b5ba2cd8177fe899232f42c82f31dbb2fbef7e3388579c3d
 EBUILD igbinary-3.1.2.ebuild 597 BLAKE2B 8f09f317dfc74612c30bdf35905411ad3c26077c02579b8fafedf2cd79d0aaf95ef275e0396dace13d0ae733d7cdf5b29cd9f5c419845c942ee49df44e9a2470 SHA512 b352c8647cf6faa2c7fc223d5b78514225bf04c308cf4e802f6c6305fe4b4470db33af634a34fbc3c67849ba933aad9b4ac77113eac940e4a7eff40e55ce7225
+EBUILD igbinary-3.1.4.ebuild 599 BLAKE2B 574cbbe31a4aba26a815825345c778b203bb63d96f92a8b42bcbefefa388607d06c8c528626650cf2e48b1e53a1c29da6e27538a7a22f36228b55e1cfa6a28ac SHA512 f02a4c2ec35240862a7532c41d556eb01c68be7dc3d2b912bd185529a0bb7b82f965cb2fbcabd1dee86d54c278b4b1a68f8269a304b6dda349786e041b719e74
 MISC metadata.xml 331 BLAKE2B 4187300236aa128879679c7cb4a8ddfa19dfd512a76466e835224c30323f2fafd55189228bdced507ababd5b90f561f6bb44c1554392eb0682b6ba5c7a20b681 SHA512 86f467f549b36915940e45a4e151742f2925293106dd3da2958e6153aaa8fed378b2eb563bf69da0d38101409858a4abe308f608bd94de6b4517daf9da092405
diff --git a/dev-php/igbinary/igbinary-3.0.1.ebuild b/dev-php/igbinary/igbinary-3.1.4.ebuild
index 67fde3809285..e50a7e5bec71 100644
--- a/dev-php/igbinary/igbinary-3.0.1.ebuild
+++ b/dev-php/igbinary/igbinary-3.1.4.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PHP_EXT_NAME="${PN}"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( CREDITS NEWS README.md )
 PHP_EXT_ECONF_ARGS=( --enable-${PN} )
 
-USE_PHP="php7-1 php7-2 php7-3"
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-source-r3
 
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
 HOMEPAGE="https://github.com/igbinary/igbinary"
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
+#IUSE=""
 
-DEPEND=""
-RDEPEND=""
+#DEPEND=""
+#RDEPEND=""
diff --git a/dev-php/pecl-dio/Manifest b/dev-php/pecl-dio/Manifest
index 040338f789b7..f3eb0d324fac 100644
--- a/dev-php/pecl-dio/Manifest
+++ b/dev-php/pecl-dio/Manifest
@@ -1,3 +1,5 @@
 DIST dio-0.1.0.tgz 36960 BLAKE2B 0a2c1fd6289cc9606c44c81216ce8d0f63d4bbddfae554e65499f586f5aa17f419a048e97723ff365407260740d28e36ec5dae8a45e18422a7bd900ec88b60fd SHA512 6fca1c3f2d6247f5e0c52a27b49d80a6d13f9630772956ff7aa73ad45e445686502edd956346c43955cb2f858c0c0259af86c3f92b6f93309a2b90583ad8ea05
+DIST dio-0.2.0.tgz 37328 BLAKE2B e7ad6be1a4c957c155753e834d79f51b985578a03781ddbc66f05961dc270d58b20abcc74c64a0e9744d5cfbb6e545c1a7ac2bc1d54009c74f26bf786587ef49 SHA512 172c2a2a84d348d684d84ca94f23b767952461ca848cd114e899ea3fd39503a35ac0624a2a774b9dc6fd2d463d3f6aa6937e780e2faa6a0955a8594aad27ec8b
 EBUILD pecl-dio-0.1.0-r1.ebuild 431 BLAKE2B a4d1d6a8908455204590b684ef376cd10b4afe6fbb93bf94620bb1a88e579f73f77ed8f4a695d80c31e7ad9874d224f8b291923725bb71a7442ef13f74dccdb7 SHA512 37f8af13d6a940b25b7ca0c457ba30d6231e372c10310bf7c12da0551a95b67eed1c8b624bbe785b12e0aa53d23578995bf8427515a8b9f9947887c6bb5e28be
+EBUILD pecl-dio-0.2.0.ebuild 431 BLAKE2B c2306263ecbc5e6a02aa60312c8c2669796428327a003e5e3aa8a576eb7fd666cead80fc00e0400ed368ac8c4a88b80f70a21ce57aa130ef08f9bdcdcb00ff62 SHA512 494c240552cd11aaf6b115762d3c9c423de96a9c36000e5678ea5a5f91e6fb049f41645fb9cdac1b41420b8eee4a7626e647a63b9c9e5aff6e2c19f89d27fd05
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/pecl-dio/pecl-dio-0.2.0.ebuild b/dev-php/pecl-dio/pecl-dio-0.2.0.ebuild
new file mode 100644
index 000000000000..38453c8973f0
--- /dev/null
+++ b/dev-php/pecl-dio/pecl-dio-0.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="dio"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
+
+MY_PV=${PV/_rc/RC}
+PHP_EXT_S="${WORKDIR}/${PN/pecl-/}-${MY_PV}"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Direct I/O functions for PHP"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+S="${PHP_EXT_S}"
diff --git a/dev-php/pecl-imagick/Manifest b/dev-php/pecl-imagick/Manifest
index 4799f1570f8c..cd9a933ca399 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 743 BLAKE2B a1c27b843766f38478af15a469fb6a70f524815279ec615ec63d1e7d71426e13358c0ce4d3021428c7c2574f272fd30fd7052aa6d9221ee3eddbeb4e3cb3b115 SHA512 d06bfef8aa6ddaea6c08ee06befb8754ca0ec82e0205009cfa726a3a5349b0734007dc7c45fdf20061ef8a5065d447807e1db39e85e21eab340d8a62cf498610
+EBUILD pecl-imagick-3.4.4.ebuild 751 BLAKE2B 3c1ca71995a093d2bc7bc460193022f19145aea57ac264776c8b63daf0cd2bbe142a21dd3308c7d788a109e814549c4f5b517c16b174d2cb682c58942942aacb SHA512 4ba789a3e3a5428f93e2bd4b53eb32a1b7c8b23bd9ed6a50e4374d969c1243f73520cfcb054e0303b53f45a7f337a6dcbc0a63cb7c6fc47e305db448db20da57
 MISC metadata.xml 358 BLAKE2B 0bfd697c80f3c64bff567b59cba40da1879b944b0775ed1d5e7fb4d80b057403dce613ffec5d5f06b46b7446dc16b3c95523f4b230b7f68ba3f6e05e502f9753 SHA512 c0a0fb9ceafd2378e774675500f9c1c60a7510a30c98f293bd5c92f83bfbe6a10b59d0b85ac6de1724b9e5deb1a7c0371e35871a8c7b9c63724df2762f3ca7a2
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 edf1aa7add12..d89a60267eae 100644
--- a/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild
+++ b/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild
@@ -21,6 +21,6 @@ RESTRICT="!test? ( test )"
 # https://github.com/mkoppanen/imagick#openmp
 RDEPEND=">=media-gfx/imagemagick-6.2.4:=[-openmp]"
 DEPEND="${RDEPEND}
-	test? ( >=media-gfx/imagemagick-6.2.4:=[jpeg,png,truetype] )"
+	test? ( >=media-gfx/imagemagick-6.2.4:=[jpeg,png,svg,truetype,xml] )"
 
 PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX}/usr"
diff --git a/dev-php/pecl-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest
index 232c78e679b5..58ae07ddaddd 100644
--- a/dev-php/pecl-mailparse/Manifest
+++ b/dev-php/pecl-mailparse/Manifest
@@ -1,3 +1,5 @@
 DIST mailparse-3.0.4.tgz 940428 BLAKE2B e3e33ecfa953766744a6980e0c681bb9b473d4cbf46179c8099f5483e8da46f47bba30d953d1c3629ea6d1719fcdfb0cca8536de3c3159a979cb7b2cde9ff9a2 SHA512 71eaebc1dc8a4698e60e170facaba16a5a9314bcb21c375b2f9a3069d7f1da819bfabc736b244e3f87131149d4efd9363120e77d8a078a0ede15113123d13ce3
+DIST mailparse-3.1.0.tgz 941058 BLAKE2B 050b16d90ba2cb4443df05eadb85d9835d1af8940bbb348cd5c6dd180f706519f483e9af5fe57ed35a5ea8e66a9e8a868848e7f2a1eca397c247e7f4aa1c110f SHA512 5a2a0786fc62fc47a60dcd52158ed86a1a58a26dc764b62abd763f784553f853c6644e4de76c85ad9133c8359d040c546c662b5f838ff7a5c88307aa21a589ca
 EBUILD pecl-mailparse-3.0.4.ebuild 660 BLAKE2B 66ce0d63743294160c0373cea35497d689b6eb17f8a83e4fe106ea053fc67ebce72a65fada5161796da3085bd2398b9424398c386363b3a88095190639ba90f2 SHA512 c6823e9b33de01c7c04f2cf80bdf368c4cc560d33d4e4944aad24b40c003efc97a01ef8976408a1022445d3ed1f3f3639bcda51f700d60c071bb4255408c67a4
+EBUILD pecl-mailparse-3.1.0.ebuild 664 BLAKE2B 270d6723aa9b83db4a0de11a7199c56712f4bb23b1d16303461049f4f1bb36c524ed52000b21f4183047c78e27145097e818936c3cb5b1c34cf765d83933db0f SHA512 40c8110d0627a466452520d5627e97d195b9d888fee4284ca7358406268f27c8a9413f559bfeb3ac0b0734c3a22e66aaa302dee13def03cacb34d0b65f45eeba
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.1.0.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.1.0.ebuild
new file mode 100644
index 000000000000..cb73196e10c0
--- /dev/null
+++ b/dev-php/pecl-mailparse/pecl-mailparse-3.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WANT_AUTOMAKE="none"
+PHP_EXT_NAME="mailparse"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=""
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+PHP_EXT_NEEDED_USE="unicode"
+DOCS=( README.md )
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME compliant messages"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE=""
+
+src_prepare() {
+	# Missing test source files in archive.  Fixed upstream in next release.
+	rm tests/011.phpt tests/bug001.phpt || die
+	php-ext-source-r3_src_prepare
+}
diff --git a/dev-php/pecl-mongodb/Manifest b/dev-php/pecl-mongodb/Manifest
index 83860cf43b53..0e1da29d30f5 100644
--- a/dev-php/pecl-mongodb/Manifest
+++ b/dev-php/pecl-mongodb/Manifest
@@ -2,9 +2,13 @@ DIST mongodb-1.5.3.tgz 1059580 BLAKE2B 23bd5f6b0f218cf55bd5713a770f3990d5c149292
 DIST mongodb-1.5.5.tgz 1060017 BLAKE2B 475ca0f6a1cbd5270c9bde0f195d6092ef25441e0cee0a45ed378a868bd1ad27c7a77c4f4702b6f82004433805563cdaa728cbc11bb5beff83b982122cad339b SHA512 1eefc8f8e359a979082dc7808e89ff5418cd2dc73d4250638e33dc32cce40ef42502e9dbbb07303381e0062b84818568034f4e4cda8c8bf905513d00bf008392
 DIST mongodb-1.6.0.tgz 1096156 BLAKE2B 16c3b1d07d31d29a214aba320347f8e40cfc4f0dae8b0713b02cd0e3ff98fd54b09217472f333722228efdfcae755bbdbfe58da7db89d4dda2893ba7b3b0e8bb SHA512 e75dc607bf41bb71a0fce3b73785ef4203af97a3e8b21bf70a80c2216e9530463a6aaca55b013a4fa2f3c4eb72405a25209935ea1a238475f990763af54aa641
 DIST mongodb-1.7.4.tgz 1223416 BLAKE2B 9db40284eb2b70e242f26c1661923c5f33de8ab1e33a7e816863b61fcbc49040204ca556b1f384cab958f9dc2cf4e49e97840b78bd520a4e374b83210a964e5d SHA512 6805ce1d0958e24e1edf3bc9698bc1f4a9d31c26250624fd35aebf7a7d310af30050e1974cd9571f989303fce4c5522e793a8cb41388397df66e8f5fe0a648f2
+DIST mongodb-1.7.5.tgz 1223892 BLAKE2B c30a217d1170c31be00259f4bb58cfea186947fa0bf1653de32e228a8eb8d3fb25b52d7a5a9e16f6b311418d977f7aa00bf96ca9d7e9ac9a8fa7b6fe05eace8f SHA512 f0565adc42659d4070e42122d02a8306f29d6d70fe0b5e9a92144df346a8c672aafdf36613435b9dc8d50db5e98c2359fdf97408c45439d4d447257b85e93122
+DIST mongodb-1.8.0.tgz 1292928 BLAKE2B 3bd9e5eb6b981010637b9e478928fa21268e1d1447f3ff345bfdb45c93637990e261c46b2ce09560cd4e284df73494dac210436cf700b588803e4ceffb8dc67c SHA512 7fd54dabde8df9533abd36d159c3da1c2b4606e7788b8a6d41faf83d0710b74885e8bfb4e1f4837a50248f3af1df2e7414b90f99227fc92c9084f779c7e68698
 EBUILD pecl-mongodb-1.5.3-r1.ebuild 1009 BLAKE2B 4c1e9184619bc2f90558608f5ab5e2413c969e99bab0a8fcfb50b5a6fd6e5cbbf7f05f1a5155e2805a22aecee5f3a09e7e1c80d17b79cfcbfcdfaadeae6c13fd SHA512 7cf1a6fca2ce421abfd4f5509c585eff0627bd638749c2fda2be9be0fe12044ace79fab604cba54ba153d24cb8bc677ecb7c64c5cedd2af2e2361950e87a4b7e
 EBUILD pecl-mongodb-1.5.3.ebuild 1019 BLAKE2B cf4f6615b0d70b685817105fb53227bddc4b85d9ef60000eed1a48b5f8601d3868ed5e7af096b7df7c4882d2fbdf22c56d21bf512c5b267a8893443e14ca7c3d SHA512 ddba025e9e91ab5fa2b065ebdef36b61510bd589afa09611dafe4e5b27f1af35019f3dc0ef7a6915d035225dcd13ef5e6cb91c2c0a9e6b0699f335d6b8d211b8
 EBUILD pecl-mongodb-1.5.5.ebuild 1009 BLAKE2B 4c1e9184619bc2f90558608f5ab5e2413c969e99bab0a8fcfb50b5a6fd6e5cbbf7f05f1a5155e2805a22aecee5f3a09e7e1c80d17b79cfcbfcdfaadeae6c13fd SHA512 7cf1a6fca2ce421abfd4f5509c585eff0627bd638749c2fda2be9be0fe12044ace79fab604cba54ba153d24cb8bc677ecb7c64c5cedd2af2e2361950e87a4b7e
 EBUILD pecl-mongodb-1.6.0.ebuild 1426 BLAKE2B 4b32da42a4141f6db317f0f77b5207f623e17560a6964d27700dbccd13caee470e29005fc97b2b1c3c1e5b59b40c5a84bb8d399b8d4b6f4c43db6bc972314675 SHA512 b185eb19982a9acd6a49b9be5f33da6106ba452d9402bd4b514f56eabcfc63637e111bfe4d0042483f826a4d5a8fb71714c900b9f398ab4c1d0611643bfdfc5a
-EBUILD pecl-mongodb-1.7.4.ebuild 1361 BLAKE2B a42114c5b183685e405e147936b9b6b980ac052b8ac60121794ab444186ed927934748193fd4b66faeddaab310d37093974c9bd578880d168e5bf844e5121681 SHA512 5a677a8017f61f8097a19c2e64ba04e5a1e6e73b1218bf97f7612647913a2518dd82c1c0f5523cf366d71a9c55a64963fbbb15bda66eb1c5e346347bd6fbaca3
+EBUILD pecl-mongodb-1.7.4.ebuild 1360 BLAKE2B 694ac42a3fdaf5ab1b2fe968dd3cb473022b5cffebdec5da6510bc5eebe34980e9a7ebe0bdd5036ffab306bf854dd00797c25cecd6ecb1da110e940b1869e385 SHA512 c699a3790c2e0f9ecd94f2dbc6f3a5200a374fe3c9a10ac0e8ad5f7d356d9b844393114bbe5b1090b88a7d1e13b6202781064800716c9b9149f61696968471ab
+EBUILD pecl-mongodb-1.7.5.ebuild 1362 BLAKE2B d2727126b6a41701aa3855f7cddaaf5cf9ca1fa69998a98a14d16509b87319c79d30c08e66483a85f08a8f7d6f5fac030357a6f5baa08f01bf211b844d2919b8 SHA512 7ec2c9c6bf1514a655222febae3bbf40ecfde2180308d65fdc8dbf7d4fdf50cf6c736a328384cc14abfb8d0eb6f66c9fedb18946c722c27b5683d6b71e5d81f8
+EBUILD pecl-mongodb-1.8.0.ebuild 1362 BLAKE2B da7514971e440ed3938edbc1b74fa02fdc3c7f7ebf94783aada4094a9d80271a390830161f187bf6d05f179825318617a4d6e999517d92b3b7db963fcf8f8dee SHA512 13bd15a1774e8ed26332b80c83f4313c3199c95aee2361a1bed82a55fc68cebecab3f1b4b51155eafad5393117a5a2338fdc000f604dfb348b82c4e916ed5604
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.7.4.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.7.4.ebuild
index cce49d84bccb..ed424ee6f5b4 100644
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.7.4.ebuild
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.7.4.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="MongoDB database driver for PHP"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="libressl sasl test"
 
 PHP_DEPEND="
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.7.5.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.7.5.ebuild
new file mode 100644
index 000000000000..ddc120fee581
--- /dev/null
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.7.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="mongodb"
+USE_PHP="php7-2 php7-3 php7-4"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="MongoDB database driver for PHP"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl sasl test"
+
+PHP_DEPEND="
+	php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] )
+	php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] )
+	php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] )"
+COMMON_DEPEND="${PHP_DEPEND}
+	>=dev-libs/libbson-1.16.2
+	>=dev-libs/mongo-c-driver-1.16.2[sasl?,ssl]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sasl? ( dev-libs/cyrus-sasl )"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-db/mongodb )"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="${PHP_DEPEND}
+	virtual/pkgconfig"
+
+# No tests on x86 because tests require dev-db/mongodb which don't support
+# x86 anymore (bug #645994)
+RESTRICT="x86? ( test )
+	!test? ( test )"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-mongodb
+		--with-libbson
+		--with-libmongoc
+		--with-mongodb-sasl=$(usex sasl)
+	)
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	local PORT=27017
+	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
+		--dbpath="${T}" --logpath="${T}/mongod.log" || die
+	php-ext-pecl-r3_src_test
+	kill $(<"${T}/mongod.lock")
+}
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.8.0.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.8.0.ebuild
new file mode 100644
index 000000000000..f2435b28dc82
--- /dev/null
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.8.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="mongodb"
+USE_PHP="php7-2 php7-3 php7-4"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="MongoDB database driver for PHP"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl sasl test"
+
+PHP_DEPEND="
+	php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] )
+	php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] )
+	php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] )"
+COMMON_DEPEND="${PHP_DEPEND}
+	>=dev-libs/libbson-1.17.0
+	>=dev-libs/mongo-c-driver-1.17.0[sasl?,ssl]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sasl? ( dev-libs/cyrus-sasl )"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-db/mongodb )"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="${PHP_DEPEND}
+	virtual/pkgconfig"
+
+# No tests on x86 because tests require dev-db/mongodb which don't support
+# x86 anymore (bug #645994)
+RESTRICT="x86? ( test )
+	!test? ( test )"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-mongodb
+		--with-libbson
+		--with-libmongoc
+		--with-mongodb-sasl=$(usex sasl)
+	)
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	local PORT=27017
+	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
+		--dbpath="${T}" --logpath="${T}/mongod.log" || die
+	php-ext-pecl-r3_src_test
+	kill $(<"${T}/mongod.lock")
+}
diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest
index e36ed5fa3a97..bcabf5f54288 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -1,7 +1,9 @@
 DIST redis-5.1.1.tgz 245205 BLAKE2B b7177be5282b081562a446b1b37c7b46ba0ef382e55f27989d5586346a10f842d050ee46e881e480ea6b768e1259458df565d02193eda13a95704cd5455c1ca2 SHA512 eb6aa538d2ae4115634fd5841e3ccccf788cad13b99e0485fb2af43def85e93328012e5cef66d1be4bdd494be6f68de329a066e41b710e434f94f3ed3401bfee
 DIST redis-5.2.1.tgz 251570 BLAKE2B 297d6130469735a53f6dfb6ffea8c7c813363099eb76f25619f0cbb05cd06f5ecad9c0f30c370e33985523cf26488cf133aa0a48a99075bc6d5796309e3d914d SHA512 de90bf65cce0cb8c5ea28415e4f7bfff23c8bb3dc96ddca3158f94be2e4bd051e13ec3f34429b0e8ceb436096520e3998f544f377d5ef7d4d1df4edba7f66bc2
 DIST redis-5.2.2.tgz 251629 BLAKE2B e6ca740412dd1ba4ee960e1c71b3f75ebb1a1e2605bc93159395c657ab61eda4c8222b6e890a447c06cd1ef016e061861ffc5d8a6fd6e7e324353a148b54c593 SHA512 0020c572bcd24cdb479046727fba2d30ca87c9a7111c51e5fe3be0b85459e3e7dfc8892b690650de0a7dc80c1a8921f9de45590f6e60257fbf0534729c6e6f4f
+DIST redis-5.3.1.tgz 264485 BLAKE2B 51f68841d51329cbbbd2012e539351b3220dc1361ae5a3782b6c3e9620ed14b9a0b9097a0d6ba6e2fa60e8a794fd2ea57fff871d2fceb7bcdb4a2ab4a6d8789f SHA512 dca62e0e87d22c25818f0eb84ec0a4ae8ab4c1a2de295b7d56d10548c95448637e1b1ca86c55adf0f801fe22bf3c05fad4ff58f3823e5d74c506d041b64f1d4a
 EBUILD pecl-redis-5.1.1.ebuild 1288 BLAKE2B 59d4de29ee1b61edede0c31ab5bb4fc40885c3d13744125f0838052299ead06f10965e5a5b9f269b368d3d4981e309fc1ee168f9a1cdbefe8eaee1554bd4c1cb SHA512 90bc2609cb87d3d3aacb72bd507a5895b5b531d243363676bbda1fb14548960b0073b61bac44e77b983570a9c116b2f369ab835bfd179e9af610deb0afadf994
 EBUILD pecl-redis-5.2.1.ebuild 1262 BLAKE2B d29de451a8f863b87a77a356f52b781c94fd448c3ba1e4ab5c74a35e0d977d64a70412fc2b51f7e2267eda03dd2e886d1faa11bb4fe5bdf186682052f3b7b52b SHA512 1d975f3afc197a779295686e9645f24dd82611e326e1c89c387f3dcc8ce20f32cf68ebd5d2fe2f8451329c7d6c655ee998cd602ba0821227319ff84c85f705a0
 EBUILD pecl-redis-5.2.2.ebuild 1262 BLAKE2B d29de451a8f863b87a77a356f52b781c94fd448c3ba1e4ab5c74a35e0d977d64a70412fc2b51f7e2267eda03dd2e886d1faa11bb4fe5bdf186682052f3b7b52b SHA512 1d975f3afc197a779295686e9645f24dd82611e326e1c89c387f3dcc8ce20f32cf68ebd5d2fe2f8451329c7d6c655ee998cd602ba0821227319ff84c85f705a0
+EBUILD pecl-redis-5.3.1.ebuild 1486 BLAKE2B 718fe2c3f07f6d6088ea908b4e0c41dc8a996bf09a5ac75c2ab0716afcb843aed71547cb10118df3b1d670ee678f6fd14b3b1acfb32813000fb47cad517c7a1d SHA512 98412ca22de8a169b782ff44b9120ad328e55a99e15fc162d067046c71b545db00c2a5179ee8b6e8814b302898c7ab4215151f0da8a90635903a8b8ef6ae18b0
 MISC metadata.xml 383 BLAKE2B b7a47896565db2f132479963a5479262864421a8388bd262ba9aa8eb6445e0d351478530475b5dba12cc9cbbc33089a904f9945816d3009c75f09dcea9c4cfdc SHA512 da5c3918a6652f1f3ae58a5bcd2c5eb3308d764df1a14bae1658f5f2022ee364b6cd288c4a3c700cf27b70b2f967f66668c17ea9850fc48910005310d16125b0
diff --git a/dev-php/pecl-redis/pecl-redis-5.3.1.ebuild b/dev-php/pecl-redis/pecl-redis-5.3.1.ebuild
new file mode 100644
index 000000000000..9f7ec9e88930
--- /dev/null
+++ b/dev-php/pecl-redis/pecl-redis-5.3.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="redis"
+USE_PHP="php7-2 php7-3 php7-4"
+PHP_EXT_NEEDED_USE="json?,session?"
+DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS )
+MY_P="${PN/pecl-/}-${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="PHP extension for interfacing with Redis"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="igbinary +json lz4 +session zstd"
+
+DEPEND="
+	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] )
+	lz4? ( app-arch/lz4:= )
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}
+	!dev-php/pecl-redis:7"
+
+# The test suite requires network access.
+RESTRICT=test
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-redis
+		--disable-redis-lzf
+		--disable-redis-msgpack
+		$(use_enable igbinary redis-igbinary)
+		$(use_enable json redis-json)
+		$(use_enable lz4 redis-lz4)
+		$(use_with lz4 liblz4)
+		$(use_enable session redis-session)
+		$(use_enable zstd redis-zstd)
+		$(use_with zstd libzstd)
+	)
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		# Run tests for Redis class
+		${PHPCLI} -d extension=modules/redis.so \
+				  tests/TestRedis.php \
+				  --class Redis \
+				  --host ${PECL_REDIS_HOST} || die 'test suite failed'
+	done
+}
diff --git a/dev-php/pecl-yaml/Manifest b/dev-php/pecl-yaml/Manifest
index f1037f68856c..2c4e36e8dfe0 100644
--- a/dev-php/pecl-yaml/Manifest
+++ b/dev-php/pecl-yaml/Manifest
@@ -1,3 +1,5 @@
 DIST yaml-2.0.4.tgz 39071 BLAKE2B 3a5dba0f6a16087909f4673543d64946e5929a5ef4cc616df6a4225aa2d274b2b5492b00ab0e95ed93f808bc2a4dd0a2f6d60c8c2ded078af35c4499042488d6 SHA512 138e5b4566800fc7d624baf71bc585d6d432755046e598ae9f4099fa565727e04d79bb171289a53eb9e5daa416ffee1b0fb4967c84976ac6cd6fc01b0a05fbae
+DIST yaml-2.1.0.tgz 39439 BLAKE2B 76cab7fe0c5cf4140b70dc86333a6a79c6f1684cef9e609b905d626e95cdf5542ef0a95a4e3b7e6b663adc81e240515c4d23b5f029c5519fa88e7178762171b9 SHA512 3731ca2b84e80599d7fae4f58efdd11e9920c672ea6e62ff6b0d57d721d3f6f12ca86efe88f63c324d4ad2b73d6947a21f6e5a47263538ca0d5e822b8fc7b8bd
 EBUILD pecl-yaml-2.0.4.ebuild 1112 BLAKE2B 84a00a78f00c4a74bc1dc305835bd03452d9631e2644f72c4324e2f94cbbe5d1e7b24a8be62d4156e4a1bba9b0c55492867c122d06b024d187ddde0873f2f43a SHA512 b97fa3b263b1492eeb08c2d3f643d19f560e022b082f23fc38028e9e321ef25453ec8b3c3856335bc2122694e2ec5f66019606253428a268969e6f568648d90d
+EBUILD pecl-yaml-2.1.0.ebuild 1112 BLAKE2B 5794d333cad654ad56e0d65012a5425f62f274e44fe48d62e0a07553e871d2d3f87fd52385230c07698b1f86ccb71ff93b7ca8f7c3fc8ab7c325e02994ac2a89 SHA512 741b903df7feaad91b84c28fb680611ae9df3f7192dcf83cfbae68c53f6997906a24bd4e4106298cbefef0d6666f2fa03d20da12dd35eaa184054c33fe7553b8
 MISC metadata.xml 238 BLAKE2B 1bb4abee8d968b36a69efa8f634c2d2e4422f5ac0611f123cf9794f1784e155a16cfd98ee209c16a745a58ddfa85d134c68a22bb5bde264c35ea285caa2d4d9a SHA512 560ff28e3776267c429b8d553d2dfc8991fa8d5845af5937c46ec68674d2b3c5cb922e557f43fcba113a70d4b3b5a32f39fc1fbed38de5781c7504fd526430cc
diff --git a/dev-php/pecl-yaml/pecl-yaml-2.1.0.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.1.0.ebuild
new file mode 100644
index 000000000000..75dd43747a88
--- /dev/null
+++ b/dev-php/pecl-yaml/pecl-yaml-2.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="yaml-${MY_PV}.tgz"
+PHP_EXT_NAME="yaml"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( CREDITS README )
+
+USE_PHP="php7-0 php7-1 php7-2 php7-3 php7-4 php5-6"
+
+inherit php-ext-pecl-r3
+
+S="${WORKDIR}/yaml-${MY_PV}"
+PHP_EXT_S="${S}"
+USE_PHP="php7-0 php7-1 php7-2 php7-3 php7-4"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="YAML 1.1 (YAML Ain't Markup Language) serialization for PHP"
+LICENSE="MIT"
+SLOT="7"
+IUSE=""
+
+DEPEND=">=dev-libs/libyaml-0.1.0"
+RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-yaml:0[php_targets_php5-6] )"
+PHP_EXT_ECONF_ARGS=""
+
+src_prepare() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
+		php-ext-source-r3_src_prepare
+	else
+		default_src_prepare
+	fi
+}
+
+src_install() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
+		php-ext-pecl-r3_src_install
+	fi
+}
diff --git a/dev-php/php-redmine-api/Manifest b/dev-php/php-redmine-api/Manifest
index 95df85b014d7..0e4b7ece18f9 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 932 BLAKE2B 8691720d635005ab500bf270a327afd2c37276b8964551c3ea273e352b30b0bae684ec358ebfb12ad6d0c1d3d029af8177d3d2e593fd91b768a95ed5489b50e5 SHA512 d8db6a06fe6154d48bb22567f1567c3891440bea873a6391c3d6700fceefa68e1604a1fef224ad9d4f066b39c1302e516f36e604ffe856b731742147372785fd
-EBUILD php-redmine-api-1.5.9.ebuild 929 BLAKE2B bd0eca33f6a52cf656729e8037b5833386eb94a63e24151fc9d9753c5a9451206f145075691b8733c46f84b786055896f3c02d3b4deb64beca23505b699c026d SHA512 b2c8599548f7dab966f3dbbd4810174937916336857cf90d267e14a5e209916e45d1e80a13feb5957e3a9810946861370f98c363e4a850c692e8856bf949ad4c
+EBUILD php-redmine-api-1.5.16.ebuild 931 BLAKE2B a276a1aadca6bcda1ef8b61c0d1a6914d755825a7e42a27b7ed778c5f2c62107ee50147ed722a648ee8abf1fd829965a9e72c1a6da7c3ad5d03dbeb1d30f5175 SHA512 a3adc8083ebdc1a8cca31a6fbb78a6bd619fcfad78019449622be66bb3d4a62b671aff783d93504e7683d2c76f2709038653953d2bae45253ebfc403c2cdcb07
+EBUILD php-redmine-api-1.5.9.ebuild 928 BLAKE2B fe9d6513a85f7ef5a081984d6f39506d588e097b7963dd54821695961f2a060d4262fd2d94c5d6cd2b08b936908d6ecf55d94b92a46b13d8baf1a36107162aad SHA512 d3627e57422b58d143dcc16b4cc6ca6a8f9564d89abc35ad76dbec35fe79a8626d35f6649c2980866c052a0b7a26d6962cff0fa8cb4ddbc02c5961e8c13e0287
 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 4752a69d8ab4..74bf4b9df940 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
@@ -14,7 +14,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php:*[curl,json,simplexml]"
-BDEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-4 )"
+BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )"
 
 src_install() {
 	insinto "/usr/share/php/${PN}"
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 e08d5e07ace0..0a816cb06bb6 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
@@ -14,7 +14,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php:*[curl,json,simplexml]"
-DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-4 )"
+DEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )"
 
 src_install() {
 	insinto "/usr/share/php/${PN}"
diff --git a/dev-php/phpspec-prophecy/Manifest b/dev-php/phpspec-prophecy/Manifest
index a7b82c97faaf..85c6e3893adc 100644
--- a/dev-php/phpspec-prophecy/Manifest
+++ b/dev-php/phpspec-prophecy/Manifest
@@ -8,7 +8,7 @@ DIST phpspec-prophecy-1.8.0.tar.gz 37907 BLAKE2B 4bdd55d7fc14604c9fade23c60bf51f
 DIST phpspec-prophecy-1.9.0.tar.gz 38262 BLAKE2B 1642d38afa368be504da73c0bcf34921fe167dff5665651af23142f33979a35d8d10112e3d1c5b1b38448b92b4741ebda2c183dca10473dce833090a603f95f6 SHA512 d0ba1840ca84cf4b0642083858326c593086f35ba3a6d83746956efbe5d538910efc01655eaa14b4e2b7e17e7bd19cd2494cdfad0dd5bdfb43cdee2402a55b05
 EBUILD phpspec-prophecy-1.10.0.ebuild 830 BLAKE2B e9972a363e07fe83f00a282b6c8f1404fcf7d8418c43cab20f72cd4a6b36880fa62e04149b2d82a657feb95719fffd31e58ea40508ab5be27ea10c2df7074f75 SHA512 3e381d989326b6f55ce31738eb4227dab625e1a8c9ddbbb236251ced16f68e103247a47f1ccca89730af2110f164009d5b1468247f0895ba270347d8d8b2d730
 EBUILD phpspec-prophecy-1.10.1.ebuild 830 BLAKE2B e9972a363e07fe83f00a282b6c8f1404fcf7d8418c43cab20f72cd4a6b36880fa62e04149b2d82a657feb95719fffd31e58ea40508ab5be27ea10c2df7074f75 SHA512 3e381d989326b6f55ce31738eb4227dab625e1a8c9ddbbb236251ced16f68e103247a47f1ccca89730af2110f164009d5b1468247f0895ba270347d8d8b2d730
-EBUILD phpspec-prophecy-1.10.3.ebuild 788 BLAKE2B 10db6dce9638c14927d090e6d7032db47a598d744946bcb4a6054b43533c3a6492365811c8c414d8cf2a399f067eb6b8f1f6202462842f2ec900af06a125ef55 SHA512 a77c1e2fb0c14db14bc292d7d3164ead2d5746382dad5ae6029303e128c042de1c7a73bbdfee03da9faa9ca125c15647c14ee8dc177ace31e831e40baf494b86
+EBUILD phpspec-prophecy-1.10.3-r1.ebuild 831 BLAKE2B 70645e58631062c12d1cfc1508ec43ac9e0087e4a755437d5e8276ab47e1162706bcb904753520270cd73f6e42b23e9c37171510e93b136c6db247025146b248 SHA512 ececed38f20dc46a4f576a0903e3ef93d25c0be04e488ca9fe1e5aa5c07e5a85dc73cd60658c8fc91365b6a1391fb363624303e371387309560d15baf98ebb54
 EBUILD phpspec-prophecy-1.7.0.ebuild 801 BLAKE2B 07c8a7cbee0def8cf2f9762f6aeb01418193d16c16b2be983d78d67d7477b3f4d42c12f65432e9dc321510d7d0e4197cc3d17b616cb6d16c86c662d9704f841d SHA512 7dc9aaed41286dc22fb624b3d5762b493ae5c590ed5d5c0c0229a91650bff0676e6391aa59ad4ad09b7837b7d7ff1c296492fa98c18aa1d835172e46bf16c4df
 EBUILD phpspec-prophecy-1.8.0.ebuild 809 BLAKE2B 26753f262d4b9005ef9e5ee2fc0888687023aad9cb7608d22e713270755ee1214f46ae2535e04d2627e10c534b0aacbc1b904f48c6740fa678d2900c9978cd47 SHA512 9484b2eb57540008f72f7b653c6b953ba706ca83b87e041df7f476ed3529fbfbe8c5b8d15fb8b27d7917116c6060df75aa2307bb36756e7c3e5f6013d59bd705
 EBUILD phpspec-prophecy-1.9.0.ebuild 809 BLAKE2B 26753f262d4b9005ef9e5ee2fc0888687023aad9cb7608d22e713270755ee1214f46ae2535e04d2627e10c534b0aacbc1b904f48c6740fa678d2900c9978cd47 SHA512 9484b2eb57540008f72f7b653c6b953ba706ca83b87e041df7f476ed3529fbfbe8c5b8d15fb8b27d7917116c6060df75aa2307bb36756e7c3e5f6013d59bd705
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.3.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.3-r1.ebuild
index 1b8181046335..3dad3fd76a4c 100644
--- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.3.ebuild
+++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.3-r1.ebuild
@@ -3,9 +3,12 @@
 
 EAPI="7"
 
+MY_PN="prophecy"
+MY_VENDOR="phpspec"
+
 DESCRIPTION="Highly opinionated mocking framework"
 HOMEPAGE="https://github.com/phpspec/prophecy"
-SRC_URI="https://github.com/phpspec/prophecy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-php/phptal/Manifest b/dev-php/phptal/Manifest
index f938d27de2c0..068ad2facf23 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 832 BLAKE2B 41a21562fa0f4ae29b0b1c9588a0d5d92c8f309b89c3277c5e0b9fb69798f1ff851e4015006ee9bbd279c3b318a461d3f274172fb40cf2b0b296a75378e20181 SHA512 779ddec874a0cbe983d1628e0e3863eb173fb41835c95d7eb2e7648469db8923d394fdbba4c81d244be1e9806783d6a1f900c929e9c343d184eb0db425f00faa
+EBUILD phptal-1.3.1.ebuild 835 BLAKE2B eaeb92593eb536a5fdc4825cb6eaf8252124b83ac8d0968329954e3409bd998226faeeeb02e1ac7ac95fab3199376694a4d9de766eeec711b056b58d8548d123 SHA512 0b86a9be16fbbad1ab9f4c81299f5e601e3fce2d5d938d3f1142a344a3b5d0024177c381e34734299f2068a50a349c6c7a34eff34ebd0230ddadcec6c20374bf
 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 041baa9a91d1..852ecd7ec345 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-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php:*"
-DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+DEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )"
 
 S="${WORKDIR}/${PHP_LIB_NAME}-${PV}"
 
diff --git a/dev-php/recaptcha/Manifest b/dev-php/recaptcha/Manifest
index 3895dd24a8c5..f69bedc55793 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 958 BLAKE2B b2e88432bd9ddc208ef45f8f89e8e95794d586dd097aa8c7b9f8fa3325fcd30c9ae328b77d5f91755dfe9268595ee8311845f05d14f55c61e9dcb8193372d018 SHA512 50ea1405e91cd41da9284934b5b8e14e833e766b7714325afaa1cb35e52ea61546e76c41408fe691e66eb816b02dd37cf57989e4261f8e978f0d81aa346fafa3
+EBUILD recaptcha-1.2.1.ebuild 961 BLAKE2B 1148399f70997bb7e82122b444191fd16e8da1656ac143aa8e521c0ab48f140dfb8a34a63e2a086dc63d3a4429ea50297270f2d7f5d60472b048375c8a309919 SHA512 2ac8660be8ce12e72dd56fcac4725aecc0271ee291ff0a7f1c40260aaad98cfbaac4a320e0a2cedcd5a447fdc2dcd8208068fddb5a92ed909a7ff248b197ff0f
 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 b5d70a8d7ba6..87981b66c8c7 100644
--- a/dev-php/recaptcha/recaptcha-1.2.1.ebuild
+++ b/dev-php/recaptcha/recaptcha-1.2.1.ebuild
@@ -14,7 +14,7 @@ IUSE="examples test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php"
-BDEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )"
 
 src_install() {
 	insinto "/usr/share/php/${PN}"
diff --git a/dev-php/symfony-config/Manifest b/dev-php/symfony-config/Manifest
index 1d5a942afd0e..b7e2e5d5f764 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 878 BLAKE2B 54aceba1691d4a8eaf6d0d7f87f266c4eee6930e9eed6ea31e8347bd8a9a58c9362fcfdad62084ba835169add5cef488ea3f13c9756dbe04bf61745fd601dbc9 SHA512 60347a0f90834ac36b56cf5901e1ea6d81c887ec9b542b4590f76379dc99656ccf745edcd1fdb2eb19fb9632252716fc51e905ffe0240539e1f498e487026f0d
+EBUILD symfony-config-2.8.20.ebuild 872 BLAKE2B 463e0674de0f8792b526b8a009d38c57918533bbd4d44d3c2e1ac69fa9e038c488359e0dc06d3c128a8beb1be61f544dd67e87b588733c78b36c357149668d3f SHA512 3f0696de9e9833de718fd4cc35272e62c77c1577165f579c95d326d23752251548aba23403a2e93804f88573e09c0925316279fc0cc4429254042b61cba47638
 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 9fe027e06223..0ec2d1882b68 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-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ RDEPEND="
 	dev-lang/php:*
 	dev-php/fedora-autoloader
 	dev-php/symfony-filesystem"
-DEPEND="test? (	${RDEPEND} >=dev-php/phpunit-5.7.15 )"
+DEPEND="test? (	${RDEPEND} <dev-php/phpunit-6 )"
 
 S="${WORKDIR}/config-${PV}"
 
diff --git a/dev-php/symfony-event-dispatcher/Manifest b/dev-php/symfony-event-dispatcher/Manifest
index e585192cccfc..1a3eff208b06 100644
--- a/dev-php/symfony-event-dispatcher/Manifest
+++ b/dev-php/symfony-event-dispatcher/Manifest
@@ -2,5 +2,5 @@ AUX autoload.php 469 BLAKE2B d86604375d82bf06cf1a50404d9218f7c73a9b08b3b1add7b12
 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 924 BLAKE2B 0762359c76570d8372745e26cf343ce0465c71084c2cc62cc263edf4f95deebd7319f8881f51942bfa9e179927396895015d0b41e7f9d1ecbc49fd8886c2df1f SHA512 8131fbbe4c13d18ac4fa4f78acf9ba1e9e9c5f0aae58ac2149f009edbc311ed8498b79f48042f024ae622cbb446b918a141dc0c57f6cbb2de2396e991055e940
-EBUILD symfony-event-dispatcher-2.8.50.ebuild 924 BLAKE2B 0762359c76570d8372745e26cf343ce0465c71084c2cc62cc263edf4f95deebd7319f8881f51942bfa9e179927396895015d0b41e7f9d1ecbc49fd8886c2df1f SHA512 8131fbbe4c13d18ac4fa4f78acf9ba1e9e9c5f0aae58ac2149f009edbc311ed8498b79f48042f024ae622cbb446b918a141dc0c57f6cbb2de2396e991055e940
+EBUILD symfony-event-dispatcher-2.8.50.ebuild 927 BLAKE2B ed521528565045ebbced171760d07c6753f38583cd6fc845490ad7633d6b5be6730130f43178f25e0eebb5e304ab363675c37e0068c46650fb6bdc92763e14da SHA512 e988ba3fdff007880c5d60d5093898beef3469949b565f4ae923847a52d97c56086477d643604e27c2728c9134ac6cd235b7e2e683cfb0615e9380e394aaa46f
 MISC metadata.xml 775 BLAKE2B e25fad462227e8d7ae05cfe82044f57c9f8c5de7dc8d88d8151c549a2e040dbeaee82866919dda13efe6d8574e3160725fbd9d42019593177d03ea352cadce9a SHA512 11095327870ea93690d14782556a5c28fa6cf2a099ff63b9f8d0ced042f79e4fc96d4b7b33b9fe4820eaf8159385a6b8056ddb32309d376675646dc1e262fe00
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 43e947bc1128..933cb529d6e9 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ RDEPEND="
 DEPEND="
 	test? (
 		${RDEPEND}
-		dev-php/phpunit )"
+		<dev-php/phpunit-6 )"
 
 S="${WORKDIR}/event-dispatcher-${PV}"
 
diff --git a/dev-php/symfony-filesystem/Manifest b/dev-php/symfony-filesystem/Manifest
index 6328ecd74926..8f511193ebea 100644
--- a/dev-php/symfony-filesystem/Manifest
+++ b/dev-php/symfony-filesystem/Manifest
@@ -2,5 +2,5 @@ AUX autoload.php 280 BLAKE2B f482a272729d9e859d789f38b8ae9179c4e79132019e62c5ab2
 DIST symfony-filesystem-3.4.28.tar.gz 19238 BLAKE2B dcb9752a5691834aa87b3866b6c2f53b54d5953cf721547cf3ae8aa03e826bcacb2393f324bf9a767013a2daebcf9654c7ce18822ac40758d96b35b174b8ab6d SHA512 4a2e19bf6df69396e503e11112d9b37e9deaaba5eb4fa95857b7b19e1ce073462d2ca18442b6cc1c30021f925d0878f635aa9bc1c5de55318f0c521a291efcc8
 DIST symfony-filesystem-3.4.36.tar.gz 19282 BLAKE2B fd084715356b49588ff6a589372ab1958e3bd58b3af690b554ef1562553bf57504ca184fea06a3aa58ea12381773cebb57e11ba385be5c23ebce3f9e576413ec SHA512 2a43d22e64adfe50a1915f3833c70962f90a8da3cf7bb8b7bf30b1e0f17d6bd4857b35687207e019037d24ad71f46228ddd6eb46713117b82a92f94653cb2384
 EBUILD symfony-filesystem-3.4.28.ebuild 913 BLAKE2B 391eac0cf1dd4052206b1c23adb2d4ba9135a208ed1aa3eff465df5e6b10afcfe904c13f5e00fb0c460c893bde234eb7de86a23966ca8bf0919e47dbd8ee4807 SHA512 5b83ca824b09e73e5c4e46b4aa5ea27fbad9266a36c95f92f775e2ae93bfbc62b4c71b8a383339bcd2a871aa924d732c91e7f557e2de7c94a13a43f5159eebac
-EBUILD symfony-filesystem-3.4.36.ebuild 913 BLAKE2B 3d77359c8b7386d436c7e3383d9cb1e3540dd5c1c5cfcb25c402e48b7d08ffb1fa513bf9f7e57dba84414a6bdc105eebe28575f2b8af6a23a754bbafa3aef5e9 SHA512 7967f3fc9e525dd867b27b08a5edba4afaf5f9b94a1927a8073beef5a8a04eb5529ba2014783d409b9144cd013c0adaff04804a6dce700080c93222c6ffd3442
+EBUILD symfony-filesystem-3.4.36.ebuild 907 BLAKE2B 042ae06eb86ac2aa8f12bcb6bb23fed4fc159d28dd04f2c99078bc51f10d453718e9f3ce4e1d58d43eecc42e1c50587148667d7594fc5e50333464dbd26de14a SHA512 c4a5e239ba0b30ebcfe6c2d84219ff24a5b627b8823146e77a13e807909607d5bcd7a5ec839143181f7470263e6868da286447229d1b7e437f93519ef574baa6
 MISC metadata.xml 671 BLAKE2B 6bac5eae2bf1dcf6ee982be6ee6bddf3c3e0b767b6fc1920f2bc7d7bd3798f6b1567a4ee9fe79c7ebe704572b633d129ea7eef0828a481bfc19fe2d4ae3fc87d SHA512 bbc967795d3f2cac6bca2c94805e8e412cacf7a32699222b27f8f658c54363c1ab49cb0e68b2323ad7d8dd71a5983aeae5e2ad52e23759b3cf9f0ff8662d4e6c
diff --git a/dev-php/symfony-filesystem/symfony-filesystem-3.4.36.ebuild b/dev-php/symfony-filesystem/symfony-filesystem-3.4.36.ebuild
index 03a6ae68819b..e6f2b87627e2 100644
--- a/dev-php/symfony-filesystem/symfony-filesystem-3.4.36.ebuild
+++ b/dev-php/symfony-filesystem/symfony-filesystem-3.4.36.ebuild
@@ -15,7 +15,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php:*
 	dev-php/fedora-autoloader"
-DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-5.7.15 )"
+DEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )"
 
 S="${WORKDIR}/filesystem-${PV}"
 
diff --git a/dev-php/symfony-finder/Manifest b/dev-php/symfony-finder/Manifest
index a848e97ddf44..b3b0b8b86e91 100644
--- a/dev-php/symfony-finder/Manifest
+++ b/dev-php/symfony-finder/Manifest
@@ -6,5 +6,5 @@ DIST symfony-finder-3.4.28.tar.gz 25618 BLAKE2B 592a10a5e8d7f1782242d79bc11ebfde
 DIST symfony-finder-3.4.38.tar.gz 25631 BLAKE2B e15224294373f35222ba5af10598339714892d637e7ee6e52ad6e0fd22802c3ea7fd9eda2e172ff0f73a3788afc640ff8093440ab71f1182d13783f96d5b70df SHA512 60987869275547b097ce8492164a443f4535d41d8b4453da3aadf96af536dd1ed6148fbb7100959e5ca7f560b2333359c9256e5d76a71e98aa6e3ccd808df051
 EBUILD symfony-finder-3.2.8.ebuild 960 BLAKE2B b9be05dabce7f2b73f61063d51b69ac6b48825113c9f5c72e77a09489a76686ef3cbaf410a0fb6fa5ce189d9e339a0b855668b56eb08e3ca58fc18b3bd71fcbf SHA512 55c995258c4405fa2417ed1d14d19cb9a15716e6e8489b682f8f96cc54f1cc864bc9e7f277f53a0947b6c52c438ab3e7e4b35e4e6f1b371b95a6ba34c71784c8
 EBUILD symfony-finder-3.4.28.ebuild 973 BLAKE2B 8feee88ca9bc72477f719e5c0182905116f8ded4bca3e678c6241833604559e22963fe5e26ce1e2b2134b06177e775ae3127a65d695bb767755636724ea34b69 SHA512 8745fdeb25cfa360259bd7d7477a3db2cd5b898738739aed7b0f7924963aa95da8502ffc1cafa6d2130f97c8f513847d4fbe1821251d9576fa716d42f47a8bca
-EBUILD symfony-finder-3.4.38.ebuild 973 BLAKE2B 00a1ef4f6214657e36cc2d219f4ff4f987f1112cd033aeb202db5a812f9f79c02372e44f8e7620724d9ed1328098bf9b7d626ea755160160ee12efada2864e4a SHA512 2f9dd1019426d37f7e1884ad69c58663c60f1f73400e24f2e1e1445b8d1c7955b578463c7f5b56b0680a7ae203ac500dc6db3d82ef00072ebf80d754d41af1da
+EBUILD symfony-finder-3.4.38.ebuild 967 BLAKE2B afe3b904f5e03ce69c5365face9ae140ca4a4203a4f1988bf020d0a3e03a3d12cf08479780a47b148d5795953c9456b2017242bfc86ac31acb35b5a7a64b910b SHA512 36cf43f315132643be93289749f2fa20a6f634c0f5f1631df394b3b2e9d7a95333ab0048bc8fdcaa7ca40bead3504a6819ac5f558bae3a199fdd61fa7522aedb
 MISC metadata.xml 685 BLAKE2B feba013286ccce28abfb477e4c32c105bced39a175c00aab8c2413144100758914f93380418fbf9acce9c44ea9887b34b77cc674240edcac687449b1c5a7e36c SHA512 664abc5b0e4894c547f4d39ed3cc3c4f4b6526e0ad9dec4a83f43410121b2aaeccc969bf4393a899d309e71c21fd6e06df7f4547927a8ae1ee0b1382a8c5dc92
diff --git a/dev-php/symfony-finder/symfony-finder-3.4.38.ebuild b/dev-php/symfony-finder/symfony-finder-3.4.38.ebuild
index cf2ac3ad9a12..27459275efb1 100644
--- a/dev-php/symfony-finder/symfony-finder-3.4.38.ebuild
+++ b/dev-php/symfony-finder/symfony-finder-3.4.38.ebuild
@@ -15,7 +15,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php:*
 	dev-php/fedora-autoloader"
-DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-5.7.15 )"
+DEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )"
 
 S="${WORKDIR}/finder-${PV}"
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-php
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)