gentoo resync : 19.04.2018

9 files changed, 20 insertions, 71 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 06524172d8e5..74eee1adcff8 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index da6fc520cfe7..dd85e59a89a5 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -3,5 +3,5 @@ DIST igbinary-2.0.4.tar.gz 179588 BLAKE2B 40624f4572622d42f57cea48739deb7374f459
 DIST igbinary-2.0.5.tar.gz 183869 BLAKE2B 8bb56ff0213c77dbc17cf65962e23579935b2330ca2107b8e6e00461a486e60df4209c375e9f74d17bb0a745136fa776233b41cfc51ffb5e1dc1c8fdb4a8bbf2 SHA512 e0abae97b5a0c9ab30ea00a490294f18f91b66b728a05186167e15c0a631d4de82b8a24d370a0d58cf5552adde68dd1b3fe56e877d382fbbdac02cfc18e49063
 EBUILD igbinary-2.0.1.ebuild 574 BLAKE2B 4d078b52245b95d27aa040aff32ce303e7b46b31b10dba9666d6d4242edb93dd80d67c684732fa6efa8582488d2fdae5d758e9b4be48fd9b51bb059b2fc7b1d5 SHA512 d87d6379ee99b42860507955214f0fbd181a68c2ad1be33d74e0cf8b3126def3c114a17c674ada6e8258aedba85fd468239b82443e9a338b1ff401102ada6304
 EBUILD igbinary-2.0.4.ebuild 576 BLAKE2B 6e531bdf7061e41bd1b8fceb54d8e2fb15cd7e6b29c1704d7c2d5114ded5ec9d3691106b16114e8595a98c764923160d87a2f29e3a5e81dbfd796f25151e94d5 SHA512 4ae1113e8f5d6db14dcd4f85166394aa710ffb22a9b84c57a8797074671e4474f31b1460b81da1ad600141cd921b1fd36f3f4596f33a064d3bb33165564cf44b
-EBUILD igbinary-2.0.5.ebuild 586 BLAKE2B 06ab30e3024877c2be0acb740bdedb378b8ffe84f3c03888a1bf4363b27faa9ce2fb30143dd9c1d33ad6dd90d2bb7ed9a13257a6179dd5cddd0a0aa9a4ab2a93 SHA512 b79d6efcca26e1d0d9f55af8bbc1e7eed3309dfcb081878a70f54fcf610065ae41ccecf0da72e2ecb61b36bbfd25d97848c1b51df9eeb977a003d71bb9e78f25
+EBUILD igbinary-2.0.5.ebuild 585 BLAKE2B 24d7d29a7b0846ad8b42cdd50e3e9f8e03e889f0787c635e993584ce66098bdd5cce0a520aa997c9e5cbc37741a7c9d8c947444bbea42c418a42cce337b1ede6 SHA512 f57860093276c7688dc5a32dc51f2f1bb56fbed2d5a8069c302516f6bf4743841d618e9fcff9ba9e0ae179b34971c0c4fa7ed1f750402497764fa8e614b67b9b
 MISC metadata.xml 331 BLAKE2B 4187300236aa128879679c7cb4a8ddfa19dfd512a76466e835224c30323f2fafd55189228bdced507ababd5b90f561f6bb44c1554392eb0682b6ba5c7a20b681 SHA512 86f467f549b36915940e45a4e151742f2925293106dd3da2958e6153aaa8fed378b2eb563bf69da0d38101409858a4abe308f608bd94de6b4517daf9da092405
diff --git a/dev-php/igbinary/igbinary-2.0.5.ebuild b/dev-php/igbinary/igbinary-2.0.5.ebuild
index 7421e044d58d..114414a580a1 100644
--- a/dev-php/igbinary/igbinary-2.0.5.ebuild
+++ b/dev-php/igbinary/igbinary-2.0.5.ebuild
@@ -12,7 +12,7 @@ USE_PHP="php5-6 php7-0 php7-1 php7-2"
 
 inherit php-ext-source-r3
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 
 DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
 HOMEPAGE="https://github.com/${PN}/${PN}"
diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index 9bf2fba4bf14..130b2d45ca53 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -5,5 +5,5 @@ DIST pecl-memcached-3.0.0.tar.gz 83732 BLAKE2B 0e38d34b6ccd72f1e58305c3b4fbb3437
 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 1623 BLAKE2B 99da5fca5dff21e9c90c5003fe746da401d466c83761e9447b665f25656748391f4f1633d649602f8f381ac08934f619db26801580b23245c781f2eedb0db8cf SHA512 b0fff002e73e98489435cdb1142d4021e71d30e5fd3a53c726c05580a1039774ee1bf72816653d268ffbb4a5b1c0a9b7346af3dd312dede7b961d2eb62770aaf
