[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-memcached/files/, dev-php/pecl-memcached/

2022-05-03 Thread Brian Evans
commit: ca7cd884979434f518598aea6fc2f4b5f16d3be2
Author: Brian Evans  gentoo  org>
AuthorDate: Tue May  3 17:16:18 2022 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue May  3 17:30:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca7cd884

dev-php/pecl-memcached: Drop old

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-memcached/Manifest|  2 -
 dev-php/pecl-memcached/files/3.1.5-fix-tests.patch | 41 --
 .../pecl-memcached-3.1.5_p20210807.ebuild  | 87 --
 .../pecl-memcached/pecl-memcached-3.2.0_rc2.ebuild | 56 --
 4 files changed, 186 deletions(-)

diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index c9ba788e51eb..ed8e45ad7aea 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -1,4 +1,2 @@
 DIST memcached-3.1.5.tgz 83015 BLAKE2B 
80f5cbed8e34f867962792d95d242015690f64ab3b462e09813a11b8b86234b0b05b0f6a78f7c6184482b66ba8015064b37f77bbb816a3aee2edd0ce97ab0cbc
 SHA512 
87d5fd079fcaad81139785d6766da71b23a1a0fe907d4b22f3a787af148a20412c11df11c4d98c165241658baf0d87c8a6b29de15db07a0f9d1fabc8aec8f0e9
 DIST memcached-3.2.0.tgz 90722 BLAKE2B 
5bc3ce40803004f45ad397684277862dbaffce467b3026e33d9737d4d93a82f2c89e32a256ebf6db3117a462ff8f81a517ed9950773cb4a0e927aa8af4e834be
 SHA512 
ece5759a9d6d52afd46beb0821811e5d4830e75ad8564af395e2107fd349e271c6e6cf20eeacd9ad15ee2e99ccf0118ccc83c5810e2f3fa7c61f1984b0b26514
-DIST memcached-3.2.0RC2.tgz 90731 BLAKE2B 
69e163f7375c94d9e8f49890f169708e2286ed96b82f13b0a6fad092870f03c6aaba0ef3a23de8775575a1b135783a0e27404120a2bbeef9bdbc73735461b1a3
 SHA512 
056dec58734dc2171429d1b33a74be829f78ab993f0f1699d9f61b105d4252e35c4e05dbda9e045ed3364d82779c662c2f28c63cdac1b81027549335b5376845
-DIST pecl-memcached-3.1.5_p20210807.tar.gz 99221 BLAKE2B 
7a6a92701d17ce2c108cda862d52cebbae38e993e4182fd23ce78ea1cbebbdba6d46a71258b7dd388ff38f2b7b04c94ca822954ff93fd9bfc64d578a6f26
 SHA512 
3c124f969efcd3bcc513e3e347828ac6e0a5540379f7d3a83c306d65a02ece3c76f87e3db52153c5d2f2c03c5fafb646f6b3b33c0b1d5afbb71ffa22d2df6f90

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..
--- 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.0 
-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.0 
-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--
- 
-+--INI--
-+serialize_precision = 14
- --FILE--
- 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 

[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-memcached/files/, dev-php/pecl-memcached/

2021-08-27 Thread Brian Evans
commit: 2c177955a903c70fdc8cde266eb705b2a627ce2e
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Aug 27 19:01:45 2021 +
Commit: Brian Evans  gentoo  org>
CommitDate: Fri Aug 27 19:01:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c177955

dev-php/pecl-memcached: Enable more tests and note known broken

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-memcached/files/3.1.5-fix-tests.patch | 41 ++
 .../pecl-memcached-3.1.5_p20210807.ebuild  | 21 ---
 2 files changed, 58 insertions(+), 4 deletions(-)

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 000..08a881c182d
--- /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.0 
-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.0 
-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--
+ 
++--INI--
++serialize_precision = 14
+ --FILE--
+ 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() {
@@ -56,7 +68,8 @@ src_configure() {
 }
 
 src_test() {
-   local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 
)
+   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"