gentoo auto-resync : 28:12:2023 - 07:37:55

47 files changed, 260 insertions, 1166 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 0990dfdeed52..599f7293709b 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index 392e7acc8f77..07e5a90c8cb3 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -1,5 +1,7 @@
+DIST igbinary-3.2.15.tar.gz 255185 BLAKE2B affe47386e65576ee44fc7616a3c1c923a5af4b50308caa02f6c75ea9a2ba483ab90a9c656f5631fb5bee7360a1505525dfadb4083e668b58d149dfc7379bd4e SHA512 285adae14c3104c4c53eec7b7e9b96e097096a06e2517ac554a4ecf5066f9b75318b6e29486cc41aa89a21ef46980285d1fa0d09a1f2b750253951c6d0480869
 DIST igbinary-3.2.7.tar.gz 248481 BLAKE2B 40936fb78b9f01d717daac78f8b707f902d78714e5202fbb1344042c2d30a3b723f9c5b6fd982f7a5002aab65e414ba7f9bda354fec4db82ba3f03fc09663a43 SHA512 1bdb60fa4ac76ef405b55b4a7e7f07c73ccc945a3fad8635934cf83a05ae554ac1a0b64c4b55229f0bd2a3269189d3266a492b064a0338fdb2bf4dfe5c3733e4
 DIST igbinary-3.2.9.tar.gz 251747 BLAKE2B d44711ffc195572a83a000f225776191e7b421e4be3065a668287f356d46fd11536af0a0969a0fc219c38d027f13aec16cfe41f15ea778ef087f7082daa9b8dc SHA512 2789f8517aaefa4e4e736592944361e8bad1ce50687aed161bb4e17bcdfbfec2320df8069c7b39704fa96c614727bd66fb65185b15f72f8c96bb5fda88f2e66f
+EBUILD igbinary-3.2.15.ebuild 525 BLAKE2B 48bd251ed1f50df20fe186973631be3c0faed837934df9b4b09efcbd14d1669b8887e32067a85c1de8c09cfd01bac0f817e3bdfdc3e0cafc9151ddc44251036d SHA512 8962212749569584b73abc4a61f5428f78748434b8dd9c0e2d0ea3c708391aaabcf46f47d7a3e5a44ace29587f4ca088ecb7ec8fb7953fccec3756ae3c10d59b
 EBUILD igbinary-3.2.7.ebuild 548 BLAKE2B ca29789fb49c8870e628235d8493ff3607bc22bd70e74301ca3e1921bfbfa2c6ee9e328b5de6c898e6e311f2c1d34137c5bdecf7af5205b3d756a943192f11ed SHA512 1d1a519acce5ae6d3b72aa75085c25b64dbf8f0c622a6c3f1c040da00091719a99697cbfceaebe28d1b2b90b1fa967aac945aa40acad34b0b3ef23e116563e1c
 EBUILD igbinary-3.2.9.ebuild 522 BLAKE2B 6db4ac955fa5064b5049195c213877113a3b13b240788dc5a82c7e1caa67eb7c6dc6b920b11e233c4c40d0a8f037da9648be3b05700bc6bbc6a2335d436724e9 SHA512 25c50cf4e21ac386f55f3aaf0b5fd6d5110233e0de8d82dbf0ee3e30c1eef7a27815f405c0fa5717d93197cc22b84e7bbea0eeab8bc46bd5aaa3652f3448a182
 MISC metadata.xml 332 BLAKE2B dd842052dec2b48669fb7d85ee2637132f64d64d56ac9ece1394222211f3cc1a698e0d5e4dda6d4d5289a4debfe7a44c0c776ec2399d3384874be03278995af2 SHA512 0e2d8ac966bb0f3e40fcf96e0ff93ebd9353a0629129e14f9be2186fe7fc3db8cb5fafc3af795b59005332d66085f1636df62b5454998cb9bd09bfacc1ced0a6
diff --git a/dev-php/igbinary/igbinary-3.2.15.ebuild b/dev-php/igbinary/igbinary-3.2.15.ebuild
new file mode 100644
index 000000000000..59415aba3a05
--- /dev/null
+++ b/dev-php/igbinary/igbinary-3.2.15.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PHP_EXT_ECONF_ARGS=( --enable-${PN} )
+PHP_EXT_INI="yes"
+PHP_EXT_NAME="${PN}"
+PHP_EXT_ZENDEXT="no"
+USE_PHP="php8-1 php8-2 php8-3"
+
+inherit php-ext-source-r3
+
+DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
+HOMEPAGE="https://github.com/igbinary/igbinary"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index bc774654afa5..391bc08c8bca 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,5 +1,7 @@
 DIST apcu-5.1.21.tgz 92516 BLAKE2B 32d73b89bde9ef4eb01c9ad766930e87300b86776c95929607a8aaefba5043e3a7947d064416ac083ff38876fdb41bb03dab1552ac000082e54f809269b4c925 SHA512 a6ffe8349760d27cde0d86017a59a68e9639bf385e606622d807094f4e5fb305bb25b9ce00077d0856f4d223d44329f7a6314c229b62c78d8e2b085593c92bb3
 DIST apcu-5.1.22.tgz 93926 BLAKE2B abc3b27c4224da14b6438df9243f6b7b8245102f7eee0208daf1317bead5463d8f454e33536b8c949a2825140487faf9bb79745180a26e1f0015494e0986acb9 SHA512 8f2f4292679bc359ea680ecaf397d69de32bf67d57d719a4839a026ab1b96d5ec4725e92c5c0d1972a117a7cd3d3c456a1f4ec03192fda4657e685de60b9e93e
+DIST apcu-5.1.23.tgz 90897 BLAKE2B 634366b99c993298c8720840d06ff3aed30bfb3f09fd7b63f4736766f4ac1b983f24317f161bf7dd1b3ab79053c905cc9136e8141468174177d2a05b94719590 SHA512 89e9f10f5d8d1a9503132e80140680be2a10d96f957f69b2f77cc1c496d15cc26dfe4c0368ebe46c72c68d1b4a794d3ddc95942b02d3ba5e8c971b09969058d8
 EBUILD pecl-apcu-5.1.21.ebuild 1127 BLAKE2B a62bd629f93eb3936afee544150c3d31ef5a237aaec499b6cd230959d33088454e1d0bd1bbe18307667d56df20982474966cbf1ca88ae77156a646560b85925d SHA512 f15b5f95d9747528aa95c78e1e3f0df8eacaa0004a7ff3c6291f6fddc13258c55c2a0c9e995f87b88b27f2a08b055acdfd3a7f3f58f1f3eeef349f814d77df5c
 EBUILD pecl-apcu-5.1.22.ebuild 1134 BLAKE2B 99c39dbe679ab5ea51bfa13fdc843ff6fbd32ee6cc6d31f75cd7136b9e10c4b9a526df8900037022b5e950a0aa69bf2ef4defcab03e785e4fd2449c2e9a9ebdd SHA512 ef3b70ad09f20350f9ac46a22698b58e03442eb42b155d5a87e9e7e9aa44bdcb2ff3e3428f652b2bbfc9ebae7e508ef9fec17697aa306dfd780dea2cf39ee69c
