gentoo auto-resync : 03:06:2024 - 00:07:25

5 files changed, 10 insertions, 7 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 9b3ba2cd1cf2..64f89f1808af 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index f54368b272a5..f32c8e8fcad6 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -22,5 +22,5 @@ EBUILD ocaml-4.12.1.ebuild 2524 BLAKE2B 379f9ca34424f1866d26ac392e49b1e3a276e348
 EBUILD ocaml-4.13.1.ebuild 2487 BLAKE2B 7e78f1e7d2023a5d243b7c4fc770bc439dfcdb245d528a596a08af9aa7d776ec3ccdd822eed9a51c4eca009e6c9712b9da2ed2beb7cea672f86e2271dce4dc50 SHA512 dba4a7593e164e6949ce7daddd9e0234db9d874adb17fd3c2bc2ffc67d67b557735a4a6ddb66af9d2c463a8ac474866395529d5f2b4443b0fbca44b0b6ce0974
 EBUILD ocaml-4.14.0-r1.ebuild 2508 BLAKE2B 333b6a84bc469d964cd8385fde845dc9a9c0f9a9b1463a87623bf09972415a651adb5c6098d3ab77a77c5dc05e5b345f20782838e49889d1fe8f900e4b26e447 SHA512 e41e0849502b7692f990f679fb2e8d50b183643ad71cd9e2171621db57143c7ea01d9caa317222118aa0a5fd5021b00c8548ebad600278a293d18432948c9e9e
 EBUILD ocaml-4.14.1.ebuild 2446 BLAKE2B 09e43241eb2b0c9219963a777648fe7db4ea4829b1e089d4d08f494066e6230a4f4f49f08b3db26b882fe4916a3842af4e637fe4866c811bd8ecfefed5a08219 SHA512 1db8ce4ddb772e4ac7fe3c03e80237ece1c459ab42161cbd6fc9d22a86f59318dda3d2b74eaf7359005f488dfb15c1a30c51c2e6caceed779dbe9ef7e6a7b2d0
-EBUILD ocaml-4.14.2.ebuild 2451 BLAKE2B b1ef54d0818b4495c83eda065b51415122fc1407000c7cb3f3597784d374aa98426d824ebb7566eb74eb9dbc1a5f57d6b023c7bfd810bfa0e9d7f4469f3cbfca SHA512 54221fb06950adc412555abd731407b009c8de8e10cde3dc5ae89c3414cb72d5b1f54a2652d519970c859c49a40a8c440ba08322d4faf3d58592d7df558960cf
+EBUILD ocaml-4.14.2.ebuild 2567 BLAKE2B e6946e76e1bf235cfece9f1ea55948b967d3c1a791011f51fc5da5e57805e77be5b289b059aeea7e4ea230e449f85d09779c71f57a92528a9bb5a80cba0b8277 SHA512 9e94e7d5b5fb5d36d2619fd1710a801c5ceb0df5461c43386862214303a6971215406b1c248b4dd1af928e6dd36eb81be91e14b55d567baf2733d77f0f7d7af4
 MISC metadata.xml 671 BLAKE2B 452ea340c8abacedbdb20a344cffa9b91db2251e0174db596e4f96bf2b1c9d308ceb035e0870e738a15c313003fcbf39bb91c5f68b40a185e5e08e3ea7042616 SHA512 1d8248e2b05b145c804cc9cce6aa617bd6466f26326033cee06ed27ceb93ebc88b62f3badbfe13092fbaa89c3a71087491b88c4fc094da8624ab668cdc73b383
