gentoo resync : 05.02.2020

22 files changed, 109 insertions, 389 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 584fc30ab45b..e28484f1e614 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Crypt_CHAP/Manifest b/dev-php/PEAR-Crypt_CHAP/Manifest
index 1e69060764f0..2f7b8b5fb129 100644
--- a/dev-php/PEAR-Crypt_CHAP/Manifest
+++ b/dev-php/PEAR-Crypt_CHAP/Manifest
@@ -1,4 +1,4 @@
 AUX CHAP-1.5.0-constructor.patch 1273 BLAKE2B 84e35031521587383a843c78f49df567cdaf3fd81360454797993881e272a4d5e7816073cc774e7d7c47e6c30cebaa70521c5b391f28cbc081c96d5d90a207df SHA512 2053c12f4416654b614176ff06565032df25e3db970eaeb02e327ceb986c53adfd6b9c4285d5b81525ad8f93e548794fc81ee3da31ad4ebe1ea0e707f9e47369
 DIST Crypt_CHAP-1.5.0.tgz 5549 BLAKE2B 7b79e311d36a7c59b4838f5d0bfda1a39792519f53e036fb2f500130cd9265280fb2e2fb31683d95dee283875fe738746b19c78fc80fa0fd965e19f431d032ac SHA512 44cdfdf0bc857b3992c2635945374033112d972cdefeac8a45810f5b79a6a532de67fc5e9a06f2ec4b3ce4df62e300451d0f4078b4f8ecc9805dca5c08f6aa95
-EBUILD PEAR-Crypt_CHAP-1.5.0-r3.ebuild 683 BLAKE2B e1aecc650059199f6de854cc08218adb0f61c8c1261d4f52604fbdf163b00305b9b76ff4b77c1b4108943732bc5fd2bbb8876e5e00f0770c287594ee9bfa88b5 SHA512 c0817df0bbd05674213ae56ea62f1cf0f45fc87636c850b1a38f8f328ce5c8f9050fda64d5e149e93c3507bd5c529b0befad3c3941c3525d4bdbc5e6816eb312
+EBUILD PEAR-Crypt_CHAP-1.5.0-r3.ebuild 688 BLAKE2B 6978834dd62b277562eebb36e69fca3e0652639c54a0d5d3a642d01950dddff4c3e0b3c1f8b5fa1cd9a5f556f4a95f0e95dac1ecce00c6431bc0d1413eca2f03 SHA512 24d7b02040dbbdb1462fab0cf3e6d2d28bb3eadbe6e683cc68030ad989f9d28ac394fc4c59583548bb315447aedd7794e9d5bc71fe49ae44f8b36d8deb4fa921
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild
index 3198b238d402..542e03f35808 100644
--- a/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild
+++ b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="Generating CHAP packets"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~sparc"
+KEYWORDS="amd64 ~arm ~hppa ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 # Crypt_CHAP_MSv1 needs mcrypt which is gone in 7.2+
diff --git a/dev-php/PEAR-File_SMBPasswd/Manifest b/dev-php/PEAR-File_SMBPasswd/Manifest
index 17736633532b..8bfea6605ea4 100644
--- a/dev-php/PEAR-File_SMBPasswd/Manifest
+++ b/dev-php/PEAR-File_SMBPasswd/Manifest
@@ -1,3 +1,3 @@
 DIST File_SMBPasswd-1.0.3.tgz 5251 BLAKE2B e102bee8628dfe521ad3a4b212694a306c2bcedd869e1a4203fc1280f73cf6b42a95ce0940f36e583db1d1b18260f0eb9e73cd86be2f2cb51fbf9c47a0334b8d SHA512 49c8293ec4de0b20a9a9d80cc1175693cf9846979eeb2e77b08b48da57d214f02ebcd8ed51738222640c94eccadd5bbf0d5c8a3904c9aefb42308632ffb07a0b
-EBUILD PEAR-File_SMBPasswd-1.0.3-r1.ebuild 433 BLAKE2B a2bb328ec840ec36ceaba37fdde894974527bc3b1251ad0648675d6c92f277907a225421162d3ad64261d8dff14eea86c530becf278393dd70e65f84b05e28ee SHA512 098cc339c1f21de47dad3529ec854211971f9263b04bd29f18858ad6705f8a29cef8d3413445e1a3bee100aea5b8a36c0a15faad5c0da23f51d408b773f27089
+EBUILD PEAR-File_SMBPasswd-1.0.3-r1.ebuild 438 BLAKE2B 2047be2e5f444b7c895b5df0935a21832cc7125335add783c135e018a66de748f085ac2b8225a282865a58b0952d0cc643d559856728ffdfbb4bb314d2340847 SHA512 9101b99fde82cdc3aad3cacbf5bbdfd8e2d9c8474589752089168178ce8771c8167a1eb783c0cfb9f58392068d4112aa711d0b3b2193e9c219003183a5d7da83
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3-r1.ebuild b/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3-r1.ebuild
index 62b1b51a1a43..c93463376e02 100644
--- a/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3-r1.ebuild
+++ b/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit php-pear-r2
 DESCRIPTION="Class for managing SAMBA style password files"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~sparc"