+EBUILD pecl-apcu-5.1.23-r1.ebuild 1134 BLAKE2B 3900f6af5ac73958bf2a77e6f49441ef665d912947119642a1d032982ff63998d1770c18a408a32cbc8d118d806b267fa12b09879da90958e323c73ebb5297f9 SHA512 8d085aac3ca1ac3de71b15bed940568e8f8dd58a973bf38aee06b866fca82c4fc6ca821e4a539b2b12da1261a7cec14208a0a81c6735cd66ea635d9ad11a8708
 MISC metadata.xml 541 BLAKE2B 533f563e606b35d23c766aa177ea80b56b17ff352e907f2aed65c82be8bb6b01bcb61d69c6be6560b8e975ac279cf3a00ba5976d4a50c0f3ae68677ae7557cd8 SHA512 5dde6ecb39edb11fc4222cf869449f43fe3923623cea2a8ee4d4a4b8d7bf11bcc6d40f135cb5dc4cc81b161ed50489230bba443274c914d0015046ea44c868d8
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.23-r1.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.23-r1.ebuild
new file mode 100644
index 000000000000..82e0d0a1108e
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.23-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PHP_EXT_INI="yes"
+PHP_EXT_NAME="apcu"
+PHP_EXT_ZENDEXT="no"
+USE_PHP="php8-1 php8-2 php8-3"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Stripped down version of APC supporting only user cache"
+
+LICENSE="PHP-3.01"
+SLOT="7"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+LUSE=""
+for l in ${LOCKS}; do
+	LUSE+="lock-${l} "
+done
+IUSE="+mmap ${LUSE/lock-pthreadrw/+lock-pthreadrw}"
+REQUIRED_USE="^^ ( $LUSE )"
+
+DOCS=( NOTICE README.md TECHNOTES.txt )
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-apcu
+		$(use_enable mmap apcu-mmap)
+		$(use_enable lock-spinlock apcu-spinlocks)
+	)
+
+	# Broken upstream autoconf test disables if present at all
+	use lock-pthreadrw || PHP_EXT_ECONF_ARGS+=( --disable-apcu-rwlocks )
+
+	php-ext-source-r3_src_configure
+}
+
+src_install() {
+	php-ext-pecl-r3_src_install
+
+	insinto /usr/share/php8/apcu
+	doins apc.php
+}
+
+pkg_postinst() {
+	elog "The apc.php file shipped with this release of pecl-apcu"
+	elog "was installed to ${EPREFIX}/usr/share/php8/apcu/."
+}
diff --git a/dev-php/pecl-crack/Manifest b/dev-php/pecl-crack/Manifest
deleted file mode 100644
index deabccc90727..000000000000
--- a/dev-php/pecl-crack/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 0.4-php7.patch 8435 BLAKE2B 11b9d076a684fb1e3e4bef9cd733e7675909282a5e571b3db60fbd9f852273555e3ca7731a13a1811986f529ee52b24e7a9b1bf26a564bc30187241429758e26 SHA512 f164cc8e37e37636de843063426d1ba07be17362d4b0fa0de59e1a9e21a15b7d5a312ed64bd73bcd51db5185a843a05611c23c5f5c442b720f437347f0401649
-AUX 0.4-php8.patch 9940 BLAKE2B a596f7f3329684f9c37c6ff43f392bd4936e32b3ce43bba99885a4a3f1828ded8952b392b65d2910a8cf90b5f77cba12878d2c8c7ca85b5692341c6163998825 SHA512 43d0a7d766d03dbea4c917ead7a337ccefd815cfff88f79f9e2438aa3f27e1bb079c22859baa1963720ebb53db58d3138fb4d70a76061829cabd177e59de88bd
-AUX fix-pecl-bug-5765.patch 375 BLAKE2B 6664659603006d260b578fc1169465007a600eb1b5ba4551339fc87488c7f94ac1ca49ebc829895ef2e6673fccbae2881e6f06a6cce4dfaa39db1350f2f4f0c6 SHA512 21f7d76242c630334e88c8bf1f6e4fe9718943c36c6886f8de6503c9c616beab7007e31127b40b1df66763893d692a65f20483addb1607e0cfc7ec7b92ff4500
-AUX fix-php-5-4-support.patch 674 BLAKE2B 5b2ce7a76aca15d6ff626ebced6e8844bac3d1fb959903c9882e1e59bdfc06027c6993431552deceb09df8d35e57e338818fa9b5ac11b31d4484369d3bd9d1e3 SHA512 ca2475557dc1d2f23a1e5745e7f3bac70855d0916a9d37d1a7efcd04e3bb973220b87aa2cc7ba8315473a2fd16dfd142c5c01608e94c595541ff15838c1e1d44
-DIST crack-0.4.tgz 25524 BLAKE2B 99e2289413a672d4dc3d8f9d70866efb499902a0d27379ac7b59d2873013c918d535851d8c3dbf2592596d6483f2abafe2f7bbd31fff40ce9827c7a97e16b8bc SHA512 0dec64d1ce859bb3d7e2b834e4bcc4ef8c6f3e88e5b61884e40dddc366a992a7c85bfad4227224d4401aad7f26843678709f29acd2dcc75563658040b8067d7f
-EBUILD pecl-crack-0.4-r8.ebuild 600 BLAKE2B 6f40c3c193a76116ce9ee063d47f02e811a47b76e43738ce775b8f3ad251290b845b7791833d9412293b302e1a104138c9a8f632293d8c82913eae445127329f SHA512 9b2a39421a17fac2d76b517d2341e325443a6e58a4b7ef1c04f0cb9d3849100589c8e3cd98ef53be8880c280364ae894e7260fcda6a86f0786cbdc46ba730591
-MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-crack/files/0.4-php7.patch b/dev-php/pecl-crack/files/0.4-php7.patch
deleted file mode 100644
index 5a00c9121810..000000000000
--- a/dev-php/pecl-crack/files/0.4-php7.patch
+++ /dev/null
@@ -1,356 +0,0 @@
---- a/crack.c	2016-12-19 16:04:09.244782234 -0500
-+++ b/crack.c	2016-12-20 09:20:11.903140742 -0500
-@@ -36,13 +36,31 @@
- /* True global resources - no need for thread safety here */
- static int le_crack;
- 
-+ZEND_BEGIN_ARG_INFO_EX(crack_opendict_args, 0, ZEND_RETURN_VALUE, 1)
-+	ZEND_ARG_INFO(0, dictionary)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO_EX(crack_closedict_args, 0, ZEND_RETURN_VALUE, 0)
-+	ZEND_ARG_INFO(0, dictionary)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO_EX(crack_check_args, 0, ZEND_RETURN_VALUE, 1)
-+	ZEND_ARG_INFO(0, password)
-+	ZEND_ARG_INFO(0, username)
-+	ZEND_ARG_INFO(0, gecos)
-+	ZEND_ARG_INFO(0, dictionary)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO_EX(crack_getlastmessage_args, 0, ZEND_RETURN_VALUE, 0)
-+ZEND_END_ARG_INFO()
-+
- /* {{{ crack_functions[]
-  */
- zend_function_entry crack_functions[] = {
--	PHP_FE(crack_opendict,			NULL)
--	PHP_FE(crack_closedict,			NULL)
--	PHP_FE(crack_check,				NULL)
--	PHP_FE(crack_getlastmessage,	NULL)
-+	ZEND_FE(crack_opendict,			crack_opendict_args)
-+	ZEND_FE(crack_closedict,			crack_closedict_args)
-+	ZEND_FE(crack_check,				crack_check_args)
-+	ZEND_FE(crack_getlastmessage,	crack_getlastmessage_args)
- 	{NULL, NULL, NULL}
- };
- /* }}} */
-@@ -55,7 +73,7 @@
- #endif
- 	"crack",
- 	crack_functions,
--	PHP_MINIT(crack), 
-+	PHP_MINIT(crack),
- 	PHP_MSHUTDOWN(crack),
- 	PHP_RINIT(crack),
- 	PHP_RSHUTDOWN(crack),
-@@ -84,7 +102,11 @@
- static void php_crack_init_globals(zend_crack_globals *crack_globals)
- {
- 	crack_globals->last_message = NULL;
-+#if PHP_VERSION_ID >= 70000
-+	crack_globals->default_dict = NULL;
-+#else
- 	crack_globals->default_dict = -1;
-+#endif
- }
- /* }}} */
- 
-@@ -95,7 +117,7 @@
- 	char *filename;
- 	int filename_len;
- 	int result = SUCCESS;
--	
-+
- #if PHP_VERSION_ID < 50400
- 	if (PG(safe_mode)) {
- 		filename_len = strlen(path) + 10;
-@@ -103,7 +125,7 @@
- 		if (NULL == filename) {
- 			return FAILURE;
- 		}
--        
-+
- 		memset(filename, '\0', filename_len);
- 		strcpy(filename, path);
- 		strcat(filename, ".pwd");
-@@ -111,7 +133,7 @@
- 			efree(filename);
- 			return FAILURE;
- 		}
--		
-+
- 		memset(filename, '\0', filename_len);
- 		strcpy(filename, path);
- 		strcat(filename, ".pwi");
-@@ -119,7 +141,7 @@
- 			efree(filename);
- 			return FAILURE;
- 		}
--		
-+
- 		memset(filename, '\0', filename_len);
- 		strcpy(filename, path);
- 		strcat(filename, ".hwm");
-@@ -129,39 +151,64 @@
- 		}
- 	}
- #endif
--	
-+
- 	if (php_check_open_basedir(path TSRMLS_CC)) {
- 		return FAILURE;
- 	}
--	
-+
- 	return SUCCESS;
- }
- /* }}} */
- 
- /* {{{ php_crack_set_default_dict
-  */
-+#if PHP_VERSION_ID >= 70000
-+static void php_crack_set_default_dict(zend_resource *id)
-+{
-+	if (CRACKG(default_dict) != NULL) {
-+		zend_list_close(CRACKG(default_dict));
-+	}
-+
-+	CRACKG(default_dict) = id;
-+	id->gc.refcount++;
-+}
-+#else
- static void php_crack_set_default_dict(int id TSRMLS_DC)
- {
- 	if (CRACKG(default_dict) != -1) {
- 		zend_list_delete(CRACKG(default_dict));
- 	}
--	
-+
- 	CRACKG(default_dict) = id;
- 	zend_list_addref(id);
- }
-+#endif
- /* }}} */
- 
- /* {{{ php_crack_get_default_dict
-  */
-+#if PHP_VERSION_ID >= 70000
-+static zend_resource * php_crack_get_default_dict(INTERNAL_FUNCTION_PARAMETERS)
-+#else
- static int php_crack_get_default_dict(INTERNAL_FUNCTION_PARAMETERS)
-+#endif
- {
-+#if PHP_VERSION_ID >= 70000
-+	if ((NULL == CRACKG(default_dict)) && (NULL != CRACKG(default_dictionary))) {
-+#else
- 	if ((-1 == CRACKG(default_dict)) && (NULL != CRACKG(default_dictionary))) {
-+#endif
- 		CRACKLIB_PWDICT *pwdict;
- 		printf("trying to open: %s\n", CRACKG(default_dictionary));
- 		pwdict = cracklib_pw_open(CRACKG(default_dictionary), "r");
- 		if (NULL != pwdict) {
-+#if PHP_VERSION_ID >= 70000
-+			ZVAL_RES(return_value, zend_register_resource(pwdict, le_crack));
-+			php_crack_set_default_dict(Z_RES_P(return_value));
-+#else
- 			ZEND_REGISTER_RESOURCE(return_value, pwdict, le_crack);
- 			php_crack_set_default_dict(Z_LVAL_P(return_value) TSRMLS_CC);
-+#endif
- 		}
- 	}
- 	
-@@ -171,7 +218,11 @@
- 
- /* {{{ php_crack_module_dtor
-  */
-+#if PHP_VERSION_ID >= 70000
-+static void php_crack_module_dtor(zend_resource *rsrc)
-+#else
- static void php_crack_module_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
-+#endif
- {
- 	CRACKLIB_PWDICT *pwdict = (CRACKLIB_PWDICT *) rsrc->ptr;
- 	
-@@ -191,7 +242,9 @@
- 	
- 	REGISTER_INI_ENTRIES();
- 	le_crack = zend_register_list_destructors_ex(php_crack_module_dtor, NULL, "crack dictionary", module_number);
-+#if PHP_VERSION_ID < 70000
- 	Z_TYPE(crack_module_entry) = type;
-+#endif
- 	
- 	return SUCCESS;
- }
-@@ -210,7 +263,11 @@
- PHP_RINIT_FUNCTION(crack)
- {
- 	CRACKG(last_message) = NULL;
-+#if PHP_VERSION_ID >= 70000
-+	CRACKG(default_dict) = NULL;
-+#else
- 	CRACKG(default_dict) = -1;
-+#endif
- 	
- 	return SUCCESS;
- }
-@@ -245,7 +302,7 @@
- PHP_FUNCTION(crack_opendict)
- {
- 	char *path;
--	int path_len;
-+	size_t path_len;
- 	CRACKLIB_PWDICT *pwdict;
- 	
- 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &path, &path_len) == FAILURE) {
-@@ -265,9 +322,14 @@
- #endif
- 		RETURN_FALSE;
- 	}
--	
-+
-+#if PHP_VERSION_ID >= 70000
-+	RETURN_RES(zend_register_resource(pwdict, le_crack));
-+	php_crack_set_default_dict(Z_RES_P(return_value));
-+#else
- 	ZEND_REGISTER_RESOURCE(return_value, pwdict, le_crack);
- 	php_crack_set_default_dict(Z_LVAL_P(return_value) TSRMLS_CC);
-+#endif
- }
- /* }}} */
- 
-@@ -276,7 +338,11 @@
- PHP_FUNCTION(crack_closedict)
- {
- 	zval *dictionary = NULL;
-+#if PHP_VERSION_ID >= 70000
-+	zend_resource *id;
-+#else
- 	int id = -1;
-+#endif
- 	CRACKLIB_PWDICT *pwdict;
- 	
- 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &dictionary)) {
-@@ -285,7 +351,11 @@
- 	
- 	if (NULL == dictionary) {
- 		id = php_crack_get_default_dict(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-+#if PHP_VERSION_ID >= 70000
-+		if (id == NULL) {
-+#else
- 		if (id == -1) {
-+#endif
- #if ZEND_MODULE_API_NO >= 20021010
- 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not open default crack dicionary"); 
- #else
-@@ -294,8 +364,21 @@
- 			RETURN_FALSE;
- 		}
- 	}
-+#if PHP_VERSION_ID >= 70000
-+	if((pwdict = (CRACKLIB_PWDICT *)zend_fetch_resource(Z_RES_P(dictionary), "crack dictionary", le_crack)) == NULL)
-+	{
-+		RETURN_FALSE;
-+	}
-+	if (NULL == dictionary) {
-+		zend_list_close(CRACKG(default_dict));
-+		CRACKG(default_dict) = NULL;
-+	}
-+	else {
-+		zend_list_close(Z_RES_P(dictionary));
-+	}
-+#else
- 	ZEND_FETCH_RESOURCE(pwdict, CRACKLIB_PWDICT *, &dictionary, id, "crack dictionary", le_crack);
--	
-+
- 	if (NULL == dictionary) {
- 		zend_list_delete(CRACKG(default_dict));
- 		CRACKG(default_dict) = -1;
-@@ -303,7 +386,7 @@
- 	else {
- 		zend_list_delete(Z_RESVAL_P(dictionary));
- 	}
--	
-+#endif
- 	RETURN_TRUE;
- }
- /* }}} */
-@@ -314,14 +397,18 @@
- {
- 	zval *dictionary = NULL;
- 	char *password = NULL;
--	int password_len;
-+	size_t password_len;
- 	char *username = NULL;
--	int username_len;
-+	size_t username_len;
- 	char *gecos = NULL;
--	int gecos_len;
-+	size_t gecos_len;
- 	char *message;
- 	CRACKLIB_PWDICT *pwdict;
-+#if PHP_VERSION_ID >= 70000
-+	zend_resource *crack_res;
-+#else
- 	int id = -1;
-+#endif
- 	
- 	if (NULL != CRACKG(last_message)) {
- 		efree(CRACKG(last_message));
-@@ -335,6 +422,21 @@
- 	}
- 	
- 	if (NULL == dictionary) {
-+#if PHP_VERSION_ID >= 70000
-+		crack_res = php_crack_get_default_dict(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-+		if (crack_res == NULL || crack_res->ptr == NULL) {
-+			php_error(E_WARNING, "Could not open default crack dicionary");
-+			RETURN_FALSE;
-+		}
-+
-+	}
-+	else {
-+		if((pwdict = (CRACKLIB_PWDICT *)zend_fetch_resource(Z_RES_P(dictionary), "crack dictionary", le_crack)) == NULL) {
-+			php_error(E_WARNING, "Could not open crack dicionary resource");
-+			RETURN_FALSE;
-+		}
-+	}
-+#else
- 		id = php_crack_get_default_dict(INTERNAL_FUNCTION_PARAM_PASSTHRU);
- 		if (id == -1) {
- #if ZEND_MODULE_API_NO >= 20021010
-@@ -346,6 +448,7 @@
- 		}
- 	}
- 	ZEND_FETCH_RESOURCE(pwdict, CRACKLIB_PWDICT *, &dictionary, id, "crack dictionary", le_crack);
-+#endif
- 	
- 	message = cracklib_fascist_look_ex(pwdict, password, username, gecos);
- 	
-@@ -377,7 +480,11 @@
- 		RETURN_FALSE;
- 	}
- 	
-+#if PHP_VERSION_ID >= 70000
-+	RETURN_STRING(CRACKG(last_message));
-+#else
- 	RETURN_STRING(CRACKG(last_message), 1);
-+#endif
- }
- /* }}} */
- 
---- a/php_crack.h	2005-09-21 05:00:06.000000000 -0400
-+++ b/php_crack.h	2016-12-19 16:51:22.449321851 -0500
-@@ -52,7 +52,11 @@
- ZEND_BEGIN_MODULE_GLOBALS(crack)
-     char *default_dictionary;
- 	char *last_message;
-+#if PHP_VERSION_ID >= 70000
-+	zend_resource *default_dict;
-+#else
- 	int default_dict;
-+#endif
- ZEND_END_MODULE_GLOBALS(crack)
- 
- #ifdef ZTS
diff --git a/dev-php/pecl-crack/files/0.4-php8.patch b/dev-php/pecl-crack/files/0.4-php8.patch
deleted file mode 100644
index ce5f36f11738..000000000000
--- a/dev-php/pecl-crack/files/0.4-php8.patch
+++ /dev/null
@@ -1,394 +0,0 @@
-diff -aurN a/crack.c b/crack.c
---- a/crack.c	2021-04-15 13:57:12.174874906 -0400
-+++ b/crack.c	2021-04-15 14:10:21.203314001 -0400
-@@ -68,9 +68,7 @@
- /* {{{ crack_module_entry
-  */
- zend_module_entry crack_module_entry = {
--#if ZEND_MODULE_API_NO >= 20010901
-     STANDARD_MODULE_HEADER,
--#endif
- 	"crack",
- 	crack_functions,
- 	PHP_MINIT(crack),
-@@ -78,9 +76,7 @@
- 	PHP_RINIT(crack),
- 	PHP_RSHUTDOWN(crack),
- 	PHP_MINFO(crack),
--#if ZEND_MODULE_API_NO >= 20010901
--	"0.3",
--#endif
-+	"0.4",
- 	STANDARD_MODULE_PROPERTIES,
- };
- /* }}} */
-@@ -102,57 +98,19 @@
- static void php_crack_init_globals(zend_crack_globals *crack_globals)
- {
- 	crack_globals->last_message = NULL;
--#if PHP_VERSION_ID >= 70000
- 	crack_globals->default_dict = NULL;
--#else
--	crack_globals->default_dict = -1;
--#endif
- }
- /* }}} */
- 
- /* {{{ php_crack_checkpath
-  */
--static int php_crack_checkpath(char* path TSRMLS_DC)
-+static int php_crack_checkpath(char* path)
- {
- 	char *filename;
- 	int filename_len;
- 	int result = SUCCESS;
- 
--#if PHP_VERSION_ID < 50400
--	if (PG(safe_mode)) {
--		filename_len = strlen(path) + 10;
--		filename = (char *) emalloc(filename_len);
--		if (NULL == filename) {
--			return FAILURE;
--		}
--
--		memset(filename, '\0', filename_len);
--		strcpy(filename, path);
--		strcat(filename, ".pwd");
--		if (!php_checkuid(filename, "r", CHECKUID_CHECK_FILE_AND_DIR)) {
--			efree(filename);
--			return FAILURE;
--		}
--
--		memset(filename, '\0', filename_len);
--		strcpy(filename, path);
--		strcat(filename, ".pwi");
--		if (!php_checkuid(filename, "r", CHECKUID_CHECK_FILE_AND_DIR)) {
--			efree(filename);
--			return FAILURE;
--		}
--
--		memset(filename, '\0', filename_len);
--		strcpy(filename, path);
--		strcat(filename, ".hwm");
--		if (!php_checkuid(filename, "r", CHECKUID_CHECK_FILE_AND_DIR)) {
--			efree(filename);
--			return FAILURE;
--		}
--	}
--#endif
--
--	if (php_check_open_basedir(path TSRMLS_CC)) {
-+	if (php_check_open_basedir(path)) {
- 		return FAILURE;
- 	}
- 
-@@ -162,7 +120,6 @@
- 
- /* {{{ php_crack_set_default_dict
-  */
--#if PHP_VERSION_ID >= 70000
- static void php_crack_set_default_dict(zend_resource *id)
- {
- 	if (CRACKG(default_dict) != NULL) {
-@@ -172,60 +129,32 @@
- 	CRACKG(default_dict) = id;
- 	id->gc.refcount++;
- }
--#else
--static void php_crack_set_default_dict(int id TSRMLS_DC)
--{
--	if (CRACKG(default_dict) != -1) {
--		zend_list_delete(CRACKG(default_dict));
--	}
--
--	CRACKG(default_dict) = id;
--	zend_list_addref(id);
--}
--#endif
- /* }}} */
- 
- /* {{{ php_crack_get_default_dict
-  */
--#if PHP_VERSION_ID >= 70000
- static zend_resource * php_crack_get_default_dict(INTERNAL_FUNCTION_PARAMETERS)
--#else
--static int php_crack_get_default_dict(INTERNAL_FUNCTION_PARAMETERS)
--#endif
- {
--#if PHP_VERSION_ID >= 70000
- 	if ((NULL == CRACKG(default_dict)) && (NULL != CRACKG(default_dictionary))) {
--#else
--	if ((-1 == CRACKG(default_dict)) && (NULL != CRACKG(default_dictionary))) {
--#endif
- 		CRACKLIB_PWDICT *pwdict;
- 		printf("trying to open: %s\n", CRACKG(default_dictionary));
- 		pwdict = cracklib_pw_open(CRACKG(default_dictionary), "r");
- 		if (NULL != pwdict) {
--#if PHP_VERSION_ID >= 70000
- 			ZVAL_RES(return_value, zend_register_resource(pwdict, le_crack));
- 			php_crack_set_default_dict(Z_RES_P(return_value));
--#else
--			ZEND_REGISTER_RESOURCE(return_value, pwdict, le_crack);
--			php_crack_set_default_dict(Z_LVAL_P(return_value) TSRMLS_CC);
--#endif
- 		}
- 	}
--	
-+
- 	return CRACKG(default_dict);
- }
- /* }}} */
- 
- /* {{{ php_crack_module_dtor
-  */
--#if PHP_VERSION_ID >= 70000
- static void php_crack_module_dtor(zend_resource *rsrc)
--#else
--static void php_crack_module_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
--#endif
- {
- 	CRACKLIB_PWDICT *pwdict = (CRACKLIB_PWDICT *) rsrc->ptr;
--	
-+
- 	if (pwdict != NULL) {
- 		cracklib_pw_close(pwdict);
- 	}
-@@ -239,13 +168,10 @@
- #ifdef ZTS
- 	ZEND_INIT_MODULE_GLOBALS(crack, php_crack_init_globals, NULL);
- #endif
--	
-+
- 	REGISTER_INI_ENTRIES();
- 	le_crack = zend_register_list_destructors_ex(php_crack_module_dtor, NULL, "crack dictionary", module_number);
--#if PHP_VERSION_ID < 70000
--	Z_TYPE(crack_module_entry) = type;
--#endif
--	
-+
- 	return SUCCESS;
- }
- 
-@@ -263,12 +189,8 @@
- PHP_RINIT_FUNCTION(crack)
- {
- 	CRACKG(last_message) = NULL;
--#if PHP_VERSION_ID >= 70000
- 	CRACKG(default_dict) = NULL;
--#else
--	CRACKG(default_dict) = -1;
--#endif
--	
-+
- 	return SUCCESS;
- }
- /* }}} */
-@@ -280,7 +202,7 @@
- 	if (NULL != CRACKG(last_message)) {
- 		efree(CRACKG(last_message));
- 	}
--	
-+
- 	return SUCCESS;
- }
- /* }}} */
-@@ -292,7 +214,7 @@
- 	php_info_print_table_start();
- 	php_info_print_table_header(2, "crack support", "enabled");
- 	php_info_print_table_end();
--	
-+
- 	DISPLAY_INI_ENTRIES();
- }
- /* }}} */
-@@ -304,32 +226,23 @@
- 	char *path;
- 	size_t path_len;
- 	CRACKLIB_PWDICT *pwdict;
--	
--	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &path, &path_len) == FAILURE) {
-+
-+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &path, &path_len) == FAILURE) {
- 		RETURN_FALSE;
- 	}
--	
--	if (php_crack_checkpath(path TSRMLS_CC) == FAILURE) {
-+
-+	if (php_crack_checkpath(path) == FAILURE) {
- 		RETURN_FALSE;
- 	}
--	
-+
- 	pwdict = cracklib_pw_open(path, "r");
- 	if (NULL == pwdict) {
--#if ZEND_MODULE_API_NO >= 20021010
--		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not open crack dictionary: %s", path);
--#else
--		php_error(E_WARNING, "Could not open crack dictionary: %s", path);
--#endif
-+		php_error_docref(NULL, E_WARNING, "Could not open crack dictionary: %s", path);
- 		RETURN_FALSE;
- 	}
- 
--#if PHP_VERSION_ID >= 70000
- 	RETURN_RES(zend_register_resource(pwdict, le_crack));
- 	php_crack_set_default_dict(Z_RES_P(return_value));
--#else
--	ZEND_REGISTER_RESOURCE(return_value, pwdict, le_crack);
--	php_crack_set_default_dict(Z_LVAL_P(return_value) TSRMLS_CC);
--#endif
- }
- /* }}} */
- 
-@@ -338,33 +251,20 @@
- PHP_FUNCTION(crack_closedict)
- {
- 	zval *dictionary = NULL;
--#if PHP_VERSION_ID >= 70000
- 	zend_resource *id;
--#else
--	int id = -1;
--#endif
- 	CRACKLIB_PWDICT *pwdict;
--	
--	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &dictionary)) {
-+
-+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &dictionary)) {
- 		RETURN_FALSE;
- 	}
--	
-+
- 	if (NULL == dictionary) {
- 		id = php_crack_get_default_dict(INTERNAL_FUNCTION_PARAM_PASSTHRU);
--#if PHP_VERSION_ID >= 70000
- 		if (id == NULL) {
--#else
--		if (id == -1) {
--#endif
--#if ZEND_MODULE_API_NO >= 20021010
--			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not open default crack dicionary"); 
--#else
--			php_error(E_WARNING, "Could not open default crack dicionary"); 
--#endif
-+			php_error_docref(NULL, E_WARNING, "Could not open default crack dicionary"); 
- 			RETURN_FALSE;
- 		}
- 	}
--#if PHP_VERSION_ID >= 70000
- 	if((pwdict = (CRACKLIB_PWDICT *)zend_fetch_resource(Z_RES_P(dictionary), "crack dictionary", le_crack)) == NULL)
- 	{
- 		RETURN_FALSE;
-@@ -376,17 +276,6 @@
- 	else {
- 		zend_list_close(Z_RES_P(dictionary));
- 	}
--#else
--	ZEND_FETCH_RESOURCE(pwdict, CRACKLIB_PWDICT *, &dictionary, id, "crack dictionary", le_crack);
--
--	if (NULL == dictionary) {
--		zend_list_delete(CRACKG(default_dict));
--		CRACKG(default_dict) = -1;
--	}
--	else {
--		zend_list_delete(Z_RESVAL_P(dictionary));
--	}
--#endif
- 	RETURN_TRUE;
- }
- /* }}} */
-@@ -404,25 +293,20 @@
- 	size_t gecos_len;
- 	char *message;
- 	CRACKLIB_PWDICT *pwdict;
--#if PHP_VERSION_ID >= 70000
- 	zend_resource *crack_res;
--#else
--	int id = -1;
--#endif
--	
-+
- 	if (NULL != CRACKG(last_message)) {
- 		efree(CRACKG(last_message));
- 		CRACKG(last_message) = NULL;
- 	}
--	
--	if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "rs", &dictionary, &password, &password_len) == FAILURE) {
--		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ssr", &password, &password_len, &username, &username_len, &gecos, &gecos_len, &dictionary) == FAILURE) {
-+
-+	if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "rs", &dictionary, &password, &password_len) == FAILURE) {
-+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|ssr", &password, &password_len, &username, &username_len, &gecos, &gecos_len, &dictionary) == FAILURE) {
- 			RETURN_FALSE;
- 		}
- 	}
--	
-+
- 	if (NULL == dictionary) {
--#if PHP_VERSION_ID >= 70000
- 		crack_res = php_crack_get_default_dict(INTERNAL_FUNCTION_PARAM_PASSTHRU);
- 		if (crack_res == NULL || crack_res->ptr == NULL) {
- 			php_error(E_WARNING, "Could not open default crack dicionary");
-@@ -436,22 +320,9 @@
- 			RETURN_FALSE;
- 		}
- 	}
--#else
--		id = php_crack_get_default_dict(INTERNAL_FUNCTION_PARAM_PASSTHRU);
--		if (id == -1) {
--#if ZEND_MODULE_API_NO >= 20021010
--			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not open default crack dicionary"); 
--#else
--			php_error(E_WARNING, "Could not open default crack dicionary"); 
--#endif
--			RETURN_FALSE;
--		}
--	}
--	ZEND_FETCH_RESOURCE(pwdict, CRACKLIB_PWDICT *, &dictionary, id, "crack dictionary", le_crack);
--#endif
--	
-+
- 	message = cracklib_fascist_look_ex(pwdict, password, username, gecos);
--	
-+
- 	if (NULL == message) {
- 		CRACKG(last_message) = estrdup("strong password");
- 		RETURN_TRUE;
-@@ -470,21 +341,13 @@
- 	if (ZEND_NUM_ARGS() != 0) {
- 		WRONG_PARAM_COUNT;
- 	}
--	
-+
- 	if (NULL == CRACKG(last_message)) {
--#if ZEND_MODULE_API_NO >= 20021010
--		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No obscure checks in this session");
--#else
--		php_error(E_WARNING, "No obscure checks in this session");
--#endif
-+		php_error_docref(NULL, E_WARNING, "No obscure checks in this session");
- 		RETURN_FALSE;
- 	}
--	
--#if PHP_VERSION_ID >= 70000
-+
- 	RETURN_STRING(CRACKG(last_message));
--#else
--	RETURN_STRING(CRACKG(last_message), 1);
--#endif
- }
- /* }}} */
- 
-diff -aurN a/php_crack.h b/php_crack.h
---- a/php_crack.h	2021-04-15 13:57:12.174874906 -0400
-+++ b/php_crack.h	2021-04-15 14:10:28.853298881 -0400
-@@ -52,11 +52,7 @@
- ZEND_BEGIN_MODULE_GLOBALS(crack)
-     char *default_dictionary;
- 	char *last_message;
--#if PHP_VERSION_ID >= 70000
- 	zend_resource *default_dict;
--#else
--	int default_dict;
--#endif
- ZEND_END_MODULE_GLOBALS(crack)
- 
- #ifdef ZTS
diff --git a/dev-php/pecl-crack/files/fix-pecl-bug-5765.patch b/dev-php/pecl-crack/files/fix-pecl-bug-5765.patch
deleted file mode 100644
index c180d5310b1b..000000000000
--- a/dev-php/pecl-crack/files/fix-pecl-bug-5765.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- crack-0.4/libcrack/src/cracklib.h   2005-09-21 11:00:06.000000000 +0200
-+++ crack-0.4-new/libcrack/src/cracklib.h       2006-10-08 20:44:00.618783250 +0200
-@@ -46,7 +46,7 @@
- 
- typedef unsigned char int8;
- typedef unsigned short int int16;
--typedef unsigned long int int32;
-+typedef unsigned int int32;
- 
- #ifndef NUMWORDS
- # define NUMWORDS                           16
diff --git a/dev-php/pecl-crack/files/fix-php-5-4-support.patch b/dev-php/pecl-crack/files/fix-php-5-4-support.patch
deleted file mode 100644
index 7fddadfabbbd..000000000000
--- a/dev-php/pecl-crack/files/fix-php-5-4-support.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Gentoo bug: 423869
-Thanks to hanno
-
---- a/crack.c	2008/07/17 10:02:47	262854
-+++ b/crack.c	2012/06/07 16:13:34	326013
-@@ -38,7 +38,7 @@
- 
- /* {{{ crack_functions[]
-  */
--function_entry crack_functions[] = {
-+zend_function_entry crack_functions[] = {
- 	PHP_FE(crack_opendict,			NULL)
- 	PHP_FE(crack_closedict,			NULL)
- 	PHP_FE(crack_check,				NULL)
-@@ -94,6 +94,7 @@
- 	int filename_len;
- 	int result = SUCCESS;
- 	
-+#if PHP_VERSION_ID < 50400
- 	if (PG(safe_mode)) {
- 		filename_len = strlen(path) + 10;
- 		filename = (char *) emalloc(filename_len);
-@@ -125,6 +126,7 @@
- 			return FAILURE;
- 		}
- 	}
-+#endif
- 	
- 	if (php_check_open_basedir(path TSRMLS_CC)) {
- 		return FAILURE;
diff --git a/dev-php/pecl-crack/metadata.xml b/dev-php/pecl-crack/metadata.xml
deleted file mode 100644
index 222c77f3742a..000000000000
--- a/dev-php/pecl-crack/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-php/pecl-crack/pecl-crack-0.4-r8.ebuild b/dev-php/pecl-crack/pecl-crack-0.4-r8.ebuild
deleted file mode 100644
index c5211d5881c8..000000000000
--- a/dev-php/pecl-crack/pecl-crack-0.4-r8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="crack"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_EXTRA_ECONF=""
-DOCS=( EXPERIMENTAL )
-
-USE_PHP="php8-0"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="amd64 ppc ppc64 x86"
-
-DESCRIPTION="PHP interface to the cracklib libraries"
-LICENSE="PHP-3 CRACKLIB"
-SLOT="0"
-IUSE=""
-
-# Patch for http://pecl.php.net/bugs/bug.php?id=5765
-PATCHES=(
-	"${FILESDIR}/fix-php-5-4-support.patch"
-	"${FILESDIR}/fix-pecl-bug-5765.patch"
-	"${FILESDIR}/${PV}-php7.patch"
-	"${FILESDIR}/0.4-php8.patch"
-)
diff --git a/dev-php/pecl-dio/Manifest b/dev-php/pecl-dio/Manifest
index e1af8f2194dc..41b0f0d4500e 100644
--- a/dev-php/pecl-dio/Manifest
+++ b/dev-php/pecl-dio/Manifest
@@ -1,3 +1,5 @@
 DIST dio-0.2.0.tgz 37328 BLAKE2B e7ad6be1a4c957c155753e834d79f51b985578a03781ddbc66f05961dc270d58b20abcc74c64a0e9744d5cfbb6e545c1a7ac2bc1d54009c74f26bf786587ef49 SHA512 172c2a2a84d348d684d84ca94f23b767952461ca848cd114e899ea3fd39503a35ac0624a2a774b9dc6fd2d463d3f6aa6937e780e2faa6a0955a8594aad27ec8b
+DIST dio-0.2.1.tgz 37004 BLAKE2B 5988e7fbbb26f904ed8f651bb3499afdd444fce7408d76fd62a8bf74b5a035006ecb9b23fdcf85cb42885976c7f39c9b2480578e3bfa56ad9ab972dcda481124 SHA512 ed40ae3a950410e65a15c893a90d16da7f152c73e92623b68706b942c42f27e01a799134cb4b464d09f6e99c35d80e634ba662a20c7c9bc7f27ca2515c392abf
 EBUILD pecl-dio-0.2.0-r1.ebuild 327 BLAKE2B f860d87a4d86b25d157cfc6923e5f7f2ceb141d7901490bef30e3f7cffe1ae60e6d470293623f85e48983abe4f834f195ed556d24c9f764c1b4dbe3daa93850a SHA512 15ff8432b330ba0751259f1a1f252a730a4cffcd53a76b942cdeb2c0bf940d31bf35306ea7f721f601ade0eb3e90ea5abb0e5ac5b895d418befeaf9679ab70fc
+EBUILD pecl-dio-0.2.1.ebuild 324 BLAKE2B 3217d7c7c99f7587b560819366208a59e20718b2077923d9acbd455fc3f94520377c31e31478db37554b986963183762e2fd20d390d2bde23ebc4d664aee85db SHA512 a782e1d69d1fdbcef2cbe1ceba4ba317c378a188cb6075b6b4f51db8da0412bcb735224a67e004f154affb3b0be1985dc9e6a4f2e64fba0b2d88a4610078bf66
 MISC metadata.xml 236 BLAKE2B 55612da78a71f8cee31c387a5862636996734210d765fac66d8c7706acc5151e6a9e7ff5123aeb097c911495c6220ba3b5d2f1355f46e8ab6bdb240e1697e26d SHA512 2782b20a65dca663ff7c64b7e67db05641abed478fd5996e5750b2e52ba870829f89125baa8967dd29fd20ef9b46ad233b0dd08801308b7756717ec2f292446c
diff --git a/dev-php/pecl-dio/pecl-dio-0.2.1.ebuild b/dev-php/pecl-dio/pecl-dio-0.2.1.ebuild
new file mode 100644
index 000000000000..dec265550cb3
--- /dev/null
+++ b/dev-php/pecl-dio/pecl-dio-0.2.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PHP_EXT_NAME="dio"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php8-1 php8-2 php8-3"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Direct I/O functions for PHP"
+LICENSE="PHP-3.01"
+SLOT="0"
diff --git a/dev-php/pecl-eio/Manifest b/dev-php/pecl-eio/Manifest
index b61cdb31048e..dc6f3c6f0f8b 100644
--- a/dev-php/pecl-eio/Manifest
+++ b/dev-php/pecl-eio/Manifest
@@ -1,7 +1,3 @@
-DIST eio-3.0.0RC2.tgz 89591 BLAKE2B 7923f8715870cfd744148980e3ad6de8373384d85e45abc687be2cde22fd425a33b8c80fbd1226e23dbac417533826dfbf639fed751bfc2a88e118750e38d626 SHA512 23e7d88720222ac3f58015ba140e3338e100cf72cf64276fd7e0f0d63a5e50f878ab0a4a742eac7b51484c56ee438fcc3f7cbf7b1da5db44e0178a5098a4a6ae
-DIST eio-3.0.0RC4.tgz 89689 BLAKE2B 2b8cc414d212ec7d3345621a1190ef4e2b2a286ea76569dd39f6a1ce9a77e77bbb6959d9d25be59ab4fea617cb4c16bfcc726d6d1c8aee0dfa87c2cdcbd9f095 SHA512 126f189eb1ccce6093c764b9910bd844561ff644efeaeb762dd5eccb34122b0012160168f223f46d82dd6bf55ebcd1561c96bc69c408b2c8a37c0d2a04d619e4
 DIST eio-3.1.0RC1.tgz 99307 BLAKE2B dbadc519f43a38796994d5854ef5f5e0c2876aa1afe9f98a3933f89332c4dc7b6db7a675cb06e47039243130d39f12f26085f02d9ea871eda68580d8fdcf143f SHA512 2118eb47bfa24a753588e24691d96f46d07fde9e2ce409f1d93d77aa52494536aa06654c95831b7841d54f44a5cfd5c958efd4304a344a620c7f348cd5f7a368
-EBUILD pecl-eio-3.0.0_rc2.ebuild 621 BLAKE2B a103d49843db384edaad08663b34e72aa7ef65d80d49606ea54a45dc9b98c4ad58835594c6e479a3c1e4643ec395de13a45977d49eae89a916a6a12007017eaf SHA512 cad80677dd187fc98491d62043074a24a712d302f10b053f7fb636bdf4a451b8f9e73df36ac5bb3b9584552c6b77e0b53e774732dcb9628723c51db4cd74e08b
-EBUILD pecl-eio-3.0.0_rc4.ebuild 628 BLAKE2B 2732d76add11f68a7e52dc232ae064b6f24ff108286501ad06832ee3aedd0fbf06851039b1e512a31cdd86090afa68403209699dadec73dce8ce9abbe9a173dd SHA512 2aab3fb0aecac4990d07bf31b6c89752b3027cee4f56b3573ece0161962b135e9c31a53783c7152bb3a1ff8d12da38513ed2bdf87d3023ec7bc9b0497c0b2bd1
-EBUILD pecl-eio-3.1.0_rc1.ebuild 628 BLAKE2B 2732d76add11f68a7e52dc232ae064b6f24ff108286501ad06832ee3aedd0fbf06851039b1e512a31cdd86090afa68403209699dadec73dce8ce9abbe9a173dd SHA512 2aab3fb0aecac4990d07bf31b6c89752b3027cee4f56b3573ece0161962b135e9c31a53783c7152bb3a1ff8d12da38513ed2bdf87d3023ec7bc9b0497c0b2bd1
+EBUILD pecl-eio-3.1.0_rc1.ebuild 621 BLAKE2B e81488c67f01d0b2e73c34ca13ab8a55e1cc6dbbae8fb236ff138b9537ba1347bd0ec2486cefc08334eb65e5df30021e83af7d7808cf80534bd7af633b400907 SHA512 0c4eece0b59b095c1aebd582461a146388c08d17bbacff3a3f721659ad1562dcb695dffe47349698c0370866558fd45578b6f66a48a97b69916f240c8160136d
 MISC metadata.xml 409 BLAKE2B 1cf0f6ca2ff772e4be8f8d664d88ac0cfc5f7858f5011f41c436bdb8327820f93009f9e124f7521d9f805cce08914856da3053d1533e06d09e2f345fb26076e6 SHA512 48fa355975faf994325d4c37ef68a33856c13a8ca24a031b14d3a78d6d0f756a2647906581568ac638841b1a964424dfdf456039205add67ce3b7f0cded96b22
diff --git a/dev-php/pecl-eio/pecl-eio-3.0.0_rc2.ebuild b/dev-php/pecl-eio/pecl-eio-3.0.0_rc2.ebuild
deleted file mode 100644
index b7ea9d1d2ba3..000000000000
--- a/dev-php/pecl-eio/pecl-eio-3.0.0_rc2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/pecl-}"
-MY_PV="${PV/_rc/RC}"
-MY_P="${MY_PN}-${MY_PV}"
-PHP_EXT_NAME="eio"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
-PHP_EXT_S="${WORKDIR}/${MY_P}"
-DOCS=( README.md )
-
-USE_PHP="php8-0"
-inherit php-ext-pecl-r3
-
-DESCRIPTION="PHP wrapper for libeio library"
-S="${PHP_EXT_S}"
-
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=("--with-eio" "$(use_enable debug eio-debug)" )
-	php-ext-source-r3_src_configure
-}
diff --git a/dev-php/pecl-eio/pecl-eio-3.0.0_rc4.ebuild b/dev-php/pecl-eio/pecl-eio-3.0.0_rc4.ebuild
deleted file mode 100644
index 09c39fede5e8..000000000000
--- a/dev-php/pecl-eio/pecl-eio-3.0.0_rc4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/pecl-}"
-MY_PV="${PV/_rc/RC}"
-MY_P="${MY_PN}-${MY_PV}"
-PHP_EXT_NAME="eio"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
-PHP_EXT_S="${WORKDIR}/${MY_P}"
-DOCS=( README.md )
-
-USE_PHP="php8-0 php8-1"
-inherit php-ext-pecl-r3
-
-DESCRIPTION="PHP wrapper for libeio library"
-S="${PHP_EXT_S}"
-
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=("--with-eio" "$(use_enable debug eio-debug)" )
-	php-ext-source-r3_src_configure
-}
diff --git a/dev-php/pecl-eio/pecl-eio-3.1.0_rc1.ebuild b/dev-php/pecl-eio/pecl-eio-3.1.0_rc1.ebuild
index 09c39fede5e8..79eff92d0976 100644
--- a/dev-php/pecl-eio/pecl-eio-3.1.0_rc1.ebuild
+++ b/dev-php/pecl-eio/pecl-eio-3.1.0_rc1.ebuild
@@ -13,7 +13,7 @@ PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
 PHP_EXT_S="${WORKDIR}/${MY_P}"
 DOCS=( README.md )
 
