gentoo resync : 08.06.2019

3 files changed, 79 insertions, 3 deletions

diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index e19fa4506b93..637b0410c93e 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -3,5 +3,6 @@ DIST memcached-3.0.4.tgz 78776 BLAKE2B ce2539e2e4960217d9ee3b50ed5625214d4b22c4d
 DIST memcached-3.1.3.tgz 82673 BLAKE2B ccb9267cbd974337b7cd8836ab6e35c4fd9398d731dcd333bcb664b91037d1775651e6bb5d00b602767834681289064ede678ea2e6e3641631bba4990a380dee SHA512 9c09648c26011c5e749bee1a556c976e6e5e648dc65580e7caa296dab79e3764edf1408f96edcaca5efb0229320c86fcfa0422e55d486beb6466892f7e08c4a3
 EBUILD pecl-memcached-2.2.0-r2.ebuild 1326 BLAKE2B 5e8263a0affd9dd1fe3ddab2fb0e40ae9b7b7b93241d785facde7941164dcc85d4b1fb7c55c7690df75b2d6f3ec2fd2296963183763b1397036de12687cf095f SHA512 91b5c873c5a4e484c56e9ab3080972fd4bcd553c7e1630eabb7f552747a9004a3bdb3cf74993d214d6281358b4e0fde6ba3af1a8e55d0603f3828b579f499434
 EBUILD pecl-memcached-3.0.4.ebuild 1576 BLAKE2B cb1e70517c9470e28826a52819c0f4fe99905e3b46eb2f18120206ae8e111d41b83f0d09064f2a7c8dfab150884ae9137fcbecc74bf3020300b7e6a1ec1e8239 SHA512 de5d39a48266e9f393daaa88844b29d923e5bb3d58053b097023fd79045b5958930b3d8beb7b987a87d6460b2db2a0a14ddacafc7b80400806afaee612ee8701
-EBUILD pecl-memcached-3.1.3.ebuild 2350 BLAKE2B 936bba35400475d9b7bdf81d362de77e9332931c339f816e6f1a80b15930ddf72be2fea363426969623fc3d72072a5ebc1005d5d438910d744afad2c2efa5410 SHA512 011787060ca0a80c3f9308764a572e7fe09ec94912bb607f0f5827f5e9c98b5aef648293078e6527a34cba974c7ecb8d50f8c7ec32ea660fe4d55609ffeb39f9
+EBUILD pecl-memcached-3.1.3-r1.ebuild 2147 BLAKE2B 2f524041231d596eba2232bb4547f3a4f9d948518b464a1cecaac56ad257f6a097f6ef330172d4a888642e00a00c5f592d6bcc4ec22a288af70511535c27b2c4 SHA512 afe35045cd5f57ee74de13cc6348d16ed522f6bae80382c2378b19354dffbd2642e85b3cb588572fd874e58d2baa050bc3cdcaddd244c90457a05d06a6b80798
+EBUILD pecl-memcached-3.1.3.ebuild 2361 BLAKE2B f244c38640a95786ae9c28e042921888b5f4aa7ff7b24eae130591306d1279ba9d9abac56b402188b1cfdfbcfdddf4d414c4148e637050d7667eb39aeec0de2d SHA512 38d3fb0c6f66e88844b31a41b8683193b27d1115b829f54681e51f28c2eae2ac2c8687a45205acbd6fc30de18d8dcbcb47a6bbafea6cc505356a7531b43da664
 MISC metadata.xml 568 BLAKE2B f99b2eb530ffd87100256bb477bfbd50e48b28283bc01147b0cb1e3dd7dbfb940cd8e16e24c68723fe764df0cbdb1ecb0b995e151c67a37673a19a2cfeb1bcfa SHA512 9fb2c3ea2dba6b4b1cdda8acc02afa006a95651b4fdb5011b15e4046bc44742cc5306d20db070f4f1977352873576040a34ed24a660ec2c640e118115359f2c6
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild
new file mode 100644
index 000000000000..93d54cc2a7a8
--- /dev/null
+++ b/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild
@@ -0,0 +1,75 @@
+# 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-1 php7-2 php7-3" # Pretend to support all four targets...
+inherit php-ext-pecl-r3
+USE_PHP="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
+"
+
+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(-)] )
+	)"
+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 ; 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 ; 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 ; 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
index a9f98652d5fb..29089ab19505 100644
--- a/dev-php/pecl-memcached/pecl-memcached-3.1.3.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-3.1.3.ebuild
@@ -12,12 +12,12 @@ 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"
+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?] )
+	igbinary? ( dev-php/igbinary[php_targets_php7-0(-)?,php_targets_php7-1(-)?,php_targets_php7-2(-)?,php_targets_php7-3(-)?] )
 "
 
 DEPEND="