gentoo resync : 12.08.2018

19 files changed, 405 insertions, 8 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 3a3f4a2640a3..011ca8e39075 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index d088b7a9bd0b..039edd1660f9 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -1,5 +1,7 @@
 DIST igbinary-2.0.5.tar.gz 183869 BLAKE2B 8bb56ff0213c77dbc17cf65962e23579935b2330ca2107b8e6e00461a486e60df4209c375e9f74d17bb0a745136fa776233b41cfc51ffb5e1dc1c8fdb4a8bbf2 SHA512 e0abae97b5a0c9ab30ea00a490294f18f91b66b728a05186167e15c0a631d4de82b8a24d370a0d58cf5552adde68dd1b3fe56e877d382fbbdac02cfc18e49063
 DIST igbinary-2.0.6.tar.gz 184889 BLAKE2B 7c07dc7b766ea395137c2cfffab6329f6fe5fc7e8ffb712474ef9c945319364b20ba4f8735aa776bc15b94c2cd815bba5c1a8b7c25c9715d706a6773f80082d8 SHA512 c9f76aedcfb5aace6b8a3c064410b099bf4563d99115ebfeb9c53a3dd18a48e5c44b99a04a2a75f5d114aa5a6d9030b6f2242502c6b3c9d273a6936f9fa410e6
+DIST igbinary-2.0.7.tar.gz 185004 BLAKE2B e95326a90f8226a3b01e8a7db960a950b47ac72af42b1a2c069fdab0bc8b524c52d36c283490e8123a28b21ebaff09c23ca6b1c0696d5d57548bbcaaae43d500 SHA512 1e17b53c39118e5f1e1808a0cf9ce9dce053ba84706670c6d4b2323e2aafd612df6a95b95b43344e4ecdc792c304c43aa8eab959fba0fee77b0a21d9ce3b2ffa
 EBUILD igbinary-2.0.5.ebuild 584 BLAKE2B 6c928e2f63bc4af2255092a71c39e916db15b1ece4f1aa171719ad31a744231aedc099e938a66eaca37c9b936d607e060fb1ac19e0519c186c6988ae11a8ed23 SHA512 ae02b0f4099d8f65f796d60ccb11c8aa05b7d7218b6b7eae137229f5269d6168a0caea1e5215795cb12a1379442b7e7ac3ffff3dcb391154951a5da643aa285a
 EBUILD igbinary-2.0.6.ebuild 586 BLAKE2B 06ab30e3024877c2be0acb740bdedb378b8ffe84f3c03888a1bf4363b27faa9ce2fb30143dd9c1d33ad6dd90d2bb7ed9a13257a6179dd5cddd0a0aa9a4ab2a93 SHA512 b79d6efcca26e1d0d9f55af8bbc1e7eed3309dfcb081878a70f54fcf610065ae41ccecf0da72e2ecb61b36bbfd25d97848c1b51df9eeb977a003d71bb9e78f25
+EBUILD igbinary-2.0.7.ebuild 599 BLAKE2B 96eb591d71584c6b8c2cc56b258db4f59c4ca9a2df834b4af4db1b25a11a4e28ef3991c338ac3cf3f033b85d4ee6c60126d8f4d993b936846963b49617e8c23e SHA512 128bc5df0c7e708d9715aa036ee223b1bb4ce9a2330eac25340ebef3583dc4326df8c757c4a08cf54daa607171163fd344378061d5c87443e883a78cf690f8a3
 MISC metadata.xml 331 BLAKE2B 4187300236aa128879679c7cb4a8ddfa19dfd512a76466e835224c30323f2fafd55189228bdced507ababd5b90f561f6bb44c1554392eb0682b6ba5c7a20b681 SHA512 86f467f549b36915940e45a4e151742f2925293106dd3da2958e6153aaa8fed378b2eb563bf69da0d38101409858a4abe308f608bd94de6b4517daf9da092405
