commit:     22a7c49a8fe26435a3fd01470a48f302b313ec31
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 25 00:56:32 2024 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Jan 25 02:07:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22a7c49a

dev-lang/php: add 8.3.2, drop 8.3.0-r2

Bug: https://bugs.gentoo.org/922742
Bug: https://bugs.gentoo.org/922812
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 dev-lang/php/Manifest                                  |  2 +-
 dev-lang/php/{php-8.3.0-r2.ebuild => php-8.3.2.ebuild} | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index fd3ffb61811e..ee648cd44a22 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,4 +1,4 @@
 DIST php-8.1.20.tar.xz 11793228 BLAKE2B 
ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096
 SHA512 
d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558
 DIST php-8.1.26.tar.xz 11809448 BLAKE2B 
e1d50f1de572580a207586b3c3b57081f7b9f1b680ffe8f9e82c88c9285af117dd7e9e2576fcb13119176cb9cd02b39481b6f40e9a1df81aa90b8c4d3e59e4b1
 SHA512 
5bc40077e57c0fccdf17810d688baea416f22ac248bb01b73d2e2590fc4cfabc7001c1c3833281a60870c74178f7b06cbc85474eba695aabf969ad0081a98417
 DIST php-8.2.13.tar.xz 12069092 BLAKE2B 
24da2de8cb00bb2aac485360a14f75d6ce3df1bae78b4bf46e013888aa7f1e9d9e077ca40462fe36c59e19a7c45db05cbb0a64b140c07e4621baa99520a2865b
 SHA512 
8031e33d148c5acbfbb3ed00d7a266813c8919db86ba260ba65e1837d6db8d0bd66d8ddef66884466dd3fe51ece7882b03f8d8db6ff4383f80a68b7beafc03af
-DIST php-8.3.0.tar.xz 12431612 BLAKE2B 
c6c01b28edea15f05e8894bf69a9f4ea3ea6fb0a2bd70d9417ce9473d57636e08e19f62cac1dfee66d153e5aee4f1b99035ccc14bba1e41712971321deee264f
 SHA512 
8758bb0789787dda04f3d4a175f4d4a0bffadc8c3d272fefa000d6fd7b0c0a7096347c829c1ddfb3b60cf6300803d68ba6d8379f2a343e02d935ba77d01c5cf1
+DIST php-8.3.2.tar.xz 12440200 BLAKE2B 
90ab2fe220d99cc1da47162e04c768dc35ed4044ea9154f67bbc9124372859b85a33270bc38d41e9ab28df4b0defaf0e78cffe8eb8bd6fdfbec296a31ea4beab
 SHA512 
acf9013d35ae639558fd4816d12dcae03f8af7944c2639f33cd33517503c6170d30101da6c72ebdaf5542bcaf858a54a22ecc8f86822a128f52938bd6ea9606c

diff --git a/dev-lang/php/php-8.3.0-r2.ebuild b/dev-lang/php/php-8.3.2.ebuild
similarity index 98%
rename from dev-lang/php/php-8.3.0-r2.ebuild
rename to dev-lang/php/php-8.3.2.ebuild
index bbaa24f665a7..2f308ebfbdf4 100644
--- a/dev-lang/php/php-8.3.0-r2.ebuild
+++ b/dev-lang/php/php-8.3.2.ebuild
@@ -262,6 +262,13 @@ src_prepare() {
 
        # https://github.com/php/php-src/issues/12801
        rm ext/pcre/tests/gh11374.phpt || die
+
+       # A new test failure appearing in 8.3.2, mentioned on the PR
+       # where it was likely introduced:
+       #
+       #   https://github.com/php/php-src/pull/13017
+       #
+       rm ext/dom/tests/DOMNode_isEqualNode.phpt || die
 }
 
 src_configure() {
@@ -293,6 +300,10 @@ src_configure() {
                $(use_enable threads zts)
        )
 
+       # The slotted man/info pages will be missed by the default list of
+       # docompress paths.
+       docompress "${PHP_DESTDIR}/man" "${PHP_DESTDIR}/info"
+
        our_conf+=(
                $(use_with apparmor fpm-apparmor)
                $(use_with argon2 password-argon2 "${EPREFIX}/usr")

Reply via email to