-USE_PHP="php8-0 php8-1"
+USE_PHP="php8-1"
 inherit php-ext-pecl-r3
 
 DESCRIPTION="PHP wrapper for libeio library"
diff --git a/dev-php/pecl-imagick/Manifest b/dev-php/pecl-imagick/Manifest
index 5f6eccadf306..7ebc535cdeec 100644
--- a/dev-php/pecl-imagick/Manifest
+++ b/dev-php/pecl-imagick/Manifest
@@ -1,3 +1,5 @@
+AUX pecl-imagick-3.7.0-php8.3.patch 599 BLAKE2B e7de69a62d949738d132d40788c44d8441c0bdebb548b61b874fa7f9bf5dc287ab8061bdd133abe0bd3e2075b777ee43ccd847ae9cdb429500db214fac4af065 SHA512 9f2abe51c7fba5739ef9a2de484a3131ca6c79e09db3c2a59029c3b5c8a2c29df15d75cc4feb2f35215ed7faa30b42d403cc729260a89b40e8dc7cdf08e17a61
 DIST imagick-3.7.0.tgz 360138 BLAKE2B 2c149f2ec771df92789d67e88c6f7180d3da7c9182561432bdd4e0a83f96982cc8fc95bc1a003e05e37a54fabe6ab0fe693a6b9208d2e481d36e6c334aeee023 SHA512 c84408e4e4a0c46d979240e06d58d264c6bb21f3b95e3d434c8a21cd808f6c495fd453ef9c07b5c44dac81c6f205b6697f8ecaf1a65a86ce4e9052328a389ebe
 EBUILD pecl-imagick-3.7.0-r2.ebuild 919 BLAKE2B d648c1dec5c816f40967aa563854b2a282ceb784cf4c1657f8deadcf1196203e84e65fa0afbde12e20ed420c9783c5a1ce783938fc701a2a7d41c312643ea40d SHA512 25cd45526ac912cd162efb2f1bf4a2334c1cc37cd7ae6b2a6e6222c65d8ddf67b3a31a4912e0c1231379c123f2d624fbc4040090d4d7918f082fb3fe678a3589
