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

10 files changed, 230 insertions, 24 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index be718f991d5e..ed327b4fcb64 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 619a2f729f1c..049f52a54344 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,8 +1,10 @@
 AUX go-never-download-newer-toolchains.patch 368 BLAKE2B 0c90f46492af80622f430b2d506b143f3b553b5276085f78f41b93fee8219745179038302462603b5b1677554d92911eb4865084d0488aaa4c71ae1abc307f71 SHA512 b5acf97ccf96c6a353fcb7bd97113c38562defd82338828124fcc72c71334feda9c4e839d2aae5b66b809bc8a692eac96396c54a478e17a7ffd8d2c68fea95e6
 AUX go-sets.conf 313 BLAKE2B 03e94776e317d34b72bfb8385b8b0dfa6a599a6086e4d0c9214e7b49293768947c21d9afb323ffcc7fd85ba0af72d9cb243dbb571eee9eb81de9400fd5f5e79c SHA512 7d01b98bc8d1b609183682dd942bd4c9fa757a98243c7de3cf6c497c7bc20b8cdbe59dd669ce4bb11f914a0e9b6d100e65cea2dffd99f38be50b18e0ecf66315
 DIST go1.20.7.src.tar.gz 26192928 BLAKE2B 89a1b2bde472c22534e63585cd8fcff6076a16a7f1d15e90ec5cf5277225ae3bf53805531b256d0090cb170ed7e1bd1ed494cffcf5b3777f435bbb3591906612 SHA512 c3dae709d0db8ab32a68bda2d260ffe86ee77c703bdbf34eefd0e1f745dd0aa04e3d17833877e7f06aa066686da501a85361591e510a341affc0244dde2b9946
-DIST go1.21.0.src.tar.gz 26942359 BLAKE2B ba04a8b20d4ea35cd6f32e5975a347c9359b9e9d2bf77196afb50b6f527d69623cdc7900c74abe5315e53589e0be20aef5eb4a5faa0efa836ed22db12d041203 SHA512 da629fee156de6abbc5195f746e2fe4172a31b97eccd3871283c60452e81ac740533cc28ca68762ebc0ce48fb791dc527d3b7ebe7e1aee0f0b68868de736ed42
+DIST go1.20.8.src.tar.gz 26197375 BLAKE2B 1d6c5eb4da9f2f892b30013427b54039feeaf0bc41e1928a82da56e1c96689a796828758989a85a2d156f0547826eb0d408c324a93e02894dbb0a6c7b73b6b67 SHA512 858d0289b3cd709e71e14aed9a36fd3d462fb3aa72cc1108eef0c70ab583742ab2eff99a24f8bfd72d42d1cc741adc1d3619073fbed943f8aea20e453ed479d3
+DIST go1.21.1.src.tar.gz 26974429 BLAKE2B 716f7c94d29dedd2e69f33a6d9d3cab9d7b02635915bfeab00dcadcc10a40812cd8fe76c1388f0eb8cbfa3cf84e2fd2d2595eab6d2c8782b3ea760e154be21d5 SHA512 b6bee4a461ed91958c334b2f8b78e8f0c45f07409ba6968ae393b34d9cd21a9b1a29df357d191144e99f8ea73f491926ea0027ecbcfcaa198349e67fa33e0e3c
 EBUILD go-1.20.7.ebuild 5385 BLAKE2B 161e5bcf4c08a899a90237983cfdd35724057f933ca12d171d0a2b036ff8770ed25f52da4b403299203e6de1ac6bcd876651f8569f55f1ef93bbe7920c107ae5 SHA512 65cab89cd5e8a26020b6d55bcc1e98ec1bda8d7f1f964cde416d77a531c2b46ca797e9893e7d8811750e0b3e2129698aa830ca6d0b49e8ab2a8cbcbd283adf5e
