gentoo auto-resync : 07:11:2022 - 21:22:53

4 files changed, 21 insertions, 15 deletions

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index e0d0194f51c8..eabe469a4849 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -19,10 +19,10 @@ DIST spidermonkey-60.0-patches-04.tar.xz 4428 BLAKE2B af78049cd9b3ee6a9b689e6253
 DIST spidermonkey-68.6.0-patches-04.tar.xz 5956 BLAKE2B b1250391a5173e676272d5926b710c06b0e9de1ff03b130a57fdac30f2deefbee3fa92250b37e28087572fe5cce73eb112ef4e1fb0c0401d6ecdb22ab9868998 SHA512 94575b11b4f006c6ee0c8d64b315734a173cecb68e9128ca61ba1a28177e3c149b8cf1f3b3c47a7a263fad8da6196fc0101df87392f016686a827e0cd24fdc74
 DIST spidermonkey-78-patches-04.tar.xz 3408 BLAKE2B f2fdd4882e1e4de1908c458dc8dfedd5665ef7118f19704dabf2b2a80e2fae48813e9bc3d0c3410287e32c21e3f9d09233d8e5d15917f53aa2f60e6190cd9cdb SHA512 87ac83c0ccc05f482913b1fbf043db1878536f935f934362a47283809c0cbfdeff040206a9c18c687384b606ba8a7bd9a7c1fc3c0bcfdd620987990a33ca1fe2
 DIST spidermonkey-91-patches-04j.tar.xz 4624 BLAKE2B d9cf47b39a165e8434d4f2f20ae3a9734c1bb81c32ddb75360e5edfa6817d6343be89aff0f8ec381485772cad80b00a069789decbc462129161afc3d4acfcb53 SHA512 bd574fee600cb4c6a262893b7d992d85c4059d512b829cd2f226aff86d8a6a83c2bdab466704e22f64bf6d29f90901037a34f9e90a42251952ba1cdbc0cab968
-EBUILD spidermonkey-102.4.0.ebuild 11041 BLAKE2B 37acb65d609cde79674874f69c2d772833e1ca857fe5b9f8ba54d151a37e1587d43daf3ba5cea061ff3753ad083c88003b7907ee61d3b4aaf94448f11c046004 SHA512 82a01b5d49e1b50c2e0f7450ad77a1b113d1f286aa509712c1e3ab1bad4f42cab52c246ccf45381e42a0bbdc2b16d3977d46035ad859a4bbca10763149395194
+EBUILD spidermonkey-102.4.0.ebuild 11046 BLAKE2B 76afc867969348b1f7d2b4ee724dabf9d6681019e9f2cb6848ffa7ac165bed78c023ea16e0b08a33729d90f42efff6b4e35ad7b446211f407f27d1d5cb48bb34 SHA512 11e95e012dc668ff2f6d25d257e7c4654cdd3c8694ab952a49df206d8c1cb69481d3e44572267c1886bcbfc12263f4ed0866105b95b56383e50e4bced1791cad
 EBUILD spidermonkey-60.5.2_p0-r6.ebuild 4080 BLAKE2B 7269a944ab109fa27ee80016d44c4c71d91c0f230fbea9704ba468bff06d62c2740af3cce4ce7c39179dca6be7c74b3eb62b877e7f7db2c7a6e7314e0361401c SHA512 971cbfaad2aabaf43b6f528bc67f5bb207bf53bc4d9bd19d8d21948ad6e055a8f3aa0f059028db13c95740fef3ebc9257a1ab2813131180dfb5c7b2306b66e2b
 EBUILD spidermonkey-68.12.0-r1.ebuild 7834 BLAKE2B 35252f841078dc8b0f06c2c2dab0d0a17abbfa23f025c3b2534232a82951298722a7ee5c3c7bcd56055879c5a886961a8ac34bb325fca7a466dc7d59f7b391ec SHA512 4ecbf27cddb67cdef15aa2c93cb4acfb4851973a07b7b9040186555027f5bc4d7126351b5bb1646640d0493afa78e63151d39b0bf37a6899c87ff20a7ea22198