+EBUILD pecl-imagick-3.7.0-r3.ebuild 977 BLAKE2B 499a132b77fa8712fd6cd256e6b5ab8e19ca0123fc68277a3aa327d5dcd05bc1f0699289d0ae728e72e838b53ee79c9fc07e42b009fa5f985085540a50dd3e6e SHA512 4cad0aff313065f2725da631663ed1e428d9d2bca68cc6761056b3164ad1273117ba967a2c7e411c928c5c2b928dd42abece1a9ef9ede6c96197f4266b1cccdc
 MISC metadata.xml 443 BLAKE2B 208b9e5262b94da1cc49b6f4666e62b6d856c10643c8dc6c1572ee641fd671a2338ceec56ca88f4c56247cd06f7d4288684ab721547d86eb3bc84bd694c5f9ef SHA512 b8d47d2293ef17d2aaaf23cb78a58df295020fd854131e53b55feb727c850bea669ed1bd24cab97c02264028b8bcd335e928b1d86702e06245c72370ccf0507c
diff --git a/dev-php/pecl-imagick/files/pecl-imagick-3.7.0-php8.3.patch b/dev-php/pecl-imagick/files/pecl-imagick-3.7.0-php8.3.patch
new file mode 100644
index 000000000000..d75d23dbf11b
--- /dev/null
+++ b/dev-php/pecl-imagick/files/pecl-imagick-3.7.0-php8.3.patch
@@ -0,0 +1,20 @@
+From 7088edc353f53c4bc644573a79cdcd67a726ae16 Mon Sep 17 00:00:00 2001
+From: FedericoHeichou <federicoheichou@gmail.com>
+Date: Fri, 24 Nov 2023 11:24:00 +0100
+Subject: [PATCH] Fix compilation error "Unterminated preprocessor conditions"
+ in php 8.3
+
+---
+ Imagick.stub.php | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Imagick.stub.php b/Imagick.stub.php
+index 804c0152..49da9386 100644
+--- a/Imagick.stub.php
++++ b/Imagick.stub.php
+@@ -1669,4 +1669,5 @@ public function setInterpolateMethod(int $method): bool{}
+ 	public function setOrientation(int $orientation): bool {}
+ #endif
+ 
++#endif
+ }
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.7.0-r3.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.7.0-r3.ebuild
new file mode 100644
index 000000000000..2e99e271ad8e
--- /dev/null
+++ b/dev-php/pecl-imagick/pecl-imagick-3.7.0-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PHP_EXT_NAME="imagick"
+USE_PHP="php8-0 php8-1 php8-2 php8-3"
+
+# https://github.com/Imagick/imagick/issues/626
+PHP_EXT_NEEDED_USE="-debug"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+DESCRIPTION="PHP wrapper for the ImageMagick library"
+HOMEPAGE="https://pecl.php.net/package/imagick https://github.com/Imagick/imagick"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+# imagemagick[-openmp] is needed wrt bug 547922 and upstream
+# https://github.com/Imagick/imagick#openmp
+RDEPEND="media-gfx/imagemagick:=[-openmp]"
+DEPEND="
+	${RDEPEND}
+	test? ( media-gfx/imagemagick:=[hdri,jpeg,png,svg,truetype,xml] )
+"
+
+PATCHES="${FILESDIR}/${PN}-3.7.0-php8.3.patch"
+
+PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX}/usr"
+
+src_install() {
+	php-ext-pecl-r3_src_install
+	php-ext-source-r3_addtoinifiles "imagick.skip_version_check" "1"
+}
diff --git a/dev-php/pecl-mcrypt/Manifest b/dev-php/pecl-mcrypt/Manifest
index ee993981289c..25ab2fab501b 100644
--- a/dev-php/pecl-mcrypt/Manifest
+++ b/dev-php/pecl-mcrypt/Manifest
@@ -1,5 +1,3 @@
-DIST mcrypt-1.0.4.tgz 27056 BLAKE2B 3faa77299ef1b5ab3f5a427b57d64f5f5ec54bc41f83924bfd285289c168341c0f044970fb0c37ca8561e68be165a40b2d6fd423ed6d5aa74225d5a3fb349546 SHA512 6a8244761035640366041a5f26057ab14bb85eaaa973ddf604e152b786ef750ec775ae91d7582044700d6fdef902425f3a9d6839113a52e0a9f957bf9d0c189a
 DIST mcrypt-1.0.5.tgz 27056 BLAKE2B 0ed78eed5d5e1c848f554bf16bb5d94fd445081ab389b4a44f3b0ad0fdb11b25bd79eea77ed87a35120fb89b8409705b01d725923d7b2777dd32276f3a39238f SHA512 fe9afd0987ddbcbb0a9fc5e8313c08c65ac6afd606cce586fe30600ab149b4f4add917bb0319f803942833a88f520f65e2e94bbcc6c58e2075e829509e7dfac5