+KEYWORDS="amd64 ~hppa ~sparc ~x86"
 IUSE=""
 RDEPEND=">=dev-lang/php-5.3:*
 	>=dev-php/PEAR-Crypt_CHAP-1.0.0"
diff --git a/dev-php/PEAR-Mail_Mime/Manifest b/dev-php/PEAR-Mail_Mime/Manifest
index cedb333ddd42..2374302f44d7 100644
--- a/dev-php/PEAR-Mail_Mime/Manifest
+++ b/dev-php/PEAR-Mail_Mime/Manifest
@@ -1,5 +1,7 @@
 DIST Mail_Mime-1.10.2.tgz 36501 BLAKE2B 59e900b99061e84d307eb46d295f843404ae06b01936cec4ed610c298b6f7e8fcee15098fa6d935696122311eae2dbf733611410b2249f2535673a3031011fa3 SHA512 4e3b2a2adc58d8b4f16f56509c9f22638dc37aedf1bec60871706390198198be6ed6dccae8c250eb33de3a441aeb122097ffaddbc49191745f0f09693ec6612b
 DIST Mail_Mime-1.10.4.tgz 36909 BLAKE2B 101d050d96b717ad970a6f8c170ba8ea7d94252274f0b006a266a5ef4ac9d49fb350d3bf120ce645e5a54af1f0ad0ab664c828abfa8a4a96170e7204c73dfd82 SHA512 6e58e1078292cf43605313e2402b60deb97be0b56c8eb5dbbb501cf92ca836ca4bdbc9e1ab878c89f8e59941962a91b73dd917c8e678f0944f271e5537f065e5
+DIST Mail_Mime-1.10.6.tgz 38355 BLAKE2B d12b0496122c67236090db84710aa1fa660570d82952f037ddeb795ac3184a427965e12b21a6dcd6bfaea692299fb6e610822a364470c444455369f96dbbe972 SHA512 223e4a3a3ab52497d7cee551108642aa8c90328cd5d28ec0f215e16e0f2066fbaa3e4d51e62080d322846f8410c2e4641cd7c743e736062b6f8215e637877518
 EBUILD PEAR-Mail_Mime-1.10.2-r1.ebuild 651 BLAKE2B ecff98990c6f209029ea163a93d2521fcd908100cc257ec7f17189747795bcac5b4972bb5c8d76ac5590be998d2194a96ead357f1639b93bc8c3c5141fa8e375 SHA512 a538af615577fd65dcea28709ee32bda7809b3868f06bd73a1b5853e9de43bfaaed3de31a931523791e5d4a51bd0fb04ba0907da26341dc7697c8faa7f6132f4
 EBUILD PEAR-Mail_Mime-1.10.4.ebuild 663 BLAKE2B c7fec7b8724596d7d4745511c64567a3fbe6793ed1d87b4b08426222998e133c6236701231eda523e4671dd2a3cd4595882b0719d240fcf09b4a4dc95039d0d5 SHA512 b30976ca51d1fd1b1ee08aad5ef3cf5c4f5ca3522734fa73864c671412153f90d1fe67309235990cc5f802a17c6877ed28f4c6a24935b72104bcbe6e7a0d2e08
