gentoo resync : 15.12.2019

6 files changed, 101 insertions, 12 deletions

diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index 33bbe73a52f7..6f339ca2fc90 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -2,9 +2,11 @@ DIST memcached-2.2.0.tgz 70449 BLAKE2B dca76bfb993c647860ae2ce648580e6131c6df30d
 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
-EBUILD pecl-memcached-2.2.0-r2.ebuild 1328 BLAKE2B 9329ea2cb375e689a85a6f3642073085021871c5411ceb39407221779a588138a7c9f6c7f38d30bb360a3e900ba4ba7e0f3beba65be14242d4e69d024a2de941 SHA512 7bde32cce2bd022b7c351b93d099880662089531ef3ee8b2265a1e54bb57fd5e4d95e83d44160ffe4082df32e883017ade1978170aa174b0c0172fac048bac9c
+DIST memcached-3.1.5.tgz 83015 BLAKE2B 80f5cbed8e34f867962792d95d242015690f64ab3b462e09813a11b8b86234b0b05b0f6a78f7c6184482b66ba8015064b37f77bbb816a3aee2edd0ce97ab0cbc SHA512 87d5fd079fcaad81139785d6766da71b23a1a0fe907d4b22f3a787af148a20412c11df11c4d98c165241658baf0d87c8a6b29de15db07a0f9d1fabc8aec8f0e9
+EBUILD pecl-memcached-2.2.0-r2.ebuild 1335 BLAKE2B 8115bc7e0678e74a71a4238d751ffd077da6bc966c17c2922ee044082d7c0da7e74f333d3b9c83f3f4e334881e92914543b3bf02f00a061eaf42485f898c2755 SHA512 53a8cc1ea2bb9cc970dc4283d92173de9d430aa2d45245265a138d9559550d9b5c077333873a76e9e12afd5d97f23564ee7395e834c3ba316ff3a3d1c4da042c
 EBUILD pecl-memcached-3.0.4.ebuild 1576 BLAKE2B cb1e70517c9470e28826a52819c0f4fe99905e3b46eb2f18120206ae8e111d41b83f0d09064f2a7c8dfab150884ae9137fcbecc74bf3020300b7e6a1ec1e8239 SHA512 de5d39a48266e9f393daaa88844b29d923e5bb3d58053b097023fd79045b5958930b3d8beb7b987a87d6460b2db2a0a14ddacafc7b80400806afaee612ee8701
-EBUILD pecl-memcached-3.1.3-r1.ebuild 2152 BLAKE2B abc8ded50f93353de90d9094a6817971b6d88e4b975e02d496a070094cbde42fb0baaf6704d42a0fdb60eca8ab16d1eb2c19975b1ebda00ce93ab8e72305703a SHA512 78adbd643ffb23ac2d5ea909330a22669eb492dab9b1551b3039d299a32ae2c7d0a739418c863a7a2f489b96f4d42a25fd7f0c03ee726c67a1496b2034a093a2
-EBUILD pecl-memcached-3.1.3.ebuild 2361 BLAKE2B f244c38640a95786ae9c28e042921888b5f4aa7ff7b24eae130591306d1279ba9d9abac56b402188b1cfdfbcfdddf4d414c4148e637050d7667eb39aeec0de2d SHA512 38d3fb0c6f66e88844b31a41b8683193b27d1115b829f54681e51f28c2eae2ac2c8687a45205acbd6fc30de18d8dcbcb47a6bbafea6cc505356a7531b43da664
-EBUILD pecl-memcached-3.1.4.ebuild 2182 BLAKE2B 08c12113ee7db5a1c63bd174a1db3f21f46781adb984bbee459bcd1eac20d903de30002103b212af9328039cfc0fe3c3a8167f9767526f4983f0a64c171ab615 SHA512 2714fe53769314c6bb8e2cb4b7d33e2d5fc9aff731ff98fb7eea50eb53b3a41155509900424f3b7bbd091d152daed865a2f46970946f55741e69069f1fd25878
+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
 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 fd4145a89f90..b9ba25217752 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
@@ -13,7 +13,7 @@ inherit php-ext-pecl-r3
 
 USE_PHP="php5-6"
 
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 DESCRIPTION="Interface PHP with memcached via libmemcached library"
 LICENSE="PHP-3"
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
index cd2d27c34ea5..7be1e62cbff5 100644
--- a/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild
@@ -12,8 +12,9 @@ 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 ~arm x86"
+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
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 29089ab19505..2a670cd01ef9 100644
--- a/dev-php/pecl-memcached/pecl-memcached-3.1.3.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-3.1.3.ebuild
@@ -14,6 +14,7 @@ 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
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.4.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.4.ebuild
index 88fd7a424994..f9b01c82b993 100644
--- a/dev-php/pecl-memcached/pecl-memcached-3.1.4.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-3.1.4.ebuild
@@ -5,14 +5,14 @@ EAPI=7
 PHP_EXT_NAME="memcached"
 DOCS=( ChangeLog README.markdown )
 
-USE_PHP="php5-6 php7-1 php7-2 php7-3" # Pretend to support all four targets...
+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" # But only truly build for these three.
+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 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="examples igbinary json sasl +session test"
 
 RESTRICT="!test? ( test )"
@@ -33,12 +33,16 @@ RDEPEND="
 	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 ; then
+	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
@@ -56,7 +60,7 @@ src_configure() {
 }
 
 src_test() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	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"
@@ -71,7 +75,7 @@ src_test() {
 }
 
 src_install(){
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	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.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.5.ebuild
new file mode 100644
index 000000000000..f9b01c82b993
--- /dev/null
+++ b/dev-php/pecl-memcached/pecl-memcached-3.1.5.ebuild
@@ -0,0 +1,81 @@
+# 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
+}