diff --git a/dev-php/igbinary/igbinary-2.0.7.ebuild b/dev-php/igbinary/igbinary-2.0.7.ebuild
new file mode 100644
index 000000000000..9ccd6f49840d
--- /dev/null
+++ b/dev-php/igbinary/igbinary-2.0.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PHP_EXT_NAME="${PN}"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( CREDITS NEWS README.md )
+PHP_EXT_ECONF_ARGS=( --enable-${PN} )
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64 ~arm ~x86"
+
+DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
+HOMEPAGE="https://github.com/igbinary/igbinary"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index d2062f0d7e21..1c7954ea6fa1 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,11 +1,13 @@
 DIST apcu-4.0.11.tgz 119535 BLAKE2B 2c1f8a0463b2802b11ae679987807127556b04fb099e4872bff9d1ea51c633140d978b66373eb987d5207403ed9389e58f1afa7ca94360680d9a9693230fb87a SHA512 e3b97066240e33850419e96f0fd9df0e66ee3b0fa238c418e07ac639d07439e9edfa1696e56a620e33f1ffc0993c57bde585b0c170b22995e7d5c0ae550b7899
 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.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 2098 BLAKE2B 97d552bdc1761e87d52e67d39fdff255bbdb6b568ce7d675af3cdc5fa4f4121585b62b94c512f9cf483969fc34b763193198b1236c3e8e290d538dc6d903c3c7 SHA512 bc1c9b72740a48fadfdb3299ed0277007fb2f1026c76bfae8a6e9006e84628a436e2de6d55e1d499d47ef7c641903a7fae8aab8244f9711cdb9651292d76d37b
 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.12.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
new file mode 100644
index 000000000000..531e6e6b911d
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 TODO )
+
+# 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-eio/Manifest b/dev-php/pecl-eio/Manifest
index d6a5b3ae955a..ed5879683ad6 100644
--- a/dev-php/pecl-eio/Manifest
+++ b/dev-php/pecl-eio/Manifest
@@ -1,3 +1,5 @@
 DIST eio-2.0.2.tgz 74005 BLAKE2B e09f540753f2c607b95de9c3f390fc0c31ad2a34fda99aac86f057b2e664e49aded0b5f3e491138af60d00828ee9ff13f09958177e9cfed2b254473b1f814da9 SHA512 9b5ab80e6a76a1a2e99dfa641b404d0b52cd79b54267a8ded622930b4cc99f3ba1e39a70fc2d8f5c4ed50fbd67d97bc78655cd17958f0c8a2314b3b6ac1c6384
+DIST eio-2.0.4.tgz 74118 BLAKE2B 0228f0ca91ed6410614242e7ea1ddadaa1d1aa8211b3ea6f730c0711e4339bc158d661c5addee685d750a51e654874d35a04cf011d2a02ad06ab3f249b893753 SHA512 a74464752af5792c527b9149a7edff574952cac0b5b09e1e7ff3b7c0a2cc88ab171d916d94d508b9f92aa40bd5262a5b9f8d4ba239908f13ebcb89c6513da4d0
 EBUILD pecl-eio-2.0.2-r1.ebuild 505 BLAKE2B a111e8ec1dee97e11e0766490b8fb320c529e2abf862f3c8466eddec45a2102d751a091cfa88f8242491d2d8178b23d96b6ce1ed1c36624560b9844ba7d64325 SHA512 a0444dcecf3ee753e82d6ee3b3463e5fa56bd484a01d120b3827010f43ea09ee2c50babce2cb072c8b14d5f1b1e62fbfd0155f1aca3de7168e18c46716c549de
+EBUILD pecl-eio-2.0.4.ebuild 512 BLAKE2B 77c57ccfb71d2688e297983be6dbf4769fcaa2259ee1fd754703c93f4dd22a8540dbcc4b26fe39d780fada001f0cbc33daa85e7c708006e3ad037298a44d37e5 SHA512 f290db7202414e29e053fc7bbc126a061c90b64d54861afc0dad5cbcaae5476e97678f09de87ebd5b6842531a861b05f9028d5785e2e6a66846d9c4781456d40
 MISC metadata.xml 354 BLAKE2B 468d2c00c6aa9335b37ad1cfe50547fd620182f78c04d924309b429f9a05475a8e023c69121ac0d47243a479d80d891956d4e8ca0edfacc3a82f05be74a6d046 SHA512 de8f034f4f5b9891d46191e0960bd7cf53c3b831908f70beb6b164d062462dab78ba5c3de85509c3b616bd0ad3a9231e991e370b674b694708afca0736e8a60b