+EBUILD PEAR-Mail_Mime-1.10.6.ebuild 663 BLAKE2B 3b950ebb4abffe78b00208673ca0b01a9a91c0c83acd8ced9bcdcd84021e2b9f8a8cf9ea65878a35030ba27353ec4311199a46ba574ee875cc51c873bdb10bc9 SHA512 faa78e7c72ff8fbb951a6a38d942c21048b0199a352b0c6b8e9f02db9400dbbd3201f8b60960f864f4af78dfa684f85f115c58900ab28ac8c726ab58c2e03001
 MISC metadata.xml 358 BLAKE2B 0bfd697c80f3c64bff567b59cba40da1879b944b0775ed1d5e7fb4d80b057403dce613ffec5d5f06b46b7446dc16b3c95523f4b230b7f68ba3f6e05e502f9753 SHA512 c0a0fb9ceafd2378e774675500f9c1c60a7510a30c98f293bd5c92f83bfbe6a10b59d0b85ac6de1724b9e5deb1a7c0371e35871a8c7b9c63724df2762f3ca7a2
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.6.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.6.ebuild
new file mode 100644
index 000000000000..7c2883db6689
--- /dev/null
+++ b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit php-pear-r2
+
+DESCRIPTION="Create and manipulate mime messages with PHP"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-php/PEAR-PEAR )"
+
+src_test() {
+	# Requires the "pear" executable from dev-php/PEAR-PEAR.
+	pear run-tests tests || die
+
+	# The command succeeds regardless of whether or not the test suite
+	# passed, but this file is only written when there was a failure.
+	[[ -f run-tests.log ]] && die "test suite failed"
+}
diff --git a/dev-php/PHP_CodeSniffer/Manifest b/dev-php/PHP_CodeSniffer/Manifest
index 97c25cfbf137..aacbdbeb526a 100644
--- a/dev-php/PHP_CodeSniffer/Manifest
+++ b/dev-php/PHP_CodeSniffer/Manifest
@@ -1,5 +1,3 @@
-DIST PHP_CodeSniffer-3.2.1.tgz 554343 BLAKE2B a43e253e7cdf6085ff1cfdec110878c99b61a69d80415a40cf670b7ce9ddce82f7254c34995c67084d5aa7aef8d775e6cfef5e9fcab90771f09244c1442e319d SHA512 69a4d70c6a567d262142f7f3d42507a7501ca3d5213f5b90d5893863e3d75e947a7b41e8bb08e85975677b606522b8f73df33dd35cde85c28016389f3c2ae63c
-DIST PHP_CodeSniffer-3.4.2.tgz 637880 BLAKE2B 1c919f92f0b3532f3568014a923bb644a845950587972d12c5e02885b3e8e4b2c334bd7ee8412ebc84527072b64737ea3c59ad3ba145a597ef8cfd71360717e9 SHA512 6236e3f9899d8f4637314f359a8db44835140d0292ea02b56b5e2e55ea8739841648ee03c3f25bf4df64577237b6bc1c3d0999d5452b9f292ef019347ecd41f5
-EBUILD PHP_CodeSniffer-3.2.1.ebuild 1430 BLAKE2B f613e7c088a69d4b1c0ce8e19a3c60264135dd61f0e801563a9a8f30d4df084c6e412339240a83af49f39b1228af7abc678c638bc264da6790c17067c944c159 SHA512 5212076e9fa490972adecef7f90662ba63d264f6ee555a18f71c67ded6dd160209877f628e3b1a30f20a6a085f593e5dbd06aacb464d85cb4cf62936c8cfdd41
-EBUILD PHP_CodeSniffer-3.4.2.ebuild 1441 BLAKE2B 751179c730d93f2bac891940b1c6df859c635e4668548f5fc91786cc66bde2705d7a6f87c375cbc75533d71710683b14af04c757706a4659eee30aaa902b49b2 SHA512 097e3b81fb08d34694192ff18e2ac29393448d9c9aea9fb3e18ed81448e7d683303199221203d8e32712a1a4304ab6d438753658cb54fad0734a16a85c3f7213
+DIST PHP_CodeSniffer-3.5.4.tgz 697668 BLAKE2B f5915bcb73c0db0d8dcab3eda5ab647268888e490d244568f0d0e7fff38c4764cfe62fcc79dabe8095adcef56b1e6d0367d46c36b18d0c4e0fb04a048c697737 SHA512 3e8024aac18111741637f014629eeaf5863b2f080a673e5b379a676fafb69859d1889ae13289b0149a9810641b0a140123a970ae1178fcd2cf6da1c414233bfd
+EBUILD PHP_CodeSniffer-3.5.4.ebuild 1502 BLAKE2B 02a3242341c9006a02cbaacff2a5f4b4eb6cb0d9b680c8ba3102316503c7bfb0bcc7be7799fcf4134991010f94ced0cd15c7b8e468c84f707b2904fa64a8b57f SHA512 c3cc91615ce68a44868765c66a8b6f45bcf93e8ed79f74ba9909249797b79c18565baac9ee98a0b1941fdd0a081f568c6a64a47d1cc328346585e0896f909b19
 MISC metadata.xml 329 BLAKE2B 786efd240520e1b8b5ec8fde8fe4772defb0dbae2bf69358710c227454f5de1bc831600eb81d605053163d78e0129cd657b3229a74d30bcec7ffe6ce960d87d8 SHA512 5a983e0b393c626d49f7b3b8757cb68e73a7f292ebc861ca5e6f83c20b5c6f79918422aee7830ad3dccacda719c6d42d6bfcc5eb7ddca7ed29785ef1dd9e0f30
