gentoo resync : 07.04.2018

22 files changed, 290 insertions, 148 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 30f9beb7dd5a..b3cd695cdbc6 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index 62f7178809d6..d2062f0d7e21 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,9 +1,11 @@
 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.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.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.11.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.11.ebuild
new file mode 100644
index 000000000000..d78f6c0b3188
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.11.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"
+
+inherit php-ext-pecl-r3
+
+# However, we only really build for 7.x; so redefine it here
+USE_PHP="php7-0 php7-1 php7-2"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="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 ; then
+		php-ext-source-r3_src_prepare
+	else
+		eapply_user
+	fi
+}
+
+src_configure() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		local PHP_EXT_ECONF_ARGS=(
+			--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 ; 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 ; 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 ee25e77fcbe6..d6a5b3ae955a 100644
--- a/dev-php/pecl-eio/Manifest
+++ b/dev-php/pecl-eio/Manifest
@@ -1,5 +1,3 @@
-DIST eio-2.0.1.tgz 73968 BLAKE2B 226c35b9fd8e924e9fa1c4d199e43de5b63a1311bcda2e2aadee46beeb5e983e06adf39c001cb5951471b229e7136bdd5de0e37b76ab3cb0df8188f6463281bb SHA512 29a85d4eec658003432ff3e5e84d58a3c4aaeb9724d88ca7941e35856dd2f498ae37223c929b4f7012eac69576b40bf88fb0c2e45f850af04bfefa2140d7d593
 DIST eio-2.0.2.tgz 74005 BLAKE2B e09f540753f2c607b95de9c3f390fc0c31ad2a34fda99aac86f057b2e664e49aded0b5f3e491138af60d00828ee9ff13f09958177e9cfed2b254473b1f814da9 SHA512 9b5ab80e6a76a1a2e99dfa641b404d0b52cd79b54267a8ded622930b4cc99f3ba1e39a70fc2d8f5c4ed50fbd67d97bc78655cd17958f0c8a2314b3b6ac1c6384
-EBUILD pecl-eio-2.0.1.ebuild 491 BLAKE2B 4eeca89ab6c6dd8b5c1aff65869d90d5ad637c68c77a1a525de750089810390630334446a68c2eeb0478743bd7fd84b513bb02e55f7a8df34a0eae4ac44f78a8 SHA512 aa465f06035006f71a5ee95ad1f6963bae783dad22f322d048553e7caabc07867ab7d8f0b4fef380d0c486161de8c5ef541c9d82765fb63f60b870d694cd84e7
-EBUILD pecl-eio-2.0.2.ebuild 498 BLAKE2B c8ab34a2e4de3e6abad7fe02ffd00c2f823b33f206acecc5589d9e87c248fc4fadaba673ea23702155e89ab9a979ebb8b1d60b9e86016def43b345fed7c23ef0 SHA512 4d751c75001bbcf059ef735acbb34ec075e21d120b4e8ff28dab862aac811faff66f6e506fd593aa33195dba7262906e2b10d3f82a5292660c098202d468c400
+EBUILD pecl-eio-2.0.2-r1.ebuild 505 BLAKE2B a111e8ec1dee97e11e0766490b8fb320c529e2abf862f3c8466eddec45a2102d751a091cfa88f8242491d2d8178b23d96b6ce1ed1c36624560b9844ba7d64325 SHA512 a0444dcecf3ee753e82d6ee3b3463e5fa56bd484a01d120b3827010f43ea09ee2c50babce2cb072c8b14d5f1b1e62fbfd0155f1aca3de7168e18c46716c549de
 MISC metadata.xml 354 BLAKE2B 468d2c00c6aa9335b37ad1cfe50547fd620182f78c04d924309b429f9a05475a8e023c69121ac0d47243a479d80d891956d4e8ca0edfacc3a82f05be74a6d046 SHA512 de8f034f4f5b9891d46191e0960bd7cf53c3b831908f70beb6b164d062462dab78ba5c3de85509c3b616bd0ad3a9231e991e370b674b694708afca0736e8a60b
diff --git a/dev-php/pecl-eio/pecl-eio-2.0.1.ebuild b/dev-php/pecl-eio/pecl-eio-2.0.2-r1.ebuild
index 1238529e7ff1..ed19c8deb059 100644
--- a/dev-php/pecl-eio/pecl-eio-2.0.1.ebuild
+++ b/dev-php/pecl-eio/pecl-eio-2.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( README.md )
 
-USE_PHP="php5-6 php7-0"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
 inherit php-ext-pecl-r3
 
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-php/pecl-eio/pecl-eio-2.0.2.ebuild b/dev-php/pecl-eio/pecl-eio-2.0.2.ebuild
deleted file mode 100644
index b8ac4e39c798..000000000000
--- a/dev-php/pecl-eio/pecl-eio-2.0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 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"
-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 b40ce9698050..e56e4d427003 100644
--- a/dev-php/pecl-event/Manifest
+++ b/dev-php/pecl-event/Manifest
@@ -1,5 +1,5 @@
 DIST event-2.2.1.tgz 133147 BLAKE2B 909892c937843821b34cb4d450b06698b23ed8aac59915ef96c72ba08e4afe84856e913527e9b0197d28ebbe5cac8ac45174d8e3fbeae33eae0619e3b3e21959 SHA512 a331e0cbb923b2efe95a366c842929e9ffcdf15d4b95dce83f5d1e9bb33045477f278672835ffc087df89aa3614106cf504f4e6a779a620b94c20d83449e95f2
 DIST event-2.3.0.tgz 135401 BLAKE2B a068142854ed908cc482ec48a249a5d213c1806652cffc698bc6dd298c136c5884bbb52b30179ef813af938d0ecb92a5414c93dea3d782d6ebfb4e886128454a SHA512 9e1f41a13a5fc534956561ea481816d6863ebe037cca0ce450cfb16375d6b49cd03c68e115c851ef6fa3022927f2e5850695880c65dd1d339bb747e171cc9f2f
 EBUILD pecl-event-2.2.1.ebuild 934 BLAKE2B 43790a9ae06ee9db90ea7e1fecf6726f326e10539d12cf59dc01c4d6a2edb5d6455e68d13a23c7d434dbf1da6ff42e68a31fb8c672a5f2744c63bf5c597608b6 SHA512 22f28502553ad020b1a762aaf3d439d1ded788f77cdc71ba49bd2ad7d95844ddd70866983c95cc6ad65c740ae63a3397bb70c3345c6d9c756bbe0c320b62b89e
-EBUILD pecl-event-2.3.0.ebuild 1026 BLAKE2B 509a0bd80c90f4377f9d860e14c4b708de41c7f112a2c3634bcff60c377c203bb5c6e1a811f1fde3b3bd86e86d3f6f35f5e85203c87f7087e95acabdf95d9c5f SHA512 10b39a9e4d9502356c17987c540674c9a484dc3bff01f7870b231f4ca27c528ecf5f80bd39f8d4fae06a5da2a53615d7a6cf8e384f4ccf243f8e29b52301dafa
+EBUILD pecl-event-2.3.0-r1.ebuild 1241 BLAKE2B cbe352d8b0c84bdd33510dbd1c9b7680934fddc6a5fca23ef52d8d5b673be2a68a82ca9c589a114690f5eb3ce8996518f45cad6b5ef234b64aaf45e0ee61842e SHA512 d8bf4c16f864d662c573141146a0256030732e72af5e1e64066dec58c3a491f56589431704f78f0292fe3a12406199c17064954c9bc6b15ed57791c1314bc613
 MISC metadata.xml 431 BLAKE2B 25421824761cdcc90c610236ac4acfd85e18fb63e4f92ff3fa5e51698a7e2004812a7193ced70646baf02bacd0bc896a5959ee88bd88dd5de68db729661ad02f SHA512 6349913306ea30f9ee6cd5ad862e0323d143815f4db47da14e5d54d0dcfb604118e3845f664f2a9b8527797b262c9567bbf5f189426f9becbd169be0ec111056
diff --git a/dev-php/pecl-event/pecl-event-2.3.0.ebuild b/dev-php/pecl-event/pecl-event-2.3.0-r1.ebuild
index 47dedd109882..3fbf4fc20ca4 100644
--- a/dev-php/pecl-event/pecl-event-2.3.0.ebuild
+++ b/dev-php/pecl-event/pecl-event-2.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -8,7 +8,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( README.md )
 
-USE_PHP="php5-6 php7-0 php7-1"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
 
 inherit php-ext-pecl-r3
 
@@ -24,7 +24,8 @@ DEPEND="
 	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-1? ( dev-lang/php:7.1[sockets?] )
+	php_targets_php7-2? ( dev-lang/php:7.2[sockets?] )"
 
 RDEPEND="${DEPEND} !dev-php/pecl-libevent"
 
@@ -41,3 +42,11 @@ src_configure() {
 	)
 	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-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest
index aeea2dc7031b..a6b21761db49 100644
--- a/dev-php/pecl-mailparse/Manifest
+++ b/dev-php/pecl-mailparse/Manifest
@@ -1,5 +1,6 @@
 DIST mailparse-2.1.6.tgz 36538 BLAKE2B c079a5f9980384ea90113d3e295b3de4182c8c3006a62439bfb73ab39dc67bb03202298e7bf5e42f71d599d645cf4d79fbf2d09a536e621efe73f8fff6bce56a SHA512 a7337dd2e99a953a55b38c236da95a6bd2950c2bca16fc0ddfec39be8b0ffe01007353fc7b562d0509e0bb1623c3d2b03935d1c98a07dcd9f0b14bb508bce374
 DIST mailparse-3.0.2.tgz 38206 BLAKE2B f50b3f5abfc6e2e5a3647eb33ad07de9e3e66a94933be612a51c868210745b109ddca8e3e174a7a4abcfdc72856f34848e65972b277cfa3e836bef3ee4c79897 SHA512 be04e15cf3577542447186d7ead4e31159c171c99de0a255d4ee2f6f760b80ecb44be056bd9089180601f622b9a71f4331f194e1adaa702d1d964009682896f6
 EBUILD pecl-mailparse-2.1.6-r4.ebuild 839 BLAKE2B 518ecef31d10faf97091c9c7e8cd13789d47b42ecafd7c75822c5e91a10fa2a952e48440503b5697a3581d3723ebb279e134e42b66284b017b2d11ab7341bdc8 SHA512 0ca4e958f293f3dbef2cbbbd08248a11f9eeadc971c5e5f940b56fc721aaa841ae143e4a60989e344307c5641e3e1266c771397f422e8f30074b0d0041e716c9
+EBUILD pecl-mailparse-3.0.2-r1.ebuild 1102 BLAKE2B e2d3415cdf18b60b438eb722965ce005f2eff5a369b2852130f8327371ee8a8ca116c45019c6cc7c3352adca1c270f3e05ab8397b08093cac7b9e9b6133f2c65 SHA512 1abb3679ff2b75393541481a09d5652d4e17a517e1e98e916882f1081906761b66a9469e0971506b4985d1eb22c6c0c033df8c5f8314ab0dabce76858c7ade9e
 EBUILD pecl-mailparse-3.0.2.ebuild 1070 BLAKE2B ed243cc104739cca574ff091ac1ff0722e7971a05cf9fb42cc5f6592d0f6363b1f73382cf61b3181e91c7bf7f441c702e946b787749b784648c4c8c548dd2f8a SHA512 69b0b8ded36c21069f5aa10244288526af79a3afb7b24044e1ac50fc7888158c7ca6e1d6cd247c207a3c0a43892d65ea6826f579acb74fe36f4a05ed05e13d11
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.0.2-r1.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..9b37d88dcd95
--- /dev/null
+++ b/dev-php/pecl-mailparse/pecl-mailparse-3.0.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="mailparse"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=""
+DOCS=( README )
+
+USE_PHP="php7-0 php7-1 php5-6 php7-2"
+
+inherit php-ext-pecl-r3
+
+# Only build for 7.x
+USE_PHP="php7-0 php7-1 php7-2"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME compliant messages"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE=""
+
+PHPUSEDEPEND="
+	php_targets_php7-0? ( dev-lang/php:7.0[unicode] )
+	php_targets_php7-1? ( dev-lang/php:7.1[unicode] )
+	php_targets_php7-2? ( dev-lang/php:7.2[unicode] )
+"
+DEPEND="${PHPUSEDEPEND}
+	dev-util/re2c"
+RDEPEND="${PHPUSEDEPEND} php_targets_php5-6? ( dev-php/pecl-mailparse:0[php_targets_php5-6] )"
+
+src_prepare() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		php-ext-source-r3_src_prepare
+	else
+		default
+	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-oauth/Manifest b/dev-php/pecl-oauth/Manifest
index 23e34b8e910b..ec6fcaf766e7 100644
--- a/dev-php/pecl-oauth/Manifest
+++ b/dev-php/pecl-oauth/Manifest
@@ -4,5 +4,5 @@ AUX 2.0.2-compare_segfault.patch 1664 BLAKE2B 099aa3f78002d734306673d817e21d75bc
 DIST oauth-1.2.3.tgz 45531 BLAKE2B 10fb5a3d1a46ee17fef7b129b3c29d67d565d296579aff63d8309f4efc5b881450249fb8e6d25703a33ad53e336775abc73f3d8e489f78c00c8988219b02ae1b SHA512 ca61dbec8fa51679accb31eab90b8699c7780f2d60a83566ce05667148ee44b7dc70fd8235414d6a3a996b252ad4a236b3e8a549685fd7e890e0874029c455e1
 DIST oauth-2.0.2.tgz 49115 BLAKE2B 292c8c2d7fa3728aa6a73cdb65ee1c603f341cd24596d64b910f495ef649adb1f90ba4dfdab5ce1802dee9e8a0e3a6af502da340ed467de6e8c5d83df18abc7d SHA512 b7aa9459542ec390a5420127d75607702ae6df6254f4e39acb62d35c6a39b8b7990499c279df07ce681081e455b55219c51df42fd516321f317465badf6d459d
 EBUILD pecl-oauth-1.2.3-r5.ebuild 1147 BLAKE2B ccab8eb759914ca9d30e73e8d23a829f3ab0ef120f7c9ecd70466f16658ef8e02763ffb64ed33b7cb4b797c3dbbbb9e3980bc93e3bb08d349dda02930545a48b SHA512 2b30cde4d028f636becc2f1d61e0c56a55c021910567fa78bb387ba0c83949d3d104026d917fbe63836850b374e8a1c1bc1f91bbaf102029a1ffb60e469a9e3d
-EBUILD pecl-oauth-2.0.2-r1.ebuild 1221 BLAKE2B be1ba9746bc0039ff605b57b5ebf6e20cd22c8df0d5d563d0ac779a15a33bd1ac505a6f8a4a2303880ff62a80b14a52c5604d3b31ed859209818647e6f55401e SHA512 c6db693818ed1aafdaed549fac541679b19732fdb64e5d5c0214a3e29fb2763cc5dfed2c02b0260550f5df2925b2ce1fbde467c50f756583b1a31ab975e14cbd
+EBUILD pecl-oauth-2.0.2-r2.ebuild 1407 BLAKE2B f048f3a75f5511e0ef9efc9a5e0428f0d30ae98e3ffb3664b417a87e9725f6db34ac9b959cad9b12941962849f03199525022d119d768722769340ecfaa92567 SHA512 08f2136c40fbe88a7ca94a27ca09ccd8fcac6a0367c32a28272b472243ff036192202adec19bb401b7274c65e2b1eb63911a07ab5ca76741d15b0e24a937aaa8
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-oauth/pecl-oauth-2.0.2-r1.ebuild b/dev-php/pecl-oauth/pecl-oauth-2.0.2-r2.ebuild
index 988ba351a82a..987a87b85ee0 100644
--- a/dev-php/pecl-oauth/pecl-oauth-2.0.2-r1.ebuild
+++ b/dev-php/pecl-oauth/pecl-oauth-2.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,12 +6,12 @@ PHP_EXT_NAME="oauth"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php5-6 php7-0 php7-1"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
 
 inherit php-ext-pecl-r3
 
 # Really only build for 7.0
-USE_PHP="php7-0 php7-1"
+USE_PHP="php7-0 php7-1 php7-2"
 
 KEYWORDS="~amd64 ~x86"
 
@@ -24,11 +24,13 @@ DEPEND="php_targets_php7-0? ( dev-lang/php:7.0[hash]
 		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
 	php_targets_php7-1? ( dev-lang/php:7.1[hash]
 		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
+	php_targets_php7-2? ( dev-lang/php:7.2[hash]
+		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
 "
 RDEPEND="${DEPEND} php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6(-)?] )"
 
 src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2; then
 		local PATCHES=( "${FILESDIR}/${PV}-compare_segfault.patch" )
 		php-ext-source-r3_src_prepare
 	else
@@ -37,7 +39,7 @@ src_prepare() {
 }
 
 src_configure() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2; then
 		local PHP_EXT_ECONF_ARGS=(
 			--enable-oauth
 			$(use_with curl)
@@ -48,7 +50,7 @@ src_configure() {
 }
 
 src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
+	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-redis/Manifest b/dev-php/pecl-redis/Manifest
index 5c99ed54a3c2..180f799718d3 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -1,5 +1,7 @@
 DIST redis-3.1.2.tgz 199041 BLAKE2B a90f4136dae03155d7e3fc4e5b6b32ab73c918a850c501a19e28ea62c6d105108ebd18edaa3b12a13cf38103302ee6ad0759a47b4c59e4a5464e951f02cff0ea SHA512 14b6321072f8ab41b8293b40ea8e1e2bdac1bb694c4566467ea4e6ced37c8fc41bf5712bd27cebf509f25fda0492765cd2c8d2fe61395bcb0b0d9cbbceebe684
 DIST redis-3.1.6.tgz 199920 BLAKE2B 00aa81cdbedc03b4a672a58be98d8f01d2076038622b9d1e9673c0628c096152f12f9f5ff540af639da73b4458fcb1fce9c1c8b49a95db48970bab07806ac8d0 SHA512 4263d150c93f11dd06587925ad9a3cd8fbba2e4a18b2f23e6adfaeb25d566a1c2d256551a50ae1b9c770fd0f9bc4c92f483c46d60be9d4f5b5ba056231b7d527
+DIST redis-4.0.0.tgz 212340 BLAKE2B 996138b3dd92e839fbebaf5d562cfbe90e66384233c83612c8726fa41f10c106d0195c87449fc7886b3e832fd551b962ef50c161372c04c899c9fe7fd1140101 SHA512 e4bf2294f696e468174c0fff9ed33831cf81c3548ce30ede01bc3c45a15cb87b9b9ea02899c451f63211be8cb37e953be138e93c16d9e0f12772b7b6d03e8dcd
 EBUILD pecl-redis-3.1.2.ebuild 1278 BLAKE2B 2ddaef2935d542e2cc7e0d4b9779d0798392e484026ce1bd8bcb90c46c1e126a444645abd01c7d8130ce958a86e68ace3716c1b889e80e3f2965da7e6f968b9e SHA512 4b0c20afb075ec39ba1ec4964d2cce9a892e4a99b1c7b2fef68fcac4fccf0c5e570535655a041fafac66617f4aa77dbd1ffa5381aa8fe73220c0c68a01f3eeff
 EBUILD pecl-redis-3.1.6.ebuild 1354 BLAKE2B b7507247b178bfd5dc5d02c7c9c7b7626b4823e89790f3ef87b465d41dd9135d89af196b086c626be17382be12d606c2bc0d2d819e2cfa21609320843e6c6566 SHA512 63295ee715d3ead98beffc237de5fa7e5be713bc2b68934f306caacddd6c77ac0d54dd318a6abc58cef0f5ce60af88482a35332ffe6f981cda58a43d3914fe4b
+EBUILD pecl-redis-4.0.0.ebuild 1487 BLAKE2B 79c0f93c8f7444e09149375e4756a37f03e8b0e217257849c4e8ed53af01ab6d418aad874dd74cd3cbe1373f677047e375f6952f3238e84aceff9b94b1d48def SHA512 e935943dd73dab9ac5ad65e1021cc67f08e8a01b186c183837426708282e044535a8716a8d9264e345125809f9b9d891166f9597c5892949796fc81e6dd80ffd
 MISC metadata.xml 324 BLAKE2B fc4145f462dd06f7a34385a0d8e2cbc6da6744094e84851891d5513f7be39c89cebe439e566fc2ead0afdb8ee3885b4a4d448e63d4c1a1d20a5bb8791c12d313 SHA512 916879a4b7ed11e30634a1c95637e9426932bac3c6aba2c7e686d9835097873e142f062e7d81e3ac99c3aef972b40db67b3809116cff4a3742ba6c669d999066
diff --git a/dev-php/pecl-redis/pecl-redis-4.0.0.ebuild b/dev-php/pecl-redis/pecl-redis-4.0.0.ebuild
new file mode 100644
index 000000000000..af4fb3636c09
--- /dev/null
+++ b/dev-php/pecl-redis/pecl-redis-4.0.0.ebuild
@@ -0,0 +1,57 @@
+# 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"
+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="igbinary? (
+	php_targets_php5-6? ( dev-php/igbinary[php_targets_php5-6] )
+	php_targets_php7-0? ( dev-php/igbinary[php_targets_php7-0] )
+	php_targets_php7-1? ( dev-php/igbinary[php_targets_php7-1] )
+	php_targets_php7-2? ( dev-php/igbinary[php_targets_php7-2] ) ) "
+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 "This version comes with breaking API changes."
+	elog "Be sure to verify any applications upon upgrading."
+}
diff --git a/dev-php/pecl-rrd/Manifest b/dev-php/pecl-rrd/Manifest
index 52060f2ab5d6..1df13739c55b 100644
--- a/dev-php/pecl-rrd/Manifest
+++ b/dev-php/pecl-rrd/Manifest
@@ -1,5 +1,5 @@
 DIST rrd-1.1.3.tgz 19229 BLAKE2B 14bbc97ec52be8f1b99471380cc1408c81056841d932818681868e31badc1a0abefc0d155e594a05492b86b826f21b8dadb0a0dcb43313f48863c64fd8e88a71 SHA512 356264de1b967af0f78e25e3c0afcbec704dd3e49d828e08d21d744d5fcdc46f4cd7f7c118b4e283c20bcaf2a4c29e0ac9437c7f66ca0d260a76fddf7b9d3242
 DIST rrd-2.0.1.tgz 18880 BLAKE2B c3fb65e95aece39690085830ec1c43ba173e173591215d6a66145ac71079f8d5ba5b097acd9018c86d2342550001334f8e1c98e22204d94a24aee5cc086295ca SHA512 b6f7173f54fcf49bf014cc6c78263c169cdf53dac66c12f5f88db7e01b49ea74da84a55f61deb25c866e6e2e74275ec48fc4a3d1b46719f66b5b7b7eb000b6b3
 EBUILD pecl-rrd-1.1.3-r2.ebuild 792 BLAKE2B 6ea7717d68feaf96d919f4d7e29cf10185588a29a687e068ae768555f340deb8bd93fad6111720248d8fb389fab95f6a8235af50736b54928067cbfd8f8dcdf8 SHA512 b00f02cc0ed6678df78eed5fd0a2417daf2423cf04a524429b1da116babc0baa2d45c90458ec26e71bbb5b843c1a86eee6b34ae410706f5e3fe85e4dd2580dfd
-EBUILD pecl-rrd-2.0.1-r2.ebuild 891 BLAKE2B b38a40b844bdd4199b9117e50a1113de9a0cffd66d7d59d1dc35b2778693f6f5abad8ee9ed7e09bb08e4bbb48a3a50a43a892690c522120a03930d41837db554 SHA512 f05bcb413e2442c372a65df296fb4d56f3cd15f7c9c112348ac7e4e25edef717c5a8b7fe4e3092b7ff5880753d7cb0c1c1cb594640db7296005b70ff3950bff2
+EBUILD pecl-rrd-2.0.1-r3.ebuild 1367 BLAKE2B 2ac6444ff160545e5ce4635337729ba95dc98304a70b22c9347d7fb0042b863c5af6f572391450ea2cff1cf965d24be122a23a3627a93f42d54bdb4374ab50a5 SHA512 7f5a17ce552a015eeb4a4ca9cb1d1203dff03ad49ce6f592e674a8eaf82d10e407cba1e0a7566d3178c720232686e8a60be06b78d3b504e3f943e0b95c7311b0
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r2.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r2.ebuild
deleted file mode 100644
index 08528ee02abb..000000000000
--- a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Define 5.6 here to have the {,REQUIRED_}USE generated
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-# But we really only build 7.0
-USE_PHP="php7-0 php7-1"
-
-DESCRIPTION="RRDtool bindings for PHP"
-LICENSE="BSD"
-SLOT="7"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	php_targets_php7-0? ( net-analyzer/rrdtool[graph] )
-	php_targets_php7-1? ( net-analyzer/rrdtool[graph] )
-"
-RDEPEND="${DEPEND} php_targets_php5-6? ( ${CATEGORY}/${PN}:0 )"
-
-src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=()
-	php-ext-source-r3_src_configure
-}
-
-src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild
new file mode 100644
index 000000000000..8a4100b18f95
--- /dev/null
+++ b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Define 5.6 here to have the {I,REQUIRED_}USE generated
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+# But we really only build 7.0
+USE_PHP="php7-0 php7-1 php7-2"
+
+DESCRIPTION="RRDtool bindings for PHP"
+LICENSE="BSD"
+SLOT="7"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	php_targets_php7-0? ( net-analyzer/rrdtool[graph] )
+	php_targets_php7-1? ( net-analyzer/rrdtool[graph] )
+	php_targets_php7-2? ( net-analyzer/rrdtool[graph] )
+"
+RDEPEND="${DEPEND} php_targets_php5-6? ( ${CATEGORY}/${PN}:0 )"
+
+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
+	fi
+}
+
+src_configure() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		local PHP_EXT_ECONF_ARGS=()
+		php-ext-source-r3_src_configure
+	fi
+}
+
+src_install() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		php-ext-pecl-r3_src_install
+	fi
+}
+
+src_test() {
+	local slot
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		for slot in $(php_get_slots); do
+			php_init_slot_env "${slot}"
+			# Prepare test data
+			emake -C tests/data all
+			NO_INTERACTION="yes" emake test
+		done
+	fi
+}
diff --git a/dev-php/pecl-stomp/Manifest b/dev-php/pecl-stomp/Manifest
index 0bc6a73b7cdd..82e52dddb9fa 100644
--- a/dev-php/pecl-stomp/Manifest
+++ b/dev-php/pecl-stomp/Manifest
@@ -1,7 +1,5 @@
 DIST stomp-1.0.9.tgz 23166 BLAKE2B 804fbe2703f5035a8faa744cddc84de5249b74186c22ab5e26c075a2f241262cadd237c7f566262fcdc25def846968a7788d80817743cdf53eb255cbc25053e1 SHA512 e3ab5bfb03c29edde63de4006b448e0204efbac5817b1443ee5b1a0249c2f96d58443847b878e838108b66e5307f6e803f807aff7430af748af4994bfca5199a