diff --git a/dev-lang/ocaml/ocaml-4.14.2.ebuild b/dev-lang/ocaml/ocaml-4.14.2.ebuild
index f94e0f851126..bb61347421c2 100644
--- a/dev-lang/ocaml/ocaml-4.14.2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.14.2.ebuild
@@ -79,6 +79,10 @@ src_test() {
 }
 
 src_install() {
+	# OCaml generates textrels on 32-bit arches
+	if use arm || use ppc || use x86 ; then
+		export QA_TEXTRELS='.*'
+	fi
 	default
 
 	dodir /usr/include
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index c5ac1f1a8076..58721035a0ec 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -11,6 +11,6 @@ DIST spidermonkey-102-patches-05j.tar.xz 4596 BLAKE2B 215b770bbdf17973d7b3fd1df6
 DIST spidermonkey-115-patches-01.tar.xz 3992 BLAKE2B e97d0cb3edfb885119226f54f22485ed4e8220cd904d3356b87ccc013403f976a042171cf9ca7250bcf3fe3d90996dd80b4104e7d614f95d7bcfcb0e710a8a78 SHA512 cece96f172a09dd0e29f7c2fdbf650cde405b276bc4083956365289f1da4b1d078ccbde760da6553888ddb3c53cf9aded52051db556a2c4ec492fed01dcb03a1
 EBUILD spidermonkey-102.15.0.ebuild 15624 BLAKE2B a10e3fb8fcbc0f0016778a3c5bb1caea09b05eef2d059f5bb920158b45e9f15ab1e9bd9da90300457e68a147b334a49a86bd1dd07f036feedfa69d17491e63a5 SHA512 c71d02f78d2196e9afa44e3481fa9f6ef8324799b4a4a460eab531ca3d51e09a1b43a15bd2efbac5d11d03bb410babe6400236220684641c97aaa030ee970fdf
 EBUILD spidermonkey-115.10.0.ebuild 13639 BLAKE2B 123643694d19a8346be7ff1e78bf01b4d58fc8cb2205845de1525baeb7e58f915ac6a5ba8162f9755085ce11b93988d7547affcedf6b6313107aa3919c1fcf9a SHA512 4e8f6f57d72efd842b1f66b3993c35585bea9e7c7078045353b0111e2b773dba5fb7214b3b025f006130e2770fc152f2985db84a6d0695ba29447edc072d335e
-EBUILD spidermonkey-115.11.0.ebuild 13655 BLAKE2B 0116f176823e31dcb4a98ca42b0e3946eded5d4c94e99bc092a8a4547ba0f7aa47650a6297e37c38030dbf6d727505d362e852332a0cd96df2054ceca5d771ca SHA512 67701b4736c32b8206f71a4dd50337015e42e341e2317934a16bc3d6af4bccfe7f2a49166814f88e7cb94330eedbba0d9bcc8faf3211a2c626fc4d2203918957
+EBUILD spidermonkey-115.11.0.ebuild 13677 BLAKE2B a7b427b5f698c10bb87ea9554271066094b617e8e584b794ace4de55b3f92fa8f4433f89b44ea651e8d46e21ff07dd39a61b445bc083057cf221622bfaf61149 SHA512 29e048e3c4a27a53ace468f1488dbec63878aea8de9cbef743e795bba9dd27d74f9c6182d5134e7847ccb3ad369fb6e851d1eecd541c546b0ad553464a3bebb9
 EBUILD spidermonkey-115.9.1.ebuild 12934 BLAKE2B d0be2703825b566522d31850e60320c2f250de4683983bfa1474aeef053282321d83b26007fc36ea6429c48f5a528cb47a81627cdbff23754d61275a38776063 SHA512 aaba4bdafce7062a2b8a8b66c0488c4a6b4da519b1ea91b236fde3e7fe1c352205729331e71aae022083cc9dae2dd8b62e23e5dd35e452e3f919e6469b94f5e0
 MISC metadata.xml 513 BLAKE2B 58ffd474492f03c16bda95e48511fb6281e03067d2ad77e994f8117345ecece5da9591dccedafe75b037d98e06851a3759caa4b993adc2910dbb76e1c01a7fa3 SHA512 1ee02bff37e2dabbd72b7f719463b12299270c7960b4cf5a92afab17c954c50e6acb826d4a91db4954fb4a7b0f8669988f2cdb5be991df90e3a605c6b35fdbfb
diff --git a/dev-lang/spidermonkey/spidermonkey-115.11.0.ebuild b/dev-lang/spidermonkey/spidermonkey-115.11.0.ebuild
index 7f16d6e0ba80..30f367f6a1f9 100644
--- a/dev-lang/spidermonkey/spidermonkey-115.11.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-115.11.0.ebuild
@@ -106,10 +106,10 @@ BDEPEND="${PYTHON_DEPS}
 			)
 		)
 	)
-	!clang? ( <virtual/rust-1.78 )
+	!clang? ( virtual/rust )
 	!elibc_glibc? (
 		|| (
-			<dev-lang/rust-1.78
+			dev-lang/rust
 			<dev-lang/rust-bin-1.73
 		)
 	)
@@ -391,9 +391,8 @@ src_configure() {
 		myeconfargs+=( --disable-real-time-tracing )
 	fi
 
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		myeconfargs+=( --enable-rust-simd )
-	fi
+	# We always end up disabling this at some point due to newer rust versions. bgo#933372
+	myeconfargs+=( --disable-rust-simd )
 
 	# Modifications to better support ARM, bug 717344
 	if use cpu_flags_arm_neon ; then