commit:     3846e8be2ba44b72ee513b69b403f7d382357506
Author:     Lothar Serra Mari <mail <AT> serra <DOT> me>
AuthorDate: Fri Apr 11 12:15:48 2025 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Apr 15 16:32:44 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3846e8be

dev-lang/php: Bump to 8.4.6, 8.3.20, drop old

Closes: https://github.com/gentoo/gentoo/pull/41535
Signed-off-by: Lothar Serra Mari <mail <AT> serra.me>
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 dev-lang/php/Manifest                                 | 4 ++--
 dev-lang/php/{php-8.3.19.ebuild => php-8.3.20.ebuild} | 8 --------
 dev-lang/php/{php-8.4.5.ebuild => php-8.4.6.ebuild}   | 8 --------
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index ab0fce067cf6..77c7414bc0ed 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,4 +1,4 @@
 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

diff --git a/dev-lang/php/php-8.3.19.ebuild b/dev-lang/php/php-8.3.20.ebuild
similarity index 98%
rename from dev-lang/php/php-8.3.19.ebuild
rename to 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
similarity index 98%
rename from dev-lang/php/php-8.4.5.ebuild
rename to 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
 

Reply via email to