diff --git a/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.2.1.ebuild b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.2.1.ebuild
deleted file mode 100644
index d993d514bb77..000000000000
--- a/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.2.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Detect violations of PHP code standards"
-HOMEPAGE="https://github.com/squizlabs/PHP_CodeSniffer"
-
-# The test suite isn't part of the Github tarball at the moment. Keep an
-# eye on https://github.com/squizlabs/PHP_CodeSniffer/issues/548
-SRC_URI="http://download.pear.php.net/package/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( >=dev-php/phpunit-4 )"
-RDEPEND="dev-lang/php:*[cli,tokenizer,xmlwriter]"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-src_prepare() {
-	sed -i "s~@data_dir@~${EPREFIX}/usr/share/php/data~" src/Config.php || die
-	eapply_user
-}
-
-src_install() {
-	local MY_PN="PHP/CodeSniffer" script
-	# The PEAR eclass would install everything into the wrong location.
-	insinto "/usr/share/php/${MY_PN}"
-	doins -r src autoload.php
-
-	insinto "/usr/share/php/data/${MY_PN}"
-	doins CodeSniffer.conf.dist
-	# These load code via relative paths, so they have to be symlinked
-	# and not dobin'd.
-	exeinto "/usr/share/php/${MY_PN}/bin"
-	for script in phpcbf phpcs; do
-		doexe "bin/${script}"
-		dosym "../share/php/${MY_PN}/bin/${script}" "/usr/bin/${script}"
-	done
-
-	einstalldocs
-}
-
-src_test() {
-	# The test suite will fail if date.timezone isn't set in php.ini.
-	phpunit -d date.timezone=UTC tests/AllTests.php \
-		|| die "test suite failed"
-}
diff --git a/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.4.2.ebuild b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.5.4.ebuild
index 792602dd38d6..3907599536c6 100644
--- a/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.4.2.ebuild
+++ b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,16 +14,17 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
-RESTRICT="!test? ( test )"
+RESTRICT="test" # Currently broken with latest PHPUnit
+#RESTRICT="!test? ( test )"
 