-EBUILD pecl-mcrypt-1.0.4.ebuild 508 BLAKE2B b4ff359d455a7df023e3ecdf6d500d8835b616dcf21fd67beaf7500a466bf0dddb02a988f0f5d2a2c66db1e80ec2d95fae040bae3f038eea9289059040e936b9 SHA512 ea17117b6dfbf0c59b68cfc2cd911e112f8bb33064790d81ce28cea9e8b29d4790f11464bb8b2693d248bd595396e95426f809db8e33a73a266330f6216dbee4
-EBUILD pecl-mcrypt-1.0.5.ebuild 533 BLAKE2B ed8079d40c923a1dbb9be64eb44e342b7fcb35584d3277a62845561529426e12e9fba82f44249d7ec30eda16b4ce88917530511967c01eabe901ac5ee0a2e491 SHA512 76542542d149cbef921485b21ec03c5dffe15f32f3df45f77c660ff5cf32fffd116e049638e2125dad911f4028eb507afb432b418cbc650a222d8b38d17f445c
+EBUILD pecl-mcrypt-1.0.5.ebuild 526 BLAKE2B 99f7aa63cd9861d6ce1aa915f669176a9f064aa1e17093575f5c38a8086d7425c4a92c4140cba81dcf66a0ae77604141cd2cef2809dde4eecbf53d1afdde18f8 SHA512 5debdbee9928bc70a292ec4097d3a1c5c65480cdc8beaf4dc0f20d3da691b3f317228460f3184ff753cb5c4770300305960e9ce6c986f3147fb8107f9632cc44
 MISC metadata.xml 410 BLAKE2B f833751f407d57c96e4e2f2dd05520c55037ba7874e753750df8a22d4c18a5edaf0925982b2b04c4e7e541bd691c6d7798bef0079fe980b35a9f71f5e2405793 SHA512 cf4f51a91d42ff06b0d628c44ee66463a1903de18e749d690a722e2fe77d95d83ba709595adc20e27976de502c5a5e232065d394eb41c03f9d39a8291a874841
diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.4.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.4.ebuild
deleted file mode 100644
index 45184b51edfe..000000000000
--- a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="mcrypt"
-USE_PHP="php8-0"
-MY_P="${PN/pecl-/}-${PV/_rc/RC}"
-PHP_EXT_ECONF_ARGS=()
-PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
-PHP_EXT_S="${WORKDIR}/${MY_P}"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="Bindings for the libmcrypt library"
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-DEPEND="dev-libs/libmcrypt"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.5.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.5.ebuild
index 348315f250a5..019ba4f3108c 100644
--- a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.5.ebuild
+++ b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PHP_EXT_NAME="mcrypt"
-USE_PHP="php8-0 php8-1"
+USE_PHP="php8-1"
 MY_P="${PN/pecl-/}-${PV/_rc/RC}"
 PHP_EXT_ECONF_ARGS=()
 PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
diff --git a/dev-php/pecl-memcache/Manifest b/dev-php/pecl-memcache/Manifest
index 0f9217eb3c2e..83695b82d703 100644
--- a/dev-php/pecl-memcache/Manifest
+++ b/dev-php/pecl-memcache/Manifest
@@ -1,5 +1,4 @@
 AUX 8.0-patches-20211123.patch 5706 BLAKE2B 66b9671357963c0f7c0f32f3b578f4b38acda7024e8c33bb03e328b4177c20841b8318482122b343d407d6dc5e4182d8fc74ae3dfc186ad8d606372d024a4807 SHA512 6e66664ca4aa7d3578facbdad012506b3b12fdae7460c9cad5f515228f697e511bbb02fe7f9a2efcfc3066877688bd7092e81a26199d5e26097f365806079eab
 DIST memcache-8.0.tgz 78448 BLAKE2B fb2d68d5ff4c6343dd2e66ae5c3f84fed22455b8614dce04dde2e10c164bf1f8d276776b74beaa387dd794cf82f6b897a88c8bed058376b9032e0452c2e94b06 SHA512 d5eea13b85d8d35ef6aab8c5699bdcc4707cf8debf4052cbbeac26e7e2360a4d3d4e55e8bd0b40cf19fe014ba1fc42d5417deabbe22a199f0c6aa98b67d132d4
-EBUILD pecl-memcache-8.0-r1.ebuild 1756 BLAKE2B 3a74d6df4bd2b8014ecbaa3ec60c5a792198bebe76c20292e7cb9d19c66460da0785fbe668489968403a3e7e2e5707b76f095c13860a864b14e141ab821f8ec8 SHA512 fd43111a8d3849c235acc802b444bb7cec1ebb99d287ff805fd92e4dded56f86a352345c40208ae211176e1cdf7882085d3707a3f3ad7b09de0b17e04724497f
-EBUILD pecl-memcache-8.0.ebuild 1576 BLAKE2B 3f0becc77c24a002deb94a7de2500ed39521d9611e91e22ffad85d88ea674db9b8ea5b68d6dfa3611a416ea3c5832fa3eda6554ff00e8a4030be2f34b1293347 SHA512 ca03bca8f011501972596d4bbcddb4b82c19779209fdf39e8b91b1832dbc11ed56f8f0e5740022076d9d95419e2d716c14b336de56ed49f6018666a9dfc4c8cb
+EBUILD pecl-memcache-8.0-r1.ebuild 1707 BLAKE2B 3da2ae49246d41e7938a79d67671eb1a037486bfd643527e99ee988415440ff5d0e9d8d363e3a49fd6b1f4793407e4ccc00a8394971eed11ae8f47c539b35388 SHA512 ca9a13dd7fb7122a7a2684921fcbc5355ba552ff89bea77901ff342421cb73700500473c499d812006bf92d47a0e72197368e0d30baacea0b147909e7a6217ce
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-memcache/pecl-memcache-8.0-r1.ebuild b/dev-php/pecl-memcache/pecl-memcache-8.0-r1.ebuild
index dd2db9d8a731..fad568565135 100644
--- a/dev-php/pecl-memcache/pecl-memcache-8.0-r1.ebuild
+++ b/dev-php/pecl-memcache/pecl-memcache-8.0-r1.ebuild
@@ -9,7 +9,7 @@ PHP_EXT_NEEDED_USE="session(-)?"
 DOCS=( README example.php )
 HTML_DOCS=( memcache.php )
 
-USE_PHP="php8-0 php8-1"
+USE_PHP="php8-1"
 
 inherit php-ext-pecl-r3
 
@@ -20,10 +20,7 @@ LICENSE="PHP-3"
 SLOT="8"
 IUSE="+session"
 
-DEPEND="
-	php_targets_php8-0? ( sys-libs/zlib )
-	php_targets_php8-1? ( sys-libs/zlib )
-"
+DEPEND="php_targets_php8-1? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
 
 # The test suite requires memcached to be running.
diff --git a/dev-php/pecl-memcache/pecl-memcache-8.0.ebuild b/dev-php/pecl-memcache/pecl-memcache-8.0.ebuild
deleted file mode 100644
index 5d57ff2bad0e..000000000000
--- a/dev-php/pecl-memcache/pecl-memcache-8.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PHP_EXT_NAME="memcache"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_NEEDED_USE="session(-)?"
-DOCS=( README example.php )
-HTML_DOCS=( memcache.php )
-
-USE_PHP="php8-0"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
-
-DESCRIPTION="PHP extension for using memcached"
-LICENSE="PHP-3"
-SLOT="8"
-IUSE="+session"
-
-DEPEND="php_targets_php8-0? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-# The test suite requires memcached to be running.
-RESTRICT='test'
-
-src_prepare() {
-	if use php_targets_php8-0 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default
-	fi
-}
-
-src_configure() {
-	if use php_targets_php8-0 ; then
-		local PHP_EXT_ECONF_ARGS=( --enable-memcache --with-zlib-dir="${EPREFIX}/usr" $(use_enable session memcache-session) )
-		php-ext-source-r3_src_configure
-	fi
-}
-
-src_install() {
-	if use php_targets_php8-0 ; then
-		php-ext-pecl-r3_src_install
-
-		php-ext-source-r3_addtoinifiles "memcache.allow_failover" "true"
-		php-ext-source-r3_addtoinifiles "memcache.max_failover_attempts" "20"
-		php-ext-source-r3_addtoinifiles "memcache.chunk_size" "32768"
-		php-ext-source-r3_addtoinifiles "memcache.default_port" "11211"
-		php-ext-source-r3_addtoinifiles "memcache.hash_strategy" "consistent"
-		php-ext-source-r3_addtoinifiles "memcache.hash_function" "crc32"
-		php-ext-source-r3_addtoinifiles "memcache.redundancy" "1"
-		php-ext-source-r3_addtoinifiles "memcache.session_redundancy" "2"
-		php-ext-source-r3_addtoinifiles "memcache.protocol" "ascii"
-	fi
-}
diff --git a/dev-php/pecl-mongodb/Manifest b/dev-php/pecl-mongodb/Manifest
index b5ce3eaf9d3c..639926421ff0 100644
--- a/dev-php/pecl-mongodb/Manifest
+++ b/dev-php/pecl-mongodb/Manifest
@@ -1,5 +1,3 @@
-DIST mongodb-1.10.0.tgz 1331177 BLAKE2B 8593392d50fce99059888e25d6400d2e7a35e93a1e4b74abf9b427ff43dbd2484380ecdbd7b7ce6abec643351a9c3bba572e2e0b551a88b18efbcf4c2b133767 SHA512 72527087dc3d1e1d48d6236592c1fbafa68354e2b8e070e85180d79ffcaa82740641450808a235bb711ded16ff65ec0cbd53fb66f0da18837351a3d402c3976f
 DIST mongodb-1.16.2.tgz 1907341 BLAKE2B 273ca2a5d92a195938cea103d12e9279c4a6aae43107f9b04d6e74752f82af5c258a3eff259ffc6a8381275be214bcc6cd577050ba1a908e202dda54ed31dae9 SHA512 3c81882c609b09cde534315aa4b1fe3c47e18e4ed26a940bf60a6bdbf4e53b2204d8e4e113a9b0a3469b60793ead9f8dff703920b86280e78448e07d6535a277
-EBUILD pecl-mongodb-1.10.0.ebuild 1167 BLAKE2B 4d2018ce66d683151ab20422f7364f62e092f40d04a5cd04df8f16612054bc8720fcb12ec7c0c91d08076068d50ac89c19ec32db869d61d928fe7af9c6755469 SHA512 a91f4b1a6df43ed40f91aa26c1d4a341dd48ab65f093bf53358af625029fb699e4f4057d336234920e9a744d777a0a40b05ee0ab55d00ecbc5e1390bbf579265
-EBUILD pecl-mongodb-1.16.2.ebuild 1286 BLAKE2B 97f75301812ba1f67da0f676ce0db6473d57cd8532563e93bc7b8dad02278fc235fc0ed8afabf54dca828f980021652c8a04cb28aa4db07252d2085466711a97 SHA512 e0cea0997922d699a4289c937d24d409148194a3790d940559323952e773e4ff739eedd65cd5d0e1a192c68b07f03c3444b61f188c60deb418cf8370299f7696
+EBUILD pecl-mongodb-1.16.2.ebuild 1227 BLAKE2B 595ea012466b73303def819febcaf9fffc5fc4daa16cb0455e217b9e44793b1f9fbc94fb1b180d8dd06425693f204264abc5186b6c97e0204bb491be63199aba SHA512 d05ee25bdadcfaa5e5010e6924a7dee84ccf6c01087eed4e37ae329d7fb91e1cdef3f09ce9b95626a5942a85880447dc107db1a274487e04bf9a1f2c6583c1d3
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.10.0.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.10.0.ebuild
deleted file mode 100644
index 95c226452057..000000000000
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.10.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="mongodb"
-USE_PHP="php8-0"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="MongoDB database driver for PHP"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="sasl test"
-
-PHP_DEPEND="
-	php_targets_php8-0? ( dev-lang/php:8.0[ssl,zlib] )"
-COMMON_DEPEND="${PHP_DEPEND}
-	>=dev-libs/libbson-1.18.0
-	>=dev-libs/mongo-c-driver-1.18.0[sasl?,ssl]
-	dev-libs/openssl:0=
-	sasl? ( dev-libs/cyrus-sasl )"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-db/mongodb )"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="${PHP_DEPEND}
-	virtual/pkgconfig"
-
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="x86? ( test )
-	!test? ( test )"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-mongodb
-		--with-libbson
-		--with-libmongoc
-		--with-mongodb-sasl=$(usex sasl)
-	)
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	local PORT=27017
-	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
-		--dbpath="${T}" --logpath="${T}/mongod.log" || die
-	php-ext-pecl-r3_src_test
-	kill $(<"${T}/mongod.lock")
-}
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.16.2.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.16.2.ebuild
index 3cc51273f8d1..991299c1e00e 100644
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.16.2.ebuild
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.16.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PHP_EXT_NAME="mongodb"
-USE_PHP="php8-0 php8-1 php8-2"
+USE_PHP="php8-1 php8-2"
 
 inherit php-ext-pecl-r3
 
