From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 24 Dec 2018 14:11:38 +0000
Subject: gentoo resync : 24.12.2018

---
 dev-php/File_Iterator/File_Iterator-2.0.2.ebuild   |  32 ++++
 dev-php/File_Iterator/Manifest                     |   2 +
 dev-php/Manifest.gz                                | Bin 40765 -> 40749 bytes
 dev-php/PEAR-DB/Manifest                           |   2 +
 dev-php/PEAR-DB/PEAR-DB-1.9.3.ebuild               |  26 +++
 dev-php/PEAR-Net_SmartIRC/Manifest                 |   2 +
 .../PEAR-Net_SmartIRC-1.1.13.ebuild                |  24 +++
 dev-php/PEAR-PEAR/Manifest                         |   2 +
 dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild          | 177 +++++++++++++++++++++
 dev-php/PHP_CodeCoverage/Manifest                  |   1 +
 .../PHP_CodeCoverage-4.0.7-r1.ebuild               |  47 ++++++
 dev-php/ca-bundle/Manifest                         |   2 +
 dev-php/ca-bundle/ca-bundle-1.1.3.ebuild           |  22 +++
 dev-php/cli-prompt/Manifest                        |   2 +
 dev-php/cli-prompt/cli-prompt-1.0.3.ebuild         |  22 +++
 dev-php/composer/Manifest                          |   2 +
 dev-php/composer/composer-1.8.0.ebuild             |  46 ++++++
 dev-php/doctrine-instantiator/Manifest             |   2 +
 .../doctrine-instantiator-1.1.0.ebuild             |  27 ++++
 dev-php/ming-php/Manifest                          |   2 +-
 dev-php/ming-php/ming-php-0.4.8.ebuild             |   2 +-
 dev-php/pecl-apcu/Manifest                         |   2 +
 dev-php/pecl-apcu/pecl-apcu-5.1.16.ebuild          |  80 ++++++++++
 dev-php/pecl-event/Manifest                        |   2 +
 dev-php/pecl-event/pecl-event-2.4.3.ebuild         |  53 ++++++
 dev-php/pecl-http/Manifest                         |   2 +
 dev-php/pecl-http/pecl-http-3.2.0.ebuild           |  76 +++++++++
 dev-php/pecl-mongodb/Manifest                      |   4 +-
 dev-php/pecl-mongodb/pecl-mongodb-1.5.2.ebuild     |   9 +-
 dev-php/pecl-mongodb/pecl-mongodb-1.5.3.ebuild     |  40 +++++
 dev-php/pecl-redis/Manifest                        |   2 +
 dev-php/pecl-redis/pecl-redis-4.2.0.ebuild         |  59 +++++++
 dev-php/pecl-timezonedb/Manifest                   |   2 +
 .../pecl-timezonedb/pecl-timezonedb-2018.7.ebuild  |  19 +++
 dev-php/pecl-yaml/Manifest                         |  12 +-
 dev-php/pecl-yaml/pecl-yaml-1.3.0.ebuild           |  46 ------
 dev-php/pecl-yaml/pecl-yaml-1.3.1.ebuild           |  50 ------
 dev-php/pecl-yaml/pecl-yaml-1.3.2.ebuild           |  51 ++++++
 dev-php/pecl-yaml/pecl-yaml-2.0.0.ebuild           |  44 -----
 dev-php/pecl-yaml/pecl-yaml-2.0.2.ebuild           |  44 -----
 dev-php/pecl-yaml/pecl-yaml-2.0.4.ebuild           |  44 +++++
 dev-php/pecl-yaz/Manifest                          |   4 +-
 dev-php/pecl-yaz/pecl-yaz-1.2.2-r1.ebuild          |   4 +-
 dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild             |  28 ++++
 dev-php/phpunit-mock-objects/Manifest              |   1 +
 .../phpunit-mock-objects-3.4.3-r1.ebuild           |  28 ++++
 dev-php/phpunit/Manifest                           |   1 +
 dev-php/phpunit/phpunit-5.7.15-r2.ebuild           |  55 +++++++
 dev-php/psr-log/Manifest                           |   2 +
 dev-php/psr-log/psr-log-1.1.0.ebuild               |  24 +++
 dev-php/spdx-licenses/Manifest                     |   2 +
 dev-php/spdx-licenses/spdx-licenses-1.5.0.ebuild   |  25 +++
 dev-php/swoole/Manifest                            |   2 +
 dev-php/swoole/swoole-4.2.9.ebuild                 |  71 +++++++++
 dev-php/symfony-console/Manifest                   |   2 +
 .../symfony-console/symfony-console-2.8.48.ebuild  |  28 ++++
 dev-php/xdebug-handler/Manifest                    |   2 +
 dev-php/xdebug-handler/xdebug-handler-1.3.1.ebuild |  23 +++
 58 files changed, 1188 insertions(+), 199 deletions(-)
 create mode 100644 dev-php/File_Iterator/File_Iterator-2.0.2.ebuild
 create mode 100644 dev-php/PEAR-DB/PEAR-DB-1.9.3.ebuild
 create mode 100644 dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.13.ebuild
 create mode 100644 dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild
 create mode 100644 dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r1.ebuild
 create mode 100644 dev-php/ca-bundle/ca-bundle-1.1.3.ebuild
 create mode 100644 dev-php/cli-prompt/cli-prompt-1.0.3.ebuild
 create mode 100644 dev-php/composer/composer-1.8.0.ebuild
 create mode 100644 dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild
 create mode 100644 dev-php/pecl-apcu/pecl-apcu-5.1.16.ebuild
 create mode 100644 dev-php/pecl-event/pecl-event-2.4.3.ebuild
 create mode 100644 dev-php/pecl-http/pecl-http-3.2.0.ebuild
 create mode 100644 dev-php/pecl-mongodb/pecl-mongodb-1.5.3.ebuild
 create mode 100644 dev-php/pecl-redis/pecl-redis-4.2.0.ebuild
 create mode 100644 dev-php/pecl-timezonedb/pecl-timezonedb-2018.7.ebuild
 delete mode 100644 dev-php/pecl-yaml/pecl-yaml-1.3.0.ebuild
 delete mode 100644 dev-php/pecl-yaml/pecl-yaml-1.3.1.ebuild
 create mode 100644 dev-php/pecl-yaml/pecl-yaml-1.3.2.ebuild
 delete mode 100644 dev-php/pecl-yaml/pecl-yaml-2.0.0.ebuild
 delete mode 100644 dev-php/pecl-yaml/pecl-yaml-2.0.2.ebuild
 create mode 100644 dev-php/pecl-yaml/pecl-yaml-2.0.4.ebuild
 create mode 100644 dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild
 create mode 100644 dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild
 create mode 100644 dev-php/phpunit/phpunit-5.7.15-r2.ebuild
 create mode 100644 dev-php/psr-log/psr-log-1.1.0.ebuild
 create mode 100644 dev-php/spdx-licenses/spdx-licenses-1.5.0.ebuild
 create mode 100644 dev-php/swoole/swoole-4.2.9.ebuild
 create mode 100644 dev-php/symfony-console/symfony-console-2.8.48.ebuild
 create mode 100644 dev-php/xdebug-handler/xdebug-handler-1.3.1.ebuild

(limited to 'dev-php')

