gentoo auto-resync : 16:04:2025 - 08:45:29

3 files changed, 4 insertions, 20 deletions

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index ba8670c1c07f..b5800ec3e720 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -14,10 +14,10 @@ AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd235506
 AUX php-iodbc-header-location.patch 481 BLAKE2B 9ea6a5d529dc7a8c78eeee800900372bc14309a05e352b2838da32e1384b61b507fdb623c9400094aa5b637eb1a87da92c72600eff79b18b8989ef90af56a0fa SHA512 86469f657d8807f005c28fd2149770c881add8f243fdfea087956c7987277597fe400a7af23f624f26da270356604717ed9cd04771154d7cf2ffe7237972372b
 DIST php-8.2.24.tar.xz 12110000 BLAKE2B 0f5c47350b8914f87cfbee932ea2e24d29635a0bdfed111b02e81d05574ff973f657d077858c20497bdc380285305d6c0f632eee1bbc9358f84004019108e368 SHA512 19016bfb955892a9999f01a619ab26035afe1cfb6488c7d1774d6745b703afb99e59032728ab811024413757e50163cdc32b0e95fda7e1d4243deb96568c7e79
 DIST php-8.2.28.tar.xz 12147756 BLAKE2B eb2c5ad888f98b217d553efaa5f9832c791d7dcb73e90c1f0a45b536f3cbfd8f76c0606f993ca39492e43f587f5c0be1f1adac80c3ae7281527b8b381176f3bb SHA512 af2a4f43da756a78f762dbd2b9e589e52864c7069fd55a6a2b900e32a08728a7d69b80577dc79b5d4a86993846a2232b809b75ae415344935610a3934b10c6ba
-DIST php-8.3.19.tar.xz 12560852 BLAKE2B 19fb3ee207939b497ef65960a3b691beddaecfc70c2d408a9249e048605c2a3b4eb26da362c4e8283318c03c6464ba66537eafef854615db267886ff7a6351a0 SHA512 2872639f6a6de1680540da5a2df43db7ceeb7e25690b6f66d73373779ee3f9b0c2fe74aeeb7181749c9738b64f8d41b8a6f496751778c1df10b7f9aab43f21f7
-DIST php-8.4.5.tar.xz 13604056 BLAKE2B d15b53abe74a1d22f17e8b799639daa66e6989b466e68cf045eb0ebe90a6b2f27190a40ead401b70a94f829ff3e860763e7c3945e3c2c5899aa2973d7e298b79 SHA512 02dc98ae1b8450eff1510bad40c790c1b0e79cb89cd63f40a43a0e538b7b19a70650105d01d6710bc4ecc1bc193f066c995f572f3b57f901f958db5a1f97c97c
+DIST php-8.3.20.tar.xz 12549020 BLAKE2B b00cb60ef5583ecbdf9ae9f51d01f561d446a0462540cd0adb32725265bff1bf3bd9e8162acd4a843ab76f7021ad9fa77830a77edb458b768a12616e03ca7507 SHA512 2641a721ca0cbcb05200217ba38c7d0707b6294c355e109486180beccf0f5fa4822f92caab479a473bfccf93558a5bc34d42ef271355022701d62e2d11afeff9
+DIST php-8.4.6.tar.xz 13612892 BLAKE2B 3c94b0ac29877d9cc1573be40fdd1c582fcb4505c481ba1ad58c3b3963bf458951dd5d18f55ca504a9a2bb3b74180deb9b9c6ae22ba59b18df4e2e52dc8c9d0d SHA512 aa39d97f7ffcc851bdfe674e9cccdca6e55cb4938584c1dc301746544364efb541bec242372a90ad370d802f717c8dff6054450a311a6fceb07073c922c04247
 EBUILD php-8.2.24.ebuild 26595 BLAKE2B 62bff19d9e738b5e8da960d6fc8d41ff35723356017ef048e7a45d54e07b62a43dcd632837f3917654e5600097fe2c50d2247137c693bf20627773fc6054fb36 SHA512 3df0a5705098463bedd5362af4b4ec1c06797932c1c3ad666fd6be115c601409ec3cdec75342e7da520966a17e3a4db30f975a5dbc6ff2d762a0234e639720ff
 EBUILD php-8.2.28.ebuild 26821 BLAKE2B 99ae628dedeab676fb8051827dfa4365c91e915c121934d05394894233bb9d35dfc356a30d99d8a560801a2453a0c30be5f194eaa60ebc8fb6fea6c7b32d6b71 SHA512 9232fc20d0a1385930153402ab9be846038df04f09ff97c5c9ec41735b8024cce65ae66e7fd1bff184c275931bbb7f0e3b0fe6d8af89005aa07792151a5910af
