gentoo auto-resync : 10:11:2024 - 03:03:09

5 files changed, 34 insertions, 112 deletions

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index a1ae7e7bb4ee..9b46ee4c3d4c 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -12,8 +12,8 @@ DIST firefox-128esr-patches-04.tar.xz 14416 BLAKE2B 0ffe3fd568480e37fe28fe71d530
 DIST spidermonkey-102-patches-05j.tar.xz 4596 BLAKE2B 215b770bbdf17973d7b3fd1df6cee9647459d2b02b0be5bdb289d457e5dbdb06ceac7a3082fc2f5836e991a4ac4486d73330b0276a466b5c528dab226a27829c SHA512 d2b8e32dac87d60a00fd93479dc34d8adab4feec24a38591cebeb4cf271aa2fd964f4dc26e67ebfb127a47bc8f684d50b32b2cff18ed5286701a04a289058185
 DIST spidermonkey-115-patches-02.tar.xz 4896 BLAKE2B f78d9804c1427b45d6fda496b4991ec6f672dec9ce031ed57a2920fa1968c942a235f46e40166c8ab8d731a1963f322d34bb2f6984133179175e6f7376d27d13 SHA512 11fd01152d1e7b8ca89bf628076e1f4fb4f1ba6c9dc0f9dd544252495c580c04e4d5ffc238d5587f9e993aa91a47828333564ca55f60e008bd370089cd07d2e6
 DIST spidermonkey-128-patches-02.tar.xz 3916 BLAKE2B b6640860ea091b22c61b2a78da5004816a08ab9fb39fda04ae76fe48a3a8061770d6d6e451e5f34951aa3f63473dd77d3dde8b60aec80b4c31f1b29064ce68ee SHA512 3f2d272a36ca2ac831de9108769c68e380be4e8bba7071d02686699702acac6a9325e4256d9c5c2441c3742552179031b0898d3f96f08477857fd6e989596ee6
-EBUILD spidermonkey-102.15.0.ebuild 15624 BLAKE2B a10e3fb8fcbc0f0016778a3c5bb1caea09b05eef2d059f5bb920158b45e9f15ab1e9bd9da90300457e68a147b334a49a86bd1dd07f036feedfa69d17491e63a5 SHA512 c71d02f78d2196e9afa44e3481fa9f6ef8324799b4a4a460eab531ca3d51e09a1b43a15bd2efbac5d11d03bb410babe6400236220684641c97aaa030ee970fdf
-EBUILD spidermonkey-115.16.0.ebuild 13973 BLAKE2B f2a8521abbef69521e5f0e6d11dce0c9e3e33b23bc424bdf7b1d104684db9acd5d27b43a50ee4cc7c6df691988845b24c5190e3a4aa7fbef9d5df30343f0b34e SHA512 f39ec057fd2866f764e5ff63069843e50bec25be7a1018c5a1a115f22d15892237090f1373631e60fec9296ba8e954d8a5f5dafd274896bc4e663e0cb2d4724a
-EBUILD spidermonkey-128.3.0.ebuild 14004 BLAKE2B adebce798253690c8a54312629fef6da2749a7a2f742c3fcc414b712b8c1b9c50d78514df1829e2d3e58cbfa692e911418459d3d70e48de584817d2bb846c02d SHA512 eef1fcbacf991e224a3f1b3345beac3c8473053e907d99d5fe46c0bd9aa93f1000caab80fe2f91a34f184e73279312fb27f28ea82f39f6416cd00efa9ac16035
-EBUILD spidermonkey-128.4.0.ebuild 14004 BLAKE2B d7af1322cd38ccf620466ed62e0886c783ef1c50897022cd85082a422cb7b932aaeae637d835234c90fb24e8ed856d1da33b6729d8c955bd22bd5f98658c9a42 SHA512 ce19a8d6c568229aefa1949d971aa099476b7dd08f5a22f416da0e931a72a99a3e820df9e4683bbe7d1668d3a71bb36aca0ef64346cd8b4ddd3408d7bba28a0b
+EBUILD spidermonkey-102.15.0-r1.ebuild 15100 BLAKE2B 4a3ba5c9cea694f9aaea6bb6a57958d55c7f8af568699e1e3d637d33740213badf1a3090a113524487706ee395130d8eb50865861e269355ef497000e55b2e3f SHA512 c875a3ba64c50d343a29b88e9f8c8537372f5d1bc44369d0a6e6e70c28d5a40b5da6010effe2298adb21c30b86e04502d9af8e424a75f1403ee04e322fcb164b
+EBUILD spidermonkey-115.16.0-r1.ebuild 13394 BLAKE2B 6006d416587012ffe01c837a99cce378b9b8243613a29b328f6d75ea39b1ddf5ae1258ac8676f8297116a6e11c486eb0ac1dd1c30f2adb0c8a93ccdcd41712ff SHA512 fb437e82ff2e78e5a9bc2a61b7a071f6cf371d64e60e0dd367191d6de96e6cdcc04e77f139bb949b1211a7fd4363d6f3ddc8b687b6827092938562fbf7f39589
+EBUILD spidermonkey-128.3.0-r1.ebuild 13770 BLAKE2B 59c14fb76b00c49b076338275f7979aa57b7975330afaefb401a8761b13bb26c73d2c53526d247eab79e3487c1dc44ea84a247029086fdcb0379f501f54888b3 SHA512 1206fda2249916e3f36e144aaa4df09f96dbcd38198dfe46da82fd3e1d7fdce6af162ade693a14eb72df0aede5188d3ecf23541f12cfef30a0c48c3dafe580e6
+EBUILD spidermonkey-128.4.0-r1.ebuild 13751 BLAKE2B 31c04d00bd8cd5c3703a0798b7d6cdd9f2c0c4a7c61f1a2002bf19385ac1733fb18ada53084696191d5e2919099250a35ed10faca0869524073cd771afbc300f SHA512 13bfd09838b7883a2974736cce6499a346887f43edc8f0716d3efdae21d19bfb4a8d4108656e05094b7097bae362ac12dd11d1a2da06eb093508204026dc9937
 MISC metadata.xml 513 BLAKE2B 58ffd474492f03c16bda95e48511fb6281e03067d2ad77e994f8117345ecece5da9591dccedafe75b037d98e06851a3759caa4b993adc2910dbb76e1c01a7fa3 SHA512 1ee02bff37e2dabbd72b7f719463b12299270c7960b4cf5a92afab17c954c50e6acb826d4a91db4954fb4a7b0f8669988f2cdb5be991df90e3a605c6b35fdbfb
