gentoo resync : 22.01.2019

26 files changed, 265 insertions, 266 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index d40033353201..55ba6f9abe7a 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Archive_Tar/Manifest b/dev-php/PEAR-Archive_Tar/Manifest
index 133ae673f6aa..060068422a16 100644
--- a/dev-php/PEAR-Archive_Tar/Manifest
+++ b/dev-php/PEAR-Archive_Tar/Manifest
@@ -1,3 +1,5 @@
 DIST Archive_Tar-1.4.3.tgz 20682 BLAKE2B a2e840087178fb55719634198852d191aef24139f819e3c478883fd007f6e72f523700617c7ff2c3d92a3ebe36a237b0eb7544dfe86dec394587ee0b3743520f SHA512 62e60d59266c5d19b131f769f4d71d4cee6bf8964b0c6610c4f1381500ced582865bff26c608479b2678dda1e7407ba39a7ec84b31fed13e3875f1947ce5bd6c
+DIST Archive_Tar-1.4.5.tgz 20919 BLAKE2B 506b2fae8f99634cf40ecff9c5ec695c101f4e14ae867795851a7e238a62c2611581aaab1cc0e9a9354184b20ba141f29ae3998881e7ebf777c596e5dc251577 SHA512 7a7e16e37b0c7112a77333ed2c4d0a0ae57cc1e971191c79b1858227b46f967aee915757a81bdfef3a9487a53b81a99bfbe84f78a346671fe44ac9f1f203a358
 EBUILD PEAR-Archive_Tar-1.4.3.ebuild 748 BLAKE2B 858d771c358ca260ff3c7959c4bc98276cca443fe32be23fd63d05af1ffc28d94acf34dfd66e97a05ef6b2f8b4eb6874053048fefa393af03adbe4e1034d410b SHA512 392afcb0ffb84e99c0993523d4e148cc6f34c23caa72ea3fd18fb296e98ce745fff911c5308ed76b6058707d98202243202421705c15482df3d8793cd49be9aa
