gentoo auto-resync : 10:11:2024 - 03:03:09

3 files changed, 17 insertions, 78 deletions

diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index a7b1ccb7a96c..554a5705d55b 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -1,7 +1,5 @@
 DIST memcached-3.2.0.tgz 90722 BLAKE2B 5bc3ce40803004f45ad397684277862dbaffce467b3026e33d9737d4d93a82f2c89e32a256ebf6db3117a462ff8f81a517ed9950773cb4a0e927aa8af4e834be SHA512 ece5759a9d6d52afd46beb0821811e5d4830e75ad8564af395e2107fd349e271c6e6cf20eeacd9ad15ee2e99ccf0118ccc83c5810e2f3fa7c61f1984b0b26514
-DIST pecl-memcached-3.2.0_p20230419.tar.gz 99453 BLAKE2B 3fb0e0316c9d6de9d727f9fd3a5f723d00aef33adcfa815c6571b99b9f536e9e02e9e7d37c73252dca3d5415aea554c8c16374a018210a1bbd2caa4a0c1263d8 SHA512 74e1b53f2078f343367a6c83e287c2fd29427d42f3db3eac01d3c5dea1eef1cd94130e2e59eaa3bdb368aecac740391ef4961224d5751d81306881291818fa9c
-DIST pecl-memcached-3.2.0_p20231008.tar.gz 101050 BLAKE2B b263eef7c29546d5faf71667f5266acaf77a18a65ecb972a31f29b1dafb8f7415346d066db99264e43326887e400f3e8a5372904e3f582439ed7500e0bbeb263 SHA512 b320dd4681070b35a49b87b143e01ce7f5a58364a0d9b807029c78aa57b18c3fc0add0b28c72dfaa4335c2b66fd54bb482a290c4a2b57afd80863c344a74177c
+DIST memcached-3.3.0.tgz 92669 BLAKE2B 13c21aecd1ac720ac5a0bd0b1e1bbd2508b124ffd3d5be4fed53f8588974799ccb63f67cdc3d46886216b03bea60f01610bc806b5c363ac210c3ebb3e8aa01fb SHA512 bdbe8b203cadcda50c4f8099fac1161424f3091537027251aaba7d9ba9a7932f59a9ac201dca9d9ae3aa59ff833ac6aa0284c5ab118cdb85a9fd89f63a95509a
 EBUILD pecl-memcached-3.2.0-r1.ebuild 1510 BLAKE2B 01519b94480412a11131cd7dc50845ad0083c1393dabacdb669a03fccc5d14e11364558a9d1b12b77a2c215bf11ae71fa501cae1387aa7abe3882d9dfd41f0d4 SHA512 405b0a6da739aebaff10a00d45ca3055cc3ec3cfea5608564b5288c01d4614cb9adcf0b355efd6cdcae6b656bed666f8670a76cbcd5c590261fd6891f8e29a2d