+EBUILD pecl-memcached-3.0.4.ebuild 1622 BLAKE2B dfecadae2efc6b34a3442810b753d97157fdd59cfe2118321253a4e4b1b528521dfa6c511f3cb49ccd0579f95946a11a22a253329ff8b0897286bd05f4e5cf43 SHA512 f47c459a8e86ece1467ed4dfc824509ed344fda58c9274d840f401dc573c3d405bef1cca964f5d64a4b31d968434c370cecc4161caeba7075ff1ed54e2dc4e15
 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
index e8717b1cc910..6b5b2b389544 100644
--- a/dev-php/pecl-memcached/pecl-memcached-3.0.4.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-3.0.4.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
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~x86"
 IUSE="examples igbinary json sasl +session "
 
 COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl?]
diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest
index 180f799718d3..3de292a14853 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -1,7 +1,5 @@
-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
+EBUILD pecl-redis-3.1.6-r1.ebuild 1504 BLAKE2B 39cd4e0402cde5507b4de802e6ec1a9855f293ea1710f1987690c9c4dca507c72045b87b423c89950e76facff3699ec782df904904c4f361f304f9a3f0095f2f SHA512 6588808380496dbf7f46e85483393a1c2fbe10720959a113cdf19e527a43e72e11fa948a168d965d3dbd1c1d3809051246d2a1ed504fb0958a728b20191b2ec1
+EBUILD pecl-redis-4.0.0-r1.ebuild 1638 BLAKE2B 3072def07f464db1a3148b4c1ac52db50bf47c858db808696505597e67d0adee8b5a10bb72105cfe7e51973d26233ae35410efd6599ca9c3e53ae5665b64219e SHA512 580d168d0eccc106f367457986faaadbbb9ef0cd0263e25a91202388f03363a4ad5bbc62ffa25a7c8b22d76f573bb6a5efe7202f97fbfe47789fd92abe21bbd0
 MISC metadata.xml 324 BLAKE2B fc4145f462dd06f7a34385a0d8e2cbc6da6744094e84851891d5513f7be39c89cebe439e566fc2ead0afdb8ee3885b4a4d448e63d4c1a1d20a5bb8791c12d313 SHA512 916879a4b7ed11e30634a1c95637e9426932bac3c6aba2c7e686d9835097873e142f062e7d81e3ac99c3aef972b40db67b3809116cff4a3742ba6c669d999066
diff --git a/dev-php/pecl-redis/pecl-redis-3.1.2.ebuild b/dev-php/pecl-redis/pecl-redis-3.1.2.ebuild
deleted file mode 100644
index 28fa94708b69..000000000000
--- a/dev-php/pecl-redis/pecl-redis-3.1.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 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"
-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"
-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] ) )"
-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
-}
diff --git a/dev-php/pecl-redis/pecl-redis-3.1.6.ebuild b/dev-php/pecl-redis/pecl-redis-3.1.6-r1.ebuild
index 486ad8e21f74..6c219bc92938 100644
--- a/dev-php/pecl-redis/pecl-redis-3.1.6.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-3.1.6-r1.ebuild
@@ -15,14 +15,15 @@ inherit php-ext-pecl-r3
 DESCRIPTION="PHP extension for interfacing with Redis"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+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] ) ) "
+DEPEND="
+	php_targets_php5-6? ( dev-lang/php:5.6[session?] igbinary? ( dev-php/igbinary[php_targets_php5-6] ) )
+	php_targets_php7-0? ( dev-lang/php:7.0[session?] igbinary? ( dev-php/igbinary[php_targets_php7-0] ) )
+	php_targets_php7-1? ( dev-lang/php:7.1[session?] igbinary? ( dev-php/igbinary[php_targets_php7-1] ) )
+	php_targets_php7-2? ( dev-lang/php:7.2[session?] igbinary? ( dev-php/igbinary[php_targets_php7-2] ) )
+"
 RDEPEND="${DEPEND} !dev-php/pecl-redis:7"
 
 # The test suite requires network access.
diff --git a/dev-php/pecl-redis/pecl-redis-4.0.0.ebuild b/dev-php/pecl-redis/pecl-redis-4.0.0-r1.ebuild
index af4fb3636c09..4cf2aa9cb6cf 100644
--- a/dev-php/pecl-redis/pecl-redis-4.0.0.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-4.0.0-r1.ebuild
@@ -18,11 +18,12 @@ 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] ) ) "
+DEPEND="
+	php_targets_php5-6? ( dev-lang/php:5.6[session?] igbinary? ( dev-php/igbinary[php_targets_php5-6] ) )
+	php_targets_php7-0? ( dev-lang/php:7.0[session?] igbinary? ( dev-php/igbinary[php_targets_php7-0] ) )
+	php_targets_php7-1? ( dev-lang/php:7.1[session?] igbinary? ( dev-php/igbinary[php_targets_php7-1] ) )
+	php_targets_php7-2? ( dev-lang/php:7.2[session?] igbinary? ( dev-php/igbinary[php_targets_php7-2] ) )
+"
 RDEPEND="${DEPEND} !dev-php/pecl-redis:7"
 
 # The test suite requires network access.