diff --git a/dev-php/pecl-eio/pecl-eio-2.0.4.ebuild b/dev-php/pecl-eio/pecl-eio-2.0.4.ebuild
new file mode 100644
index 000000000000..571ac16c43fb
--- /dev/null
+++ b/dev-php/pecl-eio/pecl-eio-2.0.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PHP_EXT_NAME="eio"
+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 ~x86"
+LICENSE="PHP-3.01"
+
+DESCRIPTION="PHP wrapper for libeio library"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE="debug"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS="--with-eio $(use_enable debug eio-debug)"
+	php-ext-source-r3_src_configure
+}
diff --git a/dev-php/pecl-event/Manifest b/dev-php/pecl-event/Manifest
index e56e4d427003..4a6a9b4d809e 100644
--- a/dev-php/pecl-event/Manifest
+++ b/dev-php/pecl-event/Manifest
@@ -1,5 +1,7 @@
 DIST event-2.2.1.tgz 133147 BLAKE2B 909892c937843821b34cb4d450b06698b23ed8aac59915ef96c72ba08e4afe84856e913527e9b0197d28ebbe5cac8ac45174d8e3fbeae33eae0619e3b3e21959 SHA512 a331e0cbb923b2efe95a366c842929e9ffcdf15d4b95dce83f5d1e9bb33045477f278672835ffc087df89aa3614106cf504f4e6a779a620b94c20d83449e95f2
 DIST event-2.3.0.tgz 135401 BLAKE2B a068142854ed908cc482ec48a249a5d213c1806652cffc698bc6dd298c136c5884bbb52b30179ef813af938d0ecb92a5414c93dea3d782d6ebfb4e886128454a SHA512 9e1f41a13a5fc534956561ea481816d6863ebe037cca0ce450cfb16375d6b49cd03c68e115c851ef6fa3022927f2e5850695880c65dd1d339bb747e171cc9f2f
+DIST event-2.4.0.tgz 139646 BLAKE2B fe672b5d1f4eabd06456ffb14f11ed978a23a15eba06bc01b22d1784d71d5859e71e3914ab64856dd33a1cccb6618b5926bab446a112d8bf106081c2ab41bc74 SHA512 d238b72764461cf338d20618e4dee80ed8e8519350d17a6c789a68d749d2f4adae991ee43928ab09321caaff321fa21aaa4b5fac6f827974b2f8e9295e948293
 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
 MISC metadata.xml 431 BLAKE2B 25421824761cdcc90c610236ac4acfd85e18fb63e4f92ff3fa5e51698a7e2004812a7193ced70646baf02bacd0bc896a5959ee88bd88dd5de68db729661ad02f SHA512 6349913306ea30f9ee6cd5ad862e0323d143815f4db47da14e5d54d0dcfb604118e3845f664f2a9b8527797b262c9567bbf5f189426f9becbd169be0ec111056
diff --git a/dev-php/pecl-event/pecl-event-2.4.0.ebuild b/dev-php/pecl-event/pecl-event-2.4.0.ebuild
new file mode 100644
index 000000000000..3fbf4fc20ca4
--- /dev/null
+++ b/dev-php/pecl-event/pecl-event-2.4.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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"
+
+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?] )"
+
+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-redis/Manifest b/dev-php/pecl-redis/Manifest
index ad9e2e73649a..46402d3cd313 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -1,7 +1,9 @@
 DIST redis-3.1.6.tgz 199920 BLAKE2B 00aa81cdbedc03b4a672a58be98d8f01d2076038622b9d1e9673c0628c096152f12f9f5ff540af639da73b4458fcb1fce9c1c8b49a95db48970bab07806ac8d0 SHA512 4263d150c93f11dd06587925ad9a3cd8fbba2e4a18b2f23e6adfaeb25d566a1c2d256551a50ae1b9c770fd0f9bc4c92f483c46d60be9d4f5b5ba056231b7d527
 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
 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
 MISC metadata.xml 324 BLAKE2B fc4145f462dd06f7a34385a0d8e2cbc6da6744094e84851891d5513f7be39c89cebe439e566fc2ead0afdb8ee3885b4a4d448e63d4c1a1d20a5bb8791c12d313 SHA512 916879a4b7ed11e30634a1c95637e9426932bac3c6aba2c7e686d9835097873e142f062e7d81e3ac99c3aef972b40db67b3809116cff4a3742ba6c669d999066