diff --git a/dev-lang/spidermonkey/spidermonkey-102.15.0.ebuild b/dev-lang/spidermonkey/spidermonkey-102.15.0-r1.ebuild
index b1ab05478ed6..bf9a67de35f8 100644
--- a/dev-lang/spidermonkey/spidermonkey-102.15.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-102.15.0-r1.ebuild
@@ -7,14 +7,16 @@ EAPI="8"
 FIREFOX_PATCHSET="firefox-102esr-patches-13.tar.xz"
 SPIDERMONKEY_PATCHSET="spidermonkey-102-patches-05j.tar.xz"
 
-LLVM_MAX_SLOT=17
+LLVM_COMPAT=( 17 )
 
 PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="ssl,xml(+)"
 
+RUST_NEEDS_LLVM=1
+
 WANT_AUTOCONF="2.1"
 
-inherit autotools check-reqs flag-o-matic llvm multiprocessing prefix python-any-r1 toolchain-funcs
+inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing prefix python-any-r1 rust toolchain-funcs
 
 MY_PN="mozjs"
 MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
@@ -71,41 +73,13 @@ IUSE="clang cpu_flags_arm_neon debug +jit lto test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="${PYTHON_DEPS}
-	|| (
-		(
-			sys-devel/llvm:17
-			clang? (
-				sys-devel/clang:17
-				sys-devel/lld:17
-				virtual/rust:0/llvm-17
-			)
-		)
-		(
-			sys-devel/llvm:16
-			clang? (
-				sys-devel/clang:16
-				sys-devel/lld:16
-				virtual/rust:0/llvm-16
-			)
-		)
-		(
-			sys-devel/llvm:15
-			clang? (
-				sys-devel/clang:15
-				virtual/rust:0/llvm-15
-				lto? ( sys-devel/lld:15 )
-			)
-		)
-		(
-			sys-devel/llvm:14
-			clang? (
-				sys-devel/clang:14
-				virtual/rust:0/llvm-14
-				lto? ( sys-devel/lld:14 )
-			)
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+		clang? (
+			sys-devel/lld:${LLVM_SLOT}
 		)
-	)
-	!clang? ( virtual/rust )
+	')
 	virtual/pkgconfig
 	test? (
 		$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
@@ -130,11 +104,6 @@ llvm_check_deps() {
 			return 1
 		fi
 
-		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
-			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		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
@@ -172,7 +141,8 @@ pkg_setup() {
 
 		check-reqs_pkg_setup
 
-		llvm_pkg_setup
+		llvm-r1_pkg_setup
+		rust_pkg_setup
 
 		if use clang && use lto ; then
 			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
diff --git a/dev-lang/spidermonkey/spidermonkey-115.16.0.ebuild b/dev-lang/spidermonkey/spidermonkey-115.16.0-r1.ebuild
index ec49a5bdada9..b1444fb6dae3 100644
--- a/dev-lang/spidermonkey/spidermonkey-115.16.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-115.16.0-r1.ebuild
@@ -7,14 +7,16 @@ EAPI="8"
 FIREFOX_PATCHSET="firefox-115esr-patches-13.tar.xz"
 SPIDERMONKEY_PATCHSET="spidermonkey-115-patches-02.tar.xz"
 
-LLVM_MAX_SLOT=18
+LLVM_COMPAT=( 18 )
 
 PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="ncurses,ssl,xml(+)"
 
+RUST_NEEDS_LLVM="1"
+
 WANT_AUTOCONF="2.1"
 
-inherit autotools check-reqs flag-o-matic llvm multiprocessing prefix python-any-r1 toolchain-funcs
+inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing prefix python-any-r1 rust toolchain-funcs
 
 MY_PN="mozjs"
 MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
@@ -72,47 +74,13 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
-	|| (
-		(
-			sys-devel/llvm:18
-			clang? (
-				sys-devel/lld:18
-				sys-devel/clang:18
-				virtual/rust:0/llvm-18
-			)
-		)
-		(
-			sys-devel/llvm:17
-			clang? (
-				sys-devel/lld:17
-				sys-devel/clang:17
-				virtual/rust:0/llvm-17
-			)
-		)
-		(
-			sys-devel/llvm:16
-			clang? (
-				sys-devel/lld:16
-				sys-devel/clang:16
-				virtual/rust:0/llvm-16
-			)
-		)
-		(
-			sys-devel/llvm:15
-			clang? (
-				sys-devel/lld:15
-				sys-devel/clang:15
-				virtual/rust:0/llvm-15
-			)
-		)
-	)
-	!clang? ( virtual/rust )
-	!elibc_glibc? (
-		|| (
-			dev-lang/rust
-			<dev-lang/rust-bin-1.73
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+		clang? (
+			sys-devel/lld:${LLVM_SLOT}
 		)
-	)
+	')
 	test? (
 		$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
 	)"
@@ -136,11 +104,6 @@ llvm_check_deps() {
 			return 1
 		fi
 
-		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
-			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
 		if ! tc-ld-is-mold ; 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
@@ -212,7 +175,8 @@ pkg_setup() {
 
 		check-reqs_pkg_setup
 
-		llvm_pkg_setup
+		llvm-r1_pkg_setup
+		rust_pkg_setup
 
 		if use clang && use lto && tc-ld-is-lld ; then
 			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
diff --git a/dev-lang/spidermonkey/spidermonkey-128.3.0.ebuild b/dev-lang/spidermonkey/spidermonkey-128.3.0-r1.ebuild
index 77e9e3247dbd..9b70f62cf9c9 100644
--- a/dev-lang/spidermonkey/spidermonkey-128.3.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-128.3.0-r1.ebuild
@@ -11,9 +11,11 @@ LLVM_COMPAT=( 17 18 19 )
 PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="ncurses,ssl,xml(+)"
 
+RUST_NEEDS_LLVM=1
+
 WANT_AUTOCONF="2.1"
 
-inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing python-any-r1 toolchain-funcs
+inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing python-any-r1 rust toolchain-funcs
 
 MY_PN="mozjs"
 MY_PV="${PV/_pre*}"
@@ -73,11 +75,8 @@ BDEPEND="${PYTHON_DEPS}
 			sys-devel/clang:${LLVM_SLOT}
 			sys-devel/lld:${LLVM_SLOT}
 			sys-devel/llvm:${LLVM_SLOT}
-			virtual/rust:0/llvm-${LLVM_SLOT}
 		)
 	')
-	!clang? ( virtual/rust )
-	!elibc_glibc? ( dev-lang/rust )
 	>=dev-util/cbindgen-0.26.0
 	virtual/pkgconfig
 	test? (
@@ -103,11 +102,6 @@ llvm_check_deps() {
 			return 1
 		fi
 
-		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
-			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
 		if ! tc-ld-is-mold ; 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
@@ -189,6 +183,7 @@ pkg_setup() {
 		check-reqs_pkg_setup
 
 		llvm-r1_pkg_setup
+		rust_pkg_setup
 
 		if use clang && use lto && tc-ld-is-lld ; then
 			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
diff --git a/dev-lang/spidermonkey/spidermonkey-128.4.0.ebuild b/dev-lang/spidermonkey/spidermonkey-128.4.0-r1.ebuild
index 3915902d6caa..0bf52dabea6e 100644
--- a/dev-lang/spidermonkey/spidermonkey-128.4.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-128.4.0-r1.ebuild
@@ -13,7 +13,7 @@ PYTHON_REQ_USE="ncurses,ssl,xml(+)"
 
 WANT_AUTOCONF="2.1"
 
-inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing python-any-r1 toolchain-funcs
+inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing python-any-r1 rust toolchain-funcs
 
 MY_PN="mozjs"
 MY_PV="${PV/_pre*}"
@@ -73,11 +73,8 @@ BDEPEND="${PYTHON_DEPS}
 			sys-devel/clang:${LLVM_SLOT}
 			sys-devel/lld:${LLVM_SLOT}
 			sys-devel/llvm:${LLVM_SLOT}
-			virtual/rust:0/llvm-${LLVM_SLOT}
 		)
 	')
-	!clang? ( virtual/rust )
-	!elibc_glibc? ( dev-lang/rust )
 	>=dev-util/cbindgen-0.26.0
 	virtual/pkgconfig
 	test? (
@@ -103,11 +100,6 @@ llvm_check_deps() {
 			return 1
 		fi
 
-		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
-			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
 		if ! tc-ld-is-mold ; 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
@@ -189,6 +181,7 @@ pkg_setup() {
 		check-reqs_pkg_setup
 
 		llvm-r1_pkg_setup
+		rust_pkg_setup
 
 		if use clang && use lto && tc-ld-is-lld ; then
 			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')