-DIST stomp-2.0.0.tgz 23422 BLAKE2B bff7aec9c59c0d812f00a8e6ba7beedb2c484b5b4337949c5463a97f8743f303633448706907eb076a1c1c40a0bc3911515f5236383444f387ec385631f1938b SHA512 f999762f842f19e920bca35175e65e20173c9ef5162eba3b79a7a2a70a52991c5d39f6d9dd6d9dfa081f1c2fb23e0dae5fa42224dcad4626666e5785076f1a12
 DIST stomp-2.0.1.tgz 23494 BLAKE2B 3e9f042ffa4a8f54a0746db638ade4bf75febad0359e398894714c6c4d4b6bbaee65cfa384c379d14387026219f02013c6dbb7faba62ae11b4231215be7310ad SHA512 61cfacbd96f1061dc869ede6c1ca0f7bceb6120b28cc4a78fabcbace54a66ba540faf41ef72747b8bcc6a4ef98e405daac04e82bd4e079d90293f030684b04d3
 EBUILD pecl-stomp-1.0.9-r1.ebuild 899 BLAKE2B edeab12f987c00ac202b5bcdf848757ec686b56d602e6761741ca7d703a2733e8e81704c7ca47ec8825c0305767b12175911563515b69fad567c9e6c3d429a3e SHA512 1b645c6e9e90ea33397e7c963f1551c9b369100e65b085229f3882ca6d6f9a341b1f224ccb399bf147f330fde6ba218ca20b192973b598a5b170fce80fe73d67
