gentoo resync : 06.12.2017

3 files changed, 73 insertions, 5 deletions

diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index f63247f5240b..8722d3f36eb8 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -1,7 +1,9 @@
-DIST memcached-2.2.0.tgz 70449 SHA256 17b9600f6d4c807f23a3f5c45fcd8775ca2e61d6eda70370af2bef4c6e159f58 SHA512 61207d3f8c11b0620dbcb20fb2ebb6d1fc10159a7e879ee91556a303c3dcdf3d2571e8dda5efcbed77ff779f5c9b226aa48800630b9e7781cd964126b848c356 WHIRLPOOL 1114a4c4371cfb42e3e4cb991980b32894f438abacf61c6da3dd6d9742c93e20df7691287c852c17dfe8261046227d73b1887c0b7b9c03a0e895a713005dc95a
-DIST memcached-3.0.3.tgz 77310 SHA256 5d1c29a1d5e391d6bb7b736a07e063d2f0834800673dd246d64ce1b73e47645d SHA512 cb24d76f82ce8c1fdd8877bbb46131545bba5011cfff965e3c190b7c0f71f754b47ded6289d3125724d9de781b916971aaadfa0b247c6fe2f51aab77dce61b61 WHIRLPOOL f7a76bb72438490db34dcec26800222d46c7b03ce777fc4573a0b36ae9078b9f811ad161cb5f36722d03f7d606eb0edc29bdefc3e078607c0ba1bb4a0c78fd71
+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 pecl-memcached-3.0.0.tar.gz 83732 SHA256 15b8de6688a7a7c08c4893102918955a34f68edf7a64eed871f9f2b5e683d244 SHA512 ddc6b6fbdd55c6cdf64b9a7833142ea43eb974ecaae3437b30ed731f0ddbf4108b46ea5eb01a197788978273bdff31da6a0c0fb0354335b85618d98ba070bfec WHIRLPOOL 378b873dc5e944d0d8a9367f29b9746fcf0e15226f6b4a2eb1916e07fefcec0ce5229351f5796dc1513a2104565c6c04957ed9202133c111aad5ebb8e6c08b74
-EBUILD pecl-memcached-2.2.0-r2.ebuild 1172 BLAKE2B 3ac23b86974686df1a8867cb8c0cc0743cc96e8fc61962b901cc630050539c20e53eb851c628d58efd73ac4ed451c5f6e68f901ac4c6c8f2ca256c8cf1aaa436 SHA512 4f14d13da24fa2a4f41cc5175053767d9d4b1531a04c830db5335e88be776cf50efa98d59f44fe5ac4ea4642e0c72d52873608722a1f3f8dc15b4d7084030b2b
+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
 MISC metadata.xml 568 BLAKE2B f99b2eb530ffd87100256bb477bfbd50e48b28283bc01147b0cb1e3dd7dbfb940cd8e16e24c68723fe764df0cbdb1ecb0b995e151c67a37673a19a2cfeb1bcfa SHA512 9fb2c3ea2dba6b4b1cdda8acc02afa006a95651b4fdb5011b15e4046bc44742cc5306d20db070f4f1977352873576040a34ed24a660ec2c640e118115359f2c6
diff --git a/dev-php/pecl-memcached/pecl-memcached-2.2.0-r2.ebuild b/dev-php/pecl-memcached/pecl-memcached-2.2.0-r2.ebuild
index 1ca7d7234622..353b38418dfa 100644
--- a/dev-php/pecl-memcached/pecl-memcached-2.2.0-r2.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-2.2.0-r2.ebuild
@@ -7,7 +7,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( ChangeLog README.markdown )
 
-USE_PHP="php5-6 php7-0"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
 
 inherit php-ext-pecl-r3
 
@@ -27,7 +27,11 @@ DEPEND="php_targets_php5-6? (
 		igbinary? ( dev-php/igbinary[php_targets_php5-6?] )
 	)"
 RDEPEND="${DEPEND}"
-PDEPEND="php_targets_php7-0? ( dev-php/pecl-memcached:7[php_targets_php7-0] )"
+PDEPEND="
+php_targets_php7-0? ( dev-php/pecl-memcached:7[php_targets_php7-0] )
+php_targets_php7-1? ( dev-php/pecl-memcached:7[php_targets_php7-1] )
+php_targets_php7-2? ( dev-php/pecl-memcached:7[php_targets_php7-2] )
+"
 
 src_prepare(){
 	if use php_targets_php5-6 ; then
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.0.4.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.0.4.ebuild
new file mode 100644
index 000000000000..e8717b1cc910
--- /dev/null
+++ b/dev-php/pecl-memcached/pecl-memcached-3.0.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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(){
+	use examples && dodoc -r server-example
+
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		php-ext-source-r3_src_install
+	fi
+}