gentoo auto-resync : 07:09:2023 - 22:29:07

4 files changed, 13 insertions, 19 deletions

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 76458785d1bd..39b3889457b1 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -26,10 +26,10 @@ EBUILD php-7.4.33-r6.ebuild 21502 BLAKE2B e8e5f58105088783b8ed435f4705ecb3891ad8
 EBUILD php-8.0.25.ebuild 21880 BLAKE2B 966f8b33f46767a4456686cd788f0b3c1b8fd4049f2022b1136a8530ef3a5021efb393db45de6ce60aa77ba029c384858838e576a6d2799808246fbc2645730f SHA512 2ba7d167b4075b89e6aac2feb387103ae3fca4dc0be4d6791d23995f4eeb1ca65941664374c52e48b07a8815ccdc7bf1c79b9f2da910bbae8c7c3c373b856ab5
 EBUILD php-8.0.28.ebuild 21883 BLAKE2B b0c23c162b11e652a57ec6218a26b6792baf81190168a6ac6c279d682bfa4a7a36b02598d063f9fd69f503bf463a97660b7c6ccdcfe637dc8a24cf097909f459 SHA512 2c8326ec110c74729a8daad7cfcb1a3c58d86ef741d6164e9248d68519dde26739e5c2c1bef89819fa641ed4c07f7566dfced4361ece573789a5752a3b9d9136
 EBUILD php-8.0.29.ebuild 21850 BLAKE2B 30c89684d086d2562a7b6d16c6c72c9f18ebe4a2e0b96b922c4a86292e845f34ed8047568593c9a078eb3800eedfc90b56725fc13b8a8f9cb66683d98e9c8923 SHA512 342dc912db1e7117044faabf265853fd265178dee671a23e9fa00d3cf49a5350d15fa02156a19f964230a5b0e961c415173087e5bb161cf4606c1b01687d8c9a
-EBUILD php-8.0.30.ebuild 21961 BLAKE2B 29703856249d9edf5ee7066fcaab23ab9d7f5e26fdb8e15b8ba9a5124a92ebb0a6c4486bf2d5d20181f7e93f2d3abcc1d2388c231bb683d36897082839d743e0 SHA512 e7a3721dee3990db45590528048dfac38e2dc463d196a425b2e1f34563dc2b5b8eaf08d174989bd10d4de57382ff944d8048a254dd18e0b31990d28470ec4221
+EBUILD php-8.0.30.ebuild 21942 BLAKE2B 827699ea72d9adc7d65eaa24699a40d809ae70e9cc5fb0b2f3e6527644fe9afd5538f74ff4b86773937992b56d52b042d409d4ac9ce6d488fcbf636f463177d0 SHA512 b4b1c5839f67d25bc621f693906f2238acb9203604f5ea78b248cd84f2e8e111c191e7b085e8b8210cbf18dda64695c2d755bb43663cd66296f531ee5365cc2a
 EBUILD php-8.1.12.ebuild 21815 BLAKE2B c1610ff5a4e439954b228744cd0223a4205dd1b53e6cff7a48535db414b6d20d307ba1b31c96ea6ab60b2ed1f811eb612c80e245b49acdf9659a6f8b2bb94b08 SHA512 73b766c5dec9b7231f1149b279b47e8621e527bbce2e1606bafdf1e6cd3f647ca30b2fcd16e1d9c3160c4a50c464fdeefbd05e1102f9debe7b79abd68fbceb4d
 EBUILD php-8.1.16.ebuild 21818 BLAKE2B 1782dc5c71cef2ac3ca067f4d53fcf64e61850044384dfe9bc0e64a025ab1dcf328a455b2aadbd17dd8c92cc65029337598763e3644f488122cde39a913d3343 SHA512 2215fb5851cfd28ffff620ffe86b0d924f61e9a24ff724fa019be7c788fb7de3c53f23489d21553fd81670887cd463b959f9f9857a53cc872e72f70478e330d9
 EBUILD php-8.1.20-r1.ebuild 21912 BLAKE2B 09c455238617b57c66b9913e85226293f0d6714d5f0831ce352d6dde4b81eba3a48fc5b547aad2cff5638f1ac2c2ca36db2293e9943c77e3f2d029b0ff50a43a SHA512 d76af211f86309094ff21e5e98ff755de96b2eb9c6a1c14fd915385a81f823a1842dd25ef6bd11de094dd62eb8ba0a9d0d5a1960527542af8946fb01911dd749