-EBUILD pecl-memcached-3.2.0_p20230419.ebuild 1738 BLAKE2B 3c4854858bfea88ed068800201be1dec9e90f7d28b2c2cff6b429916c293dddb8a63b18094c3595838e37b8b06275786556c2f0ec16d4c1113985886840e27b6 SHA512 df4318d20f681c5ff3bcc91f72f68ca0e5e385d020af7fd4af0fd171d4510ed4297555a88ddb34ff94c3fbde317bc87f524d1ed990804a12bf588b3fc85a0527
-EBUILD pecl-memcached-3.2.0_p20231008.ebuild 1879 BLAKE2B a444fca75c31527e8af6ac8e20d27620e39096c6dbc14226c29f8d362b9f9fd9c49226e50d3773378d9e7e1dece7c463824d77b6ebf1b9ee6a3f19cdaa7153d6 SHA512 dec995456fe9dae65cfe1c45c9f63bff51cf88ef14c697fcb14be37853fb9c9d65d87ab3e586ee5210657909bf7907c9a09255aea7682580a66fe269d5ae7405
+EBUILD pecl-memcached-3.3.0.ebuild 1916 BLAKE2B 3960aff9db309c83231e605715a60162126da73d4c8ec829ed2767f51b3390598fad6a0defe828c0846eea00d437e9c1d63ea6e370383114921386cc452673a4 SHA512 182969a2bbea9bd6fbeb34f0597320e6493fc4ebb1e19137cf1d2ac6de2176dff389a69041ebc88c3e73f24493ab6335f36614e727877eb611079875d96c8b87
 MISC metadata.xml 569 BLAKE2B 686b6c91f4d91fb82bd90b08af6627a8211e9676139417551e8a8425da410c15a77b79ff51760c2a16815c84c55c1e81ff462af17282ffa198db0829b20566c6 SHA512 8f3154fc7f3c9d1707b121ddc8d94d8d5570f7ca0cc93c0f732cda3ba6a756ed421a6facd96000ade0c22af9a78efbdd69ec118bd195c4c83fc523f2cd7e1cc7
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.2.0_p20231008.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.2.0_p20231008.ebuild
deleted file mode 100644
index 6e8bb8a2e28e..000000000000
--- a/dev-php/pecl-memcached/pecl-memcached-3.2.0_p20231008.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PHP_EXT_NAME="memcached"
-DOCS=( ChangeLog README.markdown )
-
-USE_PHP="php8-1 php8-2"
-PHP_EXT_NEEDED_USE="json(+)?,session(-)?"
-MY_P="${PN/pecl-/}-${PV/_rc/RC}"
-PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
-GH_COMMIT="7fefcb792423906bba2bac66a49194f98bf11aa6"
-PHP_EXT_S="${WORKDIR}/php-memcached-${GH_COMMIT}"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="Interface PHP with memcached via libmemcached library"
-SRC_URI="https://github.com/php-memcached-dev/php-memcached/archive/${GH_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/php-memcached-${GH_COMMIT}"
-LICENSE="PHP-3.01"
-SLOT="7"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="igbinary json sasl +session test"
-
-REQUIRED_USE="test? ( igbinary )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="|| ( dev-libs/libmemcached-awesome[sasl(-)?] >=dev-libs/libmemcached-1.0.14[sasl(-)?] )
-	sys-libs/zlib
-	igbinary? ( dev-php/igbinary[php_targets_php8-1(-)?,php_targets_php8-2(-)?] )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="${COMMON_DEPEND} test? ( net-misc/memcached )"
-
-src_prepare() {
-	# remove broken tests
-	rm -r tests/experimental || die
-
-	php-ext-source-r3_src_prepare
-}
-
-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_p20230419.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.3.0.ebuild
index a2c7dc77ae96..cdb216878689 100644
--- a/dev-php/pecl-memcached/pecl-memcached-3.2.0_p20230419.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-3.3.0.ebuild
@@ -5,28 +5,31 @@ EAPI=8
 PHP_EXT_NAME="memcached"
 DOCS=( ChangeLog README.markdown )
 
-USE_PHP="php8-1 php8-2"
+USE_PHP="php8-1 php8-2 php8-3"
 PHP_EXT_NEEDED_USE="json(+)?,session(-)?"
 MY_P="${PN/pecl-/}-${PV/_rc/RC}"
 PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
-GH_COMMIT="6926c53ac32a579b38a0dcc3c8aec662f8cd9dd5"
-PHP_EXT_S="${WORKDIR}/php-memcached-${GH_COMMIT}"
 
 inherit php-ext-pecl-r3
 
 DESCRIPTION="Interface PHP with memcached via libmemcached library"
-SRC_URI="https://github.com/php-memcached-dev/php-memcached/archive/${GH_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/php-memcached-${GH_COMMIT}"
 LICENSE="PHP-3.01"
 SLOT="7"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="igbinary json sasl +session test"
 
+REQUIRED_USE="test? ( igbinary )"
 RESTRICT="!test? ( test )"
 
+# php-ext-pecl-r3 doesn't expose a $*_USEDEP so we roll our own
+IGBINARY_DEPEND=""
+for slot in ${USE_PHP} ; do
+	IGBINARY_DEPEND+="dev-php/igbinary[php_targets_${slot}(-)?] "
+done
+
 COMMON_DEPEND="|| ( dev-libs/libmemcached-awesome[sasl(-)?] >=dev-libs/libmemcached-1.0.14[sasl(-)?] )
 	sys-libs/zlib
-	igbinary? ( dev-php/igbinary[php_targets_php8-1(-)?,php_targets_php8-2(-)?] )
+	igbinary? ( ${IGBINARY_DEPEND} )
 "
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
@@ -48,9 +51,12 @@ src_test() {
 	[[ ${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=$?
+	# make test fails to pull in igbinary.so, so we run it ourselves with the correct setting strings
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		NO_INTERACTION="yes" "${PHPCLI}" run-tests.php -n -d "extension=${EXT_DIR}/igbinary.so" -d "extension=modules/memcached.so" || die
+	done
 
 	kill "$(<"${T}/memcached.pid")"
 	return ${exit_status}