-RDEPEND="dev-lang/php:*[cli,tokenizer,xmlwriter]"
+RDEPEND="dev-lang/php:*[cli(-),tokenizer(-),xmlwriter(-)]"
 DEPEND="test? ( >=dev-php/phpunit-4 ${RDEPEND} )"
 
 DOCS=( CONTRIBUTING.md README.md )
 
 src_prepare() {
 	sed -i "s~@data_dir@~${EPREFIX}/usr/share/php/data~" src/Config.php || die
-	eapply_user
+	default
 }
 
 src_install() {
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index 068a53c278a2..edea3e79a3ef 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -3,5 +3,5 @@ DIST apcu-5.1.17.tgz 94814 BLAKE2B 2e49f08b9445f04fd036bc949c9099ee045c3ecd460b3
 DIST apcu-5.1.18.tgz 94668 BLAKE2B c88af867a5f0f3feb550b4b93b83451d972d8f9c2281af8b000b45cb42e2d005f82fe626da8665e0490c79bc378cf9ee5c9a0136d0b490a1155a885bb56fe4f2 SHA512 5e9c5b4540be7abdf2f473d2f8955d8708934a1d6e05cb2c99154cc7ba8a2bbf9afde51769e20f46ef278efd6f60b9172e0864c31e0976b9d3096a337035e7a9
 EBUILD pecl-apcu-5.1.12.ebuild 2091 BLAKE2B f0d62746f48ad4110941d369da65f38858a1834152a33a56ab0b1eea53a5d1b52fbe5bc3effe2defc724729c6865b34e9a765092ecccf4b32ff2b1c76949ad97 SHA512 81f2c1edb96dc7383fb4b91774c1b985754031ce4f4796860825a7e226c345145c84662d80f0d8f834006697d45d5010863590107ab472574c715b3e85b857d6
 EBUILD pecl-apcu-5.1.17-r1.ebuild 1548 BLAKE2B d60a97e831b68873e09e79d3efa1042bdeb1b2a39858fc9e5eb18f6e690188989d950b0a919d26345d3bc8217d8e5e7b78410511248785698215045e2f5a7a96 SHA512 647e12e2a890ab531840bd9c87827e5bcf3bbd1ee82505420b16b69312dc20776ebe0df39b39f51277cb8959652faa33f52f044531494cc151f6ad0c8511192e
-EBUILD pecl-apcu-5.1.18.ebuild 1547 BLAKE2B cd29069dba677bad4b2784777e6d1926cab8ebee0be083cc5c2c7d77d7a4432ca1cae02ec267918e7c1d560eb4a14f8d275a91c21d8a5f6d8c2c0e188da7beea SHA512 bdcbae46e6c1ed3155337e91eb4e243b02205cf8ea7bba2b6405a8e9fc907c1c3ac4d9369af624b99b5da0f364e268f6365f28f416d9d234ef192f96fa8e17fb
+EBUILD pecl-apcu-5.1.18.ebuild 1546 BLAKE2B efac91b618cce89bedd5a92bfe70052b0e4c1a4000c0fe9f934299d6d467feba5831880b92092d8cd1756250f53f34a623985c37f4d4ff533d9788f515bb1643 SHA512 20ac8e6651905fac5e15b7c802e3049d291d8e36c24ce9236e07e3acb505a76c764de74b2b99156da94bb652804c9d9a06242e518f091e01cbbefc99775d17a8
 MISC metadata.xml 540 BLAKE2B a29196911604b13d643db1b09cdae2c578c52f3b3ce92f9d6ae534c6fe9872435a46b15dca79ce8ccf5ca02070f2e694f518c69524ea9380eff8e597d8d4124d SHA512 acd09a9a8e52ddc7e4cde2f048db7f7721fcbe3e24b7b628bf1c14b17381a75b463dede6faa0acfecf8e270693001c30b83758f8ad761979fcbdccb454098e56
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.18.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.18.ebuild
index 97d7ace42391..df758bf3f797 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.18.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.18.ebuild
@@ -12,7 +12,7 @@ USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DESCRIPTION="Stripped down version of APC supporting only user cache"
 LICENSE="PHP-3.01"
diff --git a/dev-php/pecl-imagick/Manifest b/dev-php/pecl-imagick/Manifest
index 363f68c1a412..4799f1570f8c 100644
--- a/dev-php/pecl-imagick/Manifest
+++ b/dev-php/pecl-imagick/Manifest
@@ -1,3 +1,3 @@
 DIST imagick-3.4.4.tgz 253434 BLAKE2B 73ce21547881b60733dbc19ae83cd2e60135dbb4052ea723f1ee10b3759ce12065a0cab2a7e4923b78e9e68b12fd7b875c7d1bd7b2a14ce4e4d7ff5b9c7fbc06 SHA512 73145a1f095849c32760db2dfc4acc13c57d99a037d65eca9b0ddf8f8e81cf6d28a50f2614e44bae1d90b4f881a2e9a64926e0e3b9403e491fd903ffeb30c4b7
-EBUILD pecl-imagick-3.4.4.ebuild 745 BLAKE2B 7e753b3f1fd62a106d3823520a9e7e410686d410330af657895f64edfd94dd5d9ca82b51a0fae73da4e4d888b89a5aa2070200a9bf924aac67ece5cfa0235698 SHA512 fa8ee43dd4de12df29909b182f6e8d480399fecabcbb242dbf52e74e35cf02320afb41827cdd2e3a2412e18810f2a3b13ec659141dbb98f0e1da5c8070d4adb6
+EBUILD pecl-imagick-3.4.4.ebuild 743 BLAKE2B a1c27b843766f38478af15a469fb6a70f524815279ec615ec63d1e7d71426e13358c0ce4d3021428c7c2574f272fd30fd7052aa6d9221ee3eddbeb4e3cb3b115 SHA512 d06bfef8aa6ddaea6c08ee06befb8754ca0ec82e0205009cfa726a3a5349b0734007dc7c45fdf20061ef8a5065d447807e1db39e85e21eab340d8a62cf498610
 MISC metadata.xml 358 BLAKE2B 0bfd697c80f3c64bff567b59cba40da1879b944b0775ed1d5e7fb4d80b057403dce613ffec5d5f06b46b7446dc16b3c95523f4b230b7f68ba3f6e05e502f9753 SHA512 c0a0fb9ceafd2378e774675500f9c1c60a7510a30c98f293bd5c92f83bfbe6a10b59d0b85ac6de1724b9e5deb1a7c0371e35871a8c7b9c63724df2762f3ca7a2
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild
index 217848a2c012..edf1aa7add12 100644
--- a/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild
+++ b/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -23,4 +23,4 @@ RDEPEND=">=media-gfx/imagemagick-6.2.4:=[-openmp]"
 DEPEND="${RDEPEND}
 	test? ( >=media-gfx/imagemagick-6.2.4:=[jpeg,png,truetype] )"
 
-PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX%/}/usr"
+PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX}/usr"
diff --git a/dev-php/pecl-mcrypt/Manifest b/dev-php/pecl-mcrypt/Manifest
index 162a48dd6725..0ae94c9090b0 100644
--- a/dev-php/pecl-mcrypt/Manifest
+++ b/dev-php/pecl-mcrypt/Manifest
@@ -3,5 +3,5 @@ DIST mcrypt-1.0.2.tgz 33698 BLAKE2B b79985455986ca28e7cb55d3f6f62f87e1112f57c4e2
 DIST mcrypt-1.0.3.tgz 33590 BLAKE2B 5de1108f53604fffea9e3cb64d9efdae2008da164acd47b27fd0df8f12a0f508345d63bee4d588c1eecd9a935f8be3b2db5c3d119c5b3013955c54085ebe9e9f SHA512 ef215b576b471d6e1ecac4bb097f518fa57fd551b678b7fdddd9d5058f6667b0ee757e887f00b61672b89cd86f1962cbfe0e355681fa47daba9873c3bf4db679
 EBUILD pecl-mcrypt-1.0.1.ebuild 643 BLAKE2B bf6681c494f092acbcd868ed66a0b50ca0fa72713463b96b8c392380ee12edbaac8e17d3cf3171e7b0ba47b11a064f9b1e55005f95b647d0e8f3b2dc6cf992e3 SHA512 b6bb1f170a9bcca8cb9d076090c209610435422ce8b186f07c1502db3cbbdbec6daf8f77095de2d5191d2139b839e173b588434fe2e34c2ad2c87233351603ee
 EBUILD pecl-mcrypt-1.0.2.ebuild 673 BLAKE2B a5e32bd4510bf76b05d1103c65fd8636e4d37f1cd3de6147dd1f1c0c494318ce4f7f81f8bdd46431adbd6b7ccb09041a523992275568fc9da6ca14bc9ef3984e SHA512 926055b28940c84eb9f959bf5c62113e80bb24e3e5f1bedea0235de6cb82f0fe881c09ca2bf8ff7d1c8b1e1a758a9c5e5fe6bf4362095041bb83e953c0adcb30
