From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1702471-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id C94251580FD
	for <garchives@archives.gentoo.org>; Sun, 22 Dec 2024 20:05:07 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 8493CE0896;
	Sun, 22 Dec 2024 20:05:06 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 6A672E0896
	for <gentoo-commits@lists.gentoo.org>; Sun, 22 Dec 2024 20:05:06 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 482FE33C84E
	for <gentoo-commits@lists.gentoo.org>; Sun, 22 Dec 2024 20:05:05 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 9FC7A18E7
	for <gentoo-commits@lists.gentoo.org>; Sun, 22 Dec 2024 20:05:03 +0000 (UTC)
From: "Michael Orlitzky" <mjo@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" <mjo@gentoo.org>
Message-ID: <1734896934.08fd7e075423fb0a948a2e49ba7c49c229ac0ffa.mjo@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/php/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-lang/php/Manifest dev-lang/php/php-8.3.14.ebuild dev-lang/php/php-8.3.15.ebuild
X-VCS-Directories: dev-lang/php/
X-VCS-Committer: mjo
X-VCS-Committer-Name: Michael Orlitzky
X-VCS-Revision: 08fd7e075423fb0a948a2e49ba7c49c229ac0ffa
X-VCS-Branch: master
Date: Sun, 22 Dec 2024 20:05:03 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: e51aad7c-0a9c-4c5f-9bfe-94cc75059e31
X-Archives-Hash: 028e6654eab9d50e373adb32c2f9935f

commit:     08fd7e075423fb0a948a2e49ba7c49c229ac0ffa
Author:     Lothar Serra Mari <mail <AT> serra <DOT> me>
AuthorDate: Wed Dec 18 11:15:27 2024 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Dec 22 19:48:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08fd7e07

dev-lang/php: add 8.3.15, drop 8.3.14

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

 dev-lang/php/Manifest                                 | 2 +-
 dev-lang/php/{php-8.3.14.ebuild => php-8.3.15.ebuild} | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 04a1762494e4..f795e6e33b6a 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -3,4 +3,4 @@ DIST php-8.1.30.tar.xz 11850340 BLAKE2B 9053c57814f53ff694ea6cf1a87253e4f8f7c5af
 DIST php-8.2.20.tar.xz 12097568 BLAKE2B 1e38e48ea9c28abfe2c3bd860bc5d959fbe327669c007f2e2a665ae14f5a045f6ad8a0a972f32618f88ea1ff3636c2692504478b5b094b48404d6c4a214f863b SHA512 c659ed4809b6507aa428b483c85c7322815ac9d7d8e4bfe575513a5e69c5a680b8d089fd98a19f83d3a00df3de61468809f21408455913aa24d519776e44abc5
 DIST php-8.2.24.tar.xz 12110000 BLAKE2B 0f5c47350b8914f87cfbee932ea2e24d29635a0bdfed111b02e81d05574ff973f657d077858c20497bdc380285305d6c0f632eee1bbc9358f84004019108e368 SHA512 19016bfb955892a9999f01a619ab26035afe1cfb6488c7d1774d6745b703afb99e59032728ab811024413757e50163cdc32b0e95fda7e1d4243deb96568c7e79
 DIST php-8.2.27.tar.xz 12150992 BLAKE2B 220b71c04db5654b16f46f831776741f653d77d4363ae1279e5f7eb745aa862087cd89f63740a6584fb4925bf5cb9f72a267cf85ea5e0828f35975a08a011861 SHA512 c368d90d833e25d2b2e3a667010f1c5b37df772e2200855d38e4bcb3344585e0783ae53fadae499fe98abab95372adf787ba2413e9b6bc818628bc29a11ed453
-DIST php-8.3.14.tar.xz 12519488 BLAKE2B 763a00d3041470951eac255f976abc41e05ed67ee9581effa146d80979611ec14fd276a5bc1c589386562f533173b5907a205ac5dc42393d6c14c5addf6e48c0 SHA512 48a995a5095626dc1b8bb40641e86f01e6806ce10a8c159a402f3b081f8464429ef2d33c3a288cb0f7c643c9236601220dfc604d36b3c2a572cd9f30e5359752
+DIST php-8.3.15.tar.xz 12525028 BLAKE2B 630045fd371ccf80f3c8849d52c61915459a03a5170b4ccea83881a0d3ccd31c67f157f78876c213f370983952fb91515d0bb456529a91726f20c918dcc78841 SHA512 43057cca0a6c2187f7991dfbf9743495784f0fa4d0336f08392036ecc2b6f83c7155737ebef3af6144a79eca557bf84cba4aedd34e0d19c701249ca4e8fa86d0

diff --git a/dev-lang/php/php-8.3.14.ebuild b/dev-lang/php/php-8.3.15.ebuild
similarity index 99%
rename from dev-lang/php/php-8.3.14.ebuild
rename to dev-lang/php/php-8.3.15.ebuild
index bc70e79d1540..25b030fbad28 100644
--- a/dev-lang/php/php-8.3.14.ebuild
+++ b/dev-lang/php/php-8.3.15.ebuild
@@ -286,6 +286,13 @@ src_prepare() {
 	   ext/gd/tests/bug73272.phpt \
 	   || die
 
+	# Test for https://github.com/php/php-src/issues/16390 relies
+	# on the inifile handler to be present, so we have to skip
+	# this test in case the inifile USE flag is _not_ set.
+	if ! use inifile ; then
+		rm ext/dba/tests/gh16390.phpt || die
+	fi
+
 	# One-off, somebody forgot to update a version constant
 	rm ext/reflection/tests/ReflectionZendExtension.phpt || die