diff --git a/dev-php/pecl-redis/pecl-redis-4.1.1.ebuild b/dev-php/pecl-redis/pecl-redis-4.1.1.ebuild
new file mode 100644
index 000000000000..5679d6c4a9f6
--- /dev/null
+++ b/dev-php/pecl-redis/pecl-redis-4.1.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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-stomp/Manifest b/dev-php/pecl-stomp/Manifest
index 82e52dddb9fa..7d16117ec8ee 100644
--- a/dev-php/pecl-stomp/Manifest
+++ b/dev-php/pecl-stomp/Manifest
@@ -1,5 +1,5 @@
 DIST stomp-1.0.9.tgz 23166 BLAKE2B 804fbe2703f5035a8faa744cddc84de5249b74186c22ab5e26c075a2f241262cadd237c7f566262fcdc25def846968a7788d80817743cdf53eb255cbc25053e1 SHA512 e3ab5bfb03c29edde63de4006b448e0204efbac5817b1443ee5b1a0249c2f96d58443847b878e838108b66e5307f6e803f807aff7430af748af4994bfca5199a
-DIST stomp-2.0.1.tgz 23494 BLAKE2B 3e9f042ffa4a8f54a0746db638ade4bf75febad0359e398894714c6c4d4b6bbaee65cfa384c379d14387026219f02013c6dbb7faba62ae11b4231215be7310ad SHA512 61cfacbd96f1061dc869ede6c1ca0f7bceb6120b28cc4a78fabcbace54a66ba540faf41ef72747b8bcc6a4ef98e405daac04e82bd4e079d90293f030684b04d3
+DIST stomp-2.0.2.tgz 23609 BLAKE2B b6ed89b5b8fd0bb501b2337e87107797eedc6ac53c81ba86d2e755cfa2dd716bf4e409cee623430791e0b4854833ef44ed7f6f9e1d89fcd2250d598af0dcaea6 SHA512 577a781b45ef394cd833fb69c808da9b8a8ff69b31b1093c5eef3f7b5d1b37cd0b45c32a03883f56f86213e32bb18aaf0a80010c6bec7efa7239ea48bc57b4b4
 EBUILD pecl-stomp-1.0.9-r1.ebuild 899 BLAKE2B edeab12f987c00ac202b5bcdf848757ec686b56d602e6761741ca7d703a2733e8e81704c7ca47ec8825c0305767b12175911563515b69fad567c9e6c3d429a3e SHA512 1b645c6e9e90ea33397e7c963f1551c9b369100e65b085229f3882ca6d6f9a341b1f224ccb399bf147f330fde6ba218ca20b192973b598a5b170fce80fe73d67
-EBUILD pecl-stomp-2.0.1-r1.ebuild 1206 BLAKE2B 4bf5f2d2003a7cd3799218dbfd4025c88fcecfff01ef365a75250aea5a35a7fe21beb7b0e060b4b01897c0bb0c685718902d817c68d60678e241d37dec11b62d SHA512 45d183ed424595af9de5a600e1fdcc9faf4246a2779b6d25040684c2bd6db0ff296a1e6677099350936dda1fe427822deb7bcb16574e5804b19fb4672d452bc9
+EBUILD pecl-stomp-2.0.2.ebuild 1346 BLAKE2B 6c2d3b5dd80460232f0e09953547d8d4eeef4b521a7ee6bf811620b0a94f2964589c22ae347df1bc79c2da0e19343364b592a31febd1a9ebaa353224fd36f0ba SHA512 bdf9c479e6cca49fe78689624bc57cc2a18f73c73ca9fb842524df07ba1fce2511d3d3ecd3071e0b0ae1d690cdc56166025651f07138429ca814060d1616e5ee
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-stomp/pecl-stomp-2.0.1-r1.ebuild b/dev-php/pecl-stomp/pecl-stomp-2.0.2.ebuild
index dc494fe74045..a4649795c926 100644
--- a/dev-php/pecl-stomp/pecl-stomp-2.0.1-r1.ebuild
+++ b/dev-php/pecl-stomp/pecl-stomp-2.0.2.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=6
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2"
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
 PHP_EXT_NAME="stomp"
 DOCS=( CREDITS doc/classes.php doc/functions.php )
 
 inherit php-ext-pecl-r3
 
-USE_PHP="php7-0 php7-1 php7-2"
+USE_PHP="php7-0 php7-1 php7-2 php7-3"
 
 KEYWORDS="~amd64 ~x86"
 
@@ -21,14 +21,15 @@ IUSE="examples ssl test"
 DEPEND="${DEPEND}
 	php_targets_php7-0? ( dev-lang/php:7.0[ssl?] )
 	php_targets_php7-1? ( dev-lang/php:7.1[ssl?] )
-	php_targets_php7-2? ( dev-lang/php:7.1[ssl?] )
+	php_targets_php7-2? ( dev-lang/php:7.2[ssl?] )
+	php_targets_php7-3? ( dev-lang/php:7.3[ssl?] )
 "
 
 RDEPEND="${DEPEND}
 	php_targets_php5-6? ( dev-php/pecl-stomp:0 )"
 
 src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+	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