-EBUILD pecl-mcrypt-1.0.3.ebuild 698 BLAKE2B 4b501f2d06336081ee51675ca55a0ba8d843b057d8fdc7b6fac895c246cba2f57b30fc6ffa64758b9766a888fbb0edd6883c23d878f2d58c93d7b798ab549144 SHA512 91c370e0d2c46d25085fee33d818c4c5d98aeef617c1e18caf5203467e1c2a7e46ecfc131e662d8e942079a8e68bcaf0cb0e9b08389345ebcea68ce58904f38a
+EBUILD pecl-mcrypt-1.0.3.ebuild 703 BLAKE2B c8309fb6eae266858a6ba67546c566aea86815d7bca57b77100fcff4340455a26cf43b76c525eae5897d289e786f0a1415e07a9055b033e08b5e856a7dde1514 SHA512 46ec1f5b617144667cd3cd3c004e06ee4369959b18f5c38bfe9e6761436272253ab9098f7cba4424bcabb4c4405f477b93bfc0d485145b7f74182012341dcd13
 MISC metadata.xml 379 BLAKE2B 8e9441d2b290b2055894f11d940424ead756cc408b91b5eecd413f6ed4476de9e025fac57b71d8b92ec655787ba8c6e4ec7565f40c2ab22fc0d96051a56faefb SHA512 f39a4765eca2676d25bd98ad9f17c85e528a31ccc1b06e6327203ddfca981363a5eac870fd4f856f4d11926f689dd5b2ea45297055625e2f7089a7b9aec3f975
diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild
index 21565e7239a2..14a2960b1785 100644
--- a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild
+++ b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ inherit php-ext-pecl-r3
 DESCRIPTION="Bindings for the libmcrypt library"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~sparc"
+KEYWORDS="~amd64 ~arm ~hppa ~sparc ~x86"
 
 DEPEND="dev-libs/libmcrypt"
 RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index e0a136adeb2c..f67bb59625de 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -1,10 +1,5 @@
-DIST memcached-3.0.4.tgz 78776 BLAKE2B ce2539e2e4960217d9ee3b50ed5625214d4b22c4d7e64595fdbfa2d130bce0402a67561f76a50690991996d84f16f926f27a057722bfab66ba3c388772ed77a8 SHA512 d0a0f9e99cbcc6829528554551dfacf0d943d54d4be60c9da708de82913a2a0bed7c51d594ae3ecf0c13b56064739f074ce6ada5d7433bdc7e26e8caf9cf5ca2
 DIST memcached-3.1.3.tgz 82673 BLAKE2B ccb9267cbd974337b7cd8836ab6e35c4fd9398d731dcd333bcb664b91037d1775651e6bb5d00b602767834681289064ede678ea2e6e3641631bba4990a380dee SHA512 9c09648c26011c5e749bee1a556c976e6e5e648dc65580e7caa296dab79e3764edf1408f96edcaca5efb0229320c86fcfa0422e55d486beb6466892f7e08c4a3
-DIST memcached-3.1.4.tgz 82920 BLAKE2B 67eb2a26453aa3253ab0d1327023da9318d7af6eb4d935f2c9f1d3da0b1590c58dbcbbea24c491eed6161a9e0462651c749a6e333e98a8cb26432c360ce805d0 SHA512 df1d2c2182c6d3565b929bb55e25a5285c0d5cf8b0fbb75417d756898970abc2b9c4d87e8bb8382d9d4fd62227de3838996c971525fb8a90bf503f025fc6f9f7
 DIST memcached-3.1.5.tgz 83015 BLAKE2B 80f5cbed8e34f867962792d95d242015690f64ab3b462e09813a11b8b86234b0b05b0f6a78f7c6184482b66ba8015064b37f77bbb816a3aee2edd0ce97ab0cbc SHA512 87d5fd079fcaad81139785d6766da71b23a1a0fe907d4b22f3a787af148a20412c11df11c4d98c165241658baf0d87c8a6b29de15db07a0f9d1fabc8aec8f0e9
