6 files changed, 44 insertions, 80 deletions
diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest
index 8c535e0f2cdd..8bba19119471 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -1,4 +1,3 @@
-DIST redis-5.1.1.tgz 245205 BLAKE2B b7177be5282b081562a446b1b37c7b46ba0ef382e55f27989d5586346a10f842d050ee46e881e480ea6b768e1259458df565d02193eda13a95704cd5455c1ca2 SHA512 eb6aa538d2ae4115634fd5841e3ccccf788cad13b99e0485fb2af43def85e93328012e5cef66d1be4bdd494be6f68de329a066e41b710e434f94f3ed3401bfee
-DIST redis-5.2.1.tgz 251570 BLAKE2B 297d6130469735a53f6dfb6ffea8c7c813363099eb76f25619f0cbb05cd06f5ecad9c0f30c370e33985523cf26488cf133aa0a48a99075bc6d5796309e3d914d SHA512 de90bf65cce0cb8c5ea28415e4f7bfff23c8bb3dc96ddca3158f94be2e4bd051e13ec3f34429b0e8ceb436096520e3998f544f377d5ef7d4d1df4edba7f66bc2
-DIST redis-5.2.2.tgz 251629 BLAKE2B e6ca740412dd1ba4ee960e1c71b3f75ebb1a1e2605bc93159395c657ab61eda4c8222b6e890a447c06cd1ef016e061861ffc5d8a6fd6e7e324353a148b54c593 SHA512 0020c572bcd24cdb479046727fba2d30ca87c9a7111c51e5fe3be0b85459e3e7dfc8892b690650de0a7dc80c1a8921f9de45590f6e60257fbf0534729c6e6f4f
-DIST redis-5.3.1.tgz 264485 BLAKE2B 51f68841d51329cbbbd2012e539351b3220dc1361ae5a3782b6c3e9620ed14b9a0b9097a0d6ba6e2fa60e8a794fd2ea57fff871d2fceb7bcdb4a2ab4a6d8789f SHA512 dca62e0e87d22c25818f0eb84ec0a4ae8ab4c1a2de295b7d56d10548c95448637e1b1ca86c55adf0f801fe22bf3c05fad4ff58f3823e5d74c506d041b64f1d4a
+DIST redis-5.3.6.tgz 274235 BLAKE2B 8479b3060abb99f765b27fd8937cb4c7ef92c55c0581ae6a69dd06113367547d546a9f96a8418df928f258520cb0fed6f5d39f6d88972c74b8446134be08edc4 SHA512 e5047ba9974ff6065be0fe8614aea8bf7d7c77b3a4ca08b19d0bb53069dd164614ffd19bf09bda458511abddce438fd816c28a169536388c8c4cd923596aadf0
+DIST redis-5.3.7.tgz 275200 BLAKE2B 50cff3d36e189593a741ed3fe05c3558e6a0621e7ff906e4902ba39e3f7d3ae5b9bfa554480a131e32bcc0334bccbd3aa5507dc714b6d4b20ac808139c525a95 SHA512 b945d5aa86d3f58e75094369b0f324e987202f104aca7d7b46ba23cfaed54d186bb66931e200dd16d2dbeea11732dd0311da4e3d7485c3b725027f7924652832
+DIST redis-6.0.2.tgz 365966 BLAKE2B d8baebb64e1a2b8799da151253b98d045beebcbdadae7b6081f3a8e29fe20ca0928cac027ebb74264b25b900d7c04ea2e15a07b20090aa529299808878fc45d0 SHA512 1918d15433d1b4d782a9fb0364f6dfeed8d9e6c2ae70c34e235be5f890992c73a40ef19842e0aabb181da86dd2cde28b9aebab8698b387738321298a2ab94aa6
diff --git a/dev-php/pecl-redis/metadata.xml b/dev-php/pecl-redis/metadata.xml
index 25557ad02e0d..381f530243d9 100644
--- a/dev-php/pecl-redis/metadata.xml
+++ b/dev-php/pecl-redis/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-redis/pecl-redis-5.2.2.ebuild b/dev-php/pecl-redis/pecl-redis-5.2.2.ebuild
deleted file mode 100644
index ec5cd6b371d3..000000000000
--- a/dev-php/pecl-redis/pecl-redis-5.2.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="redis"
-USE_PHP="php7-2 php7-3 php7-4"
-PHP_EXT_NEEDED_USE="json?,session?"
-DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS )
-MY_P="${PN/pecl-/}-${PV/_rc/RC}"
-PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
-PHP_EXT_S="${WORKDIR}/${MY_P}"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="PHP extension for interfacing with Redis"
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE="igbinary +json +session"
-
-DEPEND="
-	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] )
-"
-RDEPEND="${DEPEND} !dev-php/pecl-redis:7"
-
-# The test suite requires network access.
-RESTRICT=test
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-redis
-		$(use_enable igbinary redis-igbinary)
-		$(use_enable json redis-json)
-		$(use_enable session redis-session)
-	)
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		# Run tests for Redis class
-		${PHPCLI} -d extension=modules/redis.so \
-				  tests/TestRedis.php \
-				  --class Redis \
-				  --host ${PECL_REDIS_HOST} || die 'test suite failed'
-	done
-}
diff --git a/dev-php/pecl-redis/pecl-redis-5.3.1.ebuild b/dev-php/pecl-redis/pecl-redis-5.3.6.ebuild
index 9f7ec9e88930..b2d812cbde98 100644
--- a/dev-php/pecl-redis/pecl-redis-5.3.1.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-5.3.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PHP_EXT_NAME="redis"
-USE_PHP="php7-2 php7-3 php7-4"
-PHP_EXT_NEEDED_USE="json?,session?"
+USE_PHP="php8-1"
+PHP_EXT_NEEDED_USE="json(+)?,session(-)?"
 DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS )
 MY_P="${PN/pecl-/}-${PV/_rc/RC}"
 PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