@@ -16,7 +16,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="sasl test"
 
 PHP_DEPEND="
-	php_targets_php8-0? ( dev-lang/php:8.0[ssl,zlib] )
 	php_targets_php8-1? ( dev-lang/php:8.1[ssl,zlib] )
 	php_targets_php8-2? ( dev-lang/php:8.2[ssl,zlib] )"
 COMMON_DEPEND="${PHP_DEPEND}
diff --git a/dev-php/pecl-raphf/Manifest b/dev-php/pecl-raphf/Manifest
index 5393a5ef83c2..66b3c1cc8649 100644
--- a/dev-php/pecl-raphf/Manifest
+++ b/dev-php/pecl-raphf/Manifest
@@ -1,4 +1,3 @@
 DIST raphf-2.0.1.tgz 16003 BLAKE2B 4eaf9f89e6572e17e0df347543dc99221f68d45103444f89e59862b9078574722278fbb1e2841b0a5952ffd6dfc4ea0fa81298f2014ffbe8a6b51ed6887f6692 SHA512 0a609fc21a62880963e7afb75297eb75a2598aab2c816cb61e84d665b0453e4952aa9bf25fe2c818cc94492a4b94aed965053c67899fdb984d88661364fffb1e
-EBUILD pecl-raphf-2.0.1-r1.ebuild 399 BLAKE2B 6684bad12b6388c14e4130d1ca3113f47980ef6ddd4b3584143e8d59dff5a1b7738725f1110e78f8613ac85b59a8e83e1401fc7f8d84c9d1568c4eca00cc71cd SHA512 03ae042b060144e64385e215280a90a113b59543a99e33f15a19640dfb40650f5937fac43b3edc2877dee88f646b95cc22e976568f7932a68713f03c495c99d0
-EBUILD pecl-raphf-2.0.1-r2.ebuild 406 BLAKE2B fc9a6ba64ec47c2a6f17c6658702f60883e2815c7879979a0fdd9511d4f9d9d8d10b1eeeb282181673b4c7463b74a54b42fd7174b4e2afe892062335e4d62317 SHA512 804062d4034dbdfe5f3b86192ba83e4a65556b086b8c7854f1810ce4d6b0c36f7fb2a32b63e51a39f345f9a1bdddfcfedaa9a42bf976ee49c2f4a6cc092b03f8
+EBUILD pecl-raphf-2.0.1-r2.ebuild 399 BLAKE2B dd9cb9203a26f11241d9b2193dc718d58a559785e2741343882c0ab60e092e2b35207fbc51094e8148741a89bc1a38b494d16c9cdc9098f935a0d4f82dbf50ec SHA512 35cb0ed1c3ff0eb990fda29a2d9d64ae33db8fc1f164458285f3200507ec67d31613b0079169f0cd8e1039a9073573bf1dcd90c5f729880726e03f2ad42439a2
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-raphf/pecl-raphf-2.0.1-r1.ebuild b/dev-php/pecl-raphf/pecl-raphf-2.0.1-r1.ebuild
deleted file mode 100644
index 6d5801fa0023..000000000000
--- a/dev-php/pecl-raphf/pecl-raphf-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="raphf"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_ECONF_ARGS=""
-PHP_INI_NAME="30-${PHP_EXT_NAME}"
-
-USE_PHP="php8-0"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="A reusable, persistent handle and resource factory API"
-LICENSE="BSD-2"
-SLOT="7"
-IUSE=""
diff --git a/dev-php/pecl-raphf/pecl-raphf-2.0.1-r2.ebuild b/dev-php/pecl-raphf/pecl-raphf-2.0.1-r2.ebuild
index 1e0c6bfb8b03..3d7ea2841257 100644
--- a/dev-php/pecl-raphf/pecl-raphf-2.0.1-r2.ebuild
+++ b/dev-php/pecl-raphf/pecl-raphf-2.0.1-r2.ebuild
@@ -9,7 +9,7 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_ECONF_ARGS=""
 PHP_INI_NAME="30-${PHP_EXT_NAME}"
 
-USE_PHP="php8-0 php8-1"
+USE_PHP="php8-1"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest
index 2c83f7fb438a..18715341fb38 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD pecl-redis-5.3.6.ebuild 1470 BLAKE2B 79bbd479077110c62c5256d4114ec44285e99fcde7e22294008ef4368c6562d846c8d614f1f8fd0e6a545bc7d29556a62822c96872345d97e420d5e57f8fc299 SHA512 c3e8bb1a1df9cec44a044588715fadc2028bc2f7cc049bc4bdbda290a3bb116d737bf4047348b21404b62b0a63dcbf0b10ee9121c1d8f3623112a8b2a511022d
 EBUILD pecl-redis-5.3.7-r1.ebuild 1507 BLAKE2B 000dbad244cccb87bc3d4ee2c9463a515877a08112676337c83d28851e736bad7b071478c870d1b261ea8eb1faf19d405f2b176208c88cdd99fcfd538d0a3347 SHA512 813f7b7ea8b5f0336125859e087a9f81702c0fe34a2bc4f2a67838367aaa835398a408917e736d1630c299d86b01f15da9027d2af4f623a827cdd05ea67c2e5d
+EBUILD pecl-redis-6.0.2.ebuild 1441 BLAKE2B 30c479fead535064c32b5779bb6fe254d622b19d90cb7155fc553f32a45f0f21302144d6e2e0dd74e9ed4784b7884ee18e614ee91151e11aa9d12ad2564fd206 SHA512 2b17fe201328fa2bf06ebee7b00ae744b147c02dc49e2a3000ad754bdb7ae8c3dfb7bb62bb54d06cf5e36885f5c7c771e411f7265b78ca391ddeb9c4ce38f3f0
 MISC metadata.xml 384 BLAKE2B 4a1a6b326526bb3f5b9d9d57158d6abbfe3c65b1cfc11980ce849d5f7278558ee0daf580aefc521939aae175cd8e2cb990e046fce8faf6774348b24fa6465ef8 SHA512 851e1fb9f6612105640028262a4821f0da5b1ee5949fdd99067e821ce1d22c41888ee53e102becc93c918a605c2b8dbb2d493cd7cad516530912fec652011364
diff --git a/dev-php/pecl-redis/pecl-redis-6.0.2.ebuild b/dev-php/pecl-redis/pecl-redis-6.0.2.ebuild
new file mode 100644
index 000000000000..a503233916ff
--- /dev/null
+++ b/dev-php/pecl-redis/pecl-redis-6.0.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PHP_EXT_NAME="redis"
+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}"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="PHP extension for interfacing with Redis"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64"
+IUSE="igbinary +json lz4 +session zstd"
+
+DEPEND="
+	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php8-0(-)?,php_targets_php8-1(-)?,php_targets_php8-2(-)?] )
+	lz4? ( app-arch/lz4:= )
+	zstd? ( app-arch/zstd:= )
+"
+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
+		--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
+}
+
+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-rrd/Manifest b/dev-php/pecl-rrd/Manifest
index 245549d0cf57..1ae2061e76a2 100644
--- a/dev-php/pecl-rrd/Manifest
+++ b/dev-php/pecl-rrd/Manifest
@@ -1,7 +1,5 @@
 AUX 2.0.1/0001-arginfo.patch 2714 BLAKE2B 23b597baafd80f10abd922d096b94968b54bb4d3b5682242ad66f85d85dd3ab984d9e3623cd03a4f8c38a8798887ceba62e33c177d3ce8c0ebaf6e3cae99a149 SHA512 01ff4826777e30048dd9db3b9589017a39da6e038a113fdc772e1023c85527af146ee5ad7f79cc91976f7991e1b182e20537df38e94ac28307fc26a6708bb290
 AUX 2.0.1/0002-relax-float-test-result.patch 3214 BLAKE2B 28be00e2e4c85baf8f3da4da764d45e9f5f9a232c49e73c9d4f76a94c9eeb9b265ed56feffe3b19f7a5f314907139446e4b6ec837ceabb4f760c08fa0092202f SHA512 fd18c196df8a9fb36acf7f4f5cfbf048f829c00b08f2ad3c371252adbe9f148082026ce7c2e48126cb089e8820b77db8e19f86fe6e97836eac0eec4ca97a2871
-DIST rrd-2.0.1.tgz 18880 BLAKE2B c3fb65e95aece39690085830ec1c43ba173e173591215d6a66145ac71079f8d5ba5b097acd9018c86d2342550001334f8e1c98e22204d94a24aee5cc086295ca SHA512 b6f7173f54fcf49bf014cc6c78263c169cdf53dac66c12f5f88db7e01b49ea74da84a55f61deb25c866e6e2e74275ec48fc4a3d1b46719f66b5b7b7eb000b6b3
 DIST rrd-2.0.3.tgz 19178 BLAKE2B 473fe53e858665372133db9f13d9aeac330da2ca57a8fb59f0eb280f1bdd40d2f0b28179a9b150acdf15d7bbc6fb5416a82dcd670c67ad39050cbd1c5795b62e SHA512 28679ccead54806d1e92accc6f5ebab582a41db802f95797ddb43e3e15690889be3437f22e2a14939d217422ac2700ef90ae0a9b36244ddead3856343b3e09b4
-EBUILD pecl-rrd-2.0.1-r4.ebuild 539 BLAKE2B 52caa9ed8c69d96a904753fb37399b0edf3357e6d44c5542e4cdec491acde567659d73717c49c75bf2da453dcaa22204265c04c17cb011cd6b00526ac80d6d69 SHA512 de38dd3de24d95d763d2a9dc03f563c71b07a1c9717b457fb3fb295e405bf02de9e46b2f68ea5dabd0963708bce03ea65cb4753965228e23cb21b94dbbe888c9
-EBUILD pecl-rrd-2.0.3.ebuild 582 BLAKE2B e66b755d5f3be4d67c547fb81d37882744e195ea90305d5781c2bc3c7f039156559d43ac1d3939f4207bb1ed65d62c3938e0f8f57accb5ec4287c9811c3da346 SHA512 3f071794555d1d1b4a4be9d6e91e77b5311412b5f18bab5c5fe1f71cdb96254b39f47acf7b1dd69fe0668878202b02c8d0a3d34bbe8b472362bd27144bd512d2
+EBUILD pecl-rrd-2.0.3.ebuild 575 BLAKE2B c10adb66a490cd65af7c88526db51ff52cc31db042eb59de894f4c01fa51c3cc9cc459f9a4fd2e878f73e8e7a1c4eec7c9e9e32e71fdfce6fa3edf4eb73dc02e SHA512 a45e3211c9cf9bebb80dd2e065de7e424a43db7daeaf9d8d7eb17a7c84553045a1e65f3a817b365e7be88e95a0c69372357d5c8466bbf1826701e6d4fbce7097
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r4.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r4.ebuild
deleted file mode 100644
index 39bf35460c56..000000000000
--- a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-USE_PHP="php8-0"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="RRDtool bindings for PHP"
-LICENSE="BSD"
-SLOT="7"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-analyzer/rrdtool[graph(-)]"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PV}" )
-PHP_EXT_ECONF_ARGS=()
-
-src_test() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		# Prepare test data
-		emake -C tests/data all
-		NO_INTERACTION="yes" emake test
-	done
-}
diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild
index b4d86011970e..10d676933d22 100644
--- a/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild
+++ b/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
-USE_PHP="php8-0 php8-1 php8-2"
+USE_PHP="php8-1 php8-2"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index 9d5f709ec14d..b9378ed6bcdb 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1,5 +1,4 @@
 DIST ssh2-1.3.1.tgz 33838 BLAKE2B 05976ad143563fd9d51be3f8e23b5b22099e351d6f252b612aa1dcb56648dc337b623d2cddf7b9079f3e07c879ca69215a1987cd6f4326f97ba134e13c6d28e7 SHA512 c74d4f699853148b53cdca0eaf8837bfdbdd21d185761606acadf2442e84dbefdb00cde207e0ce4794ae1e4f8692a38ed903b6d11fdc57bca7b54a4250da9a76