-EBUILD pecl-stomp-2.0.0-r1.ebuild 895 BLAKE2B 76d75e39fc00bdc46f543b28b4dd57b12aee6f19cc4bc0de4b175cb06693cf343151c3e3bf6628b35d08139f14061c00da0f3f5cf852fe6a49d14c5fa497f5dd SHA512 5dfdf66f63742e99621627998dacea5b4b2402b07897554cf7247639a5bd1d18f6c6cb05084022c8d153e66e7f3cda40f137b773a6292a114fcff04caac83751
-EBUILD pecl-stomp-2.0.1.ebuild 1009 BLAKE2B 4b36a0e7d9dabcb38ea2693be0f4fde1ac74624bacc80d4c60d918ad7e3a9406d4ea82013027ab264c6e875cad1f8f8a9f192d30eddfa9a904eda67873dc3e0c SHA512 6ddb73ac506c635ddaf072302fb5e8eaadd059b540fae0621831626e68923862bf3538d981fbc6c421a8d02b9852ba6d923cbb7f412d47aee33c807016015bbe
+EBUILD pecl-stomp-2.0.1-r1.ebuild 1206 BLAKE2B 4bf5f2d2003a7cd3799218dbfd4025c88fcecfff01ef365a75250aea5a35a7fe21beb7b0e060b4b01897c0bb0c685718902d817c68d60678e241d37dec11b62d SHA512 45d183ed424595af9de5a600e1fdcc9faf4246a2779b6d25040684c2bd6db0ff296a1e6677099350936dda1fe427822deb7bcb16574e5804b19fb4672d452bc9
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-stomp/pecl-stomp-2.0.0-r1.ebuild b/dev-php/pecl-stomp/pecl-stomp-2.0.0-r1.ebuild
deleted file mode 100644
index 67d853f1c4e4..000000000000
--- a/dev-php/pecl-stomp/pecl-stomp-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_PHP="php5-6 php7-0"
-PHP_EXT_NAME="stomp"
-DOCS=( CREDITS doc/classes.php doc/functions.php )
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php7-0"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP extension to communicate with Stomp message brokers"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE="examples ssl test"
-
-DEPEND="${DEPEND}
-	php_targets_php7-0? ( dev-lang/php:7.0[ssl?] )
-"
-
-RDEPEND="${DEPEND}
-	php_targets_php5-6? ( dev-php/pecl-stomp:0 )"
-
-src_prepare() {
-	if use php_targets_php7-0 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-stomp
-		--with-openssl-dir=$(usex ssl "${EPREFIX}/usr")
-	)
-	php-ext-source-r3_src_configure
-}
-
-src_install() {
-	if use php_targets_php7-0 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-stomp/pecl-stomp-2.0.1.ebuild b/dev-php/pecl-stomp/pecl-stomp-2.0.1-r1.ebuild
index a5a0477007f3..dc494fe74045 100644
--- a/dev-php/pecl-stomp/pecl-stomp-2.0.1.ebuild
+++ b/dev-php/pecl-stomp/pecl-stomp-2.0.1-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_PHP="php5-6 php7-0 php7-1"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
 PHP_EXT_NAME="stomp"
 DOCS=( CREDITS doc/classes.php doc/functions.php )
 
 inherit php-ext-pecl-r3
 
-USE_PHP="php7-0 php7-1"
+USE_PHP="php7-0 php7-1 php7-2"
 
 KEYWORDS="~amd64 ~x86"
 
@@ -21,29 +21,32 @@ 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?] )
 "
 
 RDEPEND="${DEPEND}
 	php_targets_php5-6? ( dev-php/pecl-stomp:0 )"
 
 src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