-EBUILD go-1.21.0.ebuild 5208 BLAKE2B cb10da15a0798d5b7f6c0138e5003f7ee913c5899b72fa77f4eaeae7130249a4c807330abb590c13df242fa8404a4f369862c3c028a95dc4fa44065d8b6f53ab SHA512 f0728ed7ad0fbfb8b83a725766af0c53cb7ee4ef62120eed90f84c61e9f6faa76cf5250bf9b5d0d81ef904c91dc811bc05afe4b62bac35f79870884c990698ab
+EBUILD go-1.20.8.ebuild 5388 BLAKE2B e87d5f9408ad1e51ce372a81525c0ae10c7b76e7c72df07185bebacb387d738f74a7d52879338279afe2200f7cbde52ed6a33a76bd6e406d5f55256efa7db847 SHA512 e1c140f4f724d66ab996243bc21163c8c1cc81330dd8b8bae98f44718bfaa807789d4a116e5996424b8eb1f11698a08265154ea98cb83596bb0b38efe37e9ba9
+EBUILD go-1.21.1.ebuild 5206 BLAKE2B 7c144b1e30bf171fc83d43b99213537538dd843718da6b8768df7f9a56afe49496e9ad2053bf9ce77fd04c4e4c1bbf458fea140c8d8b9625f2cac687007a55c7 SHA512 8cd347824c984e76313e77e08dc77d5ca148b86378e33d28761a598f02643ef846edd8783cf1aa8b4ac375a17180beffc5418bcb95b69c7dda079f526566e2a1
 EBUILD go-9999.ebuild 5274 BLAKE2B 1e74a60e9de0b342e779bea1907c7c83c0a3ffe4ecab199d1467898afaf16dbbdcb52655907c8e89e0680a18161a0be7135363c31124ca4ccb24521390df6740 SHA512 511bb883ddec424909084425de81a5524ffc25f6b6b3ac207b7d531e6fa7350a1d8e88dd624f42632fc186a16bcc43f562da3f5d00e1c2adad4ea4ced48360c7
 MISC metadata.xml 590 BLAKE2B 56da63bdc350df5c6ef3b511a386627f4020f655027ca88da6a83ecb09581d3c3055c836eb8fe98a383412b3d431a77a9935ad753fe2d8392afa37cd613c15b0 SHA512 5d78adbae30c3a805194567bbb1af2ad59b78487819e7841a040d2a4d5db02f5b5d1d58f7cfc7a37f39e5e9bcf332dda4d336456e33e36c33caef792ac45d48b