-EBUILD pecl-memcached-3.0.4.ebuild 1576 BLAKE2B cb1e70517c9470e28826a52819c0f4fe99905e3b46eb2f18120206ae8e111d41b83f0d09064f2a7c8dfab150884ae9137fcbecc74bf3020300b7e6a1ec1e8239 SHA512 de5d39a48266e9f393daaa88844b29d923e5bb3d58053b097023fd79045b5958930b3d8beb7b987a87d6460b2db2a0a14ddacafc7b80400806afaee612ee8701
 EBUILD pecl-memcached-3.1.3-r1.ebuild 2186 BLAKE2B edd9106a503c8d59f79e06c2113958d919cbbc8919c8355e6194be422d2a9558d387ba07254c85ee30134dfabd8f2fb8fccd11a01639500250dc2fbce320ae52 SHA512 1ee36279e7b83ec66ae72b97296f1fd3e52bd79cb9cfc0da51956a0daa72240e89714d1a92efcb1e1bd35fd19aa4ab466ce2457e6ec2ea91d452944fba33064e
-EBUILD pecl-memcached-3.1.3.ebuild 2388 BLAKE2B 416e01a1a4224ac62480ef9f4b18960fd6ce398026347a5883ba60820d156c35ed5b2bcd3edcb0e51f043647cb41f130c123c8cd1b01af44f8df196b20e254a4 SHA512 4152a192f578f236a3d37437f42859129c0949a9f8b0fe7dbf0cdb8123cb6caaff33c16e05ede6320e5f7882126aac7dd03dad231c916b612445cec06e14688e
-EBUILD pecl-memcached-3.1.4.ebuild 2414 BLAKE2B 2d5f6311eb6478089701d13d92cb7b80f3dd8e08a2adcb366be784abfb11fd76269c9592ed1600d07cfa4da85312c48f7493be9f2d5f13d27a4cb3c7be544212 SHA512 49f68f0972d9f881365a7267909ef8b5a5ab15b9babf8253082fdceb9f2b1b54aaf339087506a77083b29c54285e1948275a916117fd3b59bad0e2fd355fcf09
-EBUILD pecl-memcached-3.1.5.ebuild 2414 BLAKE2B 2d5f6311eb6478089701d13d92cb7b80f3dd8e08a2adcb366be784abfb11fd76269c9592ed1600d07cfa4da85312c48f7493be9f2d5f13d27a4cb3c7be544212 SHA512 49f68f0972d9f881365a7267909ef8b5a5ab15b9babf8253082fdceb9f2b1b54aaf339087506a77083b29c54285e1948275a916117fd3b59bad0e2fd355fcf09
+EBUILD pecl-memcached-3.1.5-r1.ebuild 1595 BLAKE2B eb92a31294cb219ec9cff7a3757645e01423fe4699d8cb16452c360e2c6ed9c10bd8641c7aa4fb14b468d8c90de5841daf5fc95132e092e2b8552f30b856c3ad SHA512 e9dfe47919a892f5bbe71109b11f8b62cdb3d4118c94710d49d7851260643f0706ca5866bb4a090bc48220f245b42eea8827f5c5547d29c59e1a6f88f7d3560e
 MISC metadata.xml 568 BLAKE2B f99b2eb530ffd87100256bb477bfbd50e48b28283bc01147b0cb1e3dd7dbfb940cd8e16e24c68723fe764df0cbdb1ecb0b995e151c67a37673a19a2cfeb1bcfa SHA512 9fb2c3ea2dba6b4b1cdda8acc02afa006a95651b4fdb5011b15e4046bc44742cc5306d20db070f4f1977352873576040a34ed24a660ec2c640e118115359f2c6
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.0.4.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.0.4.ebuild
deleted file mode 100644
index f2b36a648eaa..000000000000
--- a/dev-php/pecl-memcached/pecl-memcached-3.0.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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" # Pretend to support all three targets...
-inherit php-ext-pecl-r3
-USE_PHP="php7-0 php7-1 php7-2" # But only truly build for these two.
-
-DESCRIPTION="Interface PHP with memcached via libmemcached library"
-LICENSE="PHP-3"
-SLOT="7"
-KEYWORDS="amd64 x86"
-IUSE="examples igbinary json sasl +session "
-
-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?] )
-"
-
-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?]
-	)"
-RDEPEND="${DEPEND}
-	php_targets_php5-6? (
-		dev-php/pecl-memcached: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_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_install(){
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
-		php-ext-source-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.3.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.3.ebuild
deleted file mode 100644
index 2a670cd01ef9..000000000000
--- a/dev-php/pecl-memcached/pecl-memcached-3.1.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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"
-RESTRICT="!test? ( 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(){
-	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/pecl-memcached/pecl-memcached-3.1.4.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.4.ebuild
deleted file mode 100644
index f9b01c82b993..000000000000
--- a/dev-php/pecl-memcached/pecl-memcached-3.1.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PHP_EXT_NAME="memcached"
-DOCS=( ChangeLog README.markdown )
-
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4" # Pretend to support all five targets...
-inherit php-ext-pecl-r3
-USE_PHP="php7-1 php7-2 php7-3 php7-4" # But only truly build for these four.
-
-DESCRIPTION="Interface PHP with memcached via libmemcached library"
-LICENSE="PHP-3"
-SLOT="7"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="examples igbinary json sasl +session test"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl?]
-	sys-libs/zlib
-"
-
-RDEPEND="
-	php_targets_php7-1? (
-		${COMMON_DEPEND} dev-lang/php:7.1[session?,json?]
-		igbinary? ( dev-php/igbinary[php_targets_php7-1(-)] )
-	)
-	php_targets_php7-2? (
-		${COMMON_DEPEND} dev-lang/php:7.2[session?,json?]
-		igbinary? ( dev-php/igbinary[php_targets_php7-2(-)] )
-	)
-	php_targets_php7-3? (
-		${COMMON_DEPEND} dev-lang/php:7.3[session?,json?]
-		igbinary? ( dev-php/igbinary[php_targets_php7-3(-)] )
-	)
-	php_targets_php7-4? (
-		${COMMON_DEPEND} dev-lang/php:7.4[session?,json?]
-		igbinary? ( dev-php/igbinary[php_targets_php7-4(-)] )
-	)"
-DEPEND="${RDEPEND} test? ( net-misc/memcached )"
-RDEPEND="${RDEPEND} php_targets_php5-6? ( dev-php/pecl-memcached:0[php_targets_php5-6(-)] )"
-
-src_prepare(){
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_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() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		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}
-	fi
-}
-
-src_install(){
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		php-ext-source-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.5-r1.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.5-r1.ebuild
new file mode 100644
index 000000000000..186395c51c6d
--- /dev/null
+++ b/dev-php/pecl-memcached/pecl-memcached-3.1.5-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PHP_EXT_NAME="memcached"
+DOCS=( ChangeLog README.markdown )
+
+USE_PHP="php7-2 php7-3 php7-4"
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Interface PHP with memcached via libmemcached library"
+LICENSE="PHP-3.01"
+SLOT="7"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="examples igbinary json sasl +session test"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl(-)?]
+	sys-libs/zlib
+"
+
+RDEPEND="
+	php_targets_php7-2? (
+		${COMMON_DEPEND} dev-lang/php:7.2[session(-)?,json(-)?]
+		igbinary? ( dev-php/igbinary[php_targets_php7-2(-)] )
+	)
+	php_targets_php7-3? (
+		${COMMON_DEPEND} dev-lang/php:7.3[session(-)?,json(-)?]
+		igbinary? ( dev-php/igbinary[php_targets_php7-3(-)] )
+	)
+	php_targets_php7-4? (
+		${COMMON_DEPEND} dev-lang/php:7.4[session(-)?,json(-)?]
+		igbinary? ( dev-php/igbinary[php_targets_php7-4(-)] )
+	)"
+DEPEND="${RDEPEND} test? ( net-misc/memcached )"
+
+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}
+}
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.5.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.5.ebuild
deleted file mode 100644
index f9b01c82b993..000000000000
--- a/dev-php/pecl-memcached/pecl-memcached-3.1.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PHP_EXT_NAME="memcached"
-DOCS=( ChangeLog README.markdown )
-
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4" # Pretend to support all five targets...
-inherit php-ext-pecl-r3
-USE_PHP="php7-1 php7-2 php7-3 php7-4" # But only truly build for these four.
-
-DESCRIPTION="Interface PHP with memcached via libmemcached library"
-LICENSE="PHP-3"
-SLOT="7"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="examples igbinary json sasl +session test"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl?]
-	sys-libs/zlib
-"
-
-RDEPEND="
-	php_targets_php7-1? (
-		${COMMON_DEPEND} dev-lang/php:7.1[session?,json?]
-		igbinary? ( dev-php/igbinary[php_targets_php7-1(-)] )
-	)
-	php_targets_php7-2? (
-		${COMMON_DEPEND} dev-lang/php:7.2[session?,json?]
-		igbinary? ( dev-php/igbinary[php_targets_php7-2(-)] )
-	)
-	php_targets_php7-3? (
-		${COMMON_DEPEND} dev-lang/php:7.3[session?,json?]
-		igbinary? ( dev-php/igbinary[php_targets_php7-3(-)] )
-	)
-	php_targets_php7-4? (
-		${COMMON_DEPEND} dev-lang/php:7.4[session?,json?]
-		igbinary? ( dev-php/igbinary[php_targets_php7-4(-)] )
-	)"
-DEPEND="${RDEPEND} test? ( net-misc/memcached )"
-RDEPEND="${RDEPEND} php_targets_php5-6? ( dev-php/pecl-memcached:0[php_targets_php5-6(-)] )"
-
-src_prepare(){
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_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() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		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}
-	fi
-}
-
-src_install(){
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		php-ext-source-r3_src_install
-	fi
-}