+EBUILD PEAR-Archive_Tar-1.4.5.ebuild 752 BLAKE2B d05b7f13ab2f55facfd3b17f0762e6a30bebde3f3087f9e398780db1154c6551e7c3c313f4a2650dd96b52071b2c3ffa67ce98240db3cacc0639092fd46b30ea SHA512 df6e6523ad6f384d9768e7e193196cfb40b747e336453c1ff9b5cbbc5a4362144206b03ebf575bdb070b311b045c0f761742fe36200ff5330b8a8bb5c47c732e
 MISC metadata.xml 313 BLAKE2B 96717f88c6747b4b6dc814ffee022a1bfe7965ca71f0d1dff4acae773d37ba43d21b92343993b19c753360651ae63c7e0cea16d51c12d4fee03d6852a50be7ff SHA512 189683deca6b9b76a4ca070938afa484580b57a8c799f49f26e9b123165d545ab6aec31bc2b96400cfc5390f3837477a8d58b461e317ab14bf1152292880ece1
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild
new file mode 100644
index 000000000000..d9cfbfde0bf5
--- /dev/null
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tar file management class"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
+IUSE=""
+
+# bzip2 and zlib are needed for compressed tarballs, and there's one
+# call to preg_match to test paths against a pattern of files and
+# directories that will be ignored.
+RDEPEND="dev-lang/php:*[bzip2,pcre(+),zlib]"
+PDEPEND="dev-php/PEAR-PEAR"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/share/php
+	doins -r Archive
+
+	dodoc docs/*
+}
diff --git a/dev-php/pecl-apcu_bc/Manifest b/dev-php/pecl-apcu_bc/Manifest
index 7338924965c5..1aba692f733b 100644
--- a/dev-php/pecl-apcu_bc/Manifest
+++ b/dev-php/pecl-apcu_bc/Manifest
@@ -1,5 +1,4 @@
-DIST apcu_bc-1.0.3.tgz 7245 BLAKE2B cf3a632568218a3dead69c251aac67a3e1c9c03e0bef0b57184bb1e85c60aadc09dcbcf49f2703869783128949a9aa2f4e5eb660d9ca88f800e85ce0692847b1 SHA512 b1faf811316bbba25354b9b28d5c13c69ae93913b90eb36d1904ef4d9ca35000e1d83f8204ab4500813cb8858feccebb262523f42b3116b85c59c6a796affe67
 DIST apcu_bc-1.0.4.tgz 7406 BLAKE2B c7099f13bfe589c9752fb7fa8454f16094a13d63924ceef614db1fef11d37265673e745383241836685dcabca8ae83af3c71ba2f2d8a77b4ab213db209924f12 SHA512 633ae74c4be3ee0c2c98540f696dc440f3f345c52811e856cb46c65c6b6fa8fa9f06ecb1d784cd990cf8b5219b65e14a29b97e57828dc6e7aa6b91d2475e6a0e
-EBUILD pecl-apcu_bc-1.0.3-r1.ebuild 738 BLAKE2B 3a84093f3a30dc29947a13c78a2e8a0f05817789ae4f4ce57aaf86ad0f56d149613276168918d7c1ea2d85b5ce1283e7964243c3afa7b0cc6a1847a751c44030 SHA512 c82072c2bf7f501479cc92d379bcb53ed83e99b1da929feb1ca8a15455a01c3b48dd48f778641f091c76f13f12fe92c85a14175332f5e9a0a263a7ceb499f9fc
+EBUILD pecl-apcu_bc-1.0.4-r1.ebuild 1156 BLAKE2B 7fdf5cd9441b17f937644a326f6039d25c7fea9f651a7959d51fc1adb1b92c00a404c2c531e885b0f3e288150c5cabb73b67ca67bf9c9741b9222ff6a72cabae SHA512 9458838b228b4b0cfb7930b4d2f288dd40a1c0613ac5a8e12a1d41348b6d34dead4c7b8f80cffb5d0e132bda8a47080dc38d55bf0e0b9ee9496d414b8b73d6d1
 EBUILD pecl-apcu_bc-1.0.4.ebuild 1154 BLAKE2B 1cd0dde4480b764156c1ce0dfbf43a8ef9854301b403047a720b4408bcbb12b189623766f76d315c5c1326171e0ee121e78884f9ab3cbad348c1f61bfeb4d7ba SHA512 8624329b8c1bf082c2bfd5f9f4e4f04230d995fd46a6f0adf801e40152a2a550f3c2a962cf77274a271b8f7a2dbaab74aedc6ff4bda54ac48ddd7445a225add6
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.3-r1.ebuild b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.3-r1.ebuild
deleted file mode 100644
index 4cc807e6da9b..000000000000
--- a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="bc_apc"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_EXTRA_ECONF=""
-DOCS=( README.md )
-
-USE_PHP="php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="Provides APC backwards compatibility functions via APCu"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-php/pecl-apcu:7[php_targets_php7-0?,php_targets_php7-1?]"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	# Rename the apc.so to match the ini file loading requirement
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		mv "modules/apc.so" "modules/${PHP_EXT_NAME}.so" || die
-	done
-	php-ext-pecl-r3_src_install
-}
diff --git a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4-r1.ebuild b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..e9ed00d7cc4e
--- /dev/null
+++ b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_INI_NAME="bc_apc"
+PHP_EXT_NAME="apc"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_EXTRA_ECONF=""
+DOCS=( README.md )
+
+USE_PHP="php7-1 php7-2 php7-3"
+
+inherit php-ext-pecl-r3 multilib
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Provides APC backwards compatibility functions via APCu"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-php/pecl-apcu:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?]"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# This fixed version is necessary to have apcu load
+	# from the install before the tested apc.
+	# It is intentional to specify phpoptions twice.
+	# This mimics the Makefile.
+	local slot phpoptions
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		ln -s "${EXT_DIR}/apcu$(get_libname)" \
+			"modules/" || die
+		phpoptions=( -n -d extension_dir="${PHP_EXT_S}/modules"
+			-d extension=apcu$(get_libname)
+			-d extension=apc$(get_libname)  )
+		NO_INTERACTION="yes" TEST_PHP_EXECUTABLE="${PHPCLI}" \
+			"${PHPCLI}" "${phpoptions[@]}" \
+			run-tests.php "${phpoptions[@]}" || die
+	done
+}
diff --git a/dev-php/pecl-geoip/Manifest b/dev-php/pecl-geoip/Manifest
index 7aee1ae55fca..739a2219b77c 100644
--- a/dev-php/pecl-geoip/Manifest
+++ b/dev-php/pecl-geoip/Manifest
@@ -1,4 +1,4 @@
 AUX fix-failing-tests-1.1.1.patch 1250 BLAKE2B 587561ec400fe54b21333d09d2ad721b66c321de5a9c1823c0cb9706e63c41a24f81e53eb9fb92bc1f33bc867e141e8f29c26abc1452058dc387d29a53b0c7bc SHA512 9e3c93b337c38feaec29001a5a5b243f376bc7a32caaafa848b51daa3f0efbdecf407de6c8f304801ad106aa0e4906513588c42aa19bc6d5b261ccd6cb00b652
 DIST geoip-1.1.1.tgz 13004 BLAKE2B fe073b9459c434751ea0291ce6802041db47254f9d2d5b930db51751b3a66ce5cf925dc4bd07764920748b1735f26ba8bd136654e08ed9c24ac3b520e842f45d SHA512 395715297726aa8e7ed71297d403bea9cb08417a03adfca29dc6ea68bbc738c176f71ea621f9026109e07cd5a2adc647e2af8e140e18a6af1c8f0fe4ed1a9c6b
-EBUILD pecl-geoip-1.1.1-r4.ebuild 446 BLAKE2B 78b6421dcbeb18887dc29a6040c462de4c47e6b49df43fec2f0bb3e295a712ecb86c696776d0e90bdb29889b863d7f4b9cecb0b2df84a348c1b909ebc0c080e6 SHA512 04a5ce1c3ffe7788f6add50b50d55323c55ff62b118043d5fa3040494b74b05faf950d3019c2bfd89abe0978921b5208a9f556aed5e91b8bf44cc6b088db739f
+EBUILD pecl-geoip-1.1.1-r4.ebuild 453 BLAKE2B fe91ec1b0e11a751afe482b5410950cebae109f7a003de6be87e00905a423fe40d340a4974e9ea81e7545d5072eebe57b2d37b9fa1447e011ad0ec1c385bcc0a SHA512 802d3256fba8a8ccb34442b5f287d2ba616a0bd683fcc0ba5f5bf6511ea39c04c3d2454a68dab68a7ece8cb4dc051387a20e497b90a1d3010083dc8fcb54c6b1
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild
index 24bbcb5b0a0e..bc68f7d98675 100644
--- a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild
+++ b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PHP_EXT_NAME="geoip"
 DOCS="README ChangeLog"
-USE_PHP="php5-6 php7-0 php7-1 php7-2"
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-imagick/Manifest b/dev-php/pecl-imagick/Manifest
index 1310f866fa16..a9cf53ed88ce 100644
--- a/dev-php/pecl-imagick/Manifest
+++ b/dev-php/pecl-imagick/Manifest
@@ -1,3 +1,6 @@
+AUX pecl-imagick-3.4.3-tsrm_ls-is-undeclared.patch 462 BLAKE2B 0dd7b445b3e896fce69522eca802cbe6731535d19ed931a3e2a9e4195bf614503fe827c36726f24ba80824c007ccc063cdfab64d74bec67c62e5fa125ebe8ef0 SHA512 4774244f09152d4542dff8841ebabf7a7370026e0d61b397d69e2766562fea16a2fa93cdf92c778ae289c04daecf3ec2353ee3d0a773893ad89445d0ec52c4fa
 DIST imagick-3.4.3.tgz 245410 BLAKE2B 778c3b8ad3ad5e698044a832d71409eea220a82041544abeb88b59370d4b719388ce13b277d7aad84e67e40fcbbfa06d66a2458d4d9e8d33bb7358ab46368230 SHA512 2cb2b856cf83a78d3542cdf7c69554dcc063a0541e9092b24e5e1fbd8928066a4a3de154049d0202c35addbc5055ccfbb5910ae92f2f13da80ddfc025340ddcd
+DIST pecl-imagick-3.4.3_p20181129.tar.gz 260443 BLAKE2B 43d30514f5faeeaa5894e2eb51d5b2ebbe2940728c7770eec60c41c9f01f86f7423d87a71a9ad2068e388f3994c31e499940c2042994846a6b6ab66542c7ea53 SHA512 7f3719118849857d19b9a35a63de68d4e992780fd41231a041d6d152ab2f0abd3d8215ab2362a998f8fe6a733c087d3c3e5d09fa826480d621739e92f5aeabf2
 EBUILD pecl-imagick-3.4.3.ebuild 619 BLAKE2B 346a2b31b3bd66759246937d2145c00f14af2b86aa8bdb0eae1909c5e94f4627c1429b729f0e2396fbcb65cb69ebe5c9b8edc2dac998bac6a36976250fc2b1c1 SHA512 945955dfa61d5ba5e936a2f8780bdced9e03ec02b2f9288eb3290106e4cd47a80cb55f82a2b31a493bdc1bb849dd8db03abeca02dc98e8bb6f65177dde0eb8c4
+EBUILD pecl-imagick-3.4.3_p20181129.ebuild 958 BLAKE2B 18e4f43fdd2c29b7b51aa964641f367386a5ac3f0a2ce550fb9c473448b6c4245c07740c8f20edb94c7b4c2207caba870617e043d510e2f99fe79a13c2edf6c4 SHA512 74b1927651bca3be6310ac75790e209cb6748bba7754e059a6d4ca2d51ec9919517d84260318f60ce03faeb17f57c8883d4e94ebad471a349ecf5273724ca10a
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-imagick/files/pecl-imagick-3.4.3-tsrm_ls-is-undeclared.patch b/dev-php/pecl-imagick/files/pecl-imagick-3.4.3-tsrm_ls-is-undeclared.patch
new file mode 100644
index 000000000000..ff0a1eb38885
--- /dev/null
+++ b/dev-php/pecl-imagick/files/pecl-imagick-3.4.3-tsrm_ls-is-undeclared.patch
@@ -0,0 +1,18 @@
+https://github.com/mkoppanen/imagick/issues/264
+
+--- a/imagick_file.c
++++ b/imagick_file.c
+@@ -160,11 +160,13 @@ static
+ int php_imagick_read_image_using_imagemagick(php_imagick_object *intern, struct php_imagick_file_t *file, ImagickOperationType type TSRMLS_DC)
+ {
+ 
++#ifdef ZTS
+ #ifndef ZEND_ENGINE_3
+ #if PHP_VERSION_ID >= 50600
+ 	// This suppresses an 'unused parameter' warning.
+ 	(void)tsrm_ls;
+ #endif
++#endif
+ #endif
+ 
+ 	if (type == ImagickReadImage) {
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.4.3_p20181129.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.4.3_p20181129.ebuild
new file mode 100644
index 000000000000..e1c86fc73437
--- /dev/null
+++ b/dev-php/pecl-imagick/pecl-imagick-3.4.3_p20181129.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PHP_EXT_NAME="imagick"
+
+MY_COMMIT="d57a444766a321fa226266f51f1f42ee2cc29cc7"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+
+S="${WORKDIR}/imagick-${MY_COMMIT}"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP wrapper for the ImageMagick library"
+HOMEPAGE="https://pecl.php.net/imagick https://github.com/mkoppanen/imagick"
+SRC_URI="https://github.com/mkoppanen/imagick/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="examples test"
+
+# imagemagick[-openmp] is needed wrt bug 547922 and upstream
+# https://github.com/mkoppanen/imagick#openmp
+RDEPEND=">=media-gfx/imagemagick-6.2.4:=[-openmp]"
+DEPEND="${RDEPEND}
+	test? ( >=media-gfx/imagemagick-6.2.4:=[jpeg,png,truetype] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.4.3-tsrm_ls-is-undeclared.patch )
+
+PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX%/}/usr"
diff --git a/dev-php/pecl-mcrypt/Manifest b/dev-php/pecl-mcrypt/Manifest
index 31b3bdaf80c8..78693a6854ca 100644
--- a/dev-php/pecl-mcrypt/Manifest
+++ b/dev-php/pecl-mcrypt/Manifest
@@ -1,3 +1,5 @@
 DIST mcrypt-1.0.1.tgz 33782 BLAKE2B db5f89fdbc64c81bd50c92301155527f40b28cd274312565c79327133baa20e14c488f8ad1f87e6ddfd3ced9706ca30f10dc69a08279c82c9ec83fb5f713e826 SHA512 1677202715499a41ac6999089257a059106e58cbac06ca8a7dd2e9edd28be5a4118234dd7468110e9e3d7f9de5d099367848fe84bcd06716ea56645c9015c578
-EBUILD pecl-mcrypt-1.0.1.ebuild 647 BLAKE2B 0003f92a3422b4727eff96664caae6e85fbb6b575cae2b4d3144aef86e3d4e7531c5a4dae828074fa7f988287b7a729c739c0ca8aab6aa744a5f6f657bfcc662 SHA512 e3f99a96ca617d71654571b2fea7454477cce1ea02f429298295e33819fa92429e006e863a7e64a9303357a78333457b42d30b9669f6e812a57bec3595a5cf3d
+DIST mcrypt-1.0.2.tgz 33698 BLAKE2B b79985455986ca28e7cb55d3f6f62f87e1112f57c4e26761a08a2d9ce7c702cf325fccb50f703cfe5c570c7e3abc473030742f098b10e709145f7ac9676f834a SHA512 bf3796b60f1d8d34185c3ad0d813653fe64ccfc883106ba544b01a8caa7bf9729978f44e0d481d28af9f8827803dcc5cd8bfc83e50dc950d26f851fabc868b18
+EBUILD pecl-mcrypt-1.0.1.ebuild 643 BLAKE2B bf6681c494f092acbcd868ed66a0b50ca0fa72713463b96b8c392380ee12edbaac8e17d3cf3171e7b0ba47b11a064f9b1e55005f95b647d0e8f3b2dc6cf992e3 SHA512 b6bb1f170a9bcca8cb9d076090c209610435422ce8b186f07c1502db3cbbdbec6daf8f77095de2d5191d2139b839e173b588434fe2e34c2ad2c87233351603ee
+EBUILD pecl-mcrypt-1.0.2.ebuild 673 BLAKE2B a5e32bd4510bf76b05d1103c65fd8636e4d37f1cd3de6147dd1f1c0c494318ce4f7f81f8bdd46431adbd6b7ccb09041a523992275568fc9da6ca14bc9ef3984e SHA512 926055b28940c84eb9f959bf5c62113e80bb24e3e5f1bedea0235de6cb82f0fe881c09ca2bf8ff7d1c8b1e1a758a9c5e5fe6bf4362095041bb83e953c0adcb30
 MISC metadata.xml 379 BLAKE2B 8e9441d2b290b2055894f11d940424ead756cc408b91b5eecd413f6ed4476de9e025fac57b71d8b92ec655787ba8c6e4ec7565f40c2ab22fc0d96051a56faefb SHA512 f39a4765eca2676d25bd98ad9f17c85e528a31ccc1b06e6327203ddfca981363a5eac870fd4f856f4d11926f689dd5b2ea45297055625e2f7089a7b9aec3f975
diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.1.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.1.ebuild
index 133d25ed4e63..2e2076290b17 100644
--- a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.1.ebuild
+++ b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ inherit php-ext-pecl-r3
 DESCRIPTION="Bindings for the libmcrypt library"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="dev-libs/libmcrypt"
 RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.2.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.2.ebuild
new file mode 100644
index 000000000000..078d2acdae8c
--- /dev/null
+++ b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="mcrypt"
+USE_PHP="php7-2 php7-3"
+MY_P="${PN/pecl-/}-${PV/_rc/RC}"
+PHP_EXT_ECONF_ARGS=()
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Bindings for the libmcrypt library"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-libs/libmcrypt"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# PHP Warning: Use of undefined constant MCRYPT_CBC - assumed 'MCRYPT_CBC'
+	sed -i '/MODE3/s/MCRYPT_CBC/"MCRYPT_CBC"/g' tests/bug8040.phpt || die
+
+	php-ext-source-r3_src_prepare
+}
diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index 5cf472d882c3..5df80b40c7c9 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -1,9 +1,11 @@
 DIST memcached-2.2.0.tgz 70449 BLAKE2B dca76bfb993c647860ae2ce648580e6131c6df30d30def9a1f907fce06621f3d5a21b93605da9fc50bda542fd950317a5a398d6bf0db85f61469cfb5e9757566 SHA512 61207d3f8c11b0620dbcb20fb2ebb6d1fc10159a7e879ee91556a303c3dcdf3d2571e8dda5efcbed77ff779f5c9b226aa48800630b9e7781cd964126b848c356
 DIST memcached-3.0.3.tgz 77310 BLAKE2B 9756878087594f1bf13b1edaa38dd18f7cd4d6a61618444f2c2a32972acb67e3aee66b2083b7303d50f53cfd7902374fed49db68a2780e0d824d90f4289ecb54 SHA512 cb24d76f82ce8c1fdd8877bbb46131545bba5011cfff965e3c190b7c0f71f754b47ded6289d3125724d9de781b916971aaadfa0b247c6fe2f51aab77dce61b61
 DIST memcached-3.0.4.tgz 78776 BLAKE2B ce2539e2e4960217d9ee3b50ed5625214d4b22c4d7e64595fdbfa2d130bce0402a67561f76a50690991996d84f16f926f27a057722bfab66ba3c388772ed77a8 SHA512 d0a0f9e99cbcc6829528554551dfacf0d943d54d4be60c9da708de82913a2a0bed7c51d594ae3ecf0c13b56064739f074ce6ada5d7433bdc7e26e8caf9cf5ca2
+DIST memcached-3.1.3.tgz 82673 BLAKE2B ccb9267cbd974337b7cd8836ab6e35c4fd9398d731dcd333bcb664b91037d1775651e6bb5d00b602767834681289064ede678ea2e6e3641631bba4990a380dee SHA512 9c09648c26011c5e749bee1a556c976e6e5e648dc65580e7caa296dab79e3764edf1408f96edcaca5efb0229320c86fcfa0422e55d486beb6466892f7e08c4a3
 DIST pecl-memcached-3.0.0.tar.gz 83732 BLAKE2B 0e38d34b6ccd72f1e58305c3b4fbb3437d53ba93bb00a610bf4e91701e2bee6acb20667f3a74b2f2aa8d09dfcd1475e82808aeade6b22364aea0a359edf1e889 SHA512 ddc6b6fbdd55c6cdf64b9a7833142ea43eb974ecaae3437b30ed731f0ddbf4108b46ea5eb01a197788978273bdff31da6a0c0fb0354335b85618d98ba070bfec
 EBUILD pecl-memcached-2.2.0-r2.ebuild 1326 BLAKE2B 5e8263a0affd9dd1fe3ddab2fb0e40ae9b7b7b93241d785facde7941164dcc85d4b1fb7c55c7690df75b2d6f3ec2fd2296963183763b1397036de12687cf095f SHA512 91b5c873c5a4e484c56e9ab3080972fd4bcd553c7e1630eabb7f552747a9004a3bdb3cf74993d214d6281358b4e0fde6ba3af1a8e55d0603f3828b579f499434
 EBUILD pecl-memcached-3.0.0.ebuild 1671 BLAKE2B b927ba0eef69a46c03b0a3d23f5779abdef82d14b57c268c9b9e20047212d75344025bf4160cb827f81cfa238f484b3866f488575f5cde57c621c51dbbc7bd4a SHA512 9bc30d5a84abff5cd98a9cab7b07ec00681b1e66142dc39290b6faad653266a736f05f8b6156510cf34a1d288efe68f823ff3444b465ffa1d714afe363ac0b6e
 EBUILD pecl-memcached-3.0.3.ebuild 1438 BLAKE2B 9968ae8d4b03469f33773eda816c4740294b7cddd2ada6404711beb3ee369aa8e176cb79311c0a7438d1e27fbc26bc595ccc9112cdf4e877c0d13143d3cb6699 SHA512 f62be49b9f34d5143812488d460764584521e9c2416067f38006d6c6183438613bbed1f1137b2bf644d3883c29e78b43b00f9481b7343a7077dd1c90e9d0bee2
 EBUILD pecl-memcached-3.0.4.ebuild 1621 BLAKE2B b771c0067cb973665106bfe3b1530182a5c1653a3fe0ec69db0e7402ab9f88ebb5d29aaf1d35f82a678e2785a44421545b427b74323542034ffb90f1115b0ab5 SHA512 846c2260afd11e1ecb707c3b45fb9b1d8597e91d07e419a27e292b2041041c352098fbed14367b39df1e4cfad7aa6e9d98ff95463a00ae1aef53c673825ca0c8
+EBUILD pecl-memcached-3.1.3.ebuild 2392 BLAKE2B 93d98dee69a9710b7403509ed5de6eb96c7799e4c48613bbeb6bfbf46daf32a2d9dd4f6a66628015b2922651be2025ea0772aa825d4d110fe08d012d21fa2107 SHA512 49de665721b04c363a5c4f24bbacb5575bfd96ef396b57777356e3595522763f7bc21f38901d837ba6aaa2d6c955f91325571b17327e60b7d1ebb8f2f4f24c16
 MISC metadata.xml 568 BLAKE2B f99b2eb530ffd87100256bb477bfbd50e48b28283bc01147b0cb1e3dd7dbfb940cd8e16e24c68723fe764df0cbdb1ecb0b995e151c67a37673a19a2cfeb1bcfa SHA512 9fb2c3ea2dba6b4b1cdda8acc02afa006a95651b4fdb5011b15e4046bc44742cc5306d20db070f4f1977352873576040a34ed24a660ec2c640e118115359f2c6
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.3.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.3.ebuild
new file mode 100644
index 000000000000..c4e0fb13e2e3
--- /dev/null
+++ b/dev-php/pecl-memcached/pecl-memcached-3.1.3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PHP_EXT_NAME="memcached"
+DOCS=( ChangeLog README.markdown )
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" # Pretend to support all four targets...
+inherit php-ext-pecl-r3
+USE_PHP="php7-0 php7-1 php7-2 php7-3" # But only truly build for these three.
+
+DESCRIPTION="Interface PHP with memcached via libmemcached library"
+LICENSE="PHP-3"
+SLOT="7"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples igbinary json sasl +session test"
+
+COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl?]
+	sys-libs/zlib
+	igbinary? ( dev-php/igbinary[php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?] )
+"
+
+DEPEND="
+	php_targets_php7-0? (
+		${COMMON_DEPEND} dev-lang/php:7.0[session?,json?]
+	)
+	php_targets_php7-1? (
+		${COMMON_DEPEND} dev-lang/php:7.1[session?,json?]
+	)
+	php_targets_php7-2? (
+		${COMMON_DEPEND} dev-lang/php:7.2[session?,json?]
+	)
+	php_targets_php7-3? (
+		${COMMON_DEPEND} dev-lang/php:7.3[session?,json?]
+	)
+	test? ( net-misc/memcached )"
+RDEPEND="
+	php_targets_php7-0? (
+		${COMMON_DEPEND} dev-lang/php:7.0[session?,json?]
+	)
+	php_targets_php7-1? (
+		${COMMON_DEPEND} dev-lang/php:7.1[session?,json?]
+	)
+	php_targets_php7-2? (
+		${COMMON_DEPEND} dev-lang/php:7.2[session?,json?]
+	)
+	php_targets_php7-3? (
+		${COMMON_DEPEND} dev-lang/php:7.3[session?,json?]
+	)"
+
+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_configure() {
+	local PHP_EXT_ECONF_ARGS="--enable-memcached
+		$(use_enable session memcached-session)
+		$(use_enable sasl memcached-sasl)
+		$(use_enable json memcached-json)
+		$(use_enable igbinary memcached-igbinary)"
+
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 )
+	[[ ${EUID} == 0 ]] && memcached_opts+=( -u portage )
+	memcached "${memcached_opts[@]}" || die "Can't start memcached test server"
+
+	local exit_status
+	php-ext-source-r3_src_test
+	exit_status=$?
+
+	kill "$(<"${T}/memcached.pid")"
+	return ${exit_status}
+}
+
+src_install(){
+	use examples && dodoc -r server-example
+
+	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_install
+	fi
+}
diff --git a/dev-php/xdebug-client/Manifest b/dev-php/xdebug-client/Manifest
index 1833efb13712..5087276dc67e 100644
--- a/dev-php/xdebug-client/Manifest
+++ b/dev-php/xdebug-client/Manifest
@@ -1,13 +1,7 @@
-DIST xdebug-2.4.1.tgz 265542 BLAKE2B 01526f01bc24f6b241c9647da100b3c080a93bcce4cc00f6a0311b15759457735f1465022874d673069afe6a9a51fe5a7d6a1a2bbf190200193496d640e4381d SHA512 64b345b4809fb0f020eb8fe7a0826056a64728ec9565bbb2d0e717ac7b3ca8aa0856b91c2ba47a7435b7500c5efa643682f245d6cd9d0a537f8bb9ab0d5cea3a
-DIST xdebug-2.5.0.tgz 267640 BLAKE2B beaa0ac97867a4d28f7daca3277f3c2071f2bc5cfa9302b64f8e02b65b2745340a689962d4f8e1668e3434ed271af741f8d47466f501e1d05c0e2240f0f39730 SHA512 75b1dbf32059eebb6ea3fb6ebb50ab26d73f8ce2964be1fec41ecfd9ae3d8bd55b6997daf03727b28b91ba06d08734865158bed6f038a46f00a1da5424ce5fe6
 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
+EBUILD xdebug-client-2.6.1.ebuild 606 BLAKE2B ed52f2ee0fa29ad7c1d6eded2a57c4461e0bce96017084c82ce04f334bc7df458f9a343191969e71f37eabb6f7e30522241942548e388ed516393f6844311cb2 SHA512 e6fa101dd1a18fdd60de9ca6c246a62956c766ceeeb87a11f4f6d7a0f5700137e7dca8c4057a30467a39cc227bde15d4eabf1260effde54b460086b6292bb7ab
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug-client/xdebug-client-2.4.1.ebuild b/dev-php/xdebug-client/xdebug-client-2.4.1.ebuild
deleted file mode 100644
index 3728ad41804d..000000000000
--- a/dev-php/xdebug-client/xdebug-client-2.4.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 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 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf $(use_with libedit)
-}
-
-src_install() {
-	newbin debugclient xdebug
-}
diff --git a/dev-php/xdebug-client/xdebug-client-2.5.0.ebuild b/dev-php/xdebug-client/xdebug-client-2.5.0.ebuild
deleted file mode 100644
index 0251001539eb..000000000000
--- a/dev-php/xdebug-client/xdebug-client-2.5.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 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 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf $(use_with libedit)
-}
-
-src_install() {
-	newbin debugclient xdebug
-}
diff --git a/dev-php/xdebug-client/xdebug-client-2.6.0.ebuild b/dev-php/xdebug-client/xdebug-client-2.6.0.ebuild
deleted file mode 100644
index 6956e42e79f5..000000000000
--- a/dev-php/xdebug-client/xdebug-client-2.6.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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-client/xdebug-client-2.6.1.ebuild b/dev-php/xdebug-client/xdebug-client-2.6.1.ebuild
index 6956e42e79f5..cc129cdbb631 100644
--- a/dev-php/xdebug-client/xdebug-client-2.6.1.ebuild
+++ b/dev-php/xdebug-client/xdebug-client-2.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 
 MY_PV="${PV/_/}"
 MY_PV="${MY_PV/rc/RC}"
diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest
index d5892e43ddbf..cc92b360c3d1 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -1,15 +1,9 @@
 AUX 2.4.1-xdebug.ini 1285 BLAKE2B 830f55244b0ccece6f3123cef1489440372468aa3d4f02115e8695ff610505b91e36fb65e7f110b46e3fc5888d6c366eeaa5592dd7f40e2eb2133bb0711dd8aa SHA512 1eff8bc1e3cf9a3fae2ff2bc33e7ea47636e15496aa2a8efc039974fc2734632890d1da8bd6b07db6402c38c8e07631be38916f16a54d66068d0fad15d446bfc
 AUX 2.6.0-xdebug.ini 1623 BLAKE2B 6d8c3352dc55778e29cce92794ae36421a6e696244e3c7e1dd4e98d2ff0a6c86ce91e4e4ff2749cd58135e838ff61e2cad5bca8879caf9928d82e2f4bf17af80 SHA512 fe715f986fc5fbc0b92f8d708281feb5b9f6e0a054537ad7883c11acd035d0ddfc20812d64b35a616e0e8048b6332a097a0103329e2c96221571eeecbaaa963f
-DIST xdebug-2.4.1.tgz 265542 BLAKE2B 01526f01bc24f6b241c9647da100b3c080a93bcce4cc00f6a0311b15759457735f1465022874d673069afe6a9a51fe5a7d6a1a2bbf190200193496d640e4381d SHA512 64b345b4809fb0f020eb8fe7a0826056a64728ec9565bbb2d0e717ac7b3ca8aa0856b91c2ba47a7435b7500c5efa643682f245d6cd9d0a537f8bb9ab0d5cea3a
-DIST xdebug-2.5.0.tgz 267640 BLAKE2B beaa0ac97867a4d28f7daca3277f3c2071f2bc5cfa9302b64f8e02b65b2745340a689962d4f8e1668e3434ed271af741f8d47466f501e1d05c0e2240f0f39730 SHA512 75b1dbf32059eebb6ea3fb6ebb50ab26d73f8ce2964be1fec41ecfd9ae3d8bd55b6997daf03727b28b91ba06d08734865158bed6f038a46f00a1da5424ce5fe6
 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 1036 BLAKE2B b6a2c5e3cd1d53a8b86c87429c2d3e75fdbe87ee110f970401b215e904aa42f21099a1ed797387c6c8631ddff6af789d200623bd6ea80a0a7a4a784c2585c5ad SHA512 05a747c280de622ae6141c130c04c5f478096a9adb57b6aeb7bc75c0c217e80acb07c9e7c6eb50a9de70adf909a8605595f1c23923ca6dbbab820e9edc72c9e7
+EBUILD xdebug-2.6.1.ebuild 1032 BLAKE2B 71cd322d334d47194e8fa317e5f0722fa944f4612c2bd45cb1d56241495c891702ca2ad5e647e1356af0d51307f7e752c1e37f57b5044ea8f085209332091cb1 SHA512 b0ffe7473f0c0e79d470fd6f7ab9526918817bb6256a88b69e1f53e99d2e8270530174e991093b8be8af3ef54d6f85e3d5a5affd9fe703e51babeaaf5c431aa8
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug/xdebug-2.4.1.ebuild b/dev-php/xdebug/xdebug-2.4.1.ebuild
deleted file mode 100644
index 322f4d397420..000000000000
--- a/dev-php/xdebug/xdebug-2.4.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PHP_EXT_NAME="xdebug"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="yes"
-PHP_EXT_INIFILE="2.4.1-xdebug.ini"
-
-USE_PHP="php7-0 php5-6"
-
-MY_PV="${PV/_/}"
-MY_PV="${MY_PV/rc/RC}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-inherit php-ext-source-r3
-
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-
-DESCRIPTION="A PHP debugging and profiling extension"
-HOMEPAGE="http://www.xdebug.org/"
-SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
-LICENSE="Xdebug"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		~dev-php/xdebug-client-${PV}"
-DOCS=( README.rst CREDITS )
-
-pkg_postinst() {
-	ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
-	ewarn "installed as a dependency, and not all users will want xdebug to be"
-	ewarn "enabled by default. If you want to enable it, you should edit the"
-	ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
-	ewarn "call xdebug_enable() in your code."
-}
diff --git a/dev-php/xdebug/xdebug-2.5.0.ebuild b/dev-php/xdebug/xdebug-2.5.0.ebuild
deleted file mode 100644
index 6c9476032402..000000000000
--- a/dev-php/xdebug/xdebug-2.5.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PHP_EXT_NAME="xdebug"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="yes"
-PHP_EXT_INIFILE="2.4.1-xdebug.ini"
-
-USE_PHP="php7-1 php7-0 php5-6"
-
-MY_PV="${PV/_/}"
-MY_PV="${MY_PV/rc/RC}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-inherit php-ext-source-r3
-
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-DESCRIPTION="A PHP debugging and profiling extension"
-HOMEPAGE="http://www.xdebug.org/"
-SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
-LICENSE="Xdebug"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		~dev-php/xdebug-client-${PV}"
-DOCS=( README.rst CREDITS )
-PHP_EXT_ECONF_ARGS=()
-
-pkg_postinst() {
-	ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
-	ewarn "installed as a dependency, and not all users will want xdebug to be"
-	ewarn "enabled by default. If you want to enable it, you should edit the"
-	ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
-	ewarn "call xdebug_enable() in your code."
-}
diff --git a/dev-php/xdebug/xdebug-2.6.0.ebuild b/dev-php/xdebug/xdebug-2.6.0.ebuild
deleted file mode 100644
index c3c96b4ac598..000000000000
--- a/dev-php/xdebug/xdebug-2.6.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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"
-
-MY_PV="${PV/_/}"
-MY_PV="${MY_PV/rc/RC}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-inherit php-ext-source-r3
-
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-DESCRIPTION="A PHP debugging and profiling extension"
-HOMEPAGE="http://www.xdebug.org/"
-SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
-LICENSE="Xdebug"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		~dev-php/xdebug-client-${PV}"
-DOCS=( README.rst CREDITS )
-PHP_EXT_ECONF_ARGS=()
-
-pkg_postinst() {
-	ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
-	ewarn "installed as a dependency, and not all users will want xdebug to be"
-	ewarn "enabled by default. If you want to enable it, you should edit the"
-	ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
-	ewarn "call xdebug_enable() in your code."
-}
diff --git a/dev-php/xdebug/xdebug-2.6.1.ebuild b/dev-php/xdebug/xdebug-2.6.1.ebuild
index 6450d9968aa9..2b843ff635af 100644
--- a/dev-php/xdebug/xdebug-2.6.1.ebuild
+++ b/dev-php/xdebug/xdebug-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 inherit php-ext-source-r3
 
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 
 DESCRIPTION="A PHP debugging and profiling extension"
 HOMEPAGE="http://www.xdebug.org/"