-EBUILD spidermonkey-78.15.0.ebuild 13125 BLAKE2B 30de33d7210c4a9757e27ebf850877f01e311b9a19f7e5aedec56cb5e024d2c96640658d412fcb96a4c3300e449465c82ad271d491d084a6a49ca21ac81f182b SHA512 efac163acbd4b988fbf3974bbe7bbad2be2d1c91c83cd93ca5560f13c5cb873d3cd72c92c34b26498524ed0920e8729ddef48ecd539d7f3b428446ca72c93570
+EBUILD spidermonkey-78.15.0.ebuild 13130 BLAKE2B d0c2f2749c442b6d67ad990e07e2496ef1c57af7e71f0fd0d7fc362d11278e062847d730429b64edfc94e289c11236efdc3b66006fd6c7208bedf3043f6676ca SHA512 626aa7d0d21e5718def7d2e948c2606ae07a0536267ec6c81af2f95bc390e0eb2c436d4749fe65ccb8d1efac311525ac69261f27754bfb2a039e9fb73935aa7d
 EBUILD spidermonkey-91.11.0.ebuild 15080 BLAKE2B 0f68ed8232a2f7b34a6be94638a24c8f0a039e285f84945f5655357b6374341251651aad3a98ca05909dfe40eceff3b62e80a088baf8a78e72d89fa5b4769981 SHA512 5fa0fde2e74255e34c00869f06780cc7ed8cc251c41a35e9f9c7e2330282e7b487039c3a1b100dead979ce06d0b2254bd1c63c8e6e1f83d7dbcddabb8f442834
-EBUILD spidermonkey-91.13.0.ebuild 15168 BLAKE2B 50b6aeda98b52f1c14cf68e36151ff5b01c65f7f36f7ef8788b2f5aff4d1444e3b59f494560b411151e4c35a9eea774caf2c416c99d14e2614680130b90440ba SHA512 cf117ee9feda65c611fe05601cde5f23b443d55c1b2a1186a8c09923acec57700a49ffb60de96ff01d95c8bb79c1c8d30699463f7e36f01ade7b800bbab13d72
+EBUILD spidermonkey-91.13.0.ebuild 15173 BLAKE2B 89cdc1302610d7f7c3269719bbe24461fb00d7e75065e7bf6a128d2334a4a0f6064655251380509913e1bfddd69625846e3b8873eb9d215e966cabc8960804d0 SHA512 89b55aa8d82eb5d5043f7727ebe16aed245e4473e7dd7b24abd7dc78d5eed4958a07141e509ac4271e34504423fee47c0502c0bcf00348dd0a5dfbdff6f93947
 MISC metadata.xml 869 BLAKE2B 79d6ea91e84e3bb666797cde6b2993282ff1b4266dfa835eaf02d8aa65d5d000729b149a49c9fa5c8dbf12e4b97b46d976243c888834db9df73a8a5c814aa610 SHA512 f78399a1ad88583c50ad1e967f5ba293cdfff7d58cf26b87bd8888c7102b62d42ef1982d1b8462f3d31f0806b6cead8db28b7f0c7b12c08d3871607b5a4c63cc
diff --git a/dev-lang/spidermonkey/spidermonkey-102.4.0.ebuild b/dev-lang/spidermonkey/spidermonkey-102.4.0.ebuild
index 40a248c7290f..d78ef4c2e97f 100644
--- a/dev-lang/spidermonkey/spidermonkey-102.4.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-102.4.0.ebuild
@@ -113,8 +113,8 @@ llvm_check_deps() {
 		fi
 
 		if use lto ; then
-			if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-				einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+				einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
 				return 1
 			fi
 		fi
@@ -228,10 +228,12 @@ src_configure() {
 	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
 
 	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
+	if use clang; then
 		# Force clang
 		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
+		if tc-is-gcc; then
+			have_switched_compiler=yes
+		fi
 		AR=llvm-ar
 		AS=llvm-as
 		CC=${CHOST}-clang
diff --git a/dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild
index 80ef8034aaa8..8af327dd9b6e 100644
--- a/dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild
@@ -126,8 +126,8 @@ llvm_check_deps() {
 		fi
 
 		if use lto ; then
-			if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-				einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+				einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
 				return 1
 			fi
 		fi
@@ -252,10 +252,12 @@ src_configure() {
 	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
 
 	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
+	if use clang; then
 		# Force clang
 		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
+		if tc-is-gcc; then
+			have_switched_compiler=yes
+		fi
 		AR=llvm-ar
 		CC=${CHOST}-clang
 		CXX=${CHOST}-clang++
diff --git a/dev-lang/spidermonkey/spidermonkey-91.13.0.ebuild b/dev-lang/spidermonkey/spidermonkey-91.13.0.ebuild
index 6dc4ab9f813f..11f4cc2fe5e8 100644
--- a/dev-lang/spidermonkey/spidermonkey-91.13.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-91.13.0.ebuild
@@ -120,8 +120,8 @@ llvm_check_deps() {
 		fi
 
 		if use lto ; then
-			if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-				einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+				einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
 				return 1
 			fi
 		fi
@@ -235,10 +235,12 @@ src_configure() {
 	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
 
 	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
+	if use clang; then
 		# Force clang
 		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
+		if tc-is-gcc; then
+			have_switched_compiler=yes
+		fi
 		AR=llvm-ar
 		CC=${CHOST}-clang
 		CXX=${CHOST}-clang++