@@ -36,7 +37,7 @@ src_prepare() {
 }
 
 src_configure() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7_2 ; then
+	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-stomp
 			--with-openssl-dir=$(usex ssl "${EPREFIX}/usr")
@@ -46,7 +47,7 @@ src_configure() {
 }
 
 src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7_2 ; then
+	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/swoole/Manifest b/dev-php/swoole/Manifest
index 40acb3ad6c11..58f27d206acb 100644
--- a/dev-php/swoole/Manifest
+++ b/dev-php/swoole/Manifest
@@ -1,3 +1,5 @@
 DIST swoole-4.0.1.tgz 899395 BLAKE2B 7e7320905cb83794115280977031cc5254a4947781fde05db6e7803f34ff0f5c0ecad84f8aa86adc3c21320b031fa3104fb6c953e9060791dbd9d5c497edbcfc SHA512 0df6ae1bf28ec52abebf1a597c0774e7e5de4bb8378c916a46896c7f84822c8466bbb0d3d188e671e7c39faafa94d2dc2245a468dacb2711c7f0fa617dc42aa8
+DIST swoole-4.0.4.tgz 907216 BLAKE2B f078f712c61c7ec9c1a98d94370c892fedd7d1efee7de34438a19d96fea9d41a0553d53fdd34c3d32138c6685045bf45be5fad533b0430b07cb7e60d183433d5 SHA512 b448abeec1fdfe94e0fd5d05b9c2abc7cfc2bb9477d6847adc35cba051d38acfb9ff3bdfaeb10591a50f5a6238f21cef4e0b614e1ff53c71f62b0bcd846d785f
 EBUILD swoole-4.0.1.ebuild 1695 BLAKE2B 7720c6946b04a5c35c012187873a351919f02a4c9b8cf041b20f4777b57db65e8f2376a1cd121af0203d802227bedae046fd1aa3b3ea3c0fecc6c677f9f029ce SHA512 fa2a870086d261175ff9ed262bd3051a62bd12ba979a384d8fbfca121ba9cba74ffe55cf8f84c687eec4b449d57904d73232c637d87fb6cd5d42e7d1bff19ee5
+EBUILD swoole-4.0.4.ebuild 1818 BLAKE2B 94bfc9d9802443718edef78fdfa3b86375e822b6ee5983b97c3a001e04fd15ae42b94c7dfd12b8439f976a6c035ccf0f7055a21a44107c0cf1e50b7dede89aef SHA512 cd256d3486b92e544db3ecf8a55c994b0305c1be747c7cb1497977a6b9ae6c1a242ceb6978c5f7a57cdef2fe57c0f04af596df5a74049a56eb788a996b6c6bf9
 MISC metadata.xml 424 BLAKE2B abaaecb73dd8caf77e25775dc2b3307efa430399d197b24f3ade567b93989108c70216949327677f5c9540e6aaafaf2f77d9af17b01f99de2ac6f04a95abb03b SHA512 52dc7ac48b61458b810ba467bbe5cfaeaef808ae7db72f58ba4ad4dd8723c7149995e43e94c8b4552e7dfc38cd1c3e627dd5c9854652ee656f421f345dd72471