diff --git a/dev-php/File_Iterator/File_Iterator-2.0.2.ebuild b/dev-php/File_Iterator/File_Iterator-2.0.2.ebuild
new file mode 100644
index 000000000000..7763457d86b5
--- /dev/null
+++ b/dev-php/File_Iterator/File_Iterator-2.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="php-file-iterator"
+
+DESCRIPTION="FilterIterator implementation that filters files based on criteria"
+HOMEPAGE="https://github.com/sebastianbergmann/php-file-iterator
+	https://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+	>=dev-lang/php-7.1:*"
+
+src_install() {
+	insinto /usr/share/php/File/Iterator
+	doins -r src/*
+	doins "${FILESDIR}/autoload.php"
+}
+
+pkg_postinst() {
+	ewarn "This library now loads via /usr/share/php/File/Iterator/autoload.php"
+	ewarn "Please update any scripts to require the autoloader"
+}
diff --git a/dev-php/File_Iterator/Manifest b/dev-php/File_Iterator/Manifest
index fdd9d1a595b4..201064042dd3 100644
--- a/dev-php/File_Iterator/Manifest
+++ b/dev-php/File_Iterator/Manifest
@@ -3,7 +3,9 @@ AUX channel.xml 804 BLAKE2B d6a965a41a220f07e3a0d206bc3359e2649b55d186e7975726c1
 DIST File_Iterator-1.3.4.tgz 5199 BLAKE2B 75da70ad638230dd231947e3af26c2570eff367328d2e541fb1228ba531c0f249c931a9185f977dce9e17846e1e9b8b1f9f8d21219291e637b2eaf7805dcf360 SHA512 7117e0e56a9bc533d9f93556366a8026d1e5a9a3894c05551adef6c1e6cd556c1ebf6b96bd98279cb92077b3d8f8d7b7e42f446b39895850e573d0ec511392be
 DIST File_Iterator-1.4.2.tar.gz 4141 BLAKE2B 4c8d9847fa198d444571acdf777020b76e87e09506038c7d7ce732b97c149149bcf22dc25d0af36f041b7930673b05f940df8211c29829e0fed2b3dcfae0ba05 SHA512 295943681853c858e3e1c336c030338c61a74169bd2a619da6fca8c43611e587c6f626fa92799d614bcb0a1f86bbb39895b20f2a389107cedb9660a7e792a243
 DIST File_Iterator-1.4.3.tar.gz 4140 BLAKE2B 89274c6f9b561dbc732d0b81f06b7c34d267ea31d1deb5977eaa16852d87442183221ed6789fd5e09b80ef96811df2ff8ef5da5c764703f5e7a2d5289f582527 SHA512 cea906d6028d9c2dbbb5486198adbecbca87f8b4dcbe12f72b9732ac29cf8eb868a23af7a5bcf2de55e0040a077ab55b016e773d5145f987f7e3f9671ad3ea28
+DIST File_Iterator-2.0.2.tar.gz 7239 BLAKE2B af2cc29d087bd597b10fd1d22a35c906deca70eb79bbcbb52ca3d8c408cbe8887233b69ba7f9c37fe639ff7d544d1109609a0b2e59c5f49bb286aee3e3f3f2d1 SHA512 2f1acee0358e03bd831d0228dfd2fc65848f7105e0dabb6cf81890d8549e3f39037a01bed2357316a27bb863955c1f51d56770c0ea733f5389d8e47f30050687
 EBUILD File_Iterator-1.3.4.ebuild 577 BLAKE2B 0c98424026c342511d6f73c2fe4d2ccad1e14dd97f97cf1d36bec6e469093bbef5fcdf0ca89c79d3410c1957083150d121587a509ac45689273aa1b34132d848 SHA512 5b389c4cb5c4a939a330347db4281fdc2c0c3ef993cb3f5606fa1a54f7968616c2ae275fb49c810256b84774cca5aa4776bd3a139078e9e4651cb3a47d5b5b57
 EBUILD File_Iterator-1.4.2.ebuild 857 BLAKE2B 35f38333c62934f9db26e34d5c12aaa43175d6bd39907d0d519f68a5620491ad0983969e7256386578f99b9e46b7b98d156b5a71f3f97831ba47b1141085114d SHA512 9e9108633f405935b025aa4cdd957387ae152bbe943435f896fd97fb063dcd2a2cb089e7c1e1e4cfd16fd180ad754565c7709f01faf8a5fb3d1ee930ab469c24
 EBUILD File_Iterator-1.4.3.ebuild 866 BLAKE2B e5e1e0dc5ebe224bbddeab59ee7f2e0be3b06a400af818f7d0045869fdfdddbf60efc405a9aa1e30bad8a9c3310e4a71db866821fea6b4e5486d35001f92a306 SHA512 f45b221200b40f5c10c1d7240b3eb1e459c8784741cd5a0ec594ce7ba382e5383a9f8086aa9e58fbd1d739795b52a11e02ed35a9f18f6a9c4e970f7268cfb6bc
+EBUILD File_Iterator-2.0.2.ebuild 863 BLAKE2B 32456063a934491a2e434f613ca846f920334da7215b41f5acc3201349be9aea4d2b3f379fb5e9b87548906bb498f0bcfc6d226efbe3f24743a2c2f94da8343e SHA512 f22f9ba8c3f5128f28d246f5d34269c7792c4427023daf83e0b43cf8a9b42b4dd1e84dca8ed048ca6b0571b90a078bc1debabbff6611732a9c14c06f92a737fe
 MISC metadata.xml 349 BLAKE2B ab948322ce2cfa4e40d9b0ac17d435db9e4613000fa05c810860e281615d5b1297f826ec51ed460ba87080508578e2353729843cdd2bf1f4226890413137a911 SHA512 85e7e819b346185575934f4f356d1346534fce0fe1ddcf5e88e855ce40f64c48bf73c1f14085cf0526ee681014943f7524ea79b7d951b66c12e67e6f04c099e8
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index b724c027810f..d40033353201 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/PEAR-DB/Manifest b/dev-php/PEAR-DB/Manifest
index d3e67e48e658..a651d516570c 100644
--- a/dev-php/PEAR-DB/Manifest
+++ b/dev-php/PEAR-DB/Manifest
@@ -1,3 +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 734 BLAKE2B 55553e5f5029189f6ab184bd99b339a06bf0e40b1639ffe12eabdcf50b6a54dbf1783156daf55d80b9467cca5e50b11f1a32e5c439e3b083c9fc026dc5c7c204 SHA512 149ebb0686cccb7be2de824b8cf170e2c08fc45c0fd0f0ddd7b53cf5c50138fd9a53ad6a00c2e0be6dca1a9faa38ec32857d8239f014c34718f2909002097f4a
+EBUILD PEAR-DB-1.9.3.ebuild 740 BLAKE2B 1450bd0678f82e051b1bc55bc88f2f4fdd08dac5ea82318cc8bbf992fe35826ab74473461549171ba8aab8111998bd3f16b4fc02475eae897d59e0ca0b21871a SHA512 4df453871bcf77c810cdfaf94f9045e9d6f04067f5aa70854f562843f28ddf65a12d24cf59ac14f40ded231b6fef553b1ee3319ed554f11ad52b03321e73911e
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-DB/PEAR-DB-1.9.3.ebuild b/dev-php/PEAR-DB/PEAR-DB-1.9.3.ebuild
new file mode 100644
index 000000000000..b7d376017594
--- /dev/null
+++ b/dev-php/PEAR-DB/PEAR-DB-1.9.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+DESCRIPTION="Database abstraction layer for PHP"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE="test"
+DEPEND="test? ( dev-php/PEAR-PEAR )"
+
+DOCS=( doc/TESTERS doc/IDEAS doc/MAINTAINERS doc/STATUS )
+
+src_test() {
+	# Requires the "pear" executable from dev-php/PEAR-PEAR, and also
+	# a working version of the cli SAPI eselected.
+	pear run-tests tests || die
+
+	# The command succeeds regardless of whether or not the test suite
+	# passed, but this file is only written when there was a failure.
+	[[ -f run-tests.log ]] && die "test suite failed"
+}
diff --git a/dev-php/PEAR-Net_SmartIRC/Manifest b/dev-php/PEAR-Net_SmartIRC/Manifest
index c35962225df7..155a383ff1fe 100644
--- a/dev-php/PEAR-Net_SmartIRC/Manifest
+++ b/dev-php/PEAR-Net_SmartIRC/Manifest
@@ -1,5 +1,7 @@
 DIST Net_SmartIRC-1.1.10.tar.gz 927009 BLAKE2B b410a0b4a02e60e27860f9c6b0ab8fecf4874273601694ad61dcf88a2e916aee20d1858cf951fffb229f4eac0c0ddda55530bb6840da3c7b741cf9ee3971f7b2 SHA512 16ad30d358af99f40c53a75cf5f1c944a3e68f4c1cffd586acd61ceed280d5d1fcd4f4d5e88db55f1f66c37c5b7f37aec2f45a26dc6b98860eacb42c9f3fbea5
 DIST Net_SmartIRC-1.1.12.tgz 166039 BLAKE2B 43aec437de08d6e0dd651b810b21b5fed5587e2e7e154fe4f078cc618ee501c3d962b824931558458895541ddc9dc46ec3b1f0356aac5b052dd63b498018bb47 SHA512 2da5f0f9ea9167dfd1490fb6ba1e97416c78389924f390030ba71ea28dc5b667451223daa7e3878cbae607159054d656534ff646636f8f5294eb0bda1b17074c
+DIST Net_SmartIRC-1.1.13.tgz 166028 BLAKE2B 7e2b91dc01febe561c3ce55901f999f84f87fdbe20b5a1560a060125de4ae7d9869141cc0b2bcd9dfd0479a3a0a2d3c9d0f2719f70edc122df70f181d788f73b SHA512 d8f5a4f38b0aa830a84c9433deaf16b936f79e30bd9588cb0225ec20698af3d334fd1fdb320c64d1a72b0d206ae794b9e4135f1053855f586155694f6342cb0b
 EBUILD PEAR-Net_SmartIRC-1.1.10-r1.ebuild 774 BLAKE2B 640ed23e9f99b57056d92b502b0b9bf6816834a34d11329048dd0a6f95fd4e191b99db9f805bb701b97e43b38ec77ab2c8e71138ffeee0405f4df5e97edbb480 SHA512 8ee23e5be03c0e64b69d4d5b0405e66cbceea14cfd508ee619c7731e1ac12257816f48171ca31b1969210ca74920bb11d68c6d690b4f2ed6ac75533fdf460bba
 EBUILD PEAR-Net_SmartIRC-1.1.12.ebuild 545 BLAKE2B 80991f66ddd016eacdbf1c1d1b9232bf15a507e04e4ca530f0a78d135187c1a944cb7cf57e88a4266e45a0c20c76b74b720ee733daf6562e5fc303c978e75c64 SHA512 aea02f3d6ac0e4fd6b8fa92730162e6fe07e1e6299d084f8260cead0b2e8b6d982644ed4d37cb8c8ceeb296bf118b88f8913005d81b8e972e060885aeb56d4fe
+EBUILD PEAR-Net_SmartIRC-1.1.13.ebuild 542 BLAKE2B 8ea1b954d63b2b9b79c19b5188933c28a64978bcf64e48427ff5d2d5c54b27d7ef134f30c0d04a87c3d002fa9aef40b8fce72310827c9e96600089d5707abbd5 SHA512 9e8bd3b6c852f93458b9704a28f5b0ee11d7d8eb5f08dc1ed708d1b943026f379cac37679e2446b8db06544f34c48589bc2a0b1a4f3c892b66cead0caab563b8
 MISC metadata.xml 383 BLAKE2B ab5de001d8fe2ec2f6beaf3b457f5296123b286b335b3910ea58eadefe3369ab4fba6ad34fd1262ae465e2e521251b8034c046d1cbaf35afe819717d709917a7 SHA512 083df49fdd76cb7e00bb81b6501d0f475788cef1da463919fc35abc6d0725cda8b47fa027a1a3f6af4872897567b8ba8104463be276a1524182138bdc15d04c0
diff --git a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.13.ebuild b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.13.ebuild
new file mode 100644
index 000000000000..59e964213993
--- /dev/null
+++ b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.13.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="PHP class to communicate with IRC networks"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples"
+DOCS=( CREDITS FEATURES docs/HOWTO README.md )
+
+src_install() {
+	local HTML_DOCS=( )
+	use examples && HTML_DOCS+=( docs/examples/ )
+
+	if use doc; then
+		DOCS+=( docs/DOCUMENTATION )
+		HTML_DOCS+=( docs/HTML/* )
+	fi
+	php-pear-r2_src_install
+}
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index b3306a8d3d81..8c4d9c19014a 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,5 +1,7 @@
 AUX gentoo-libtool-mismatch-fix-v2.patch 510 BLAKE2B 59571998b848501efcdd4c304dc48e4950560f2f4d08add530d078787519b1c33dd511e92914208342011bd727e0fca12974b92a46b6a6bc9a66cbca061c9495 SHA512 03848aa6447c2969715e872481e17f7a6dbe7df9e42a13305fdbcfaf09505de40ed6d91c9c93f11a944adc94389472f04eac2b656f08dbdd9d1c3a1d07946ff4
 AUX pear.conf-r2 379 BLAKE2B fe57574f4e4ce095f7ddd9bc26606181a86e67f6c8e6dad57a713e187175b711d50d90c346759d430c32da0a740e7f79cffc7ccedc3b719d04dcd1792a9309f6 SHA512 81e4c95ccfd1a50d30d6e9db90fa099f3dd098bf4fa2c023f5369d0e96a197da91d2572ff3785bcfc83dba82abeca3932431083b5aa2aed155336697764666be
 DIST PEAR-1.10.6.tgz 291529 BLAKE2B 7a75c89df2b34b368564e745a727292e5c5ee3a145995c15d338901b235664d0a783ca0efc9cd1d321cc2c496e88395db376ce7bbd6ccbf55d484d7f1021cd2b SHA512 ccd436a2cb9d30b434a78483432c51a8fa5b3e96e79ca3b28131b8dcd37bbae0b782efd762eb92dc40db24d3f61025c64ec5d29aed10fd80a6b28c224c4f1e2a
+DIST PEAR-1.10.7.tgz 291786 BLAKE2B 7e760c2782832fab2a35f86e2f9072058d622918cdc2b61b7066d2f17787488d228186948e96e602bb412b76b806004642e7ba83db00950a822996869dae9cd4 SHA512 ebe93cff5546ad3a80d3d1c0284e34a46ec8dbdb7d015a11350231244baca75a57596e446c1386bc40650525f59c04617e73b1071a0fe77210dc5979edb5151f
 EBUILD PEAR-PEAR-1.10.6.ebuild 5891 BLAKE2B 2fdc55716f1b7fbfd359c27b1265fe8d72ff58d91f0c2b5d40fa353f164389b75a981e0c37555606326f3f1cf844e64db0ee16f9d1b9db27aaaeddf7720d986e SHA512 5c926169b5918fea5b1387ba7a363eeccbd51ad33598dc407ccd6fc92e7721fae92cbeb2f6c153f5ebf2b3c3f91c620ac4c603de9288cdd1044dbfe2dd72dc48
+EBUILD PEAR-PEAR-1.10.7.ebuild 5896 BLAKE2B c70be68cb99cd6a657cce7a2be0840f10427395f945fd1231250daa784af66be28cec0db41a14c8de0e960e2b3ff36011775df1b23648b91d5f23c1c5a80d6ab SHA512 d385674cfa1c442e446c01e5992bb3066b8f6d0ba0620d2d25b9531c6b82fca925012eca027687035025d87455326cf84b4896ab8b159359e29c06c3833b8b5f
 MISC metadata.xml 306 BLAKE2B fdddffeab9925e2296436f14f6224e0cbdbe2d386e863de68a555cf8b1e5434409af998a4b73c9380d2118db0a021401b23034895038e31559e0de0919a8c597 SHA512 2e46d7a6fcadfed2ff7be17a5f0a82b5cbf6184b50384f868a6ad8821746badfe126279ef9c114ef9d9a42374931193dba4b84483d437797636b95e6e97247fa
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild
new file mode 100644
index 000000000000..70bd0801cdb3
--- /dev/null
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PEAR Base System"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/php:*[cli,xml,zlib]
+	>=dev-php/PEAR-Archive_Tar-1.4.0
+	>=dev-php/PEAR-Console_Getopt-1.4.1
+	dev-php/PEAR-Exception
+	>=dev-php/PEAR-Structures_Graph-1.1.0
+	>=dev-php/PEAR-XML_Util-1.3.0"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/gentoo-libtool-mismatch-fix-v2.patch" )
+
+pkg_setup() {
+	[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
+	[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
+	[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp"
+
+	elog
+	elog "cache_dir is set to: ${PEAR_CACHEDIR}"
+	elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
+	elog "temp_dir is set to: ${PEAR_TEMPDIR}"
+	elog
+	elog "If you want to change the above values, you need to set"
+	elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
+	elog "accordingly in /etc/portage/make.conf and re-emerge ${PN}."
+	elog
+}
+
+src_prepare() {
+	default
+	# Exception.php is part of dev-php/PEAR-Exception.
+	rm PEAR/Exception.php || die "failed to remove PEAR/Exception.php"
+}
+
+src_install() {
+	insinto /usr/share/php
+	doins -r PEAR/
+	doins -r OS/
+	doins PEAR.php System.php
+	doins scripts/pearcmd.php
+	doins scripts/peclcmd.php
+
+	newbin scripts/pear.sh pear
+	newbin scripts/peardev.sh peardev
+	newbin scripts/pecl.sh pecl
+
+	# adjust some scripts for current version
+	[[ -z "${PEAR}" ]] && PEAR="${PV}"
+	for i in pearcmd.php peclcmd.php ; do
+		sed "s:@pear_version@:${PEAR}:g" -i "${D}/usr/share/php/${i}" \
+			|| die "failed to sed pear_version"
+	done
+
+	for i in pear peardev pecl ; do
+		sed "s:@bin_dir@:${EPREFIX}/usr/bin:g" -i "${D}/usr/bin/${i}" \
+			|| die "failed to sed @bin_dir@ in ${i}"
+		sed "s:@php_dir@:${EPREFIX}/usr/share/php:g" -i "${D}/usr/bin/${i}" \
+			|| die "failed to sed @php_dir@ in ${i}"
+	done
+
+	sed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" \
+		-i "${D}/usr/bin/pear" \
+		|| die "failed to set PHP ini values in pear executable"
+
+	sed "s:@package_version@:${PEAR}:g" \
+		-i "${D}/usr/share/php/PEAR/Command/Package.php" \
+		|| die "failed to sed @package_version@"
+
+	sed "s:@PEAR-VER@:${PEAR}:g" \
+		-i "${D}/usr/share/php/PEAR/Dependency2.php" \
+		|| die "failed to sed @PEAR-VER@ in Dependency2.php"
+
+	sed "s:@PEAR-VER@:${PEAR}:g" \
+		-i "${D}/usr/share/php/PEAR/PackageFile/Parser/v1.php" \
+		|| die "failed to sed @PEAR-VER@ in v1.php"
+
+	sed "s:@PEAR-VER@:${PEAR}:g" \
+		-i "${D}/usr/share/php/PEAR/PackageFile/Parser/v2.php" \
+		|| die "failed to sed @PEAR-VER@ in v2.php"
+
+	# finalize install
+	insinto /etc
+	newins "${FILESDIR}"/pear.conf-r2 pear.conf
+
+	sed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed PHPCLILEN in pear.conf"
+
+	sed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed CACHEDIRLEN in pear.conf"
+
+	sed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed DOWNLOADDIRLEN in pear.conf"
+
+	sed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed TEMPDIRLEN in pear.conf"
+
+	# Change the paths for eprefix!
+	sed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed the docs path (prefix) in pear.conf"
+
+	sed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed the data path (prefix) in pear.conf"
+
+	sed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed the tests path (prefix) in pear.conf"
+
+	sed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed the PHP include path (prefix) in pear.conf"
+
+	sed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed the bin path (prefix) in pear.conf"
+
+	[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}"
+	keepdir "${PEAR_CACHEDIR#${EPREFIX}}"
+	diropts -m1777
+	keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}"
+
+	insinto /usr/share/php/.packagexml
+	newins "${WORKDIR}/package.xml" "${MY_P}.xml"
+}
+
+pkg_config() {
+	# Update PEAR/PECL channels as needed, add new ones to the list if needed
+	elog "Updating PEAR/PECL channels"
+	local pearchans="pear.php.net pecl.php.net pear.symfony-project.com"
+
+	for chan in ${pearchans} ; do
+		# The first command may fail if, for example, the channels have
+		# already been initialized.
+		pear channel-discover ${chan}
+		pear channel-update ${chan} || die "failed to update channels: ${chan}"
+	done
+}
+
+pkg_postinst() {
+	pear clear-cache || die "failed to clear PEAR cache"
+
+	elog "Run 'emerge --config =${PF}' to automatically update the PEAR/PECL channels while online."
+
+	# Register the package from the package.xml file
+	# It is not critical to complete so only warn on failure
+	if [[ -f "${EROOT}usr/share/php/.packagexml/${MY_P}.xml" ]] ; then
+		"${EROOT}usr/bin/peardev" install -nrO --force \
+			"${EROOT}usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \
+			|| ewarn "Failed to insert package into local PEAR database"
+	fi
+}
+
+pkg_prerm() {
+	# Uninstall known dependency
+	"${EROOT}usr/bin/peardev" uninstall -nrO "pear.php.net/PEAR"
+}
diff --git a/dev-php/PHP_CodeCoverage/Manifest b/dev-php/PHP_CodeCoverage/Manifest
index e611ccffcc83..3f104ee7e072 100644
--- a/dev-php/PHP_CodeCoverage/Manifest
+++ b/dev-php/PHP_CodeCoverage/Manifest
@@ -3,5 +3,6 @@ AUX channel.xml 804 BLAKE2B d6a965a41a220f07e3a0d206bc3359e2649b55d186e7975726c1
 DIST PHP_CodeCoverage-1.2.13.tgz 158772 BLAKE2B 7f9703cf724dece9535fce4e5dbc7a354302227b38daabf9f8c4417a43980f369807dfbcd65fde79215a14531971d0bf6cf096a6b01c2c6b99a5bc326c5d5b66 SHA512 6a3426c945ad6abf35be3068cf0f7e17215179a382e93b7be3a5e436611b327c9b7bc715f7acc900231856678f578c1f614648d2679baca9b6960dfafd897dc6
 DIST PHP_CodeCoverage-4.0.7.tar.gz 349906 BLAKE2B 2ba665efa2d20a5eb66c66375a095425057e883697dd1d3ba7214e56de29c96451516adb2843589e64732c994aac7289afa0e34a74d56ef9bc36f36e635eb944 SHA512 8418efa2585d05b3004ab50e7ba77513429d649f71fdb2479412424a0f40a698a962e1d87852db08fec8f92e569a9a5767dad66d5d64e072637dde33182e71e9
 EBUILD PHP_CodeCoverage-1.2.13.ebuild 578 BLAKE2B 29c9c830a5dce3332b4e2e072a78930dd2a5e9ce41ad4e582644e6e435ae5ec6ac60ff41d710fd53d23797c66929509fe0c631beb35966883f0f9ff497ecd539 SHA512 9a23f02d10f100de9d110830b5c0ff8a5e36b0dc940422ebd25f857eacb8610f3e9e774840b4c228ab1b4353396f0543f0bafc1f0c359f088e059516c2aa358f
+EBUILD PHP_CodeCoverage-4.0.7-r1.ebuild 1302 BLAKE2B fe67ca3c3912093e52d58b0bd5416ec11153abd014f457445f6795cd57448c12fd73e41ed47d791a7d685e16e70a3c7afcbd50e8edd992638551a11034702949 SHA512 1cefafb639d6b2bfd4c2a17d49031ac8a7570923e711297a8e265771a892f125ade7138b6ba36a0fe1d8fc80357319077ad4c5325a34d2c61688bb00867e309b
 EBUILD PHP_CodeCoverage-4.0.7.ebuild 1308 BLAKE2B 126f6c37e89eedd936e223473c15f378885fddce46e2f7ac8dd1611d99d22c9ddeac27aa8cc850f17cff227b0f7de81ed87f328462b68097d46c65134cfa3e31 SHA512 e8019cc9ead2d067fa7916c896a22d15fe7b72fe02dde0f0251b93ce5354214ab3b10fa418645ed630188b3acebe9a5ec752ecdaeb08e15e45ba98446db52c22
 MISC metadata.xml 339 BLAKE2B a9f68f1bacb42eb4e4a6463dc03080c343501c0f6525ed08556f9d04606b42c2744f458ba35fff8cd4f5c8e68f81f226193dc79bf7808da8c4229588f34dc3dc SHA512 5057d1d80d43e4e8f8a6f2bbddabda7c7f639eb26a7be8f534ac2c470341834c7d99e78a20f18062ef1c7252b75428af122f2858dac78f88f8ab6d50a6f66f4a
diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r1.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r1.ebuild
new file mode 100644
index 000000000000..e4af4df00710
--- /dev/null
+++ b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="php-code-coverage"
+
+DESCRIPTION="Collection, processing, and rendering for PHP code coverage"
+HOMEPAGE="http://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+	>=dev-php/File_Iterator-1.3
+	<dev-php/File_Iterator-2.0
+	>=dev-php/Text_Template-1.2
+	<dev-php/Text_Template-2.0
+	>=dev-php/PHP_TokenStream-1.4
+	<dev-php/PHP_TokenStream-3.0
+	>=dev-php/sebastian-environment-1.3.2
+	<dev-php/sebastian-environment-3.0
+	>=dev-php/sebastian-version-1.0
+	<dev-php/sebastian-version-3.0
+	dev-php/sebastian-code-unit-reverse-lookup
+	<dev-php/sebastian-code-unit-reverse-lookup-2.0
+	|| (
+		dev-lang/php:5.6[xml,xmlwriter]
+		dev-lang/php:7.0[xml,xmlwriter]
+		dev-lang/php:7.1[xml,xmlwriter]
+	)"
+
+src_install() {
+	insinto /usr/share/php/PHP/CodeCoverage
+	doins -r src/*
+	doins "${FILESDIR}/autoload.php"
+}
+
+pkg_postinst() {
+	ewarn "This library now loads via /usr/share/php/PHP/CodeCoverage/autoload.php"
+	ewarn "Please update any scripts to require the autoloader"
+}
diff --git a/dev-php/ca-bundle/Manifest b/dev-php/ca-bundle/Manifest
index 063638ba5e59..381e5ee2aa57 100644
--- a/dev-php/ca-bundle/Manifest
+++ b/dev-php/ca-bundle/Manifest
@@ -1,6 +1,8 @@
 AUX autoload.php 268 BLAKE2B 0b6618f45d1a4e03a317ea55b4af12c60c43f9eb98fe9b3cacc45e5cf505530cc4e332d5289365956abfb3eb882b3447d19919b5116d249d727b0c934f272eb3 SHA512 186ccfc3ae6669722d01948c266a9c0518e1da228095a880695b7de6502c9798203019622cc0c63e30fbf7abe94aa988b7c694bcc98522e04298aa90217b8ed8
 DIST ca-bundle-1.0.3.tar.gz 151659 BLAKE2B a8755af7041a1e093d06f6bf3bfdcd7461bd50ab5347f48285fb6e69d6e621c82c458c73625ed36d6745e91b0c7fabae37318da3674c47bb2813b78aa9483379 SHA512 e33629345d63121b7a6a46b0812afefad5adbc24fd5516eeb7471dd93b7e4126f144b6fc933b526796607fdc3fc9a99f5703188e15d905654d629591c555ad86
 DIST ca-bundle-1.1.2.tar.gz 129296 BLAKE2B 54912144510c7d2c09647540542cdaba24ae9ce1638c74d1f796bee7e82a7161c11ad8561aae6290c13c8e818acae55cfcab3d75d0572906632c6ca456376068 SHA512 4ab7ee419fe0a45b526fe985ecf87f2c8834538c21d008736b8daceec987caf87f525d60208639ade66c39d2fd3c774f54f0bf784cadbd5c81954e8df48ab058
+DIST ca-bundle-1.1.3.tar.gz 126613 BLAKE2B 6b1013c2544f8795a4d054c6807cc2a2c51d03547f0d404def311d7edde9891f27ca1a249bef90e10f129a85f0dea489e1fc933b4c5f3bd8213c3428dba588d2 SHA512 b3e1f6bc9196b6c70476a7b656fb3dc4d398cd033d223b436d50676f228b62b561075787df36b880b7b4eb7de677da19d3e597752f88f279279b8569cc865a5f
 EBUILD ca-bundle-1.0.3.ebuild 526 BLAKE2B d1f23cf223d8fafb9849c0884b8c1536db6e70a2600f91d25dc236fc5a79467fcd439933e71d7562855894ec2a6f60fcb3297e45c44df80d0dd78f10c8eadaa4 SHA512 0f2858fc082c4253f4b50f309a1f5f86538802302c8d97067210391d735f4a5274342ea234fe0a97d1f58f9fedd6d18bc996e2e08a5e43eab818295734e14315
 EBUILD ca-bundle-1.1.2.ebuild 526 BLAKE2B 7de55f6c6e143a7e414b32980ab29fcffd4a7c3d3f589a7bc9af2818a94f276e160e848b5d544479a6ac652d808b005e0654dd91a600d3001289d83bfc5043e8 SHA512 ce0d8339d59b5ff273eb251520ff8651294a5ad54412de0b17fe024f33c18667fd11735ce96f478f7b9c482de7c9faabda6c2b474afa2d3ef2dcc9fe436b6d4e
+EBUILD ca-bundle-1.1.3.ebuild 523 BLAKE2B 2047130b6f105cdb9520c0106b45f1698b2f1e13969df79b2c3f5e678808ea9309295d92f9be1890869fa2f742513fd15d7ae2dadf755bf7a72a45fcaa2088b9 SHA512 958ac491c2a5711bfd49ccea3a695c639f5e526d7ac2b5b1f4152e93115f44dccafdfeedf15ec71fe1cfb04923188328732638d280690d10556b35e7f7b28220
 MISC metadata.xml 843 BLAKE2B d66b37ea7e1468303bbf544d3492a5f3108810a2a04bd5eec1562fa3b873e22cfc7922b46c96982900d8a0c7af7a22e4b33e9700057d32e238c35dd7fdaf5d06 SHA512 9cf3344f7122a81e5ce4b114a53af7c2cedc76e9607abffb906c70263b0c9dfab0209ee06be67ffc22d3da2e386fc376cc3aee007974e5338a259f853c5452fe
diff --git a/dev-php/ca-bundle/ca-bundle-1.1.3.ebuild b/dev-php/ca-bundle/ca-bundle-1.1.3.ebuild
new file mode 100644
index 000000000000..164c183e94b7
--- /dev/null
+++ b/dev-php/ca-bundle/ca-bundle-1.1.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Find the system CA bundle or fall back to the Mozilla one"
+HOMEPAGE="https://github.com/composer/ca-bundle"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/php:*
+	dev-php/fedora-autoloader"
+
+src_install() {
+	insinto /usr/share/php/Composer/CaBundle
+	doins src/CaBundle.php "${FILESDIR}/autoload.php"
+	dodoc README.md
+}
diff --git a/dev-php/cli-prompt/Manifest b/dev-php/cli-prompt/Manifest
index 1fbc70d6099a..9501468f5722 100644
--- a/dev-php/cli-prompt/Manifest
+++ b/dev-php/cli-prompt/Manifest
@@ -1,4 +1,6 @@
 AUX autoload.php 261 BLAKE2B 71987b4c16fe40a74fe8b84c22e855580ccd5901c1adef39d8a78ac2b48be6459e08dffadb979ec41f07d34ddfd88c8636e34a24f90941b4aedd0853b128b457 SHA512 e5eb2fe6feeacf29f0b2b6b5f8370ecb5e42d1d7f3464c0ba1f90565b6f0a15a6c3b79b6c8d1179f37c4fe8bee28c241b750af864b106c67dd7019c75aae38f9
 DIST cli-prompt-1.0.0.tar.gz 7538 BLAKE2B 650bb080c77471515d9baf31d1c5ea13fbfb4a9100e607e2f9c372c8c2ba0f6eac2d67ea0d2327bf30d1cbfaa65a8feb7e999b3a0b130f54e48c85ed8236cbe4 SHA512 5a1f6f999976f3b01d857890b5a06cfed377597397266b44d4aba324bedc2b9f73db5dc184ab40ee6632b43c80da99f5641366903bbc7bb7e18409cb367c8461
+DIST cli-prompt-1.0.3.tar.gz 7563 BLAKE2B 5f4ba04f3ed1e98b30c5ce840fdb0189422b6c83e6df82b3a617eb120b4dadc840287b3ee559b6605f1b2a9eb873abbc446a9ed3ec1dfeba1158a7a27ebee951 SHA512 e7e7bb0ae5173b784ab7dac4453b23d039abb68c11b21bfd3756f7f37da413744dcd76d8f8769ace023f91f0f2a8f78421d432bf96fe0781c05a9584b0f0f64d
 EBUILD cli-prompt-1.0.0.ebuild 536 BLAKE2B c63bff6a789b815aeb911d8e7718cf056c79cd418d0be6a2330c81cb11a02ec59c3aca0f3898715e22c25e79b52f17096023cafd7f105df898421ae5362eac06 SHA512 de432496c42dfe1819c89d90b37404a2f236d83c8072969d36da16776ea3070a50023d333fda107cf454ccf9ceb878a5666bd7090e23f77cfaa0cb2b43ef2bd2
+EBUILD cli-prompt-1.0.3.ebuild 533 BLAKE2B 47fc3b7308de999c3ed4ca592a84adb22fbc6b2f0736602788dc0e6fecc6df3eeb353bf489ab4d3cf3dc5c30ae3ddc029cd3a8c91e349cf58806ffa27d85d30a SHA512 446b14dad2c14f7b7c64251087a8a236ef3ece44f48c662ee1ba955b7f30ebb6c5e48de33ef3d8d3a0c423903d6c482d5a5b4614f607c898c0db403804a71f04
 MISC metadata.xml 708 BLAKE2B ff80a057a2ccf142b03191ef285e81ec250e145998eabed54849b6ad7cfe42f0b009b463268f6d792de97718310afdfab8c1f5c86e4853761958f1079284dcbe SHA512 87e434fed2ee3d6586a6e4cfdbc866a9aed25ad26c28ebca1cda29109031212430a97f0dc8d40668ef20fc355529f9141d03ab14ccc49e93a9ebf427294f6c78
diff --git a/dev-php/cli-prompt/cli-prompt-1.0.3.ebuild b/dev-php/cli-prompt/cli-prompt-1.0.3.ebuild
new file mode 100644
index 000000000000..5a3a63f745e2
--- /dev/null
+++ b/dev-php/cli-prompt/cli-prompt-1.0.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Allows you to prompt for user input on the command line"
+HOMEPAGE="https://github.com/Seldaek/cli-prompt"
+SRC_URI="https://github.com/Seldaek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/php:*
+	dev-php/fedora-autoloader"
+
+src_install() {
+	insinto "/usr/share/php/Seld/CliPrompt"
+	doins -r src/. "${FILESDIR}"/autoload.php
+	dodoc README.md
+}
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index a8664e199e0f..2ce0028bcb15 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -4,8 +4,10 @@ DIST composer-1.6.3.tar.gz 396955 BLAKE2B ee455c8ff7446fe2b51180c1c719a28a5efd30
 DIST composer-1.6.5.tar.gz 398169 BLAKE2B e89fb8805a58d031d4ba1e9694fb45eefa734d5ed79e1bd7c6aef02bf8a52ace19ed7fa109270d67af973f6892a45122017bc42bbd115245dc521e4720b5a549 SHA512 5f18a43af0b94006f4d553f03574347c7f279c409e3467ee65dfff12dad810d625a06452208e2024479faa0b1608ce122a293810e69b826667072171de7d905a
 DIST composer-1.7.2.tar.gz 401211 BLAKE2B b3470a45dcffe8758c3e498a6298f726928a03d297eefa182b823c5c263aca3492f2b3514528c3bb252100cd2f2b64d5a46a74c91cba76823d75433d1ae5c762 SHA512 c6cdb3c122c78383ea5f133bf54d44474c13e343e25e8ac4992e8d213f7645221009b20def194de8d91217f3f9105a7a3b601ab86206ce4c376b028dcb181151
 DIST composer-1.7.3.tar.gz 402233 BLAKE2B b9ae601e5710f12acd6da189a64217fee0198a0eb14227d905b3faab1dd5a4e6b573c4be89968f3b66b4e5612189fc7c284c2aa7d63c2247bce1cc56913acc5f SHA512 7dd6200abdae845e71bc9cb9d329547ee82a3186db93b535af92bdf01d5e0fecc1d7f7ddcbce54c05e60cf75dea9aba0f27ad86746b61b2301effe8d4c115949
+DIST composer-1.8.0.tar.gz 404169 BLAKE2B 977d04d3477e0660eb33e4cb746a5f7cf1cc15544b0afdc48ce7dc7774750b685c36db7796280dd825e2b5b5d310f65521a6c12ca92ca9d2b15c2213c64bec4f SHA512 d8589c75174fd36f5ce10c8f4e18045b8c86167ccc7d6cadb4eed8828d4d7b4b44b0b477b6bd0ebf6d0981a381b35f662205d6b4324c92c86ea3fbc8c3aeb6e4
 EBUILD composer-1.6.3.ebuild 1155 BLAKE2B 18766c885a71fa4d17165f8244c9774dbad115ae6b66b000c5b27cf7b204da33b03b61f1b24dc274e9b6d571c1f1308690ec8ee9b1bdd57efca174e0cbb4fe2a SHA512 1e9e91f1b0f8fb37bf79983ac246b543d9bc958a90fb8136f393a2dd103671daa72e3134bcf403e612aeab810d368c8806b34908e1505e01ffe1c018930d465e
 EBUILD composer-1.6.5.ebuild 1155 BLAKE2B 18766c885a71fa4d17165f8244c9774dbad115ae6b66b000c5b27cf7b204da33b03b61f1b24dc274e9b6d571c1f1308690ec8ee9b1bdd57efca174e0cbb4fe2a SHA512 1e9e91f1b0f8fb37bf79983ac246b543d9bc958a90fb8136f393a2dd103671daa72e3134bcf403e612aeab810d368c8806b34908e1505e01ffe1c018930d465e
 EBUILD composer-1.7.2.ebuild 1177 BLAKE2B dc6041ecb976eca609e0da23ddc706bc06c35aa9227db41b3601efde2afc879bb6506a316b8b555f6b23c3571835b3b3e03c4292c06b425cce01f5d52d639dbe SHA512 ae2da2f3b91755a9a685d54c951ade473f4105f448aa4cbd8b49c9643f8ae1648e7257e25548363f0570281f3780b50bc7ff0644afdf8081d53d256e3fdb9254
 EBUILD composer-1.7.3.ebuild 1174 BLAKE2B 1e6f4617e815a83a69ba7eed6d248a3079d5a9192d9c88870ea1df72e6477558783f7d988f670b275dbe13b2ee3181e4da3d9381be565822fd2b4f55f0a22cc5 SHA512 44bdde80de9eb5beeaf60f3afdfc2d0c1e09ec5dea428da2d979e199b384e714f6b959e60f4e27a0a1a258ce9076d196cfa66ad488885c244f2aa2d945d06a5d
+EBUILD composer-1.8.0.ebuild 1174 BLAKE2B 078e9c8cbf921512b98933c8e58197bbcb2027dfc6881bcc4b1f7b922c7476f68bad0d0614d871e8df9a0d444637ea975ef62972f55f01cd79c43bd972233e8c SHA512 0d6ced0951e40a33cb59cee465690444e1205f809ce7d1333001ff54f2f87dd2e8810230195ecc2e7cd02d041c8a38971aa9a719d9ab69db0838cfad6aaf6280
 MISC metadata.xml 774 BLAKE2B 8a1f75c0c7da6f0d193a981c6db3888d62e2223b6368c4a7dece62ae33cc9a2a8c0b34714170462f262569954e70cc9b976012ff864ccfa36a46da3c719169ae SHA512 1a17bfae65923a3bea593c57d7ecf4fb2aeef43d0537636105e52294de295cbfeaed4b3c36ffb8675a563f657f4f969e62096cee20b9ab178c962acf2f68ac3a
diff --git a/dev-php/composer/composer-1.8.0.ebuild b/dev-php/composer/composer-1.8.0.ebuild
new file mode 100644
index 000000000000..7e07fce8b85f
--- /dev/null
+++ b/dev-php/composer/composer-1.8.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 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="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.1.3
+	>=dev-php/psr-log-1.1.0
+	dev-php/fedora-autoloader
+	>=dev-php/json-schema-5.2.7
+	>=dev-php/jsonlint-1.7.1
+	>=dev-php/phar-utils-1.0.1
+	>=dev-php/semver-1.4.2
+	>=dev-php/spdx-licenses-1.5.0
+	>=dev-php/symfony-console-2.8.48
+	>=dev-php/symfony-filesystem-2.8.48
+	>=dev-php/symfony-finder-2.8.49
+	>=dev-php/symfony-process-2.8.48
+	>=dev-php/xdebug-handler-1.3.1"
+
+src_install() {
+	insinto "/usr/share/${PN}"
+
+	# Composer expects the LICENSE file to be there, and the
+	# easiest thing to do is to give it what it wants.
+	doins -r src res LICENSE
+
+	insinto "/usr/share/${PN}/vendor"
+	newins "${FILESDIR}"/autoload-r1.php autoload.php
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
+}
diff --git a/dev-php/doctrine-instantiator/Manifest b/dev-php/doctrine-instantiator/Manifest
index 0ad213ed6144..d251e2dd70ad 100644
--- a/dev-php/doctrine-instantiator/Manifest
+++ b/dev-php/doctrine-instantiator/Manifest
@@ -1,4 +1,6 @@
 AUX autoload.php 258 BLAKE2B 3ed7c897b02b90914e7ba7fa06e79805586b0b5bf2b614e8b81b077ccd43557165af8c7ae61e4c30430ae838d8387cb536dd0ef3ed9464fc7343fdb842dbc2d1 SHA512 92a06f40f6ea012fbf0a0e521959b41b5aa23ed047c00cf7e52f974f650060969d4a602c569096da47fbd86393c854b2b16da91c7bfeb38e159eeb7254abc725
 DIST doctrine-instantiator-1.0.5.tar.gz 10202 BLAKE2B 77ab3fba96672f6aa2826002510c99c21beccdc09e92dbc2c09426f8fc47590554ef5d32b6bec92ea2dc2ab1c61a178c280ab01090b3aafc14a10a4b4fec3628 SHA512 78b00b2550b47772b5825fbde59729e0613a90c1d9dacf1b7b7d13ccb5bbd8534af7e732dcc1b5b6f9bbafa2f9c3e7418e184851ab0f3a37c0c945b5eed1e229
+DIST doctrine-instantiator-1.1.0.tar.gz 5343 BLAKE2B 73f737f19c8ae7a3fa9a7dcaa760246da6d688e28f15be0c40e031be8147887885bba2ec0a7770ead7de7b718247108b41b4c1d08712137c9c06911bde263176 SHA512 7f59dd7f80df02fd1e46f4b0ecd8488022b34933effddfc40d3424b279a35928adfc0fb7567172149338a8d4273b24305eaa46fc51aa0af45a7b230646354f09
 EBUILD doctrine-instantiator-1.0.5.ebuild 691 BLAKE2B f9cd79662e24c0cb74721cb2360ef75b71fc5665c3bd8bfd67a620c4b26ec8ce247a7cecdb82e03b55ea826b22c579b394efcbea6ad17d75e1040ec4c7052db9 SHA512 d55cd58b746437919ff7e3be207e2013922634453d8ce4a130642b53b02a41941f6ee719115c7da555da63322f8e5aec314866fa691d66db7137a5a0af81f2fb
+EBUILD doctrine-instantiator-1.1.0.ebuild 697 BLAKE2B 26b290a9204392862a18f54c6af9a0d7ad35790c4648ea6cb542bc908e10927b56ee20c5cd661f05ec9a62a73bff343a08730f273f5b1878c049a08e6c0090aa SHA512 88d26edeed1c29549ad35a9cf56355ae5ef73e0484f8300a791f279daeb65cc7246dafb4a9b0ee345932bf9e0d666ccd34c16c2259ae69190972101953cb7598
 MISC metadata.xml 313 BLAKE2B 76bc8cb4562afb0810ab8a4a79265bc44ba328370c3ab64d3599c6971ee1005f75cca364a00bfca316584c00c28d1c9ad5b0eb3c86889426852af9a6bca31986 SHA512 6a34d1c5966ec568eb1cdc499ef9ea9c799e104a4c47aa061b3197ecafce3a49a372e5f4d92b834b3b725c7697ed1e5e85be4654b3159a2427f5d649b11bf93d
diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild
new file mode 100644
index 000000000000..9ca2b9c37c06
--- /dev/null
+++ b/dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/doctrine-//}"
+
+DESCRIPTION="Utility to instantiate objects in PHP without invoking their constructors"
+HOMEPAGE="https://github.com/doctrine/${MY_PN}"
+SRC_URI="https://github.com/doctrine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+	>=dev-lang/php-7.1:*"
+
+src_install() {
+	insinto /usr/share/php/
+	doins -r src/*
+	insinto /usr/share/php/Doctrine/Instantiator
+	doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/ming-php/Manifest b/dev-php/ming-php/Manifest
index c727033d1c68..23098085ab0d 100644
--- a/dev-php/ming-php/Manifest
+++ b/dev-php/ming-php/Manifest
@@ -3,5 +3,5 @@ AUX php_ext-config.m4 2939 BLAKE2B cb3e65a0397b753fb6675425e3eaab0c68349b7d14f38
 DIST ming-0_4_7.tar.gz 14903570 BLAKE2B 48e7b3c2b8a81fa63da18dd140064c572efe563eb621f33b4bc57cdcad8d6cb828e8f62fc63b47144389b0eefa5b571c47e39013ec2724611d20e74928275213 SHA512 232cf45daabd7b60203c9382aa6568455a42ddcd1bd60eec9bfe3f5e80376fcc9ff6304efbafca1ac8a504e2e167bc394e4902e0d067303d9582551461e09d3c
 DIST ming-0_4_8.tar.gz 14908459 BLAKE2B df89beab98a7fbdcbefccad3a2fb013453405a7dba757131a61f06d9e40b7e1fe7beeadab42c113b12cff24b91cb1e76e9fabee0e1b4af58e2127eba13cc27bc SHA512 e395acde9119ad32f4cedd500bcceee70bdd563222a41dda899cc318d5e34eb580abc38ac39c6dec7821913a0a70d2f953fc81f52255b623e34f7c3aaafbc9c0
 EBUILD ming-php-0.4.7.ebuild 1332 BLAKE2B 4eb3cb1d05c52660df43e15e172154564754261cc0630669f212c31a5d551fd389966bac27becca64e5ab531a8039feb5b2cd214bd970ef21a5772f1410ad648 SHA512 0793f4410f866ae8fbe38e083c5c0a828d9e0d643aeeb1973d9b644854e336fbe3fa2f812e4a26948474af242ba7bf202c3f8dbfb4c3ad1ca63f74c4a10c3b28
-EBUILD ming-php-0.4.8.ebuild 1388 BLAKE2B eb28560f6e2fff8b7efff4884cee9a72b1e30f5ad4fe47031457b61efb69eada66cd6e25d5e861c2cd06af1168b9df86d135c5f1a82586242fd7430c63c0a54e SHA512 2821e23b019091ac1723ce7639d5c03867ef550bab04c1b5fbcf1e24752643cb73763dd03f9ac018b22f2339c79df9cbdabbdf4273d741079954284cd20533f2
+EBUILD ming-php-0.4.8.ebuild 1386 BLAKE2B 0171247c6d5a43cdb6d8f7c3806321ec7585483b57c9d4676c95dba80cb71a8e22564a73229f064b357fa4f873d5342f2ccd172daff967a6faca345f3fd559e2 SHA512 16ada646ebefd7b309ddab630475d36cece991e2e015f80dedd57defcf3463905001a30da6677b437444675a70cc7e0b1857020b2b14b718bc5fc72ba6879ab9
 MISC metadata.xml 475 BLAKE2B 3f1db2ece7aef5e9f24e7fc1b2649422102cacb521ba830ae36a7cb7683957bcb89366d980c305fb9ad2a7fee9ecb87176e934f6ba328a6a2039d36f9c3ca207 SHA512 f5586b50f459b96dd287bb1ee2d1a166cb8086584c76f5b5b68cf1d8271afe22903f77d8641aee3c2d68ffd2b41441aed5f641a303b6f43243d67d65d41748c4
diff --git a/dev-php/ming-php/ming-php-0.4.8.ebuild b/dev-php/ming-php/ming-php-0.4.8.ebuild
index d1d6cf5f7ebd..9bee315bfb27 100644
--- a/dev-php/ming-php/ming-php-0.4.8.ebuild
+++ b/dev-php/ming-php/ming-php-0.4.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/libming/libming/archive/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="media-libs/ming"
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index f804bea1bd38..ce4ffb620d1f 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -2,12 +2,14 @@ DIST apcu-4.0.11.tgz 119535 BLAKE2B 2c1f8a0463b2802b11ae679987807127556b04fb099e
 DIST apcu-5.1.10.tgz 111937 BLAKE2B 87bf86b43a775c38b232e4acd876f5c63628fc095747fecc26109fddc0473672180e3886dd613fa426772ea53aa8d7f46d08ec3e3383f6ce53be2f63a9ff066b SHA512 fdf82f2b46231849b373f50d1255bcedab8fbefa7ded7c157649cf6406fb593cc2f4e63ca7d3cecfbadb4533ecd8d0ad80e198626dc1489cea8a22ba87ca583a
 DIST apcu-5.1.11.tgz 105462 BLAKE2B 37ff632555e1bca51951db3021a4108a1de491b1bae2b12daed80e5d2d4651737cad744023c62956779395198accf33290c0c3b81b6abfc7bb54337a1a23e082 SHA512 2c284bbe84012030cc5c24ccf903c3abee995af549616c10211dbd5e463a5f37a3f27a5982127db81787a64345597a10be495380b844ce6204dc57c8b058bb88
 DIST apcu-5.1.12.tgz 105890 BLAKE2B 110a56ed1da8e33bd39c9d694007acdca2deb42219ae5d31b57296ff3729bab3fdbc508965b2cd0fccc425b2c2fea9249933cd7f45586beeee7cd3bd38ef2473 SHA512 f53b7840d5aecfc899e3e878f0bb9a5dc4a83628543963c20c25ce2b2a2adf14dd40d39a6a2014c139962453e0e9e5038fca7b1d0be205c0b9b2aa6e3fefb054
+DIST apcu-5.1.16.tgz 94032 BLAKE2B 3676cfaad796f565b63fa882fad79ed2fc8de383d364ff24369556761e21f7091ebd7064ac8e0815f283e839bc95ca88aced83d882b622d3a4297af46dc0da72 SHA512 cda2b61540b786cdecc09a2c1f77c5bf91cc118ac97fa929f1d4c3c63d29969397cf3ee37691a86e7bd7784411046df5d93efe37b4cc0c1ce903dfa7dc7dce89
 DIST apcu-5.1.8.tgz 111260 BLAKE2B eb41b1af33500ed9ddbbcb5e1a92884af4b356e16cf76c70f75a8853522cc91af1c156cc0bbd464fce539a138bf4e2ead5101810223b0f1bb91cd062850ef08e SHA512 4f377389e713bcae5534c64ea28f72c20ab2176aa758188c4d956c1f2370be49bc33dd2a1db43941fff5344a164aaeebc4e73e6d579f62d17334bcc520171526
 DIST apcu-5.1.9.tgz 111049 BLAKE2B c7138f65d73a056e4a34972098c2b543ad6d96d0d8215e82757c457cc8938af48fea842e006c79c83deee4060cdc94047764930592eef03c5f347abeb7730897 SHA512 3e9b29a293b5bfb29283dd650907bfb9f31a1cb99ef908021d3869c3e3ae4051a2c45aab27275e90b0a2fa94c35cc9e170637dc539184d955f3f13dc09cba060
 EBUILD pecl-apcu-4.0.11.ebuild 1453 BLAKE2B 3d0e75d3dbe866f5e10dc464fb5a54a67ed79656ef9d97d62052da4670be39d91122fb2b1da4e6629c26b7aff71585e683e3fccddf59d77afda21d47eaea2c8b SHA512 b0fb1cdceb8e2c48b459309c6e98a1fb16faa48e1228bc0bfbe5c01cee0b038121ffae8a094cdc030fd1bc94624d4602e6abcb5b99dd6a2109024856446571b1
 EBUILD pecl-apcu-5.1.10.ebuild 1980 BLAKE2B 5370b05a1172cf5ea96dc526029890c003fc802c762924063155bd4458d7273773599171e28908e69c99bcfcb3d19611df15ac8caabf26f4f20b4b6ab27e8a20 SHA512 eda7e2586c04f39c4a6217b344d97110e3a8371f43b5b06b70845b89564e6b948e7ead601c523a43d2bda8b8670bc61cf0b9b29de1e89d1cc497df349b5d6c61
 EBUILD pecl-apcu-5.1.11.ebuild 1980 BLAKE2B 5370b05a1172cf5ea96dc526029890c003fc802c762924063155bd4458d7273773599171e28908e69c99bcfcb3d19611df15ac8caabf26f4f20b4b6ab27e8a20 SHA512 eda7e2586c04f39c4a6217b344d97110e3a8371f43b5b06b70845b89564e6b948e7ead601c523a43d2bda8b8670bc61cf0b9b29de1e89d1cc497df349b5d6c61
 EBUILD pecl-apcu-5.1.12.ebuild 2093 BLAKE2B 84a4783d1e5f9fb621369986b1b6f53952a3c85154ab9984051abb63a9d8b6ffee8870cd47991434f32cd81d322f74ad51098a3a1f77a19882cb86613d95e585 SHA512 d93c6e848b15a7365bc38ae5ff0fed0ed7c8be3025e18e178fb3c6ac9855e9a91c32da9c91a3849bbe8f8ce88c2931404fe0c1366ed14bd8e02674fb1f2801bc
+EBUILD pecl-apcu-5.1.16.ebuild 2090 BLAKE2B 233c80de86e73a3bed2a41701298a208e05c39c2f5d33f54932853338e59b549740196425ce2883cb8da93fececc93180753857c3d80e77e715ae1cd99efc937 SHA512 aa3d7fac044ec8e36b849f5e8545020f0374dd7a0492797268a4a27566301495d77bcad8a1e368cd7a15893771fcca5fac013f78c07ad2b4e011ba7b8195a993
 EBUILD pecl-apcu-5.1.8.ebuild 1860 BLAKE2B f13dd25e9afa2054bd3474d72f326f815384befe594b9bec7803021bbe4c67fc9501e9b23760b08a22d29654a3b34a6c76120ebe5baf27cb22814bef8b7425c4 SHA512 f086a6e970a87a65658064feecbe42b30c3e1bb6c01effb0cd890ced791df3228b8143374957e94c970899a7d7fffaf3abe818816de8f29b4398fbc23002be9b
 EBUILD pecl-apcu-5.1.9.ebuild 1980 BLAKE2B 5370b05a1172cf5ea96dc526029890c003fc802c762924063155bd4458d7273773599171e28908e69c99bcfcb3d19611df15ac8caabf26f4f20b4b6ab27e8a20 SHA512 eda7e2586c04f39c4a6217b344d97110e3a8371f43b5b06b70845b89564e6b948e7ead601c523a43d2bda8b8670bc61cf0b9b29de1e89d1cc497df349b5d6c61
 MISC metadata.xml 540 BLAKE2B 87b95a306509825ceb5c27c471c496692da1efaf9fc04c357d9aa47c458db302456884401b077cd040bc70a6540706cc54ac2aa76f7da8a1d3b63b6af8661e5a SHA512 46b3e028a3632c8ebfa89a9e2053bc0bb8893fd0a75ee3f84e1d62daec9be5cadbe1f9fc55bb14931a91cde04ff04c5f7c19b2dcf57551ee08fa3eb64ed88232
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.16.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.16.ebuild
new file mode 100644
index 000000000000..77f78a0680aa
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.16.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="apcu"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( NOTICE README.md TECHNOTES.txt )
+
+# 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"
+
+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"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Stripped down version of APC supporting only user cache"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE="+mmap"
+
+DEPEND=""
+RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] )"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+	LUSE+="lock_${l} "
+done
+
+IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
+
+REQUIRED_USE="^^ ( $LUSE )"
+
+src_prepare() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+		php-ext-source-r3_src_prepare
+	else
+		eapply_user
+	fi
+}
+
+src_configure() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+		local PHP_EXT_ECONF_ARGS=(
+			--enable-apcu
+			$(use_enable mmap apcu-mmap)
+			$(use_enable lock_pthreadrw apcu-rwlocks)
+			$(use_enable lock_spinlock apcu-spinlocks)
+		)
+
+		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
+		php-ext-pecl-r3_src_install
+
+		insinto /usr/share/php7/apcu
+		doins apc.php
+	fi
+}
+
+pkg_postinst() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+		elog "The apc.php file shipped with this release of pecl-apcu was"
+		elog "installed into ${EPREFIX}/usr/share/php7/apcu/."
+		elog
+		elog "If you depend on the apc_* functions,"
+		elog "please install dev-php/pecl-apcu_bc as this extension no longer"
+		elog "provides backwards compatibility."
+	fi
+}
diff --git a/dev-php/pecl-event/Manifest b/dev-php/pecl-event/Manifest
index d4e635a31932..fa42c4dadd0a 100644
--- a/dev-php/pecl-event/Manifest
+++ b/dev-php/pecl-event/Manifest
@@ -2,8 +2,10 @@ DIST event-2.2.1.tgz 133147 BLAKE2B 909892c937843821b34cb4d450b06698b23ed8aac599
 DIST event-2.3.0.tgz 135401 BLAKE2B a068142854ed908cc482ec48a249a5d213c1806652cffc698bc6dd298c136c5884bbb52b30179ef813af938d0ecb92a5414c93dea3d782d6ebfb4e886128454a SHA512 9e1f41a13a5fc534956561ea481816d6863ebe037cca0ce450cfb16375d6b49cd03c68e115c851ef6fa3022927f2e5850695880c65dd1d339bb747e171cc9f2f
 DIST event-2.4.0.tgz 139646 BLAKE2B fe672b5d1f4eabd06456ffb14f11ed978a23a15eba06bc01b22d1784d71d5859e71e3914ab64856dd33a1cccb6618b5926bab446a112d8bf106081c2ab41bc74 SHA512 d238b72764461cf338d20618e4dee80ed8e8519350d17a6c789a68d749d2f4adae991ee43928ab09321caaff321fa21aaa4b5fac6f827974b2f8e9295e948293
 DIST event-2.4.1.tgz 139675 BLAKE2B 47b78868bad327778c917e026456dbbb8955f4910d1b6092132101618e348b064ee33766e7e8a2aec6c6c8bdb5e79a09fbbc7ef841dca0b16826fcc1737dd028 SHA512 d115fa12dfefe164532b39b6a79f01c2c00e2718967c3d675584a0dd193b155cdc74a632f6327239e201720fbabd440b9434bde5de4a9e30373595636dafad94
+DIST event-2.4.3.tgz 139788 BLAKE2B 428e8df15d4d8e9ff731ae4cd3f8dd0a5dc7d0bc7c5dbbe3575cfaeb596fec1c97c89d6aca19b2385ad09cf9bc36492f193e6264a238b71c4595d9e9a145877c SHA512 6f0ed8803e013ef96a14d7e89d037c31d78ddb3a386d0c7527d378b9ef9dc877c1c5642de7551363e5264b4e9f73975bd9ecd60936ac54dc2ccb5abf9f918ffd
 EBUILD pecl-event-2.2.1.ebuild 934 BLAKE2B 43790a9ae06ee9db90ea7e1fecf6726f326e10539d12cf59dc01c4d6a2edb5d6455e68d13a23c7d434dbf1da6ff42e68a31fb8c672a5f2744c63bf5c597608b6 SHA512 22f28502553ad020b1a762aaf3d439d1ded788f77cdc71ba49bd2ad7d95844ddd70866983c95cc6ad65c740ae63a3397bb70c3345c6d9c756bbe0c320b62b89e
 EBUILD pecl-event-2.3.0-r1.ebuild 1241 BLAKE2B cbe352d8b0c84bdd33510dbd1c9b7680934fddc6a5fca23ef52d8d5b673be2a68a82ca9c589a114690f5eb3ce8996518f45cad6b5ef234b64aaf45e0ee61842e SHA512 d8bf4c16f864d662c573141146a0256030732e72af5e1e64066dec58c3a491f56589431704f78f0292fe3a12406199c17064954c9bc6b15ed57791c1314bc613
 EBUILD pecl-event-2.4.0.ebuild 1241 BLAKE2B cbe352d8b0c84bdd33510dbd1c9b7680934fddc6a5fca23ef52d8d5b673be2a68a82ca9c589a114690f5eb3ce8996518f45cad6b5ef234b64aaf45e0ee61842e SHA512 d8bf4c16f864d662c573141146a0256030732e72af5e1e64066dec58c3a491f56589431704f78f0292fe3a12406199c17064954c9bc6b15ed57791c1314bc613
 EBUILD pecl-event-2.4.1.ebuild 1300 BLAKE2B f79690078d2f841c465d20d576941eca88f85ab38001463d6319e0b7470483724cecf24e409008053d754593f8f3697b7700ac3f5ba402980b195822b78ba582 SHA512 f7112bace3fc41db52dcb153bf71cad1ef54785ec8589fd6c16336351bdf094c3b2e61f7f6fa5d330d6ad34f0efa1cd409a63656ddd0ab0573cb999094b31014
+EBUILD pecl-event-2.4.3.ebuild 1297 BLAKE2B 6076f916ebae71364f02aed42036916f007625595f7761ab5a626a485a5bc38d99b40a803044502b2c13503a41868e588ee00f97d0249c95be0bdb97f505711f SHA512 42718934533a23a5ea942ab9efd8794050abcbec8d9d02b9fc875c6e721bb12f54f5fcaa5df34a64806e0c9f245ee0c5861bac992522a5c48396bde00b9a5787
 MISC metadata.xml 431 BLAKE2B 25421824761cdcc90c610236ac4acfd85e18fb63e4f92ff3fa5e51698a7e2004812a7193ced70646baf02bacd0bc896a5959ee88bd88dd5de68db729661ad02f SHA512 6349913306ea30f9ee6cd5ad862e0323d143815f4db47da14e5d54d0dcfb604118e3845f664f2a9b8527797b262c9567bbf5f189426f9becbd169be0ec111056
diff --git a/dev-php/pecl-event/pecl-event-2.4.3.ebuild b/dev-php/pecl-event/pecl-event-2.4.3.ebuild
new file mode 100644
index 000000000000..c990f965da3f
--- /dev/null
+++ b/dev-php/pecl-event/pecl-event-2.4.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="event"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( README.md )
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ia64 ~x86"
+LICENSE="PHP-3.01"
+
+DESCRIPTION="PHP wrapper for libevent2"
+LICENSE="PHP-3"
+SLOT="0"
+
+DEPEND="
+	>=dev-libs/libevent-2.0.2
+	ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+	php_targets_php5-6? ( dev-lang/php:5.6[sockets?] )
+	php_targets_php7-0? ( dev-lang/php:7.0[sockets?] )
+	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?] )"
+
+RDEPEND="${DEPEND} !dev-php/pecl-libevent"
+
+IUSE="debug examples +extra libressl +sockets +ssl threads"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--with-event-core
+		$(use_enable debug event-debug)
+		$(use_with extra event-extra)
+		$(use_with ssl event-openssl)
+		$(use_with threads event-pthreads)
+		$(use_enable sockets event-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/pecl-http/Manifest b/dev-php/pecl-http/Manifest
index 4bff6325af6a..68eb00a33e20 100644
--- a/dev-php/pecl-http/Manifest
+++ b/dev-php/pecl-http/Manifest
@@ -1,10 +1,12 @@
 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
 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 2352 BLAKE2B e1dd9f8daff81a591ae52ecbb2e1bd6a6374d17fdc6c68ff114b0c6b75ab39708b559e39d728bae485ece11e5f73e10049d300f558d5750c3f7c13c70ad93c7a SHA512 6eafd1b553d3d343835acbbd8096fb5ad61fe1a0eae606f1000e57cf3ff5b51d130d49ad53ee3fc9734e2871129c3578398abd000221436d0e3668c8acbac6bc
 EBUILD pecl-http-3.1.0.ebuild 1587 BLAKE2B 1347611d4ad7f0ce44ef23370797cb37faad0d6261527fe8c28d935d9920c94ee06905396be0122f68a2ae4541169d10e8600bea3691a7d82090b8131f2275ac SHA512 f5d7f29153359c1a4a6991165e42a674c086e544c37fbdc23e580e2a6714734acbccb15081eedf92be3df79a21298ad5ee81032b75278c5ffc2bbfc59b0c6215
+EBUILD pecl-http-3.2.0.ebuild 2446 BLAKE2B 63a00ce99e238daeabcf0ddfd38c4bc89ec7c06ec502ccdc19b31a8b166a1566e5414e68ba769c96c76d718476257932cc2020f092c76e267bcb25678c04ca6f SHA512 843d0bc2e564526fe5e41dbeef3329974d6a73c05f6e31db3a0f3bed89a9bebe3a27e13b669996a700e2a1578e1244f64e112e7e9e7896555fce51badcf4787e
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-http/pecl-http-3.2.0.ebuild b/dev-php/pecl-http/pecl-http-3.2.0.ebuild
new file mode 100644
index 000000000000..e10f0ddf53c7
--- /dev/null
+++ b/dev-php/pecl-http/pecl-http-3.2.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 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-0 php7-1 php7-2 php7-3"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php7-0 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_php5-6?,php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?]
+	dev-php/pecl-raphf:7[php_targets_php5-6?,php_targets_php7-0?,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-0? ( dev-lang/php:7.0[hash,session,iconv] )
+	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-0 || 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-0 || 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-mongodb/Manifest b/dev-php/pecl-mongodb/Manifest
index 8e8187ca050c..c42aa77a3808 100644
--- a/dev-php/pecl-mongodb/Manifest
+++ b/dev-php/pecl-mongodb/Manifest
@@ -6,6 +6,7 @@ DIST mongodb-1.3.3.tgz 925476 BLAKE2B 845abd4c7cf5dbb1fb3b04c5fc4070f0a360874ac5
 DIST mongodb-1.4.1.tgz 1037836 BLAKE2B eb31be94e1508a860d88d44e3e6714bea62a34eb999285a2e40082a0b66b617d380adbbf56614244eb567b8939dae223b0553d425e608d05d86cd3232441b59d SHA512 4c053917ba6e178e114a4aafcd20ec505694bd96575235485e1524f1063d17ea1c446c86b7eb70d0c25db4ae6338d71fb33aa9df647ce1c80a17f539362230b0
 DIST mongodb-1.4.4.tgz 1043458 BLAKE2B bb159170fe6696f996a69d1a3ffbfbc66016e6f31a8c53022e836fb3c21554bd4b74f263b11c4ad78fd6e17b8ec75d551fbe65612778d3d44c9fb1c049f84e5a SHA512 fe54b169593d8cddc0318ae6e40f833796b8745a45917446ce360604bb1ceb7b3242498ac9ca6a6be1389a735c12786b0542ba29655ff42a0c96e16a4a0b68cb
 DIST mongodb-1.5.2.tgz 1057139 BLAKE2B 59ace4f5eb172bcdd2d6aba6b4a136da4ed2abfd432a9532862464f5e0082f8bfb12cf312f1860a638ba72bb1f08a187356eedf62971ebdb84e588f7d817204d SHA512 189fb18cb36873dbbcd5803c1ccc37d5ecaf9412e76051bcebf1a492a40c13cfa518df5e45c4c57781eb79ab512c9403c54344a7593d89571a3965cd327ac15a
+DIST mongodb-1.5.3.tgz 1059580 BLAKE2B 23bd5f6b0f218cf55bd5713a770f3990d5c1492925623712583356d8aee42a1b47519b93ba64036aaf98f97ab4b1b30de9d8aa39659f2575c4f4dba3892d574d SHA512 35704e75bd7867a436d953c00c7560c9a08a4fa8f3555d7cc00aeda34e87c6c7aa7ecc1d7f674747e34f4f8dac35d320f6317e60229528ea9782bbe669bafec0
 EBUILD pecl-mongodb-1.1.10.ebuild 1041 BLAKE2B 8d7f85ffb56105a779e73a180e4f84d371d4d407d97cbf99fc3bc167d16b1af1e3b40761a27688746f5a3f6f2adca2a55aaf281637c1883287298ac117a00e5e SHA512 3741733deab5a8b8896bcfb0289c94d3ee607a0d047b6f7fc5f716c782f19dcc0de3de79e5bdd202fcfb99cc4fa44577b790fabc685da5ad51abaffabe4a565b
 EBUILD pecl-mongodb-1.1.8.ebuild 977 BLAKE2B 9f914f49facf5709946fef5c21f7577a50e76422b76681a00227ac4fffbb9ac911b51b06d46e4fa14962fbc35c8b13a27cc51c021331446dbba91adc77544c0a SHA512 530ba95db69a7251560f8bcd25f247f51299fb4cc811a0acca6a85ee3dfb552f7958683d96830e71ddb2054552a42dba59de144124a3efecc9ef26a53ca18302
 EBUILD pecl-mongodb-1.2.11.ebuild 977 BLAKE2B f849f8493bf91fed804cc2f186852025a4dfdc2302fefd810004b50dfe351f42503747b3d936924ce2a21438cef5bb145b56972659d88c929946053ea72a7701 SHA512 871b2901718b5952acdfc66ddef7f009121c8354b0ff0ac8e434301bdf834e7e040db886c7e1055686ef047d29f5c3a39250f727446265d8b162986d3041d77a
@@ -13,5 +14,6 @@ EBUILD pecl-mongodb-1.2.9.ebuild 977 BLAKE2B f849f8493bf91fed804cc2f186852025a4d
 EBUILD pecl-mongodb-1.3.3.ebuild 956 BLAKE2B 7de929ccdb22c32bd99bf35d31a3e4d491092957472b7771b866ac3c17cce14ba3c3bb593d0fc395bef0ab7c079a32ff2ee89a049f33984d4b3628d2b3f87abe SHA512 571b4af8ec1da33375b4cf609d37982fa920cf9afa97bc8db79219e1a200f3f4035bafb0aaab2419b958c9831af2a88e32a06a613c8f10afec484f6a55d327e8
 EBUILD pecl-mongodb-1.4.1.ebuild 1022 BLAKE2B 3b863c31f2450f7bfa96cd6ae5d6ea88b265cd655832816d46c528de6da1dfaffc90baf30d066eb33134b5040964feafc2c59eecdd3b625f0ac30a03969af916 SHA512 7880e5768287b0c3d6c3f0db7ee162b25efeef2b241827f741e8ce765e997cff9ea2927f019d7161fbb7968a752b5e36a15b8e78ef4aa5ebb85e1d074d62e19a
 EBUILD pecl-mongodb-1.4.4.ebuild 1022 BLAKE2B 3b863c31f2450f7bfa96cd6ae5d6ea88b265cd655832816d46c528de6da1dfaffc90baf30d066eb33134b5040964feafc2c59eecdd3b625f0ac30a03969af916 SHA512 7880e5768287b0c3d6c3f0db7ee162b25efeef2b241827f741e8ce765e997cff9ea2927f019d7161fbb7968a752b5e36a15b8e78ef4aa5ebb85e1d074d62e19a
-EBUILD pecl-mongodb-1.5.2.ebuild 1024 BLAKE2B 4ffd060e6116f667cefdc4a7b9e7e96f64e8705e205dae7e72f7620245e1ad650676755dcdd9bed1578821065b7267e7dba386d7adf83c478db88eb7e01e4669 SHA512 8927653a07aa60e378067aaa4e28bd5a69c1641944a755756c0f69f7a0561eeb8799b46200ade51d4213e89a55a57a6a5354713ff56b3f333f659f4984caad18
+EBUILD pecl-mongodb-1.5.2.ebuild 1174 BLAKE2B f576c9c20c331d2ecadddf2a227860d85f07c6bdca21bf0be458c3b8e9ff80d84080c9bdeda861bf932d8c968cf4be3a7ce7dae2d18ec5e3205cdb349668f4e0 SHA512 1e73ed66a9715b26b277c3010882f0b02d3e6f5ecc0875207c6de06adf50f5bafb5c2337c0480b6e79335f4743d1401816c41480d72ad6330653dd172caa79aa
+EBUILD pecl-mongodb-1.5.3.ebuild 1019 BLAKE2B cf4f6615b0d70b685817105fb53227bddc4b85d9ef60000eed1a48b5f8601d3868ed5e7af096b7df7c4882d2fbdf22c56d21bf512c5b267a8893443e14ca7c3d SHA512 ddba025e9e91ab5fa2b065ebdef36b61510bd589afa09611dafe4e5b27f1af35019f3dc0ef7a6915d035225dcd13ef5e6cb91c2c0a9e6b0699f335d6b8d211b8
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.5.2.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.5.2.ebuild
index 05c3b280e019..74d22474551a 100644
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.5.2.ebuild
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,6 +29,13 @@ RDEPEND="
 # pkgconfig needed if system libraries are used for bson and libmongoc
 DEPEND="${RDEPEND} virtual/pkgconfig"
 
+src_prepare() {
+	# skip failing test (Bug #670642)
+	rm tests/exception/runtimeexception-haserrorlabel-002.phpt || die
+
+	php-ext-source-r3_src_prepare
+}
+
 src_configure() {
 	local PHP_EXT_ECONF_ARGS=(
 		--enable-mongodb
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.5.3.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.5.3.ebuild
new file mode 100644
index 000000000000..353be18eae0c
--- /dev/null
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.5.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="mongodb"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="MongoDB database driver for PHP"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="libressl sasl"
+
+RDEPEND="
+	php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] )
+	php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] )
+	php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] )
+	php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] )
+	>=dev-libs/libbson-1.13.0
+	>=dev-libs/mongo-c-driver-1.13.0[sasl?,ssl]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sasl? ( dev-libs/cyrus-sasl )
+"
+# pkgconfig needed if system libraries are used for bson and libmongoc
+DEPEND="${RDEPEND} virtual/pkgconfig"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-mongodb
+		--with-libbson
+		--with-libmongoc
+		--with-mongodb-sasl=$(usex sasl)
+	)
+	php-ext-source-r3_src_configure
+}
diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest
index 46402d3cd313..8f137be6e494 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -2,8 +2,10 @@ DIST redis-3.1.6.tgz 199920 BLAKE2B 00aa81cdbedc03b4a672a58be98d8f01d2076038622b
 DIST redis-4.0.0.tgz 212340 BLAKE2B 996138b3dd92e839fbebaf5d562cfbe90e66384233c83612c8726fa41f10c106d0195c87449fc7886b3e832fd551b962ef50c161372c04c899c9fe7fd1140101 SHA512 e4bf2294f696e468174c0fff9ed33831cf81c3548ce30ede01bc3c45a15cb87b9b9ea02899c451f63211be8cb37e953be138e93c16d9e0f12772b7b6d03e8dcd
 DIST redis-4.0.2.tgz 212617 BLAKE2B 5778cf08e93fe8343e8fa07f1314c39b2d6d9a150d70c5b2084274afb163f1132a4be81385563f74d3b1d8f2dc32bf6578e98a123b43a941635fd85ebb229771 SHA512 3b296926ddd6a69a4d633da8bf6257c9b2962dffb4dd38c20eaf821a8c64262b476a7fb10ab4412ceb2d1307aef26c3d1d4b72141d29dab262d521a08df13a6a
 DIST redis-4.1.1.tgz 220894 BLAKE2B 82cedf5128a62f0814c3b42792c4adb66fa58f76fdd211366c0ecd6d02130272504e20dca50a27a7ee7f16039ecfc28384743548df227dd0fa5fa1f9a2ca505c SHA512 f4cc438c81c8b5119889be1004ac1b3ac689554a31ad81516ce50249fa748c225883413da687f15a00279eff0269e5d4c992809f8d88cc49e848def511d3e623
+DIST redis-4.2.0.tgz 235569 BLAKE2B 14089171b9654affeb8c2b3861a698a3ba8d6ac235238fed7e6799cf3f2f74b240facb408acbbc987cc2d5383f197564aa81d828bfe84f91fd1bbff8dbdf563c SHA512 b6325e5e1f9209a3431cbc236dab4578f796aa748481f9a3fcda6d297bf544b0f77269bc56c6e9ff32430dbe74bd08f6d22e9b04b0ecfb735aa562f680f56f8b
 EBUILD pecl-redis-3.1.6-r1.ebuild 1504 BLAKE2B 39cd4e0402cde5507b4de802e6ec1a9855f293ea1710f1987690c9c4dca507c72045b87b423c89950e76facff3699ec782df904904c4f361f304f9a3f0095f2f SHA512 6588808380496dbf7f46e85483393a1c2fbe10720959a113cdf19e527a43e72e11fa948a168d965d3dbd1c1d3809051246d2a1ed504fb0958a728b20191b2ec1
 EBUILD pecl-redis-4.0.0-r1.ebuild 1638 BLAKE2B 3072def07f464db1a3148b4c1ac52db50bf47c858db808696505597e67d0adee8b5a10bb72105cfe7e51973d26233ae35410efd6599ca9c3e53ae5665b64219e SHA512 580d168d0eccc106f367457986faaadbbb9ef0cd0263e25a91202388f03363a4ad5bbc62ffa25a7c8b22d76f573bb6a5efe7202f97fbfe47789fd92abe21bbd0
 EBUILD pecl-redis-4.0.2.ebuild 1641 BLAKE2B 3f295bc8a957011d8eb7e86d268cb2411093e0e1b89ba25bbc5b143131fdc6769f5f5c79f56b99cdfdf3d6effa434224c524d6b946f525300f2ed3c408bf1ac2 SHA512 256b408e3d849a86fefec8383831e1a561c8b95d13e777e412fd820fd82e95977189d4a1eb5de5ac71b385f87ee6d41caa23ff7820a627ae95ef668ebc36db17
 EBUILD pecl-redis-4.1.1.ebuild 1751 BLAKE2B b30c07a980135d4ca190a41319f0d49910d6cd14560f3515b47c186c4265f9565a7fbde1f646ee1220a2f96a85e1ad482990d3989f04f68a682420a9b7c2cb55 SHA512 a7280f779e7b83314109a48aea2a3ceaf7bcbf45eafe30ceae295e63aab70302cf505e2253fe25cacb377b0943424ac5d91dc53a7a6dde436a6f8367b3b7ee56
+EBUILD pecl-redis-4.2.0.ebuild 1748 BLAKE2B e49cc0c892fecef16ec16c2c2369d5836a7e3382161a661fa7ca9c6aac5ba00b3619e89f85cce26fb320a1947473c3fa20b2823ca4507ec4b31209f720c9ca79 SHA512 4c97fe5be053ad572e5e96a2ef5c56daf9dac7afa5a9efa1332365618781a336c30ba133857929754fb8f73b8fb32de070b170fbc0c2d55874babf439884e7e0
 MISC metadata.xml 324 BLAKE2B fc4145f462dd06f7a34385a0d8e2cbc6da6744094e84851891d5513f7be39c89cebe439e566fc2ead0afdb8ee3885b4a4d448e63d4c1a1d20a5bb8791c12d313 SHA512 916879a4b7ed11e30634a1c95637e9426932bac3c6aba2c7e686d9835097873e142f062e7d81e3ac99c3aef972b40db67b3809116cff4a3742ba6c669d999066
diff --git a/dev-php/pecl-redis/pecl-redis-4.2.0.ebuild b/dev-php/pecl-redis/pecl-redis-4.2.0.ebuild
new file mode 100644
index 000000000000..efc6fc7869d2
--- /dev/null
+++ b/dev-php/pecl-redis/pecl-redis-4.2.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="redis"
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+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 +session"
+
+DEPEND="
+	php_targets_php5-6? ( dev-lang/php:5.6[session?] igbinary? ( dev-php/igbinary[php_targets_php5-6] ) )
+	php_targets_php7-0? ( dev-lang/php:7.0[session?] igbinary? ( dev-php/igbinary[php_targets_php7-0] ) )
+	php_targets_php7-1? ( dev-lang/php:7.1[session?] igbinary? ( dev-php/igbinary[php_targets_php7-1] ) )
+	php_targets_php7-2? ( dev-lang/php:7.2[session?] igbinary? ( dev-php/igbinary[php_targets_php7-2] ) )
+	php_targets_php7-3? ( dev-lang/php:7.3[session?] igbinary? ( dev-php/igbinary[php_targets_php7-3] ) )
+"
+RDEPEND="${DEPEND} !dev-php/pecl-redis:7"
+
+# The test suite requires network access.
+RESTRICT=test
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-redis
+		$(use_enable igbinary redis-igbinary)
+		$(use_enable session redis-session)
+	)
+	php-ext-source-r3_src_configure
+}
+
+src_test(){
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		# Run tests for Redis class
+		${PHPCLI} -d extension=modules/redis.so \
+				  tests/TestRedis.php \
+				  --class Redis \
+				  --host ${PECL_REDIS_HOST} || die 'test suite failed'
+	done
+}
+
+pkg_postinst() {
+	elog "The 4.0 release comes with breaking API changes."
+	elog "Be sure to verify any applications upon upgrading."
+}
diff --git a/dev-php/pecl-timezonedb/Manifest b/dev-php/pecl-timezonedb/Manifest
index 004871249210..d1d70aec95b6 100644
--- a/dev-php/pecl-timezonedb/Manifest
+++ b/dev-php/pecl-timezonedb/Manifest
@@ -1,5 +1,7 @@
 DIST timezonedb-2016.10.tgz 421824 BLAKE2B 900bc7a7e3450a3da119262bb67815dbec921d9f730c37bdc9859ad3a7f87ed4b1e9379e08ba7ede018737a4b5fd998cb2f740c1c7367aeb0c4036224274aa6b SHA512 062c5cec18ba091a1b38fcf07059b42b2aad1205fd4b83e87f2a6b59ab68b9a2906a46a9f24214b7feeb802f126282b612cb866870a31f58c7c7e30f54040731
 DIST timezonedb-2017.3.tgz 421152 BLAKE2B 1d2579d88d1c1f5a00d46488d54606ba24a63d4b7c267121bdd7cc725e3dbc7d7484a9988fdbaff186bbceda130bb31e6e8f01c45d53c25d61c4b55092c8a390 SHA512 5f6064064a71bf973f7581d452cad909ca2203c4c8773ca7cb31307c3cbe63613adf972cfc6c7b0800215018e2fb3c4b7a2d7d0df171243319ab63047e9099fc
+DIST timezonedb-2018.7.tgz 417137 BLAKE2B e2a886b7621167c422b8001d3cff74ca2b09f4a46450ebb1e727274afa5147f748bc21310153570a07d0ce8a991c7406590ab8ff88f687bddcfc432615311419 SHA512 fb8f79a53f5b10a6c01a3a43b33bdefe371ca8c6f5725b28f9efbbe009d2dd089a1747ef20ba1b8694e240ef4133dea8d6d09e8c483127f5d6932a9468106654
 EBUILD pecl-timezonedb-2016.10.ebuild 441 BLAKE2B f91b956ea57b0c77c4d135fcfbde816f9f5f6b284791442f6579eabc4f6d4eb426a072af4ffc65e85d5fc695140a8cc45e69626f448357e58646503037d0123f SHA512 8cae37b48ea29ea53f9c26c6d835c1a13810669398e98069651ab9c0913646dbe5b6f7f0e9c3ea7c76bdd1470490b8cf5314d9cb24360f38a5308e8d715bacde
 EBUILD pecl-timezonedb-2017.3.ebuild 455 BLAKE2B 37eca70ef8e6b10c32e31f39a7d1c6d1ea0814178007d4f9d5016e07f3e2a5543d5e187df2a9329043d8f520f5b92d7171f088b520c5d9268e5f0e7f0ca77d77 SHA512 69ac53b3324ec436a02645eb847452cc3e2a3c9c6db30d4b68011f73d56d885c26728fb64f61add6d2dda2c4606817d8d8874f031c677a167edb53e267981dd1
+EBUILD pecl-timezonedb-2018.7.ebuild 459 BLAKE2B 138c06a03b3a8e3bd2ed8d51def05698c9a86f9b0714fba2754fd59add20a7a7c5e7fc35e6ffbd5d33fa8f5cc0c8330ad3d192103954441489db4da105d7f6a1 SHA512 ad079c3ee82eff43543b6374404b8f1664be148038eace5771a50b534eb0669ee485537b5da6e256a299e6f34d571930e1dec1bf294e7946f9315dbfc53ca8bf
 MISC metadata.xml 635 BLAKE2B 9c3fa685e184fdb85fd630b9bbbd69bfc20569455f1fa84f147b2d2404739077f5bffbe2c4e5d1a1ff28a9f2ec36bb04d7d55952c7cee4cc5ee3dbc1b11bbc40 SHA512 3b06142a7f995b5859650fa156973deb5cf783be8ee123dc2820f1c4a0d8588d6c73a739a3fe547a3b450ee544a0a69abd260c44d53c87ba0c9911cd68e539dc
diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2018.7.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2018.7.ebuild
new file mode 100644
index 000000000000..b1218beaf0a3
--- /dev/null
+++ b/dev-php/pecl-timezonedb/pecl-timezonedb-2018.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="timezonedb"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Timezone Database to be used with PHP's date and time functions"
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+PHP_EXT_ECONF_ARGS=""
diff --git a/dev-php/pecl-yaml/Manifest b/dev-php/pecl-yaml/Manifest
index bc846b721898..1b4575db3b75 100644
--- a/dev-php/pecl-yaml/Manifest
+++ b/dev-php/pecl-yaml/Manifest
@@ -1,9 +1,5 @@
-DIST yaml-1.3.0.tgz 37075 BLAKE2B 90fc101dc5b1d040efbbda481d28a862dd4021d09cf1853644db8769b04ca7c986a38758247b6e61dd38bdae31f995fef04f7b381d303b3914b8126806e99ce8 SHA512 60f54db7cd22ef1dc31cb5b31950a138e0bd2cc436f9e667aaa69ddceb4dcd7aeea9ecca9d424cb6822c2300b382de8f10c07403f80df749192820b27881d96a
-DIST yaml-1.3.1.tgz 37263 BLAKE2B 4be9dad710a4b7b2ea3ed8222500bbf2c94807b1bed627c1460beb31b5745c1dd5484fed11d23bb7deec454fcbb5d88a93034c82f7fe978e6cbb26944c9f7c4f SHA512 67359e6b8d5b19ad594acd741dfb53006079fbdbdb7c3402be57c006f45c992158c505ad2bf0c52a1b997c9b9fac48724b1a44fc5744689b0f02b308324a4a4f
-DIST yaml-2.0.0.tgz 37960 BLAKE2B df325cb73c4788a3022661e841c9ab479a103bcee76d4f911d2ba673d7fa7344006d8ba9a22aed3a701accee49593d524ee506052ac30231f02463c34d7b51e9 SHA512 760c9f9f5738594e3ad55c030fa619bc891e1d5a8feb85bec2389e2fd4d6d4933fd13abf68c85eb1bb4cc3b6f4a66079ea75a2046c47fe4095b01a50c8e65eab
-DIST yaml-2.0.2.tgz 38495 BLAKE2B c992c72b7ba84ca3d953109a9d274c7c3b203f3ce75630860f40a43a565e9ffd92f1d831e386624351879598ee305a64cb3b4228eccfa58b4bf1db76f994cab9 SHA512 b3dd2098826cd7cdcfd1e5d97b9015de66812dc90e506e74a4a50a56afed5f9de0449465bb807a36a13170f479897cc62a9b108653aa7eb81895abd5966bde1a
-EBUILD pecl-yaml-1.3.0.ebuild 843 BLAKE2B 481ca5f3e246f42f6b3beb3bdac479c86ebc13309f82914eb374d50fd51f5b45327efd71cbd053a7e0f79d6714537fc31bca39231d9e5f223e964ac17a6b61de SHA512 90520c8e294d98b0f5081b5b13b12d16e96920f5726d39a0da703b5c50d725be1a8cca7e138f998aaaf58950f5c53dc32fd79b5c80f95773716021cad2a26700
-EBUILD pecl-yaml-1.3.1.ebuild 1010 BLAKE2B 7a0510d95b887c6fb53f0d7c8e48775671c15380bdb8835e36f6dba68fed82e1fc1e1e4a5d2bc10968f89bdbc72678f0d8113c9ded4313b02ae211c99eae48ff SHA512 ddd9a554be36a50ad40197b15b3851505311a5d7946936dda2dc427f79d2e7dcc5dfbbc15e55301676c00c5fb21ab2d71ee56bed63d03a8e57695e7b3ece5ee7
-EBUILD pecl-yaml-2.0.0.ebuild 851 BLAKE2B 7985abf810e41d6724e694c079410bea56f60dd68a655d76e9aa31fb7ca8ff07380984a2ce928b3e24d68304560bf7721a759d03bd0ee4ad0d3242be53eb75e3 SHA512 094aace10ba13de4dfdb15872ae454797fe582a32074f4f2612a3cbf5d8e7b3129b615560c5a0eb4d9970a9012003a19fd2f6b8bcf989cb85659744b2af634ee
-EBUILD pecl-yaml-2.0.2.ebuild 983 BLAKE2B e9ec310ecf527f7e962c8773fc1e759aea2f65f53c4eed0ec147e6b92d8a58b3761bfeb8800cb0602487ae40e2d42c61fc10eac8655dcaa6a0fed93fc41309a1 SHA512 16d5d58753e7a6ff02fc561ee45f90deeaed89c88f2d3b6ad2971e96c0c1066f3bed30c8fa0bab6c5de2ea4b590234f2fc54427addb0555f41edeb25778753f7
+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
 MISC metadata.xml 238 BLAKE2B 1bb4abee8d968b36a69efa8f634c2d2e4422f5ac0611f123cf9794f1784e155a16cfd98ee209c16a745a58ddfa85d134c68a22bb5bde264c35ea285caa2d4d9a SHA512 560ff28e3776267c429b8d553d2dfc8991fa8d5845af5937c46ec68674d2b3c5cb922e557f43fcba113a70d4b3b5a32f39fc1fbed38de5781c7504fd526430cc
diff --git a/dev-php/pecl-yaml/pecl-yaml-1.3.0.ebuild b/dev-php/pecl-yaml/pecl-yaml-1.3.0.ebuild
deleted file mode 100644
index a09636e5e61d..000000000000
--- a/dev-php/pecl-yaml/pecl-yaml-1.3.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV/_beta/b}"
-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 php5-6"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php5-6"
-
-S="${WORKDIR}/yaml-${MY_PV}"
-PHP_EXT_S="${S}"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="YAML 1.1 (YAML Ain't Markup Language) serialization for PHP"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-libs/libyaml-0.1.0"
-RDEPEND="${DEPEND}"
-PDEPEND="php_targets_php7-0? ( dev-php/pecl-yaml:7 )"
-PHP_EXT_ECONF_ARGS=""
-
-src_prepare() {
-	if use php_targets_php5-6 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_install() {
-	if use php_targets_php5-6 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-yaml/pecl-yaml-1.3.1.ebuild b/dev-php/pecl-yaml/pecl-yaml-1.3.1.ebuild
deleted file mode 100644
index b8e538af44ba..000000000000
--- a/dev-php/pecl-yaml/pecl-yaml-1.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV/_beta/b}"
-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 php5-6"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php5-6"
-
-S="${WORKDIR}/yaml-${MY_PV}"
-PHP_EXT_S="${S}"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="YAML 1.1 (YAML Ain't Markup Language) serialization for PHP"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-libs/libyaml-0.1.0"
-RDEPEND="${DEPEND}"
-PDEPEND="
-	php_targets_php7-0? ( dev-php/pecl-yaml:7[php_targets_php7-0] )
-	php_targets_php7-1? ( dev-php/pecl-yaml:7[php_targets_php7-1] )
-	php_targets_php7-2? ( dev-php/pecl-yaml:7[php_targets_php7-2] )
-"
-PHP_EXT_ECONF_ARGS=""
-
-src_prepare() {
-	if use php_targets_php5-6 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_install() {
-	if use php_targets_php5-6 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-yaml/pecl-yaml-1.3.2.ebuild b/dev-php/pecl-yaml/pecl-yaml-1.3.2.ebuild
new file mode 100644
index 000000000000..5d179e7121f2
--- /dev/null
+++ b/dev-php/pecl-yaml/pecl-yaml-1.3.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/_beta/b}"
+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 php5-6"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+S="${WORKDIR}/yaml-${MY_PV}"
+PHP_EXT_S="${S}"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="YAML 1.1 (YAML Ain't Markup Language) serialization for PHP"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-libs/libyaml-0.1.0"
+RDEPEND="${DEPEND}"
+PDEPEND="
+	php_targets_php7-0? ( dev-php/pecl-yaml:7[php_targets_php7-0] )
+	php_targets_php7-1? ( dev-php/pecl-yaml:7[php_targets_php7-1] )
+	php_targets_php7-2? ( dev-php/pecl-yaml:7[php_targets_php7-2] )
+	php_targets_php7-3? ( dev-php/pecl-yaml:7[php_targets_php7-3] )
+"
+PHP_EXT_ECONF_ARGS=""
+
+src_prepare() {
+	if use php_targets_php5-6 ; then
+		php-ext-source-r3_src_prepare
+	else
+		default_src_prepare
+	fi
+}
+
+src_install() {
+	if use php_targets_php5-6 ; then
+		php-ext-pecl-r3_src_install
+	fi
+}
diff --git a/dev-php/pecl-yaml/pecl-yaml-2.0.0.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.0.0.ebuild
deleted file mode 100644
index cb318ec1f047..000000000000
--- a/dev-php/pecl-yaml/pecl-yaml-2.0.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 php5-6"
-
-inherit php-ext-pecl-r3
-
-S="${WORKDIR}/yaml-${MY_PV}"
-PHP_EXT_S="${S}"
-USE_PHP="php7-0"
-
-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 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-0 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-yaml/pecl-yaml-2.0.2.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.0.2.ebuild
deleted file mode 100644
index bcd73c631481..000000000000
--- a/dev-php/pecl-yaml/pecl-yaml-2.0.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 php5-6"
-
-inherit php-ext-pecl-r3
-
-S="${WORKDIR}/yaml-${MY_PV}"
-PHP_EXT_S="${S}"
-USE_PHP="php7-0 php7-1 php7-2"
-
-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 ; 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 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-yaml/pecl-yaml-2.0.4.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.0.4.ebuild
new file mode 100644
index 000000000000..804cd88748e5
--- /dev/null
+++ b/dev-php/pecl-yaml/pecl-yaml-2.0.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 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"
+
+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 ; 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 ; then
+		php-ext-pecl-r3_src_install
+	fi
+}
diff --git a/dev-php/pecl-yaz/Manifest b/dev-php/pecl-yaz/Manifest
index 0ac1f2d0b11f..5e22f634be8d 100644
--- a/dev-php/pecl-yaz/Manifest
+++ b/dev-php/pecl-yaz/Manifest
@@ -1,5 +1,7 @@
 DIST yaz-1.2.1.tgz 20147 BLAKE2B fa6c4b8d8d55ff734093950d1ddd2f24375aacce9d34e52680925874dafed5b0be769cb5768f02d89af573c7a1d5f1aa8290bff2cbd1c8a23a5de011bebd930a SHA512 92525e485e5499f8b4ef8b1e9b21a3fa7004206f545a3a5b300ee11e3c5ff10d335645d5c42fe3b7523a55fe58ffb0a671c67dfc627bc4bd36aeab63dfe42bf1
 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.1.ebuild 522 BLAKE2B 162fa067a1c7c9d2ed34612b5133513e7260d4f5fc3f06de16e11a4a37f30d86b22b80fc952aea8480f3007811baa7968b48d674f00d1e2fc7c3abc1a47fbae9 SHA512 80156ddce79ffa8a460fec70c99cbc68681cd4204ac6f0e18b40521ba17d81d2b4c0da6d162debb3070eb2d4477902203b431692d43a26037232a3424be54910
-EBUILD pecl-yaz-1.2.2-r1.ebuild 540 BLAKE2B 7889ee8d9d96ce6ce4db9c656fa10b24bf34259a1acac89be455af60aaafafba50620b45ef6c8ba7599d8829640d4a303a4690e6b2f7a7509c7e35d0a864b302 SHA512 eccf0a946b64529081796e36aba41c2c9d8f39fc5d7a1f5a28a0a847f36fe7f589c5b308705f1bbfa54dd8926894837dbcd7bb306de9454f04977b2205ebc197
+EBUILD pecl-yaz-1.2.2-r1.ebuild 536 BLAKE2B 0e6ecc8ddbe1691ff767676680103b1adc4427ee62000fc46ba0d791a09f9db4f0e8618cd9928768ff11f5939214960865c0d57a965fcfff49db13bedc9d4993 SHA512 a483cee5216c92ebdcb8ff0e835acf1a8f81041197fca13ee032ce776572a29864b63dfe32a1daa7040d673b3bf9bc6b7cfc5b72181c9fbf67ecb4c6e3661207
+EBUILD pecl-yaz-1.2.3.ebuild 585 BLAKE2B ca0218a933d65dfa47f437743a409ff2909d5c1b79cf556453ee06edbc79fe1915580305208b5a3ba07e99332891ac9c3fa06a1af55be99307aa5223e391b9ac SHA512 679e751eb4ac8c7197c17ef0840d11a72edb29d5afcf857250ff48f5da379f3814acbaa83432d745953cfbb8538a2ce4dcffa76e68abfc2b859cdd6ccde37d39
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.2-r1.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.2-r1.ebuild
index c55cd382414e..e53232e59f67 100644
--- a/dev-php/pecl-yaz/pecl-yaz-1.2.2-r1.ebuild
+++ b/dev-php/pecl-yaz/pecl-yaz-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ USE_PHP="php5-6 php7-0 php7-1 php7-2"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 DESCRIPTION="This extension implements a Z39.50 client for PHP using the YAZ toolkit"
 LICENSE="BSD"
diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild
new file mode 100644
index 000000000000..ee31d36f6491
--- /dev/null
+++ b/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+DESCRIPTION="This extension implements a Z39.50 client for PHP using the YAZ toolkit"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-libs/yaz-3.0.2:0="
+RDEPEND="${DEPEND}"
+
+# Needs network access
+RESTRICT="test"
+
+PHP_EXT_ECONF_ARGS="--with-yaz=/usr"
diff --git a/dev-php/phpunit-mock-objects/Manifest b/dev-php/phpunit-mock-objects/Manifest
index f5b585c5f6a3..6fa419bdfbcc 100644
--- a/dev-php/phpunit-mock-objects/Manifest
+++ b/dev-php/phpunit-mock-objects/Manifest
@@ -1,4 +1,5 @@
 AUX autoload.php 3973 BLAKE2B 0d76a132dd080b8f8fe839b1c3cb750372440ff903e464232bdcbaf2fc499c96a7579c63735631885b7e7422b3f6646179a0c4748d3885b81b53fc6652d1c164 SHA512 aee22419472bbca6c5b6a951a41c0a4098071679e5ddd40282a2d717a854189546ac8d2a8d2a9aad43e28b6ff831cedd6541c3b5e19d5599d62ffe2815204ea0
 DIST phpunit-mock-objects-3.4.3.tar.gz 37921 BLAKE2B 1d1cb1dc0bf024525f3d226d1fa67eb27a6de747ac90d58c54d145d284bb0edc06821f45b7b7bb8a3378bd68baa01c31e773da9ff522a410b3f5038746eadf67 SHA512 c9305796062a9ef412c194a82322c913b695c74fd9505580707381f9d9f96f6d69a16bde2c35226240e3c2bfaa6f0f9bf1c94c178b8a1f050b5afef7e53611de
+EBUILD phpunit-mock-objects-3.4.3-r1.ebuild 750 BLAKE2B 981ca01325cc3f5623371c834ef2f1a4d45240e8c4c1677cf8f8daabbc4d5927eb74c47f815714031e05751ab61aa811f5a88c5a7c500e402c6445d2859a4f37 SHA512 5de3bfd256abe1ad818955d383c2fb35a721ddaef8e9348f515fe3405b4031e30441eaf5bcbcf5e04327290ec37fb6ac64ef366eb43fd5014edc66129c65e869
 EBUILD phpunit-mock-objects-3.4.3.ebuild 746 BLAKE2B 0045f8e5cd267b585742c8f38049aa7448d59cccb0a68173b853cd60b8c3a17fb223fb2707e89919e8bea25587f94bcc424dbc341e7deaa214c3e128c7ff3655 SHA512 eb0f1e41a6a49f179da237d6a7e32629b2ae9b6226af0a68208dfb26de198d5b8a66e5db5c68ce9ca5c49b8c013d3dd575eaa6a341fe2b2575fa73d4bc7d5111
 MISC metadata.xml 342 BLAKE2B 1dd45edd9b24f97ff402f3b3821e9019873024d52cf1dad8541fbb165393ef9b6f38834744c9093ea033eec4b901c91e59713d3c879a6f93c8ae5f3863980b42 SHA512 81c56c098a010d97eada1ff754710726c9ede41eec3605bd7dc0e69e5066b58afcab886d4a55fa2977482cee82f7c203ae6f9e794b4c190359e66b5a756ece51
diff --git a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild b/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild
new file mode 100644
index 000000000000..a1d2fd9ecf64
--- /dev/null
+++ b/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Mock Object library for PHPUnit"
+HOMEPAGE="http://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-php/fedora-autoloader
+	>=dev-php/Text_Template-1.2
+	<dev-php/Text_Template-2.0
+	<dev-php/doctrine-instantiator-2.0
+	<dev-php/sebastian-exporter-3.0
+	!<dev-php/phpunit-5.4.0
+	>=dev-lang/php-5.6:*"
+
+src_install() {
+	insinto /usr/share/php/PHPUnit/
+	doins -r src/*
+	insinto /usr/share/php/PHPUnit/Framework/MockObject
+	doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/phpunit/Manifest b/dev-php/phpunit/Manifest
index 1a998a740532..bc4a6b320736 100644
--- a/dev-php/phpunit/Manifest
+++ b/dev-php/phpunit/Manifest
@@ -1,4 +1,5 @@
 AUX autoload.php 11422 BLAKE2B 90c68a16ab1c2a81c31430984b426e0717881e29231ea008c6e75113d4180733af64a5edf7b1aabd8fd6e84b312ed79b80ee001d805d40f060b9b641c0c27948 SHA512 1d4fd0854a85bc404f5567b78effbc0eb41859601b8e56faaa4362e85ec4d07969864b21df3188fc5e82d5993c67655fa278a9c310b2ec7366aa2195c91e90da
 DIST phpunit-5.7.15.tar.gz 205474 BLAKE2B 0220edd59fc3f191b7621f275d3e4ee8f8bf514f74533d99bfb925e11cc54a235fb292ffd1bb54f6bec1e038c06e35a0dc43c1227618590f99e7e85638a7de28 SHA512 6a836e1ad1656fd1d1c5a58ced3c1826b4decc01798b6a804b487c9b4e094ec32f6eb8a84058e268eade62a2fe19d7bd1e760b8b9433299d9fe9c09afdf2bdd3
 EBUILD phpunit-5.7.15-r1.ebuild 1616 BLAKE2B 08105d6c0d1928bf94b7bba2ad8d04461e22df6cace49739c944213f55d9089e29c0f0fb89806dbecadc8af0288a65c88a2edccfc535e934b021665a8eb8ec60 SHA512 026a7ed14423a855d23cc254bb2b0c3062ad5f59af7092cb92fbc47b47db97a09e5c78db7202a99a11e82745f69a4c4029d69812baeff3ad87d965a81c5c0dc7
+EBUILD phpunit-5.7.15-r2.ebuild 1614 BLAKE2B 8eb6d8f8beaba2fe3e13ae11f242b2349d13a93d4bd9e2f09a3d0a4af6c019da95773cef557beafeb0b48e9239c1c500fb7caf333baff18a3a124ac8768a8f2c SHA512 9fb5b4be8a69d70512fcc85920c9fd6ae172b87376f36af7cd2cd05a2286a2203b652f4ee50e5efe91b99ad217983e62ce7fef975db19d9fd87134d040a5b2d7
 MISC metadata.xml 329 BLAKE2B 45eb57929680d3c3d1c60a22dd1b760db42b1ce2a157c9b87209c391a08022c01a103972267b2f36cea142681d3cc3691a27c726b9a132974d7bb418e5316928 SHA512 007a4fea4de75a468e377398bb1539e25eedc8009ad6dcb6c170be653821b73d8eaaaeb236e207a2e33a509d2966f6a9571d8f0219d90b1662d4da1cdc7de896
diff --git a/dev-php/phpunit/phpunit-5.7.15-r2.ebuild b/dev-php/phpunit/phpunit-5.7.15-r2.ebuild
new file mode 100644
index 000000000000..83f63fe1edb1
--- /dev/null
+++ b/dev-php/phpunit/phpunit-5.7.15-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A PHP Unit Testing framework"
+HOMEPAGE="http://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-php/fedora-autoloader
+	>=dev-php/File_Iterator-1.4.0
+	<dev-php/File_Iterator-2.0
+	>=dev-php/Text_Template-1.2.0
+	<dev-php/Text_Template-2.0
+	>=dev-php/PHP_CodeCoverage-4.0.4
+	<dev-php/PHP_CodeCoverage-5.0
+	>=dev-php/PHP_Timer-1.0.6
+	<dev-php/PHP_Timer-2.0
+	<dev-php/myclabs-deepcopy-2.0
+	<dev-php/phpspec-prophecy-2.0
+	<dev-php/phpunit-mock-objects-4.0
+	<dev-php/sebastian-comparator-2.0
+	<dev-php/sebastian-diff-2.0
+	<dev-php/sebastian-environment-3.0
+	<dev-php/sebastian-exporter-3.0
+	<dev-php/sebastian-global-state-2.0
+	<dev-php/sebastian-object-enumerator-3.0
+	<dev-php/sebastian-resource-operations-2.0
+	<dev-php/sebastian-version-3.0
+	<dev-php/symfony-yaml-4.0
+	|| (
+		dev-lang/php:5.6[cli,json,unicode,xml]
+		dev-lang/php:7.0[cli,json,unicode,xml]
+		dev-lang/php:7.1[cli,json,unicode,xml]
+	)"
+
+src_install() {
+	insinto /usr/share/php/PHPUnit
+	doins -r src/*
+	insinto /usr/share/php/PHPUnit/vendor
+	doins "${FILESDIR}/autoload.php"
+	exeinto /usr/share/php/PHPUnit
+	doexe phpunit
+	dosym ../share/php/PHPUnit/phpunit /usr/bin/phpunit
+}
+
+pkg_postinst() {
+	elog "${PN} can optionally use json, pdo-sqlite and pdo-mysql features."
+	elog "If you want those, emerge dev-lang/php with USE=\"json pdo sqlite mysql\"."
+}
diff --git a/dev-php/psr-log/Manifest b/dev-php/psr-log/Manifest
index aabae34172ef..b4f0abbc0be6 100644
--- a/dev-php/psr-log/Manifest
+++ b/dev-php/psr-log/Manifest
@@ -1,4 +1,6 @@
 AUX autoload.php 258 BLAKE2B 64c22f9d35d5b8a66d0823348273123a8440eb3f93b3627767ea9112f23d488422137e5abf329d68b4f320032e1dd74ad5e17b914ca3158036d440e6acadb696 SHA512 ced0c315c49aa13275c6b06ad0c10d2601654408aa4bd535103ac518c977554c7dfaccb31a7c151ada94dfc9c1198a3c4758ce6a020d6a70041aa9cc3fea634e
 DIST psr-log-1.0.2.tar.gz 4755 BLAKE2B d56a388a94b7cfacbe082280736e5ef203c271de0aec159da56c1ad17efb3bc92e8b4bf45b9d9f5b6fd4c84c107d0c1bc28ab329fcac3b43d179233e1905497c SHA512 a95cf38a92e7259d615d48cf002c4a0a0b6d6a166a345dc40e7636f913e7a787fdc35d4279741d90e04f9b564b608a138ce2e59115014da6be9d779de2a01bf8
+DIST psr-log-1.1.0.tar.gz 5710 BLAKE2B 50f5ba979752cf27728ff7a60931f52ffad90db77ec86292af4e767f83734ec2b89d949c1276e85c3bd66f398f1526d3db1d423ee2df245326290ef2f8216112 SHA512 6ba19f184e397311ebda490bb2e1e4252a111b5aaffd6d5df73dd84a823a17c0c76607a7783e678e72c71c5e4a26b4ff9433132f96b108db9064da873235ab15
 EBUILD psr-log-1.0.2.ebuild 533 BLAKE2B ba31a5751c781fe59f2ce5b73c565d4098ff011f44410cd2249435db0737c33b7fb58b441a8a4b560724bba3ccbdce68a12fc16f2f896a8ab0b7c35927cc21e4 SHA512 084b128cb1cda9b2a285607062dc6ccd33d9f4dab7ed0a1f0c67e9f719bb29a583e6446082edfd7a0f26daedce176bd28dfb5b31aad9a1ee52fa3e22a83c1377
+EBUILD psr-log-1.1.0.ebuild 530 BLAKE2B 80d6ee7b8db8b73f9500402646ce0751602ad55f9555619bfdc49b845fe31ec2484224f91c0d9e7cc1e2297e4af65b4fe94f3ba97b50840fe200fc48c2ea0ff7 SHA512 f2c834352d3c6c85187a88626c17dd58266211ce3f1451bed7d0ec2aeeaf44dc75bd0cb20436c2a95d54dff940171a856274ccc4ae08733084ba10c912ddf820
 MISC metadata.xml 802 BLAKE2B a50b772abd7bebd2cf16fa744d0be648addc253b3c5be3c5450786af67bd66d11f2522bc27aa8b94ee3fb33d1d52225291e134a25a85468eb533cd0ef22007d2 SHA512 40f97201809cdbb080091ad04a06c6d9fd890ee0834be17591fcd91ae69a8af45c19f7ba09b6da85ea06b4b7ff8057533519a780b8121a02ba71bbc5ee7f0cff
diff --git a/dev-php/psr-log/psr-log-1.1.0.ebuild b/dev-php/psr-log/psr-log-1.1.0.ebuild
new file mode 100644
index 000000000000..72dbbfd0efa5
--- /dev/null
+++ b/dev-php/psr-log/psr-log-1.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Common interface for logging libraries"
+HOMEPAGE="https://github.com/php-fig/log"
+SRC_URI="https://github.com/php-fig/log/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/php:*
+	dev-php/fedora-autoloader"
+
+S="${WORKDIR}/log-${PV}"
+
+src_install() {
+	insinto "/usr/share/php/Psr/Log"
+	doins -r Psr/Log/. "${FILESDIR}"/autoload.php
+	dodoc README.md
+}
diff --git a/dev-php/spdx-licenses/Manifest b/dev-php/spdx-licenses/Manifest
index 6e59c877022e..e7d58dd1491b 100644
--- a/dev-php/spdx-licenses/Manifest
+++ b/dev-php/spdx-licenses/Manifest
@@ -1,6 +1,8 @@
 AUX autoload.php 264 BLAKE2B f5084534435d4e00c9a97ff6a068ff94b32b5e533095046357d7a1565c4e2422f6985c0b66ac73ce706c4cb53261d05abf3b6e5f0724bdc34e497fa2e1abc959 SHA512 6dd28dc205943fa5fa8fb7577a88926573533d553e86577ec2d2e34045ea744731ea08c9dfee277dd1550cac033ac53d1648aa8b28fc78eaa73d0613371aaaa7
 DIST spdx-licenses-1.2.0.tar.gz 10974 BLAKE2B 52cba9837202b1ae598b6d3b36f4ef67ec27988fa5911f2dfff92d39515d0401f5636922a3d205413489d21fd1dfacbf68f72c907503807317c7c9e51392e016 SHA512 fdb63dd29a099afbc116b30d1deec3d2b46be998a55fd741126f1bc393c5037a9a7477e55f7e030585d826be7d72db26be5ce0b5bb57dd536137cc45890ea9c9
 DIST spdx-licenses-1.4.0.tar.gz 11318 BLAKE2B bbeca0301c98bcbefe9ab09ab3f421480a4a777cd666dcbd870c193bb9af3083853561a3a49ea37a4534bef6c8f7e7c31d85b62355ab11dce006fe5f36864a10 SHA512 0ed7bc6e42e7cebe0763dcda8180d1c20da3f79587457e04be0f1331aa8464a1459ec584a8ef06db76b90eff1b6fd365196a2402384d00ddb5352afdc07afb0d
+DIST spdx-licenses-1.5.0.tar.gz 11576 BLAKE2B a427969df68a0ecc0f1234b1da3945c50f5f8163d182ec47a1fef31d309f216a410db95a9dd9e5b6057659a4a0afd5fad01919624e0b6ff0aee20d5bfff7d88a SHA512 184dc4c07f1d7b55539d32e4793c3ffbd8aa5a0b23439965a44450154e63e9afb74adb82031544e9e76e2ea9c5f57308d876c541dbd1583d498d3db71097fb06
 EBUILD spdx-licenses-1.2.0.ebuild 540 BLAKE2B 5408ae142e124053f36c38f211f8cbd7cd4cd37cf34d4a6bdf9049458107d9b3fc1c9b7f70168e67eaf2bcb0ad8b62b382f3312928bb013e2dfac1748a9203e7 SHA512 61e9ef062aec32f723ce485dd5f1b0dd84355894571f78f38c13dca00756d9bbb8de0703b2fd5466e806efb0b7e5e147d87061e95d003c81fc2b4f0cd789c3b3
 EBUILD spdx-licenses-1.4.0-r1.ebuild 592 BLAKE2B 51d43eb90c272c90b2f74a8a7569039604ed3a8e1d3e1aa84823aa2ecebfff13c03d518096f7ea087f0cf91268f0e9f5df64199872fcaef5aad68de9ed45d3a8 SHA512 b5ce0761d3bbb97547a639582e9d27b10033ed229467d353fc692907f54f9fa1cfdb70c313accfaf2cc14c705940bcc7e693d1a6162b38c685e104c4558dfd14
+EBUILD spdx-licenses-1.5.0.ebuild 589 BLAKE2B 98b09d9588f1730200ccbf89bb508b57e3ce0a5d845945c20b853e0eca19dcd82c6d03e1752918da5d3b7321338bb923b1c74fb5dd7974fb597fb6bc9609c369 SHA512 f067b98af3569e534c20ee26c170c41794ff303601d4da917e33a37cf6b04e51dfee1bafe1b128e10f41369d2d90e32f50e15828a559e2104a2e37a3a24d9d87
 MISC metadata.xml 675 BLAKE2B 6ae4ff5df27e2d6334deee789bf253f71f6b55999e2cd9f0c4a1be6358c63c74f668624025f0d8fedb24dea3ccb36ad7d97972f1f627979b7c40e5ca1c389eeb SHA512 f660171c2d2bf3582a91e72a9a92b8f1270a1339c8f68d47c3d6abc2d642027873b8c6a4b2ec7c8bf968cfc37de208c3505899bc2d4fd472cfd403b73dd9fefa
diff --git a/dev-php/spdx-licenses/spdx-licenses-1.5.0.ebuild b/dev-php/spdx-licenses/spdx-licenses-1.5.0.ebuild
new file mode 100644
index 000000000000..8b9ab0e5b041
--- /dev/null
+++ b/dev-php/spdx-licenses/spdx-licenses-1.5.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tools for working with and validating SPDX licenses"
+HOMEPAGE="https://github.com/composer/spdx-licenses"
+SRC_URI="https://github.com/composer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/php:*
+	dev-php/fedora-autoloader"
+
+src_install() {
+	insinto "/usr/share/php/Composer/res"
+	doins -r res/.
+
+	insinto "/usr/share/php/Composer/Spdx"
+	doins -r src/. "${FILESDIR}"/autoload.php
+	dodoc README.md
+}
diff --git a/dev-php/swoole/Manifest b/dev-php/swoole/Manifest
index 7485c83de290..13ac811f09f4 100644
--- a/dev-php/swoole/Manifest
+++ b/dev-php/swoole/Manifest
@@ -2,8 +2,10 @@ DIST swoole-4.0.1.tgz 899395 BLAKE2B 7e7320905cb83794115280977031cc5254a4947781f
 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.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
 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
diff --git a/dev-php/swoole/swoole-4.2.9.ebuild b/dev-php/swoole/swoole-4.2.9.ebuild
new file mode 100644
index 000000000000..253ee6973880
--- /dev/null
+++ b/dev-php/swoole/swoole-4.2.9.ebuild
@@ -0,0 +1,71 @@
+# 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= )
+	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 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
+	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_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/symfony-console/Manifest b/dev-php/symfony-console/Manifest
index e155e17a0a38..21595d18aa4a 100644
--- a/dev-php/symfony-console/Manifest
+++ b/dev-php/symfony-console/Manifest
@@ -1,6 +1,8 @@
 AUX autoload.php 536 BLAKE2B 1a65551494d6fb49e9e21cb397bc5d53ff2fbc1c09af6c426e2b142c5fc440290ccbe18ec1a3451053b856b334ee99c5016e3b645ae7eb0b84452155cb484dca SHA512 cf67d18e3717b9498386be165095a26679daf3a815fe314f23cf14513ba9e3b97f51c1052e9df18106c735c5b41262de0f3badd59517d1a94dce2f1e53f8fa2b
 DIST symfony-console-2.7.9.tar.gz 116610 BLAKE2B 1b1da6f81a88b2887a6a5eb5553c4aa2d3a013b68d8e469e27da42409d5bc50208cc0ff8983afd22163a724e61cf7637728939f2a92137f0b1619ad5a833ba2a SHA512 3de7d78b92c8f0c99d3c90e83a23f6b61eecc195cf92b5c9ebea03a1dc85d2166287e619822238a2f2cd54a430b4a38c7c88be3ba74dab0b66c6104e980a088b
 DIST symfony-console-2.8.43.tar.gz 131451 BLAKE2B f3a0c57f6c746c9cf18b0b9f6ae32aea055f0c3d5ba0c1a43d5492efcfab897184db49dc8ace1c465ca8b04194d10f1acab6b2c1ea2d3c62c3aa54524f514f39 SHA512 e5177052bb826fe5f023c569e24440588f75d34d4caf56f69ee1a88a5e7d3b639741c1262600543d617b80d5a086472d54b45f48e7eb79375759d4e5cce742d8
+DIST symfony-console-2.8.48.tar.gz 132206 BLAKE2B 970d4e7526681159aa76fdede0e533875c163cb7fdb2156f0eebb9540602c8e29b3ee8b5a9bb5509a629b9a910d00cfc5625f203a77807ed0da670a0e41e4be9 SHA512 358e0f44e516ffdb626bd7da29b415f1a563bd400b627991928e5014aee8a5ec9bd1c61fa4f6c25f6f28b1f88f6f16d9d718bdda22b9f3b906db4cc85cfadb1a
 EBUILD symfony-console-2.7.9-r1.ebuild 666 BLAKE2B fc6405f880bf61141284960755ff4e0737edd3a1dae204316289b930035aa14a6afa7afc556a06ab181737f339d717d94e9fd5abb219204d1cc39632f29b6fcf SHA512 0e65babf5287b41f5e2ce9d435e1fb5a8c3ec3326f6be7a70cb1a4aa5b5e38ea03fd9473ae86e3dc59950e127380fcc275c6d86e6783f5b41237fc0fb26d9ab8
 EBUILD symfony-console-2.8.43.ebuild 666 BLAKE2B df20a7988cf452daf7225a10e1faa82ef2e38142e9788ef51ae0f8d0fe0744b6f77557c8624ef77120c77a93acc15bc7bcb512f1bcda7f9503432cb829d53b3c SHA512 87bcd21dda39c819e492275fde4b123360f5724e0d44ba33e857840cfc1f2f6f0680a4089eb6218ba5d0e74948b035c721347cb078b833e8172b5ae272de7ee3
+EBUILD symfony-console-2.8.48.ebuild 663 BLAKE2B 1ad76e0692275d73f79e19621f599d8b662602631ffdfeb945094c416a33e1efae1e0f2084e9be4fa2a57f736a3e37277816618b704c65c871431a2dc7998c1d SHA512 80aa352748e9a6956c14bed659a3b01685077ac34805688e03e8bed49794052dfbfa54b7e04770655524d5b3e3a6a4641b4394f6378209781937345a6ce2b9be
 MISC metadata.xml 694 BLAKE2B 9305b006f06841ee70939962c1a72d5efab4b6e3065ad720bb83ce84ee210bab45dee93dba63c19d74e7227c458a347346c5f5a3d5724b682047f5212e83f495 SHA512 abc6b86ecc143c9a02616b46628129fa02c00e693af762a220bdb4fbd4abca4bf304dc4526dbadee11672123cc743fbe89969fbb6af3b6c6c85f6864fcc4ccb8
diff --git a/dev-php/symfony-console/symfony-console-2.8.48.ebuild b/dev-php/symfony-console/symfony-console-2.8.48.ebuild
new file mode 100644
index 000000000000..e3887444f9e9
--- /dev/null
+++ b/dev-php/symfony-console/symfony-console-2.8.48.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Subtree split of the Symfony Console Component"
+HOMEPAGE="https://github.com/symfony/console"
+SRC_URI="https://github.com/symfony/console/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/php:*
+	dev-php/fedora-autoloader
+	>=dev-php/psr-log-1.0.2
+	>=dev-php/symfony-event-dispatcher-2.1.0
+	>=dev-php/symfony-process-2.8.12"
+
+S="${WORKDIR}/console-${PV}"
+
+src_install() {
+	insinto "/usr/share/php/Symfony/Component/Console"
+	doins -r . "${FILESDIR}"/autoload.php
+	dodoc README.md
+}
diff --git a/dev-php/xdebug-handler/Manifest b/dev-php/xdebug-handler/Manifest
index 48a05d1e6d85..2da19928f05d 100644
--- a/dev-php/xdebug-handler/Manifest
+++ b/dev-php/xdebug-handler/Manifest
@@ -1,4 +1,6 @@
 AUX autoload.php 273 BLAKE2B e898a6f52339faf4a22f81207bef6a9c8620e5756b30c462f420f8b6c865ee7af33f3d23e7b251e096f25882310789da5e2f50e064ab614d59eede463befc26a SHA512 a7a63031a709deaaa2cc8a673f22252df716fd7e2d531e6207052dc3acb361cb8384e7456b949e19e00753b9693fdd0d7c65e6105c7f32d86b8800b4373ab57d
 DIST xdebug-handler-1.3.0.tar.gz 12363 BLAKE2B ad89580e57728a444958d72f236fee14665f6fbed998018a28b181cdfc3a448da0a06dc335c3d95413eff6f6b92fc3d44ac8c03da282eb3dc65ae14600430825 SHA512 ed0206982c5ffab3c8ff56dcf8055230aaa358fbe89c15880cfce33abc27adb3b13f75bf7d78988f6bae4d0d072c66f557cd93082e89e7ca7993b257c04a2c61
+DIST xdebug-handler-1.3.1.tar.gz 12589 BLAKE2B fcee0a2412473f5e7a07defa96b991803728f831c8ab0dfa053c3ff8671a2dd187d5199e51ac90579830f5a005038411c2097be8a1f1370e8e06d090922f508a SHA512 a00d9cb8e23cd6bbad6c25f82c8db314451a88f49d90e755a9c81fa57794ecc79612481e031d60cdb2ee4fd4e256ffc02e847c76089daf720f8811659799131e
 EBUILD xdebug-handler-1.3.0.ebuild 555 BLAKE2B e15ca2b4c997f9d360fc20908d9d4519fedf7d6fd7b81fc988450334d98a8afd7dcd35723c0f0122c07bbe3071d47bfdd8532a824ac061ce623007831f484103 SHA512 da05683eca9d3539c12678e5310608307fcdca40c166cd71f28dff064543061d169eef41c617e53ec1740852e9fc7ed0d5c5b592a0805662b81c2105abbc9647
+EBUILD xdebug-handler-1.3.1.ebuild 552 BLAKE2B f06ba950f4f9091a47e22971a4430b6e48c94c054061124e0d8b29e3dd57c6720bdcd90d0d13a835e74a21cc2c7922f2919a47c334877447237f64d61d7b5056 SHA512 d18c0e48e93f87097a0c2a4d0d0c0d179b6b763dc717e6b350dc496ba19d3d3ccc057c1dd381f2282d9793753247c6800bcbdd5f280301e8b64d1e3c23a52625
 MISC metadata.xml 476 BLAKE2B b4633f1f38fbb6e7a1a62cae819e0ac0ad72171efea4a371535b0728cda77f4ed25a98af77552125b9b02b8dfe2e8c053b23bd0af32286d0faffd626072bfa2a SHA512 45602542f487a5670b3ff938809bac80bdb5c6875549f31704a0e3b319128b685c51aa6fba145b393be20ead836582f24ccce3fd212c9c2c09979c6024524880
diff --git a/dev-php/xdebug-handler/xdebug-handler-1.3.1.ebuild b/dev-php/xdebug-handler/xdebug-handler-1.3.1.ebuild
new file mode 100644
index 000000000000..34166878b535
--- /dev/null
+++ b/dev-php/xdebug-handler/xdebug-handler-1.3.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Restart a CLI process without loading the xdebug extension"
+HOMEPAGE="https://github.com/composer/xdebug-handler"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/php:*
+	dev-php/fedora-autoloader
+	>=dev-php/psr-log-1.0.2"
+
+src_install() {
+	insinto /usr/share/php/Composer/XdebugHandler
+	doins src/*.php "${FILESDIR}/autoload.php"
+	dodoc README.md
+}
-- 
cgit v1.2.3