gentoo resync : 19.04.2018

4 files changed, 15 insertions, 66 deletions

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.