diff --git a/dev-php/swoole/swoole-4.0.4.ebuild b/dev-php/swoole/swoole-4.0.4.ebuild
new file mode 100644
index 000000000000..5a00e34be3f4
--- /dev/null
+++ b/dev-php/swoole/swoole-4.0.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="swoole"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_SAPIS="cli"
+DOCS=( README.md )
+
+USE_PHP="php7-0 php7-1 php7-2 php7-3"
+
+inherit php-ext-pecl-r3
+
+HOMEPAGE="https://www.swoole.co.uk"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Event-driven asynchronous & concurrent & coroutine networking engine"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="
+	dev-libs/libaio
+	dev-libs/boost:0=
+	dev-libs/libpcre
+	http2? ( net-libs/nghttp2:0= )
+	redis? ( dev-libs/hiredis:0= )
+	ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+	php_targets_php7-0? ( dev-lang/php:7.0[cli,sockets?] )
+	php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] )
+	php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] )
+	php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] )
+	mysql? (
+		php_targets_php7-0? ( dev-lang/php:7.0[mysql,mysqli(+)] )
+		php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] )
+		php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] )
+		php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] )
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+IUSE="debug http2 libressl mysql redis sockets ssl threads"
+
+src_configure() {
+	# PostgreSQL disabled due to Gentoo's slot system
+	local PHP_EXT_ECONF_ARGS=(
+		--with-swoole
+		--disable-coroutine-postgresql
+		$(use_enable debug swoole-debug)
+		$(use_enable http2)
+		$(use_enable mysql mysqlnd)
+		$(use_enable redis async_redis)
+		$(use_enable ssl openssl)
+		$(use_with ssl openssl-dir "${EROOT%/}/usr")
+		$(use_enable threads thread)
+		$(use_enable sockets)
+	)
+
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
+	done
+}
diff --git a/dev-php/xdebug-client/Manifest b/dev-php/xdebug-client/Manifest
index ef7ac989c621..1833efb13712 100644
--- a/dev-php/xdebug-client/Manifest
+++ b/dev-php/xdebug-client/Manifest
@@ -3,9 +3,11 @@ DIST xdebug-2.5.0.tgz 267640 BLAKE2B beaa0ac97867a4d28f7daca3277f3c2071f2bc5cfa9
 DIST xdebug-2.5.3.tgz 279085 BLAKE2B cbbfb15e92c3f80cda502340396a6137e2234442fd98bc3fe4b2e08e76cba6292fb5176992aadba7193308ec4c9ab32356922a4416a21b23603e9b48a0d73c06 SHA512 b301a5abb92e123bbe2b36f7838b56d370a0f2c0c4d3c350b5014f4b86d31daa66e9bff995eed67a570558f6a72ca46a097266e6ab94c413f1dcb99c0fbd4f22
 DIST xdebug-2.5.5.tgz 279491 BLAKE2B 2492911db7afca2bc96761788c4ec7eac92cb22a6d65b69070b74f702df2bae1ba7dff9f5edfe83542229dbb7ebb3850b6ed1cf19a5e5969413aac3f2d39fc73 SHA512 9faab421bd90c03734c047d8c6dcc021c8bc665eb36781c692f194d04c7dca24fe1eb920ca8dc407e5bf4ae0912c4b917587f940f34b07171a8881d4cf8695d1
 DIST xdebug-2.6.0.tgz 283644 BLAKE2B 1065585b3bdf07a7448e584dbd94b250d61247d577fe5a0c51fe9aad200ead766c140501ee9f2a6ec2a991896b9f542f911519af8c1351dbe80ac4857d4c8d34 SHA512 e81f771478eb45cdae5814037ac1b86bcb8c5616d22dcac436482c350187c53d3cc6d54be740a49dca6d38c58c086db6e4a68eb3004a0152d6215c97512538a2
+DIST xdebug-2.6.1.tgz 283961 BLAKE2B 4478d591591102a9efa248820831e4d43d89eb9b80379c92fe85c888377a31d855ac4ea98c13ad87da68f7e7f659483cfa36fd4651f245d5603fcada2e2fcf73 SHA512 31f26e592b3888d7cc74c6a7c51e0cc1151cf8a32100dda78098fb5b3e307cf8d0445b97247986c75b303a787f89b3937bc042dc52f19ca995753a6843bbd80b
 EBUILD xdebug-client-2.4.1.ebuild 590 BLAKE2B 61c014329a8817e0af4bf053b95040464ee779747a79960f9f912fc87010dddb4ce9859dd18d4d1040d5157ad26d684fc063fdb36bc56e0f69ec04bd281961ec SHA512 49462cfdf857ad66d962ed64f68017fee8b642bebfd33ad6cbe96beeea638a6805142164b452bcdf5862c792f44fa023d7babe6a1d975a9df4993f508502dcff
 EBUILD xdebug-client-2.5.0.ebuild 594 BLAKE2B bbbb12aefba3a1cf42aee60a06ccb5feb4eb5c3699745cf54cdda086ede46681dfeb3d1815f874e181e707b16a19d263c85a23f12270824c466770f728ae22e4 SHA512 45082c878e5adb1fa175021b17195101c5ee2aa7bff6d3bd4360dfe651c544c5afa5f608b5844c4ecf9b38e5ff9a789c9386217af526a1d5c2d71178e3377bb2
 EBUILD xdebug-client-2.5.3.ebuild 590 BLAKE2B 389fed0cf51727d612749239904af1a245bc46e5f40c6217b500133088019a6669718e9d87a63538d3fc60232c71f2f2579667c7b7d49cb12dba94d489b34be5 SHA512 31af43a9a78289e95185b71e58fa83b61ffda0f6bdf0c7c4597b307a65a1742eb0840904d8c02f2d1ea5997c50bac1cfb1d809880199efbff7f3ecbf765f4012
 EBUILD xdebug-client-2.5.5-r1.ebuild 613 BLAKE2B 8f768a6cb784e74dec4f686adebaa20ca718997a3a1c127c1c46e5c4a2014c5f26517b6bd74eb10a4b0547432286c74bf003f3e36430f54f2f9a6c1ebfba6cda SHA512 d0881929e891f0c0452780a0d84e572b67d85bee27e99789f7370be1e7458071f465df2a69b1d16922297adb99d1814fdefc29223246eb958547160736e2d7e9
 EBUILD xdebug-client-2.6.0.ebuild 613 BLAKE2B 0aaed511e7fe2bbad99be8adefc47ad3fc7df06528d5a65aca51a2aad881fc7a37b32799a21b91969e1e9d5cba925a8192155fae95d8084fe8946ac0c1544039 SHA512 30127a2016179cd5cf97fb3ec6252dbcbeebc436d97f9b5c7f5c43888e9caff3ea405a83713ff59c2a5079dda84ee9e3c4df85901b4393094f0c826478ae3845
