Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-memcached/files/, dev-php/pecl-memcached/
Date: Tue, 03 May 2022 17:30:50
Message-Id: 1651599042.ca7cd884979434f518598aea6fc2f4b5f16d3be2.grknight@gentoo
1 commit: ca7cd884979434f518598aea6fc2f4b5f16d3be2
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 3 17:16:18 2022 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Tue May 3 17:30:42 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca7cd884
7
8 dev-php/pecl-memcached: Drop old
9
10 Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
11
12 dev-php/pecl-memcached/Manifest | 2 -
13 dev-php/pecl-memcached/files/3.1.5-fix-tests.patch | 41 ----------
14 .../pecl-memcached-3.1.5_p20210807.ebuild | 87 ----------------------
15 .../pecl-memcached/pecl-memcached-3.2.0_rc2.ebuild | 56 --------------
16 4 files changed, 186 deletions(-)
17
18 diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
19 index c9ba788e51eb..ed8e45ad7aea 100644
20 --- a/dev-php/pecl-memcached/Manifest
21 +++ b/dev-php/pecl-memcached/Manifest
22 @@ -1,4 +1,2 @@
23 DIST memcached-3.1.5.tgz 83015 BLAKE2B 80f5cbed8e34f867962792d95d242015690f64ab3b462e09813a11b8b86234b0b05b0f6a78f7c6184482b66ba8015064b37f77bbb816a3aee2edd0ce97ab0cbc SHA512 87d5fd079fcaad81139785d6766da71b23a1a0fe907d4b22f3a787af148a20412c11df11c4d98c165241658baf0d87c8a6b29de15db07a0f9d1fabc8aec8f0e9
24 DIST memcached-3.2.0.tgz 90722 BLAKE2B 5bc3ce40803004f45ad397684277862dbaffce467b3026e33d9737d4d93a82f2c89e32a256ebf6db3117a462ff8f81a517ed9950773cb4a0e927aa8af4e834be SHA512 ece5759a9d6d52afd46beb0821811e5d4830e75ad8564af395e2107fd349e271c6e6cf20eeacd9ad15ee2e99ccf0118ccc83c5810e2f3fa7c61f1984b0b26514
25 -DIST memcached-3.2.0RC2.tgz 90731 BLAKE2B 69e163f7375c94d9e8f49890f169708e2286ed96b82f13b0a6fad092870f03c6aaba0ef3a23de8775575a1b135783a0e27404120a2bbeef9bdbc73735461b1a3 SHA512 056dec58734dc2171429d1b33a74be829f78ab993f0f1699d9f61b105d4252e35c4e05dbda9e045ed3364d82779c662c2f28c63cdac1b81027549335b5376845
26 -DIST pecl-memcached-3.1.5_p20210807.tar.gz 99221 BLAKE2B 7a6a92701d17ce2c108cda862d52cebbae38e993e4182fd23ce78ea1cbebbdba6d46a71258b7dd388ff38f2b7b04c94ca822954ff931111fd9bfc64d578a6f26 SHA512 3c124f969efcd3bcc513e3e347828ac6e0a5540379f7d3a83c306d65a02ece3c76f87e3db52153c5d2f2c03c5fafb646f6b3b33c0b1d5afbb71ffa22d2df6f90
27
28 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
29 deleted file mode 100644
30 index 08a881c182d8..000000000000
31 --- a/dev-php/pecl-memcached/files/3.1.5-fix-tests.patch
32 +++ /dev/null
33 @@ -1,41 +0,0 @@
34 ---- a/tests/experimental/session_gc.phpt 2021-08-23 01:05:26.000000000 -0400
35 -+++ b/tests/experimental/session_gc.phpt 2021-08-27 14:30:01.504619748 -0400
36 -@@ -20,22 +20,23 @@
37 -
38 - session_start();
39 - $_SESSION['foo'] = 1;
40 --var_dump($_SESSION);
41 -+$session1 = $_SESSION;
42 - session_write_close();
43 -
44 - $_SESSION = NULL;
45 --var_dump($_SESSION);
46 -+$session2 = $_SESSION;
47 -
48 - session_start();
49 --var_dump($_SESSION);
50 -+$session3 = $_SESSION;
51 - session_write_close();
52 -
53 - sleep(3);
54 -
55 - session_start();
56 --var_dump($_SESSION);
57 -+$session4 = $_SESSION;
58 - session_write_close();
59 -
60 -+var_dump($session1, $session2, $session3, $session4);
61 -
62 - --EXPECT--
63 - array(1) {
64 ---- a/tests/experimental/extreme_floats.phpt 2021-08-23 01:05:26.000000000 -0400
65 -+++ b/tests/experimental/extreme_floats.phpt 2021-08-27 14:40:03.223499433 -0400
66 -@@ -2,6 +2,8 @@
67 - Extreme floats: max, min, Inf, -Inf, and NaN
68 - --SKIPIF--
69 - <?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
70 -+--INI--
71 -+serialize_precision = 14
72 - --FILE--
73 - <?php
74 - include dirname(dirname(__FILE__)) . '/config.inc';
75
76 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
77 deleted file mode 100644
78 index baa39cff1a1b..000000000000
79 --- a/dev-php/pecl-memcached/pecl-memcached-3.1.5_p20210807.ebuild
80 +++ /dev/null
81 @@ -1,87 +0,0 @@
82 -# Copyright 1999-2021 Gentoo Authors
83 -# Distributed under the terms of the GNU General Public License v2
84 -
85 -EAPI=7
86 -PHP_EXT_NAME="memcached"
87 -DOCS=( ChangeLog README.markdown )
88 -
89 -USE_PHP="php7-3 php7-4 php8-0 php8-1"
90 -inherit php-ext-pecl-r3
91 -
92 -DESCRIPTION="Interface PHP with memcached via libmemcached library"
93 -LICENSE="PHP-3.01"
94 -SLOT="7"
95 -KEYWORDS="~amd64 ~arm ~arm64 ~x86"
96 -IUSE="igbinary json sasl +session test"
97 -REPO_COMMIT="9cd4a01d99b701a2c1a42799afe80635dcfecfe4"
98 -SRC_URI="https://github.com/php-memcached-dev/php-memcached/archive/${REPO_COMMIT}.tar.gz -> ${P}.tar.gz"
99 -
100 -RESTRICT="!test? ( test )"
101 -
102 -COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl(-)?]
103 - sys-libs/zlib
104 -"
105 -
106 -RDEPEND="
107 - php_targets_php7-3? (
108 - ${COMMON_DEPEND} dev-lang/php:7.3[session(-)?,json(-)?]
109 - igbinary? ( dev-php/igbinary[php_targets_php7-3(-)] )
110 - )
111 - php_targets_php7-4? (
112 - ${COMMON_DEPEND} dev-lang/php:7.4[session(-)?,json(-)?]
113 - igbinary? ( dev-php/igbinary[php_targets_php7-4(-)] )
114 - )
115 - php_targets_php8-0? (
116 - ${COMMON_DEPEND} dev-lang/php:8.0[session(-)?]
117 - igbinary? ( dev-php/igbinary[php_targets_php8-0(-)] )
118 - )
119 - php_targets_php8-1? (
120 - ${COMMON_DEPEND} dev-lang/php:8.1[session(-)?]
121 - igbinary? ( dev-php/igbinary[php_targets_php8-1(-)] )
122 - )
123 -"
124 -DEPEND="${RDEPEND} test? ( net-misc/memcached )"
125 -
126 -PATCHES=( "${FILESDIR}/3.1.5-fix-tests.patch" )
127 -
128 -src_unpack() {
129 - default
130 - mv "${WORKDIR}/php-memcached-${REPO_COMMIT}" "${S}" || die
131 - ln -s "${S}/tests/skipif.inc" "${S}/tests/experimental/skipif.inc" || die
132 - ln -s "${S}/tests/skipif.inc" "${S}/tests/experimental/serializer/skipif.inc" || die
133 - local x
134 - local broken_tests=(
135 - # Known broken tests. https://github.com/php-memcached-dev/php-memcached/issues/386
136 - get_bykey_cas getdelayed_bykey_cas getdelayed_cbthrows
137 - stats stats_badserver getmulti_badserver
138 - # Excessive warnings make them "BORK"
139 - serializer/serializer_php_bad_serialize serializer/serializer_php_bad_unserialize
140 - )
141 - for x in "${broken_tests[@]}" ; do
142 - rm "${S}/tests/experimental/${x}.phpt" || die
143 - done
144 -}
145 -
146 -src_configure() {
147 - local PHP_EXT_ECONF_ARGS="--enable-memcached
148 - $(use_enable session memcached-session)
149 - $(use_enable sasl memcached-sasl)
150 - $(use_enable json memcached-json)
151 - $(use_enable igbinary memcached-igbinary)"
152 -
153 - php-ext-source-r3_src_configure
154 -}
155 -
156 -src_test() {
157 - touch "${T}/memcached.pid" || die
158 - local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 -U 11211 )
159 - [[ ${EUID} == 0 ]] && memcached_opts+=( -u portage )
160 - memcached "${memcached_opts[@]}" || die "Can't start memcached test server"
161 -
162 - local exit_status
163 - php-ext-source-r3_src_test
164 - exit_status=$?
165 -
166 - kill "$(<"${T}/memcached.pid")"
167 - return ${exit_status}
168 -}
169
170 diff --git a/dev-php/pecl-memcached/pecl-memcached-3.2.0_rc2.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.2.0_rc2.ebuild
171 deleted file mode 100644
172 index 09b3c0ce9508..000000000000
173 --- a/dev-php/pecl-memcached/pecl-memcached-3.2.0_rc2.ebuild
174 +++ /dev/null
175 @@ -1,56 +0,0 @@
176 -# Copyright 1999-2022 Gentoo Authors
177 -# Distributed under the terms of the GNU General Public License v2
178 -
179 -EAPI=8
180 -PHP_EXT_NAME="memcached"
181 -DOCS=( ChangeLog README.markdown )
182 -
183 -USE_PHP="php7-4 php8-0 php8-1"
184 -PHP_EXT_NEEDED_USE="json(+)?,session(-)?"
185 -MY_P="${PN/pecl-/}-${PV/_rc/RC}"
186 -PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
187 -PHP_EXT_S="${WORKDIR}/${MY_P}"
188 -
189 -inherit php-ext-pecl-r3
190 -
191 -DESCRIPTION="Interface PHP with memcached via libmemcached library"
192 -LICENSE="PHP-3.01"
193 -SLOT="7"
194 -KEYWORDS="~amd64 ~arm ~arm64 ~x86"
195 -IUSE="igbinary json sasl +session test"
196 -
197 -RESTRICT="!test? ( test )"
198 -
199 -COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl(-)?]
200 - sys-libs/zlib
201 - igbinary? ( dev-php/igbinary[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] )
202 -"
203 -DEPEND="${COMMON_DEPEND}"
204 -RDEPEND="${COMMON_DEPEND}"
205 -BDEPEND="${COMMON_DEPEND} test? ( net-misc/memcached )"
206 -
207 -S="${WORKDIR}/${MY_P}"
208 -
209 -src_configure() {
210 - local PHP_EXT_ECONF_ARGS="--enable-memcached
211 - $(use_enable session memcached-session)
212 - $(use_enable sasl memcached-sasl)
213 - $(use_enable json memcached-json)
214 - $(use_enable igbinary memcached-igbinary)"
215 -
216 - php-ext-source-r3_src_configure
217 -}
218 -
219 -src_test() {
220 - touch "${T}/memcached.pid" || die
221 - local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 -U 11211 )
222 - [[ ${EUID} == 0 ]] && memcached_opts+=( -u portage )
223 - memcached "${memcached_opts[@]}" || die "Can't start memcached test server"
224 -
225 - local exit_status
226 - php-ext-source-r3_src_test
227 - exit_status=$?
228 -
229 - kill "$(<"${T}/memcached.pid")"
230 - return ${exit_status}
231 -}