+	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
+		default
 	fi
 }
 
 src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-stomp
-		--with-openssl-dir=$(usex ssl "${EPREFIX}/usr")
-	)
-	php-ext-source-r3_src_configure
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7_2 ; then
+		local PHP_EXT_ECONF_ARGS=(
+			--enable-stomp
+			--with-openssl-dir=$(usex ssl "${EPREFIX}/usr")
+		)
+		php-ext-source-r3_src_configure
+	fi
 }
 
 src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
+	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-yaz/Manifest b/dev-php/pecl-yaz/Manifest
index 86d6c5eafdfb..43d751293ed6 100644
--- a/dev-php/pecl-yaz/Manifest
+++ b/dev-php/pecl-yaz/Manifest
@@ -1,5 +1,5 @@
 DIST yaz-1.2.1.tgz 20147 BLAKE2B fa6c4b8d8d55ff734093950d1ddd2f24375aacce9d34e52680925874dafed5b0be769cb5768f02d89af573c7a1d5f1aa8290bff2cbd1c8a23a5de011bebd930a SHA512 92525e485e5499f8b4ef8b1e9b21a3fa7004206f545a3a5b300ee11e3c5ff10d335645d5c42fe3b7523a55fe58ffb0a671c67dfc627bc4bd36aeab63dfe42bf1
 DIST yaz-1.2.2.tgz 20131 BLAKE2B 7aa0729ba6033870099ed7c0d4961eac02d74d5aed6c7a58c0ccf59f57401cd7b438594c388ffc7c7b9d73cfc9f1c466c718ad685cc638651a9ac4e605b38ed5 SHA512 cb90d4ac9fcdadcb9215f7b795657dd3fdff69f2b2d399beb2afa6327a0be733d2a563863e2ca861182eadcc2faccfbe64e72d108662afc68d393a6bc5cc4bb2
 EBUILD pecl-yaz-1.2.1.ebuild 522 BLAKE2B 162fa067a1c7c9d2ed34612b5133513e7260d4f5fc3f06de16e11a4a37f30d86b22b80fc952aea8480f3007811baa7968b48d674f00d1e2fc7c3abc1a47fbae9 SHA512 80156ddce79ffa8a460fec70c99cbc68681cd4204ac6f0e18b40521ba17d81d2b4c0da6d162debb3070eb2d4477902203b431692d43a26037232a3424be54910