+EBUILD xdebug-client-2.6.1.ebuild 613 BLAKE2B 0aaed511e7fe2bbad99be8adefc47ad3fc7df06528d5a65aca51a2aad881fc7a37b32799a21b91969e1e9d5cba925a8192155fae95d8084fe8946ac0c1544039 SHA512 30127a2016179cd5cf97fb3ec6252dbcbeebc436d97f9b5c7f5c43888e9caff3ea405a83713ff59c2a5079dda84ee9e3c4df85901b4393094f0c826478ae3845
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug-client/xdebug-client-2.6.1.ebuild b/dev-php/xdebug-client/xdebug-client-2.6.1.ebuild
new file mode 100644
index 000000000000..6956e42e79f5
--- /dev/null
+++ b/dev-php/xdebug-client/xdebug-client-2.6.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)"
+HOMEPAGE="http://www.xdebug.org/"
+SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE="libedit"
+
+S="${WORKDIR}/xdebug-${MY_PV}/debugclient"
+
+DEPEND="libedit? ( dev-libs/libedit ) net-libs/libnsl:0="
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf $(use_with libedit)
+}
+
+src_install() {
+	newbin debugclient xdebug
+}
diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest
index 649323f1a99e..d770761367b1 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -5,9 +5,11 @@ DIST xdebug-2.5.0.tgz 267640 BLAKE2B beaa0ac97867a4d28f7daca3277f3c2071f2bc5cfa9
 DIST xdebug-2.5.3.tgz 279085 BLAKE2B cbbfb15e92c3f80cda502340396a6137e2234442fd98bc3fe4b2e08e76cba6292fb5176992aadba7193308ec4c9ab32356922a4416a21b23603e9b48a0d73c06 SHA512 b301a5abb92e123bbe2b36f7838b56d370a0f2c0c4d3c350b5014f4b86d31daa66e9bff995eed67a570558f6a72ca46a097266e6ab94c413f1dcb99c0fbd4f22
 DIST xdebug-2.5.5.tgz 279491 BLAKE2B 2492911db7afca2bc96761788c4ec7eac92cb22a6d65b69070b74f702df2bae1ba7dff9f5edfe83542229dbb7ebb3850b6ed1cf19a5e5969413aac3f2d39fc73 SHA512 9faab421bd90c03734c047d8c6dcc021c8bc665eb36781c692f194d04c7dca24fe1eb920ca8dc407e5bf4ae0912c4b917587f940f34b07171a8881d4cf8695d1
 DIST xdebug-2.6.0.tgz 283644 BLAKE2B 1065585b3bdf07a7448e584dbd94b250d61247d577fe5a0c51fe9aad200ead766c140501ee9f2a6ec2a991896b9f542f911519af8c1351dbe80ac4857d4c8d34 SHA512 e81f771478eb45cdae5814037ac1b86bcb8c5616d22dcac436482c350187c53d3cc6d54be740a49dca6d38c58c086db6e4a68eb3004a0152d6215c97512538a2