@@ -16,11 +16,11 @@ inherit php-ext-pecl-r3
 DESCRIPTION="PHP extension for interfacing with Redis"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="amd64 ~arm"
 IUSE="igbinary +json lz4 +session zstd"
 
 DEPEND="
-	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] )
+	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php8-1(-)?] )
 	lz4? ( app-arch/lz4:= )
 	zstd? ( app-arch/zstd:= )
 "
diff --git a/dev-php/pecl-redis/pecl-redis-5.1.1.ebuild b/dev-php/pecl-redis/pecl-redis-5.3.7-r1.ebuild
index f765a4d536ff..f2e20d6e2554 100644
--- a/dev-php/pecl-redis/pecl-redis-5.1.1.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-5.3.7-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PHP_EXT_NAME="redis"
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-PHP_EXT_NEEDED_USE="json?,session?"
+USE_PHP="php8-1 php8-2"
+PHP_EXT_NEEDED_USE="json(+)?,session(-)?"
 DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS )
 MY_P="${PN/pecl-/}-${PV/_rc/RC}"
 PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
@@ -16,13 +16,16 @@ inherit php-ext-pecl-r3
 DESCRIPTION="PHP extension for interfacing with Redis"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="amd64 ~arm"
-IUSE="igbinary +json +session"
+KEYWORDS="amd64 ~arm ~arm64"
+IUSE="igbinary +json lz4 +session zstd"
 
 DEPEND="
-	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] )
+	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php8-1(-)?,php_targets_php8-2(-)?] )
+	lz4? ( app-arch/lz4:= )
+	zstd? ( app-arch/zstd:= )
 "
-RDEPEND="${DEPEND} !dev-php/pecl-redis:7"
+RDEPEND="${DEPEND}
+	!dev-php/pecl-redis:7"
 
 # The test suite requires network access.
 RESTRICT=test
@@ -32,9 +35,15 @@ S="${WORKDIR}/${MY_P}"
 src_configure() {
 	local PHP_EXT_ECONF_ARGS=(
 		--enable-redis
+		--disable-redis-lzf
+		--disable-redis-msgpack
 		$(use_enable igbinary redis-igbinary)
 		$(use_enable json redis-json)
+		$(use_enable lz4 redis-lz4)
+		$(use_with lz4 liblz4)
 		$(use_enable session redis-session)
+		$(use_enable zstd redis-zstd)
+		$(use_with zstd libzstd)
 	)
 	php-ext-source-r3_src_configure
 }
diff --git a/dev-php/pecl-redis/pecl-redis-5.2.1.ebuild b/dev-php/pecl-redis/pecl-redis-6.0.2-r1.ebuild
index ec5cd6b371d3..7dbf2b7d829a 100644
--- a/dev-php/pecl-redis/pecl-redis-5.2.1.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-6.0.2-r1.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PHP_EXT_NAME="redis"
-USE_PHP="php7-2 php7-3 php7-4"
-PHP_EXT_NEEDED_USE="json?,session?"
-DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS )
+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"
 PHP_EXT_S="${WORKDIR}/${MY_P}"
@@ -16,13 +15,16 @@ inherit php-ext-pecl-r3
 DESCRIPTION="PHP extension for interfacing with Redis"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE="igbinary +json +session"
+KEYWORDS="amd64 ~arm ~arm64"
+IUSE="igbinary +json lz4 +session zstd"
 
 DEPEND="
-	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] )
+	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php8-1(-)?,php_targets_php8-2(-)?,php_targets_php8-3(-)?] )
+	lz4? ( app-arch/lz4:= )
+	zstd? ( app-arch/zstd:= )
 "
-RDEPEND="${DEPEND} !dev-php/pecl-redis:7"
+RDEPEND="${DEPEND}
+	!dev-php/pecl-redis:7"
 
 # The test suite requires network access.
 RESTRICT=test
@@ -32,9 +34,15 @@ S="${WORKDIR}/${MY_P}"
 src_configure() {
 	local PHP_EXT_ECONF_ARGS=(
 		--enable-redis
+		--disable-redis-lzf
+		--disable-redis-msgpack
 		$(use_enable igbinary redis-igbinary)
 		$(use_enable json redis-json)
+		$(use_enable lz4 redis-lz4)
+		$(use_with lz4 liblz4)
 		$(use_enable session redis-session)
+		$(use_enable zstd redis-zstd)
+		$(use_with zstd libzstd)
 	)
 	php-ext-source-r3_src_configure
 }