-EBUILD php-8.1.21.ebuild 22024 BLAKE2B a7f835cb330222be763edc9d91eb3987cf0b00e0f30509008db8b232c9caa6c0ade41fd06bf9930b76d44aa998407aa03d1c39e79cde54a1c6517bd590c0a1f8 SHA512 f68296ff164cdbd68d93654da67e801810d04b9ec45855eacde99ddd809222c57b975fdbe474a41ee931295765de12af6095015f797b0628d3e78908a6fb1091
-EBUILD php-8.2.9.ebuild 24853 BLAKE2B 4575aaf866c6bce32ef33304117db829b3b062ba35aeff414d2994e7474719bbf0f7ea52d29e164878af7fc4b17a108e13ddd5c53ad96a9ba645fa7bd2751a13 SHA512 da8708a36e205a9266f8218af830ab86fbb928a4c4d1050fa7b584e8545f9f62c693b4bd0669a72d3e6786c609915cd4b349cbfaf8782995eeb52527667f5ff1
+EBUILD php-8.1.21.ebuild 21996 BLAKE2B cf5c46780aae16a099cf97b803a18e06229976395b96c96781a5c7f7a6678b8f76f70e466e5ab419471f0c83a587ac0d1ea7d0b438cc2c90ff9008335147af33 SHA512 707a40a4ba96d6b8ea5e423a1ebde2b54c9b33eb2a6dc8b1134fb2748f4563b39f38aff96117ec4b27ee9294af03db8a0de0b4d7c41e831839eaef1b3fa2bd95
+EBUILD php-8.2.9.ebuild 24825 BLAKE2B 17fa43e5d68ed2246e1b92488b86c56ac1d8be8b54eafb3daa3a27a51c1a3941214172a28880c488561271a88deb590e0c95979a46c5f5dfb79c94c499616520 SHA512 5632dfd9191cb9ddd2552acb86f0cc51a807041c945b4dee3116e0d10985ac4efc6c2288474f8a87c4e299d71e88c4c482e783ec3af3e2d6e7e9b8fc4d827f09
 MISC metadata.xml 4018 BLAKE2B a2413be53cf35069736693b31b2ef8d4277c25c1cb4ea75d949e3a50809e77b9fae2dceeb8a71bcd0ea4c74131cfcaeaefa09ca67f312bd7eb934c2e07156502 SHA512 ba8385d8596d5e71d6b5cc7e225d2afbbed0cde36ea1b49a43efd16c03141d63baa26b440ddfeb39dea04313467077353c5ac6b8b75307bb64ea0c09fe456933
diff --git a/dev-lang/php/php-8.0.30.ebuild b/dev-lang/php/php-8.0.30.ebuild
index e6186d2f2624..fd4f849c96e5 100644
--- a/dev-lang/php/php-8.0.30.ebuild
+++ b/dev-lang/php/php-8.0.30.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 WANT_AUTOMAKE="none"
 
-inherit flag-o-matic systemd autotools
+inherit flag-o-matic multilib systemd autotools
 
 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="https://www.php.net/"
@@ -241,6 +241,9 @@ src_configure() {
 
 	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
 
+	# https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527
+	filter-lto
+
 	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
 	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
 	local our_conf=(
@@ -255,11 +258,6 @@ src_configure() {
 		$(use_enable threads zts)
 	)
 
-	if is-flagq -flto; then
-		# https://bugs.gentoo.org/866683
-		our_conf+=( --disable-gcc-global-regs )
-	fi
-
 	our_conf+=(
 		$(use_with apparmor fpm-apparmor)
 		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
diff --git a/dev-lang/php/php-8.1.21.ebuild b/dev-lang/php/php-8.1.21.ebuild
index db53ccbaa5bb..1e3a6c509724 100644
--- a/dev-lang/php/php-8.1.21.ebuild
+++ b/dev-lang/php/php-8.1.21.ebuild
@@ -245,6 +245,9 @@ src_configure() {
 
 	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
 
+	# https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527
+	filter-lto
+
 	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
 	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
 	local our_conf=(
@@ -259,11 +262,6 @@ src_configure() {
 		$(use_enable threads zts)
 	)
 
-	if is-flagq -flto; then
-		# https://bugs.gentoo.org/866683
-		our_conf+=( --disable-gcc-global-regs )
-	fi
-
 	our_conf+=(
 		$(use_with apparmor fpm-apparmor)
 		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
diff --git a/dev-lang/php/php-8.2.9.ebuild b/dev-lang/php/php-8.2.9.ebuild
index e725e7b5c992..b705912b84b2 100644
--- a/dev-lang/php/php-8.2.9.ebuild
+++ b/dev-lang/php/php-8.2.9.ebuild
@@ -311,6 +311,9 @@ src_configure() {
 	addpredict /usr/share/snmp/mibs/.index #nowarn
 	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 
+	# https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527
+	filter-lto
+
 	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
 
 	# Don't allow ./configure to detect and use an existing version
@@ -333,11 +336,6 @@ src_configure() {
 		$(use_enable threads zts)
 	)
 
-	if is-flagq -flto; then
-		# https://bugs.gentoo.org/866683
-		our_conf+=( --disable-gcc-global-regs )
-	fi
-
 	our_conf+=(
 		$(use_with apparmor fpm-apparmor)
 		$(use_with argon2 password-argon2 "${EPREFIX}/usr")