+DIST xdebug-2.6.1.tgz 283961 BLAKE2B 4478d591591102a9efa248820831e4d43d89eb9b80379c92fe85c888377a31d855ac4ea98c13ad87da68f7e7f659483cfa36fd4651f245d5603fcada2e2fcf73 SHA512 31f26e592b3888d7cc74c6a7c51e0cc1151cf8a32100dda78098fb5b3e307cf8d0445b97247986c75b303a787f89b3937bc042dc52f19ca995753a6843bbd80b
 EBUILD xdebug-2.4.1.ebuild 1006 BLAKE2B 157000b1544cf81f5f221d26b69b445aacb3fd963d58a1f0d0fac7d3b9f04b4fd8239419a8b8daeaac54d6484ad19539c2065427138a406ab199969795564870 SHA512 f8558d5c12d5a52c091fbe11751bbf84e147832a1c2c8acbe82d68a6f879bf74ca94302d41a50df27690579425d8795a694e1fe73bfbdf0caa15cf4c90e3dca3
 EBUILD xdebug-2.5.0.ebuild 1039 BLAKE2B 297525d73effe294aee72c9505876c5b2d59c54e8c2b290ecf40e836d72b3251398f5d1402cc7ed2f581ac91d2c42d2db748a760d54bdfd6b197ce0e354347d9 SHA512 605b9fd1101edcbb5270690e3e4339b815fefdf2a1291a21d1397c4d98c4884ff635bebb93729a039c6703cc20925e08184c45d5334efa403e67a421ba9c05b8
 EBUILD xdebug-2.5.3.ebuild 1035 BLAKE2B 33b476351fde796721bf602b127488496a65ad078cf2f6a2c49ba1d8f80252f08416b6c73c8424dd8a31d1ee4950dae9aa12c651c303db1c14a219c07ff25a96 SHA512 d6ba05f536ce9ab502ac4a0008b04544f37755b007a3c2efea9e75cc5e9d5b7f9c2f2bc58d76b682addef1681d747af8c6682cbf7073bee234c1571d99836081
 EBUILD xdebug-2.5.5.ebuild 1039 BLAKE2B 1e6a6b488a3e8041378d044646831021f047bbb3e923e8f5587540f35fb2234e5be4ff2017a2c293d1b3b2656d7161e1474daa724df5c0dcf1658ebe8686d38a SHA512 13d6f35f02f8869dec0c46283a8ca5c198d4d87d0be0e374c5f355c94f4e84f176713199733df72bb4eaf06a042c43c8037c2cb4a58eb621c9d14362185aa7f8
 EBUILD xdebug-2.6.0.ebuild 1039 BLAKE2B 4f5ec55ab03c1dd13a259f1bac5038594793cf8e62b620b3db8d153c445bfd678190321220565ba012d1a6c03ff93fc86216405cacf6ecd42bef790ad4196cf7 SHA512 afeda7e2133f7ada6c06743ae4839219c5afbc980c08f90ec718846c9e3a41fe026aeb176aa94ffd7d5c978f5255fcb1942fee9cec746eacf0ac7eaf80f6156b
+EBUILD xdebug-2.6.1.ebuild 1046 BLAKE2B 2d278c4123f65cb08c8d0935be9952ca7b26cdc61b5bc39568354a27eb27922b416ccd61abfa3ef7c03388579a34d1a21b5a245a043c6d091473e2be48fb4d65 SHA512 2268b379acd23ed378df6a124f63b1a0dd7c8a820fdf9c54016fe881e0b207c30a3644de5f3986300deead6e429dc5b03f6b7146a4273864b2ba7ae5aa5f4f59
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug/xdebug-2.6.1.ebuild b/dev-php/xdebug/xdebug-2.6.1.ebuild
new file mode 100644
index 000000000000..d25ad627eea4
--- /dev/null
+++ b/dev-php/xdebug/xdebug-2.6.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PHP_EXT_NAME="xdebug"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="yes"
+PHP_EXT_INIFILE="2.6.0-xdebug.ini"
+
+USE_PHP="php7-0 php7-1 php7-2 php7-3"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="A PHP debugging and profiling extension"
+HOMEPAGE="http://www.xdebug.org/"
+SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+		~dev-php/xdebug-client-${PV}"
+DOCS=( README.rst CREDITS )
+PHP_EXT_ECONF_ARGS=()
+
+pkg_postinst() {
+	ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
+	ewarn "installed as a dependency, and not all users will want xdebug to be"
+	ewarn "enabled by default. If you want to enable it, you should edit the"
+	ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
+	ewarn "call xdebug_enable() in your code."
+}