-EBUILD php-8.3.19.ebuild 24512 BLAKE2B 2c29b88c098f403a2de3b2645dbf3390a1a4691c98f965764f2b541096d7ae1cf4ea35082f82688bde6a300311388de9c60bbd8727a180ebddc162ddc06ee4da SHA512 95fd342e2f708ccbefca98edf71c9eddec3532a5297506c17841f3bb22af034be0ee84d3daa50bf0d9c1c20088a1ad9cb216735bc8b6830abbfb7b0146b4f90f
-EBUILD php-8.4.5.ebuild 23664 BLAKE2B 42d0e49f58b797bc3f8834ee25d9c057e195de92094fe6c59324c16fb51c01641e038da28a89a776ed20bb849602b7f707d91afb2bec0ea438186334a98c6589 SHA512 fbf5f499e171f1965fb83aea339a7ddcea6eafe52d0aa1395d4bd46b6dfa3636e48348a2f81b299228fda603a5f942f68fde04d44a31761a6a5eecf257d88d8b
+EBUILD php-8.3.20.ebuild 24187 BLAKE2B 7e6e798616a5ee5bcba97f443ef8ec4b9921af7d736be548d82ce9cf607eedda624f66bd170bdeebacae4a83abdedd03522eb2590b0c5570cc92b68524c617f9 SHA512 593e286b05cf3db4d673f7b90e6743fe96144ec9b61a9d36141af41f4a65e1b1006a84722ac1be258e5367f38256c2d5b652308f159e7644e6ca688e7cbb5edf
+EBUILD php-8.4.6.ebuild 23340 BLAKE2B 83bcb5174a807d8bdac95ce4a35f2db23d7a770b052d4619b4c465c01f0eee64d29fb6b94d9df9ec592c9a30ddd14f2bd92ade122c805c57c0942aed16cf31bd SHA512 334fa3297bc87e7fe220e33e7474f9093a41e27bfc2e706ec0783b88af71de27af384276d15ee625adf2562f72a325bc76953abe958e574053dd193062071d77
 MISC metadata.xml 4085 BLAKE2B a829b370fa595e7a80e957f119cd35c6e9003cf8ad7b3b99a777d3bf54c2daef784ac95f4b4f7caa1b79864a171b101dc10e20a41b29a82cc32ca017001f8e86 SHA512 f3ed63931e0e7c863c0e42551fc5386b92b9b19e955dc74f494788d1ad7a0cf63cd51d0febc014fcfb9a6d5ccec1dc3b73c47ef4a8fd11167ca42bbb48983664
diff --git a/dev-lang/php/php-8.3.19.ebuild b/dev-lang/php/php-8.3.20.ebuild
index a450d59a202e..d6a9b1fa3259 100644
--- a/dev-lang/php/php-8.3.19.ebuild
+++ b/dev-lang/php/php-8.3.20.ebuild
@@ -135,7 +135,6 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/php-8.3.9-gd-cachevars.patch"
-	"${FILESDIR}/php-bug75457-pcre2-backport.patch"
 )
 
 PHP_MV="$(ver_cut 1)"
@@ -276,13 +275,6 @@ src_prepare() {
 	   ext/gd/tests/bug73272.phpt \
 	   || die
 
-	# Test currently fails in the sandbox and the test for this variant
-	# might be broken. Upstream discusses removing the test again.
-	#
-	# - https://github.com/php/php-src/commit/930624899bb996efc2f6a24b992ede90
-	#
-	rm ext/standard/tests/file/bug72666_variation3.phpt || die
-
 	# One-off, somebody forgot to update a version constant
 	rm ext/reflection/tests/ReflectionZendExtension.phpt || die
 
diff --git a/dev-lang/php/php-8.4.5.ebuild b/dev-lang/php/php-8.4.6.ebuild
index 59e9a92dbefa..2afe7133ef03 100644
--- a/dev-lang/php/php-8.4.5.ebuild
+++ b/dev-lang/php/php-8.4.6.ebuild
@@ -132,7 +132,6 @@ DEPEND="${COMMON_DEPEND}
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/php-bug75457-pcre2-backport.patch"
 )
 
 PHP_MV="$(ver_cut 1)"
@@ -260,13 +259,6 @@ src_prepare() {
 	   ext/gd/tests/bug73272.phpt \
 	   || die
 
-	# Test currently fails in the sandbox and the test for this variant
-	# might be broken Upstream discusses removing the test again.
-	#
-	# - https://github.com/php/php-src/commit/930624899bb996efc2f6a24b992ede90
-	#
-	rm ext/standard/tests/file/bug72666_variation3.phpt || die
-
 	# One-off, somebody forgot to update a version constant
 	rm ext/reflection/tests/ReflectionZendExtension.phpt || die