3 files changed, 126 insertions, 0 deletions
diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index 0ce519a59732..883e5d1fc8b8 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -1,3 +1,6 @@
+AUX 3.1.5-fix-tests.patch 1032 BLAKE2B 15b91b77b645ea298f2334df6d4a0b804735d38dca3067f1cac7fb8fdf30d5ccb4895cc431b5dd6cc0bd8b5be9983b48e157694bc437fc057aed0c9879480bc4 SHA512 1fd27bbae55a0e0ed12ca8422fc8969b9d69ae2c26d9b991648bc2cd7d39f6ede621e453aa12a6ec027c69791988f5db4117c32a31aab20836bdd565d7c62dc2
 DIST memcached-3.1.5.tgz 83015 BLAKE2B 80f5cbed8e34f867962792d95d242015690f64ab3b462e09813a11b8b86234b0b05b0f6a78f7c6184482b66ba8015064b37f77bbb816a3aee2edd0ce97ab0cbc SHA512 87d5fd079fcaad81139785d6766da71b23a1a0fe907d4b22f3a787af148a20412c11df11c4d98c165241658baf0d87c8a6b29de15db07a0f9d1fabc8aec8f0e9
+DIST pecl-memcached-3.1.5_p20210807.tar.gz 99221 BLAKE2B 7a6a92701d17ce2c108cda862d52cebbae38e993e4182fd23ce78ea1cbebbdba6d46a71258b7dd388ff38f2b7b04c94ca822954ff931111fd9bfc64d578a6f26 SHA512 3c124f969efcd3bcc513e3e347828ac6e0a5540379f7d3a83c306d65a02ece3c76f87e3db52153c5d2f2c03c5fafb646f6b3b33c0b1d5afbb71ffa22d2df6f90
 EBUILD pecl-memcached-3.1.5-r1.ebuild 1582 BLAKE2B 7cb8c180c14bf80a1e4447bfde1c1087f483c582b3f748c819b2e1d9393e5eb5c8a3ac7c4c0cd99d8dd62ecfd2eb302cf83224fdf7de370d21e9a2520b6990cf SHA512 b9aa92fafe9a68a647e3e76212b40c36b65ebcfed423d82a22fe3aad146149a1d915a895cf77c06830b9a0bb589d992d4470e640365f3beb7f46d5c5b3e70662
+EBUILD pecl-memcached-3.1.5_p20210807.ebuild 2511 BLAKE2B 85175013cef923982265442f9551ed434c134a329aeae53c24580e921dc8284e9cb5a25b8ab974534983767e04e3834e3eaa4aed7d62d141fbe6d83080d5a95f SHA512 9c8fe68e8cc390820af6185c2bf4a4a8114c708d5410242c3cc29477b2a5a89f0330d6a9a9035113dd2cbf5428d7365f2f795589a32611823d11aaafae8e122b
 MISC metadata.xml 568 BLAKE2B 7568c14297b6c9d91a289ecccaf51548928f633f034b9468725bf149060a66782a36bf4496e39a55e4d658ae7336d105566f14d413fc299dc4ca85ad689932b8 SHA512 177558b878967a84ceb4f9bce0fe15b2bc8e3539863d66c0de1fc273601f2cb24aef9ef1c4cf7a4817a2c1fbd8e0635d35c0dae6cd6ea72ffe70111944cdbcd9
diff --git a/dev-php/pecl-memcached/files/3.1.5-fix-tests.patch b/dev-php/pecl-memcached/files/3.1.5-fix-tests.patch
new file mode 100644
index 000000000000..08a881c182d8
--- /dev/null
+++ b/dev-php/pecl-memcached/files/3.1.5-fix-tests.patch
@@ -0,0 +1,41 @@
+--- a/tests/experimental/session_gc.phpt	2021-08-23 01:05:26.000000000 -0400
++++ b/tests/experimental/session_gc.phpt	2021-08-27 14:30:01.504619748 -0400
+@@ -20,22 +20,23 @@
+ 
+ session_start();
+ $_SESSION['foo'] = 1;
+-var_dump($_SESSION);
++$session1 = $_SESSION;
+ session_write_close();
+ 
+ $_SESSION = NULL;
+-var_dump($_SESSION);
++$session2 = $_SESSION;
+ 
+ session_start();
+-var_dump($_SESSION);
++$session3 = $_SESSION;
+ session_write_close();
+ 
+ sleep(3);
+ 
+ session_start();
+-var_dump($_SESSION);
++$session4 = $_SESSION;
+ session_write_close();
+ 
++var_dump($session1, $session2, $session3, $session4);
+ 
+ --EXPECT--
+ array(1) {
+--- a/tests/experimental/extreme_floats.phpt	2021-08-23 01:05:26.000000000 -0400
++++ b/tests/experimental/extreme_floats.phpt	2021-08-27 14:40:03.223499433 -0400
+@@ -2,6 +2,8 @@
+ Extreme floats: max, min, Inf, -Inf, and NaN
+ --SKIPIF--
+ <?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
++--INI--
++serialize_precision = 14
+ --FILE--
+ <?php
+ include dirname(dirname(__FILE__)) . '/config.inc';
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.5_p20210807.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.5_p20210807.ebuild
new file mode 100644
index 000000000000..246535a68f31
--- /dev/null
+++ b/dev-php/pecl-memcached/pecl-memcached-3.1.5_p20210807.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 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="php7-3 php7-4 php8-0"
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Interface PHP with memcached via libmemcached library"
+LICENSE="PHP-3.01"
+SLOT="7"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="igbinary json sasl +session test"
+REPO_COMMIT="9cd4a01d99b701a2c1a42799afe80635dcfecfe4"
+SRC_URI="https://github.com/php-memcached-dev/php-memcached/archive/${REPO_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl(-)?]
+	sys-libs/zlib
+"
+
+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(-)] )
+	)
+	php_targets_php8-0? (
+		${COMMON_DEPEND} dev-lang/php:8.0[session(-)?]
+		igbinary? ( dev-php/igbinary[php_targets_php8-0(-)] )
+	)"
+DEPEND="${RDEPEND} test? ( net-misc/memcached )"
+
+PATCHES=( "${FILESDIR}/3.1.5-fix-tests.patch" )
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/php-memcached-${REPO_COMMIT}" "${S}" || die
+	ln -s "${S}/tests/skipif.inc" "${S}/tests/experimental/skipif.inc" || die
+	ln -s "${S}/tests/skipif.inc" "${S}/tests/experimental/serializer/skipif.inc" || die
+	local x
+	local broken_tests=(
+	# Known broken tests. https://github.com/php-memcached-dev/php-memcached/issues/386
+		get_bykey_cas getdelayed_bykey_cas getdelayed_cbthrows
+		stats stats_badserver getmulti_badserver
+	# Excessive warnings make them "BORK"
+		serializer/serializer_php_bad_serialize serializer/serializer_php_bad_unserialize
+	)
+	for x in "${broken_tests[@]}" ; do
+		rm "${S}/tests/experimental/${x}.phpt" || die
+	done
+}
+
+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() {
+	touch "${T}/memcached.pid" || die
+	local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 -U 11211 )
+	[[ ${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}
+}