gentoo resync : 12.05.2022

4 files changed, 2 insertions, 133 deletions

diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index 083b60481dd3..2da976c0ef2f 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -1,8 +1,5 @@
-AUX 3.1.5-fix-tests.patch 1032 BLAKE2B 15b91b77b645ea298f2334df6d4a0b804735d38dca3067f1cac7fb8fdf30d5ccb4895cc431b5dd6cc0bd8b5be9983b48e157694bc437fc057aed0c9879480bc4 SHA512 1fd27bbae55a0e0ed12ca8422fc8969b9d69ae2c26d9b991648bc2cd7d39f6ede621e453aa12a6ec027c69791988f5db4117c32a31aab20836bdd565d7c62dc2
 DIST memcached-3.1.5.tgz 83015 BLAKE2B 80f5cbed8e34f867962792d95d242015690f64ab3b462e09813a11b8b86234b0b05b0f6a78f7c6184482b66ba8015064b37f77bbb816a3aee2edd0ce97ab0cbc SHA512 87d5fd079fcaad81139785d6766da71b23a1a0fe907d4b22f3a787af148a20412c11df11c4d98c165241658baf0d87c8a6b29de15db07a0f9d1fabc8aec8f0e9
-DIST memcached-3.2.0RC2.tgz 90731 BLAKE2B 69e163f7375c94d9e8f49890f169708e2286ed96b82f13b0a6fad092870f03c6aaba0ef3a23de8775575a1b135783a0e27404120a2bbeef9bdbc73735461b1a3 SHA512 056dec58734dc2171429d1b33a74be829f78ab993f0f1699d9f61b105d4252e35c4e05dbda9e045ed3364d82779c662c2f28c63cdac1b81027549335b5376845
-DIST pecl-memcached-3.1.5_p20210807.tar.gz 99221 BLAKE2B 7a6a92701d17ce2c108cda862d52cebbae38e993e4182fd23ce78ea1cbebbdba6d46a71258b7dd388ff38f2b7b04c94ca822954ff931111fd9bfc64d578a6f26 SHA512 3c124f969efcd3bcc513e3e347828ac6e0a5540379f7d3a83c306d65a02ece3c76f87e3db52153c5d2f2c03c5fafb646f6b3b33c0b1d5afbb71ffa22d2df6f90
+DIST memcached-3.2.0.tgz 90722 BLAKE2B 5bc3ce40803004f45ad397684277862dbaffce467b3026e33d9737d4d93a82f2c89e32a256ebf6db3117a462ff8f81a517ed9950773cb4a0e927aa8af4e834be SHA512 ece5759a9d6d52afd46beb0821811e5d4830e75ad8564af395e2107fd349e271c6e6cf20eeacd9ad15ee2e99ccf0118ccc83c5810e2f3fa7c61f1984b0b26514
 EBUILD pecl-memcached-3.1.5-r1.ebuild 1582 BLAKE2B 7cb8c180c14bf80a1e4447bfde1c1087f483c582b3f748c819b2e1d9393e5eb5c8a3ac7c4c0cd99d8dd62ecfd2eb302cf83224fdf7de370d21e9a2520b6990cf SHA512 b9aa92fafe9a68a647e3e76212b40c36b65ebcfed423d82a22fe3aad146149a1d915a895cf77c06830b9a0bb589d992d4470e640365f3beb7f46d5c5b3e70662
-EBUILD pecl-memcached-3.1.5_p20210807.ebuild 2650 BLAKE2B 06d94ad81a17dd31d9b1988907cb540385ce816bf2b649f6cb5b1b9aca9b986996d1b6375f7168d096b7435ead2a5bf1f54eeb1a82bc3cf3e244f3548148b758 SHA512 946d76c95f96ca6e0d4b416f4c5d145eff164144c7aa71be7a3e0bdb077e7c99fadff9ee20bd2cc9d23c4690a1954c55e98071bb2fa52068c5c78ad7c7e321c5
-EBUILD pecl-memcached-3.2.0_rc2.ebuild 1527 BLAKE2B 00b017f2620871b04c87b0da4d2754ab8680a071e9687899dbdda0229c7f137344b1d471750f8079ee9194267113e4107cc75cc72e35387683de358f4dc36f8f SHA512 300580410c2e5e07fca52c4d0c4035650e59e81bb0b31d6320fedbcb61da7cf8875c20cade2c8a4530fae570d6bfb4305247c85281a22d6209a68b1bb9f9a89f
+EBUILD pecl-memcached-3.2.0.ebuild 1527 BLAKE2B 00b017f2620871b04c87b0da4d2754ab8680a071e9687899dbdda0229c7f137344b1d471750f8079ee9194267113e4107cc75cc72e35387683de358f4dc36f8f SHA512 300580410c2e5e07fca52c4d0c4035650e59e81bb0b31d6320fedbcb61da7cf8875c20cade2c8a4530fae570d6bfb4305247c85281a22d6209a68b1bb9f9a89f
 MISC metadata.xml 569 BLAKE2B 686b6c91f4d91fb82bd90b08af6627a8211e9676139417551e8a8425da410c15a77b79ff51760c2a16815c84c55c1e81ff462af17282ffa198db0829b20566c6 SHA512 8f3154fc7f3c9d1707b121ddc8d94d8d5570f7ca0cc93c0f732cda3ba6a756ed421a6facd96000ade0c22af9a78efbdd69ec118bd195c4c83fc523f2cd7e1cc7
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
deleted file mode 100644
index 08a881c182d8..000000000000
--- a/dev-php/pecl-memcached/files/3.1.5-fix-tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- 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
deleted file mode 100644
index baa39cff1a1b..000000000000
--- a/dev-php/pecl-memcached/pecl-memcached-3.1.5_p20210807.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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 php8-1"
-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(-)] )
-	)
-	php_targets_php8-1? (
-		${COMMON_DEPEND} dev-lang/php:8.1[session(-)?]
-		igbinary? ( dev-php/igbinary[php_targets_php8-1(-)] )
-	)
-"
-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}
-}
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.2.0_rc2.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.2.0.ebuild
index 09b3c0ce9508..09b3c0ce9508 100644
--- a/dev-php/pecl-memcached/pecl-memcached-3.2.0_rc2.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-3.2.0.ebuild