-EBUILD pecl-yaz-1.2.2.ebuild 534 BLAKE2B 3b5070ff3af1cd7d9d22a13db0617dd273b160bcaa838b5a5801879324c4c67974119cb4b9d5f9b318229bc9bae2bfd9118c80eddbdcc5f015b1672003ea12dd SHA512 e9d1b8233d6f28c3ff17320cd9ff35b1d0393b6ca55b5bd912982c8cdec60de820e508c3b91906ab0d2dda055f9139a7babe8fab1e4877d36f5a2f15f9fada60
+EBUILD pecl-yaz-1.2.2-r1.ebuild 541 BLAKE2B 0e232da1bc871c8a77fa6256e5ab6e6d7670ceba6fb78e7b9d4aa07ec9b239727c7ceb8b8792f1321d94384854fc9ce438c5039619686a978bf112227f53c6e5 SHA512 93e618f7415e8785799215fd4222870167a90b306a632e5a5ee7bc7e59b8dca8b0eaecab56d70572f474c6bcc275d96e3357d4f40208345b3724a6530bc4b603
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.2.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.2-r1.ebuild
index 8c86ba44950b..aa7a51a8b8ad 100644
--- a/dev-php/pecl-yaz/pecl-yaz-1.2.2.ebuild
+++ b/dev-php/pecl-yaz/pecl-yaz-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( README )
 
-USE_PHP="php5-6 php7-0 php7-1"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
 
 inherit php-ext-pecl-r3