-EBUILD pecl-ssh2-1.3.1-r1.ebuild 420 BLAKE2B 821a23b0da99a9e4c1e9a538acc5df0c6db112e8f9faf2228918621e46d1f43dd90d1ff55ce5837028b233eb1c21ad17401044410b5975d2a279d4522ff77ad2 SHA512 6407c43b9c9b67ff16327b93da89c3a0e306705ef3b927c01682d793ee7a4b4afda713b495d7d6c5ec5f4f02d273513fca75d24b0d455db591818657c733253e
-EBUILD pecl-ssh2-1.3.1.ebuild 406 BLAKE2B 53841ce9a26a4745e75cf3476723b4510cd692a0bbd6698fb92b98b41457378c13149deb0bc2120741abc674b8ec1e4d1dc9362679175d9b15ae5d90460584fe SHA512 d946e98eb185344814c21dee47ff32b0f79e8329a9290c5232bf563290ff3afb7580fc328fa8f3b7b5121608de3b3f9eaa6f12b2805d5ba0c763c878a05eab82
-EBUILD pecl-ssh2-9999.ebuild 462 BLAKE2B b58602c3becdeede30ff19cd7697dacb760e3d952e9f548830c73114bd38d19e277310699fa4b7c0fd5afddf98ff981d361c560e0de266707dc1e205ec259b89 SHA512 101ba4b002ca1a4bfbacb1ca44be02357b3ffd9e2d63f6b99be63e9e35ef366901002e79ea142abb0c3adfdbab421f097fafc08ac88cc10b5e0b5e389029d7cc
+EBUILD pecl-ssh2-1.3.1-r1.ebuild 413 BLAKE2B c7329b86cd468a24274d5847aad083fc67341969ba9aea962a3085489cb70a63e041079617a041328de3e74f383d64b6ee3a0f716c7ffccc98dea2ff69b625f7 SHA512 2b9a74d51691f44ea990f910f3187fff8d7c0a36be6c83e63f52af329b33f6a95afd2f1b45e80da5472a72d4dd974101dc98d03801e46d20c945aaca2a11246a
+EBUILD pecl-ssh2-9999.ebuild 455 BLAKE2B 676d67d2e1b5bb2bb0ba76c062e2b8bcd5bc1a228d4b4c656935f659d56907cef3369cd3cafec2810569c25d5251190e6c4b6325274fc0e6e4f51f06589bc49c SHA512 3e56aa1a8a1fd19a6d97d7d509ac7a7849b3f925297972417a3140a4e83a69088a1b63d499a975f32e0fcaf33481e6019f9cdd834d55c035759d50625149b8c0
 MISC metadata.xml 322 BLAKE2B 0576bb512c57e5e2809e3ec24de126d1f42823c1780fedae5cf2998a8074f60a6ee0aae29d8086c01c490623065d0adfd0a18568637875ff46408127a38aec60 SHA512 26fea3796f479e95df152a2d305b5ee50c0e3c44d3d0923dd0451e643ba93788f7d0e31f1d576f3d3fd90880550be4bde81b17ccc13268afa41ba566e7dbf43d
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild
index 26fa81cc22ee..3d39340c1223 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 PHP_EXT_NAME="ssh2"
 
-USE_PHP="php8-0 php8-1 php8-2"
+USE_PHP="php8-1 php8-2"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild
deleted file mode 100644
index e78e7a80d05a..000000000000
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="ssh2"
-
-USE_PHP="php8-0"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="PHP bindings for the libssh2 library"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE=""
-KEYWORDS="amd64 x86"
-# Upstream notes say there are errors with gcrypt backend
-DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
-RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
index a4c8e36fc789..3a5b4f3cb3ba 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 PHP_EXT_NAME="ssh2"
 
-USE_PHP="php8-0 php8-1 php8-2"
+USE_PHP="php8-1 php8-2"
 EGIT_REPO_URI="https://github.com/php/pecl-networking-ssh2.git"
 
 inherit php-ext-source-r3 git-r3
diff --git a/dev-php/pecl-yaml/Manifest b/dev-php/pecl-yaml/Manifest
index 5991db86a41f..7853dab32c56 100644
--- a/dev-php/pecl-yaml/Manifest
+++ b/dev-php/pecl-yaml/Manifest
@@ -1,3 +1,5 @@
 DIST yaml-2.2.2.tgz 41063 BLAKE2B 9fc85be5cb1eb86bc052b86d6292601babee0eb6fa790c0f5a77b307c2bd5a7a6ff66ea9efa21fa958a3c4f415f1850525454566b5a4303182d12a778fb2ed93 SHA512 4c1d3012623154b8d74908fb319a637d7bff178d02d0732d1a3d19d24df2c612d62948eb7dcd9ead9fd31f2da7af0cec54657b8cce128968a04079dd0002117d
+DIST yaml-2.2.3.tgz 41276 BLAKE2B f3233b63bbaffa0d6fff70092d46e6b38557b78b3a1dcee498745b9253b828c6d68b09bee17a598fd1006701a795c0ace0c61755d1cd8e8a4305092ba8bec6a6 SHA512 99d63d430dd2fa9767ecb3f70599d2ebd4c53b27770df72c00c4723816de422c581cea05e96c3cba5aaecbdc57cc482fad0f1fa300bdcf887daa7c2c034e6f4b
 EBUILD pecl-yaml-2.2.2.ebuild 404 BLAKE2B 38a65a5e9155ed0084cb2f36752d7f7da316909afce48994523cceae8ba50b924d540482cd52456a89e86bb878c4ad550251e0bf39c0b78f5541698900bba402 SHA512 b87e158437664a4da7d4bc53f76f02b36ec89aaf20117d9a1d36e7487923edf728c251dbc4035f4b09ca17c9a037b31e79f060acadca596614129e6bfda3ae96
+EBUILD pecl-yaml-2.2.3.ebuild 404 BLAKE2B d6d8952ca2935509e9819747b333c6a654143ceea578c272cc59e458a2b91d429cab0693549dc4a16252f9347b6e960a32d431be5c54755f0307816c99e52ce1 SHA512 f706245e4f2be724597a30e8922794eab799907370dec404a8279fb454fd7a3f3a6d54fc7cabea4a45cb0b128a13a93b30177ce21021f6f95e7fcd6e7822a4f4
 MISC metadata.xml 239 BLAKE2B c25c5a46bb59def6d564473a743d1c351a5fbeea2168a71478952bc219392c40f6e86a6e510589d9b70b834f58967a8d647f4cf2f1d4de1e37e2828f70035b44 SHA512 6f0cde14a96ea085b4d2e48538a956d62dbb4ee847096cebed5ad02e35f0f183a22aa19282ed4f59bf8f6d6ef935e6c7def3f7a5b4b24ee227601b6f8974e781
diff --git a/dev-php/pecl-yaml/pecl-yaml-2.2.3.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.2.3.ebuild
new file mode 100644
index 000000000000..64c9a699a0c2
--- /dev/null
+++ b/dev-php/pecl-yaml/pecl-yaml-2.2.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PHP_EXT_NAME="yaml"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+USE_PHP="php8-1 php8-2 php8-3"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="YAML 1.1 (YAML Ain't Markup Language) serialization for PHP"
+
+LICENSE="MIT"
+SLOT="7"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="dev-libs/libyaml"
+RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-yaz/Manifest b/dev-php/pecl-yaz/Manifest
index 3cc7c61bf3c8..ce10ce842bb4 100644
--- a/dev-php/pecl-yaz/Manifest
+++ b/dev-php/pecl-yaz/Manifest
@@ -1,7 +1,5 @@
 AUX 1.2.3/0001-arginfo_php8-support.patch 7166 BLAKE2B 42859817ae81ba437670c721e3967e9ec3d5eaca15dacee049a0e57d84ef9df1ac6fcff564d3ab1ba07acb75a0ce15dfdfa761d6eda4556a129c91d317292ca4 SHA512 01e742cf947fa2d4e167d16e9112a863ab23911aace807ca6a9e17f66cb304c96aec2a93dcef9f712243b2eeaa24df3a51afd999fcdf95ee7345f2586ba9768b
 AUX 1.2.3/0002-arginfo-fixes.patch 1148 BLAKE2B 5910c1ccf81193cd4da155302c460b8a4859995c94bf2994631c288b60f4bc4681687a0426642b902c31e5ffd515c67346ad3fcd7e507fd45621a7f163a279d5 SHA512 5cb04810fc9dcf6cd6aa3b8f605dd8059c3e528b135c1433f2801c2737308341dc5f5475f5c14d91abe526d8fb86cbb13f62244ac26d223ad88aff2804e10d81
-DIST yaz-1.2.3.tgz 20059 BLAKE2B 3fbf6d57e8519f6d363dbf308cb6ba259098521ae352f8886e8e12ca2a0d8119eaa31fc30301aea6979b32c6c321c4de0ad63ebe72e8f52cbb630d7f136f3e60 SHA512 5e6ebccac05fa44b0758b6817530e8cb436e45ead659f6a5029383515213bcce8c8cc7ceb8ef5ff4ec2335ad5c3009c6ccf8786116b115c24a013329d107bd7a
 DIST yaz-1.2.4.tgz 20204 BLAKE2B f36a0db6b8c49a8a4235f49ef07e28196954e9e25bcbe1a2fe94d69d14224b777f692bdc135b17b4d12d1684bb2abd52fd7966a3d78460e563d8475e31cb0ce6 SHA512 c7e17681ec82805ba74d643b427d6fdb4c4542a7efcf690cf9e4ac8adf61b9a9bfe3268ed317dc5220a85f9962f86387c3054f50e98cd986b29f8fb3f5be6b1e
-EBUILD pecl-yaz-1.2.3-r1.ebuild 570 BLAKE2B f019350ce2c09b2b158878528bce38f600fca9346e5ed04db5e3194fef109acaffb0747b154b4f4071cd2067e0b59f3c6057dce6f7ae95c1bf32e21beefc2fa3 SHA512 d97f01e2b7cb738995e6d53991a63b65a2193b57f66a0c387ebd10d85418ad661f8072922406ae14b8c91352149b6c8899b3e07095753f052b52278145d383b6
-EBUILD pecl-yaz-1.2.4.ebuild 628 BLAKE2B 321748c2158693dceeffd96b7bbce96a3e6a3f74025e0b9a5310b79ea612aafe324448ee11a714f7f1f7f80b0881f34d849bbedb724422b076573bcbc55256ae SHA512 82b530576f12899b82fe0841c1b0e743d4149fc82dc2339aca6073c0c19fcdbd02ffec9aa274ed5246de65f0ecbf9bae363f8ae21d0d60257493ef388bb727fa
+EBUILD pecl-yaz-1.2.4.ebuild 621 BLAKE2B 8c0b7ad5393bda8f183f6011b997a806bfc6b1a596f26f312eb76e5198f3d1fc4af9cc6280215fe8d077c2f23c8255432a725db7962a04e97f8e96184daad83e SHA512 272e1c4aaffb399afecdf58617429b7db77473f5519f3c03222e38d81191927a1e8fe6a059022466422bb348217256a987bc2ca5ce01c2d6cefe5ae39a82fb78
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild
deleted file mode 100644
index 905867e79e99..000000000000
--- a/dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="yaz"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( README )
-
-USE_PHP="php8-0"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 ~s390 ~sparc x86"
-
-DESCRIPTION="This extension implements a Z39.50 client for PHP using the YAZ toolkit"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-libs/yaz-3.0.2:0="
-RDEPEND="${DEPEND}"
-
-# Needs network access
-RESTRICT="test"
-
-PHP_EXT_ECONF_ARGS="--with-yaz=/usr"
-
-PATCHES=( "${FILESDIR}/${PV}" )
diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.4.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.4.ebuild
index 3b3101cb2970..c3acacaca57b 100644
--- a/dev-php/pecl-yaz/pecl-yaz-1.2.4.ebuild
+++ b/dev-php/pecl-yaz/pecl-yaz-1.2.4.ebuild
@@ -8,7 +8,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( README )
 
-USE_PHP="php8-0 php8-1 php8-2"
+USE_PHP="php8-1 php8-2"
 
 inherit php-ext-pecl-r3