diff --git a/dev-lang/go/go-1.20.8.ebuild b/dev-lang/go/go-1.20.8.ebuild
new file mode 100644
index 000000000000..acb8c0a69d23
--- /dev/null
+++ b/dev-lang/go/go-1.20.8.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+# See "Bootstrap" in release notes
+GO_BOOTSTRAP_MIN=1.17.13
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* amd64 arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		;;
+	esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://go.dev"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="abi_mips_o32 abi_mips_n64 cpu_flags_x86_sse2"
+
+RDEPEND="
+arm? ( sys-devel/binutils[gold] )
+arm64? ( sys-devel/binutils[gold] )"
+BDEPEND="|| (
+		>=dev-lang/go-${GO_BOOTSTRAP_MIN}
+		>=dev-lang/go-bootstrap-${GO_BOOTSTRAP_MIN} )"
+
+# the *.syso files have writable/executable stacks
+QA_EXECSTACK='*.syso'
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# This package triggers "unrecognized elf file(s)" notices on riscv.
+# https://bugs.gentoo.org/794046
+QA_PREBUILT='.*'
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+	CONTRIBUTING.md
+	PATENTS
+	README.md
+	SECURITY.md
+)
+
+go_arch() {
+	# By chance most portage arch names match Go
+	local tc_arch=$(tc-arch $@)
+	case "${tc_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		loong)	echo loong64;;
+		mips) if use abi_mips_o32; then
+				[[ $(tc-endian $@) = big ]] && echo mips || echo mipsle
+			elif use abi_mips_n64; then
+				[[ $(tc-endian $@) = big ]] && echo mips64 || echo mips64le
+			fi ;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		riscv) echo riscv64 ;;
+		s390) echo s390x ;;
+		*)		echo "${tc_arch}";;
+	esac
+}
+
+go_arm() {
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os() {
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple() {
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile() {
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+src_compile() {
+	if has_version -b ">=dev-lang/go-${GO_BOOTSTRAP_MIN}"; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
+	elif has_version -b ">=dev-lang/go-bootstrap-${GO_BOOTSTRAP_MIN}"; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
+	else
+		eerror "Go cannot be built without go or go-bootstrap installed"
+		die "Should not be here, please report a bug"
+	fi
+
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="${PWD}"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	use arm && export GOARM=$(go_arm)
+	use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat')
+
+	cd src
+	bash -x ./make.bash || die "build failed"
+}
+
+src_test() {
+	go_cross_compile && return 0
+
+	cd src
+
+	# https://github.com/golang/go/issues/42005
+	rm cmd/link/internal/ld/fallocate_test.go || true
+
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+	cd ..
+	rm -fr pkg/*_race || die
+	rm -fr pkg/obj/go-build || die
+}
+
+src_install() {
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# The use of cp is deliberate in order to retain permissions
+	# [1] https://golang.org/issue/2775
+	dodir /usr/lib/go
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	einstalldocs
+
+	# testdata directories are not needed on the installed system
+	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+
+	local bin_path
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	local f x
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+
+	# install the @golang-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/go-sets.conf go.conf
+}
+
+pkg_postinst() {
+	[[ -z ${REPLACING_VERSIONS} ]] && return
+	elog "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
+	elog "all packages compiled with previous versions of ${CATEGORY}/${PN}"
+	elog "due to the static linking nature of go."
+	elog "If this is not done, the packages compiled with the older"
+	elog "version of the compiler will not be updated until they are"
+	elog "updated individually, which could mean they will have"
+	elog "vulnerabilities."
+	elog "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
+	elog "See https://bugs.gentoo.org/752153 for more info"
+}
diff --git a/dev-lang/go/go-1.21.0.ebuild b/dev-lang/go/go-1.21.1.ebuild
index f89ba97d1fff..4b224ef5c625 100644
--- a/dev-lang/go/go-1.21.0.ebuild
+++ b/dev-lang/go/go-1.21.1.ebuild
@@ -23,7 +23,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-lang/luau/Manifest b/dev-lang/luau/Manifest
index 9376e81f2b57..505da601ac07 100644
--- a/dev-lang/luau/Manifest
+++ b/dev-lang/luau/Manifest
@@ -4,7 +4,7 @@ DIST luau-0.591.tar.gz 6019607 BLAKE2B b60520141f79ec576ca0ac0eb6f73b6022a7450bf
 DIST luau-0.592.tar.gz 6047275 BLAKE2B 94299eabd16c7163877b4e1b4514998d3a9db06b60f8aafb368d199eb407709987d22d02ff182e66fa38983f5eb8b09d557739d98e8d8cbc406dbfe336e99cba SHA512 69f4c3c82e26e42c6f2d5ce052b00f90cba10c4ebe2cea979e1e0c53463b2b22389e1a3308984c3c537c1efc1c488407a51f15fdd30301b8364645f362447b2f
 DIST luau-0.593.tar.gz 6053499 BLAKE2B 5cc023f32419cfc09a7dd4f4e94e99905e8e8bab42b675cb0d4712bacd930250094441f5a7ac9fbc68b9fa6e84bb5e9585100f44ee28ef9acf0b21b42f43eed6 SHA512 04c2808685db42fce09defca7a4e4e30a71e6fd6c4dc9362f030648203552e7ec79bbadda76f8e89ef3b627c18b05c277d3658286fbbf2c17db574733c0f7593
 EBUILD luau-0.583.ebuild 764 BLAKE2B 0b537522661c2c8bfabcd10bef8296ce181f8bcee1cb9ceae85d0ca93f504f68e39b668b981e84981e8aa2109e75c2b7dd955271a96e1fd493090eeb72ee7c97 SHA512 98ff58b32279b3e3c8c16812f5d10002abf63ed29bf40555b5a364af0ffdb562fc75254b8ab42df5e0bef695002f4f59bbe7f4059208da5d9a163300f07d535a
-EBUILD luau-0.589.ebuild 765 BLAKE2B 23f9d13f1fac061da43c18a71ce4dd742e8ff880d38da327fbb50859d0d8769bf86330785b09289d5323d6dd28166e1beee706e9bf669c5a9812a462be5056bb SHA512 5d6f371e31c1cf2d3a0ec657c133c6bd0543b2b02d09c7d5b75ac7724ff318c30da842fc5337277b57ad44b82e656d0e9a444a4907cfd742a967aff9bc67496f
+EBUILD luau-0.589.ebuild 764 BLAKE2B 0b537522661c2c8bfabcd10bef8296ce181f8bcee1cb9ceae85d0ca93f504f68e39b668b981e84981e8aa2109e75c2b7dd955271a96e1fd493090eeb72ee7c97 SHA512 98ff58b32279b3e3c8c16812f5d10002abf63ed29bf40555b5a364af0ffdb562fc75254b8ab42df5e0bef695002f4f59bbe7f4059208da5d9a163300f07d535a
 EBUILD luau-0.591.ebuild 765 BLAKE2B 23f9d13f1fac061da43c18a71ce4dd742e8ff880d38da327fbb50859d0d8769bf86330785b09289d5323d6dd28166e1beee706e9bf669c5a9812a462be5056bb SHA512 5d6f371e31c1cf2d3a0ec657c133c6bd0543b2b02d09c7d5b75ac7724ff318c30da842fc5337277b57ad44b82e656d0e9a444a4907cfd742a967aff9bc67496f
 EBUILD luau-0.592.ebuild 765 BLAKE2B 23f9d13f1fac061da43c18a71ce4dd742e8ff880d38da327fbb50859d0d8769bf86330785b09289d5323d6dd28166e1beee706e9bf669c5a9812a462be5056bb SHA512 5d6f371e31c1cf2d3a0ec657c133c6bd0543b2b02d09c7d5b75ac7724ff318c30da842fc5337277b57ad44b82e656d0e9a444a4907cfd742a967aff9bc67496f
 EBUILD luau-0.593.ebuild 765 BLAKE2B 23f9d13f1fac061da43c18a71ce4dd742e8ff880d38da327fbb50859d0d8769bf86330785b09289d5323d6dd28166e1beee706e9bf669c5a9812a462be5056bb SHA512 5d6f371e31c1cf2d3a0ec657c133c6bd0543b2b02d09c7d5b75ac7724ff318c30da842fc5337277b57ad44b82e656d0e9a444a4907cfd742a967aff9bc67496f
diff --git a/dev-lang/luau/luau-0.589.ebuild b/dev-lang/luau/luau-0.589.ebuild
index c7bee4916d90..b15291852bc5 100644
--- a/dev-lang/luau/luau-0.589.ebuild
+++ b/dev-lang/luau/luau-0.589.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://github.com/Roblox/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="MIT"
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")