gentoo auto-resync : 12:12:2024 - 02:01:23

14 files changed, 98 insertions, 98 deletions

diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 1b9e2180326e..f560b67c7949 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -48,17 +48,17 @@ DIST rustc-1.82.0-src.tar.xz 219769328 BLAKE2B 611f33e134c2d459c9af1695c0a4d033d
 DIST rustc-1.82.0-src.tar.xz.asc 801 BLAKE2B 8138fb15b8d7ec15be45378fe663207a8e87e3c527348ab079995b1840a771ed6e9d5464eb8855ac9e006c0cfcf54b1a4fea489d31e6c9899cb03e6f4c737b67 SHA512 3cd6b27e72041baf9996efa10f25aca2e04f3e3727b60ecfd90c1bef9c52d216d2dc130802f935b110e35766645a27637a01661aa8d5acf02bf64b02a107c93c
 DIST rustc-1.83.0-src.tar.xz 353808388 BLAKE2B 217c85f7351a7c57a2684da2c7c81a32094187b3812dee628b327a5b2faca57235abc54d033c586c071c8bfa0c7360bb28761aaa42fe18414e388db704d81231 SHA512 64db57949c6ac1df6a3f4c6bd0938685a5fb1bc3d318b34ccfcfccb0f9eff1cffd4d8a53a190ef0409eeca9ad12bc6234c2c1de69196cc74ae02d6afa20d0ce6
 DIST rustc-1.83.0-src.tar.xz.asc 801 BLAKE2B 3bacb43d50ebba579dc2d4f1726298a7887e303e15f039ef72b840e30d90bc2cf9cdbe4617a9ee113a2b1a48f1982e72cf30323d72cdfb9a65b5b4d734ca0024 SHA512 84b252ccaddc06cb05858ff64f582dd25823818c81b1e3a00362deeda06f09e6c36948fd316d5f0ca5e24949e6f99bb14a14dbd2af1cfbb85e679e27ab0a813c
-EBUILD rust-1.54.0.ebuild 16326 BLAKE2B 231bae518a4809defcfdb489c8559437ad81be0b8474610f310ec7213b57ee1a5aefe9ded2f280d18c26f7ab46b51f40ee3adfb4618a3f244961fd16a5c4900e SHA512 e82b2fb84b7a519697b401be81bf1f9feb4dd76b96c70486593fa7d78970d46235e30dad0293d0a2a76f6ac9ffbecfb9d45ae657689eaf35166be09442299e0f
-EBUILD rust-1.71.1-r100.ebuild 21745 BLAKE2B 2ade19fa2b8201f4280fd1575ca5342c71dcd7d1fc75b145c519dca7dd7ce359e64246289c90c9c6efbde4676361e8b6c618476bb555200da89e20fb9a41c647 SHA512 511066717bd0973cf756fc503acade2dd026b6ced937623b186ce5e83f885eacef6189b23a0c7d40e0844cbe782628331955196e9fa7adbf94c5f0b8ad0c3a87
-EBUILD rust-1.74.1-r100.ebuild 23089 BLAKE2B 7ec3327093c79fec12f3d135d4d17d662d72c9a5bc28490a7a1b7c3d510544a2cb0bdd3589fc63bd9847041b99423b1235665056321f68a335db8b157be24c05 SHA512 61bf06c6f5add280d2e2cbce15bb1610fdb585a8f0d10aff218deca430f8dc4e861f748dca067b5bdc4df3a134ec89285fe75e5de540204f3c9a0c1fec58a000
-EBUILD rust-1.75.0-r100.ebuild 23252 BLAKE2B 7e43ef8c38ca673d308d9ad497cf795523f8225ae5f66ce25e7c7f642c761828d745679a075938d4fb0510124e47ea9203f313b3b5587c252ce657d5cf086233 SHA512 de4bf66f616dc6ee415d40c65bc1afe8581ce0bbda27a5a2ba61cd4e714498857c3485bedfaa1fb9cc1df6a35da70173cc35fe586928b33b5a097f1ba9fac4e5
-EBUILD rust-1.76.0-r100.ebuild 19759 BLAKE2B f45ded968ca55883b4c4cd3b166ddb683dcb6b77c6fe2fddc5705474f2f6545294d4876402445e1a9d8f288544686d3e572c83f30aaa0140a0a96180b27c8015 SHA512 71f29b6e508652f7c18f9cf5d4932d2a6a39db11d714cecc229007cde0b33c6aa50f84598c55c45b647e27f62b41ef4659c5cfddcd437e15dae40babd2e50114
-EBUILD rust-1.77.1-r100.ebuild 23215 BLAKE2B fc9955ad9d4f22d3186870dae004c1e21d76fd481a1af60c5a68dc7dd0639f818f31b2a5e30ab14add57424888e41f40fc0cb91a50acd646bcb70d49ba69756b SHA512 ecc7fb5b4f9bdc03e8eb9b395e477e347eba0eef1f0561c48f7bbb32646988b2e94f0ad5d5f909873fa881a436cab65027f3c2da34dbc72292df4ad71626d5b3
-EBUILD rust-1.78.0-r100.ebuild 23450 BLAKE2B e151454124b50ac83e7f285cd5bb17d4815ac3333cca0c503f293bc3247e3889d126ab87cfd3eb49effaff0ba5bafe3797b24a7a84f33a481bb44280ec6f2b87 SHA512 9bab2222afddf712b5cdaed9c90fccf5510f61cb87ad00762167f69e23db4b5b2052b62371cd82c58abfa06f1c1a9624371b4f765bf0362d3147758123f655b8
-EBUILD rust-1.79.0-r100.ebuild 23450 BLAKE2B e151454124b50ac83e7f285cd5bb17d4815ac3333cca0c503f293bc3247e3889d126ab87cfd3eb49effaff0ba5bafe3797b24a7a84f33a481bb44280ec6f2b87 SHA512 9bab2222afddf712b5cdaed9c90fccf5510f61cb87ad00762167f69e23db4b5b2052b62371cd82c58abfa06f1c1a9624371b4f765bf0362d3147758123f655b8
-EBUILD rust-1.80.1-r100.ebuild 23322 BLAKE2B db70df6663ce1ddceb947f19c4df11498fc055f3e380e52ae683922a7399953c2cb679bffba4f8dcd7e08af9afe36c86316745d528c331aa502c87da9f4adccd SHA512 032506f4acfa88b543fd2c96ca164adb3272fa5ae4b3c9a6ba223cd572dd32a71315cad77ae2af86b760c2b26cd865f9be126b9ea6fd43965e91375842032b82
-EBUILD rust-1.81.0-r100.ebuild 23519 BLAKE2B a4dc37ae3972353f19dc803a7a3a0d08db29b25227c0c27ff8c409bd97e9af5c17acd8cc3d92de58ff302eddffb4a4583518f959959a534f31ca04461d2397ef SHA512 1676af16f4273d23ac2bad14d8b0ff47b1f6c66d379c688907cc0646b4866fe7c45bf4a4129ec1fc910970d7027d814d7f524a7860afa852d138bbfe2bf920ae
-EBUILD rust-1.82.0-r100.ebuild 23665 BLAKE2B b8f5f4b29652843825b5bb9a8522d7f86260bf6e2a9901e307173885e35df5c3445d0e1fc04520a8c6f89cb42d038504a661fe3f9c6d9d913e6f83784e1d2092 SHA512 79c3a343e555fafe21eb016bd86af5525fae9b8d4c5ac44960c70fb129688fa1dc1aba3ed997d1e5ef238530d52943edf48475a0364e73a36ebe87f746abf29f
-EBUILD rust-1.82.0-r101.ebuild 23714 BLAKE2B cf0423e0b6bb36132d7cf3a2e182f015c4f91a47cded2b852128a23f098032eb2f62fedbbc1d14ec6754d9c32aff193a871d480d017c8323a6f4118d8955d311 SHA512 aaf6cf387e689a6e7aee3f64dfaf5b5ab5644b8e64599c8d08e3ffa3ea7280c17d666c55fbbae1e9bd455bf92e84ad0251adcf0e06bfadc4c7ba69174dedf3f2
-EBUILD rust-1.83.0-r1.ebuild 22954 BLAKE2B 5b78edbc23badc3a1c25196ba18d9c2364583240ab4a4d3dec23cae71a8bce23fd215b190c0d5b39e1cecb6ebbbcb73b9bfa10366890700493305fbeab6fec42 SHA512 4ef5391f420e6d01e0454f9771818c406daff5eb3bd4d1ee069b729a72099292b170d7fca5fb2cba7ed58691c8997476da12e7fa3a78b5b3b39bc1fa62c7c35c
+EBUILD rust-1.54.0.ebuild 16326 BLAKE2B b7dbdb8f5ef963e97a6a6062c202d66e7320c30c2239576b5aae24d9bcd2197755fe41a36d274b007a31cf597db2a7a41618e47cc8caa4c4208b219907c3438a SHA512 491ad28e70b29ce2370cec883389e0bf11bc86816828c0d60d2015cf6d749ce716e3245eb5aa9477ce27e209682ba747927e09027162a52f9e30be47f4f81f54
+EBUILD rust-1.71.1-r100.ebuild 21745 BLAKE2B 00ab028c6a561771c48f027eb492e2c03c1d4cd59f0af5bf10bcd3fe035ddf6b2acde655802a5a3a3562965fa59fec28fbe0294bf2db2ae1f5efa653f26a2777 SHA512 ec1759c2d50a5e628315aa468050ab88a2e51349690919fc6cc1a3dac27ebff7da76fdfbb6a4b0d954e5237e0f5ca37dd64c6d4fe3c3d2e5072ac470fe1930b0
+EBUILD rust-1.74.1-r100.ebuild 23089 BLAKE2B e53e3cd1e84a1e37678b861c692a4ccc688743a9724b42fff5d0c01df89c729dc7d6c84f7390961bdda087b0046ef6a8287fcdcee905a5fdf6a6a88bfeef1bd3 SHA512 e382f072a7cdf6fe7aa9a73def531ae015ffbf0ae2a490571e716d9eddc82c2fd49c071485d4b3f22b22f5a6235bad87b626404cd31c8484273a0f460af0611e
+EBUILD rust-1.75.0-r100.ebuild 23252 BLAKE2B 88dd9369dce61047e031eda181fd4e6ae38cf13625407a984a69bab9585962e6065b78c510c8584f9f47615a01351ba7f57293f12a2df9356cdfdf3d77d629bb SHA512 887d3f319daa1c85ab18d1d715990b9ccb0f5588cedfe9df9a30017ee63819fdc5af630e0d59a31df9c8453b485cf4e679bdcffb49368acb4162084f2c47fd62
+EBUILD rust-1.76.0-r100.ebuild 19759 BLAKE2B e8cec2e836d194a99fd3ba229e37d33f8a5f757152439411a199cc7557f844c07e8464482fd84d9bf96a4606a94bcea19219bf5758d409009f34e30e7308e36d SHA512 a08765efb5bb8c5f3dc8921b435f6325f2ece685813e41083890a5c82b23d410dda2b6c93b57be44be3e645a023e3c111b678fd73436a3ac471d2186ac3040a0
+EBUILD rust-1.77.1-r100.ebuild 23215 BLAKE2B b237a479d561809ddd48604e54b03a90083631ee5b5f751b3792f29a05afd88358a6e16c67605bbabf740281a0e780a19d9ec058d0887d23120191d9fb2b29f8 SHA512 f4b5efe47b15c082dbb6129ccbba9a4b0c9c0d20e4ac567c40f3936601ccb83cc76720d819b3c4b679af585d7b1b2d3069d8777ce18eff4a767835e1b91069b9
+EBUILD rust-1.78.0-r100.ebuild 23450 BLAKE2B 98425791e76577e15c3ae45c6e1873c86833eedddf7b4a00683320fc3896d2ebcdc0b013d6880b33df60df85854693cf66e62b849f0d1ac7a649d44bb1227343 SHA512 2c306c7056f684dd22de926cbe893495e8f37d34913341cd095cbe2930553161ebb85b6ef253dd8c71e0961310c9f896facae1f5fedf5253a1345991198cc194
+EBUILD rust-1.79.0-r100.ebuild 23450 BLAKE2B 98425791e76577e15c3ae45c6e1873c86833eedddf7b4a00683320fc3896d2ebcdc0b013d6880b33df60df85854693cf66e62b849f0d1ac7a649d44bb1227343 SHA512 2c306c7056f684dd22de926cbe893495e8f37d34913341cd095cbe2930553161ebb85b6ef253dd8c71e0961310c9f896facae1f5fedf5253a1345991198cc194
+EBUILD rust-1.80.1-r100.ebuild 23322 BLAKE2B edd1df1fb91e17031c8eb910ef24fa7e4e1d3d17469c025ca15a39d3cf006353e6ebc6ce8c763f9b4d849854e2fc1b9cac054ea59fc5b012df99d11f5ddb82dd SHA512 d66b21f0df740b03c2348fc4e8dc20b761e831cd448aedb82ec61416cece0f1018e9435743bcf06b58f6a4bb815802298a1a0e2024dac358e5b48b6f45613f1b
+EBUILD rust-1.81.0-r100.ebuild 23519 BLAKE2B db7f998f97a8243aa652df4ddf15f2a4f8c495abc6dd7cb21f5d8f47d570f844ae8d61f2b04ac6889be5a5d365a8523a7a14cb25610d9312b17a1f0df255e226 SHA512 88884897957d6d106aed493b784135ad9b344b5e2769322aea86ae15ff5a1403d201e576fe45e6d9d4624b349aa48971cf4676f79008a9d0a31f8b718c76d11b
+EBUILD rust-1.82.0-r100.ebuild 23665 BLAKE2B 1fb57943fd1d534f52ba3f6c33746c7423d4f8daa1bca37f518d9eb8a19ed6adcebea65d3e5a3315fbfe8b428c3476047c38fd2da423cce6d9209675c267bc17 SHA512 330b68f7a681f5e7580a9578c68f59c9a04ae3362e6bf69a16cf23178fdd22ceb4bee55fe41042d517ba75c4d594ecfd73098e880730d20fc235f8ad65a49e90
+EBUILD rust-1.82.0-r101.ebuild 23714 BLAKE2B d6f58dcc964fa4aa9da2a49da37ccfbde3b0d8860bca25d21cef30626cbff921cfb06f7a8afec87bfe1e6963facb835c1182aac4e80697e031ea28c25624e3a2 SHA512 d662dbe0e1b426e82e3e56e414dcd8e5180dfac1d24bd52e9989330b4206e2638a34b3f24f431a139c13ad9cc9437d92a0ff9f4a49daf1006a99d3707e2eb886
+EBUILD rust-1.83.0-r1.ebuild 22954 BLAKE2B cc59f4989a19691f0cf886eb0aa4c84806eb89c282164a916667f5b5eaaed12e3e84e012e1acbf9f5caf1ad36c6e6d8d8a70671da2c057f34c627642761e5287 SHA512 8d237831b11d7ffe97b7f50fae146d84c5c66d4728f73d6ec2eeece88246ec7a3e260aae908417869cbae34e18a4f57a6a22afdb4dce589567dd6cdda97d5412
 MISC metadata.xml 1708 BLAKE2B ab2730e5846922c119865b26cf317a9d150321dca15500b2254fe6d0580e939a67d3b42ef1b74268ea629e843c251c5d1edc2e88edfe590c0c6e7d1b98b38b04 SHA512 6b7c99fed72711e3bdb024e6873ef0a372c7456ddcc56af239c6f8bacfff688ad8246ded6b6489172f94dbe5921159be42021248200afea2b304a529dcff7485
diff --git a/dev-lang/rust/rust-1.54.0.ebuild b/dev-lang/rust/rust-1.54.0.ebuild
index b471cc036ce5..360ae22cd5db 100644
--- a/dev-lang/rust/rust-1.54.0.ebuild
+++ b/dev-lang/rust/rust-1.54.0.ebuild
@@ -46,7 +46,7 @@ BDEPEND="${PYTHON_DEPS}
 	app-eselect/eselect-rust
 	|| (
 		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
+		>=llvm-core/clang-3.5
 	)
 	>=dev-build/cmake-3.13.4
 	dev-build/ninja
diff --git a/dev-lang/rust/rust-1.71.1-r100.ebuild b/dev-lang/rust/rust-1.71.1-r100.ebuild
index 61b83be8cfe4..6193d3d771e8 100644
--- a/dev-lang/rust/rust-1.71.1-r100.ebuild
+++ b/dev-lang/rust/rust-1.71.1-r100.ebuild
@@ -46,16 +46,16 @@ IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind +lto mi
 LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
-	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "sys-devel/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
 done
-LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'sys-devel/lld:${LLVM_SLOT}') )" )
-LLVM_DEPEND+=( "	$(llvm_gen_dep 'sys-devel/llvm:${LLVM_SLOT}')" )
+LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
+LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
 
 BDEPEND="${PYTHON_DEPS}
 	app-eselect/eselect-rust
 	|| (
 		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
+		>=llvm-core/clang-3.5
 	)
 	!system-llvm? (
 		>=dev-build/cmake-3.13.4
@@ -72,7 +72,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
@@ -169,7 +169,7 @@ pre_build_checks() {
 }
 
 llvm_check_deps() {
-	has_version -r "sys-devel/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
+	has_version -r "llvm-core/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
 }
 
 # Is LLVM being linked against libc++?
@@ -687,7 +687,7 @@ pkg_postinst() {
 
 	eselect rust update
 
-	if has_version dev-debug/gdb || has_version dev-debug/lldb; then
+	if has_version dev-debug/gdb || has_version llvm-core/lldb; then
 		elog "Rust installs helper scripts for calling GDB and LLDB,"
 		elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}."
 	fi
diff --git a/dev-lang/rust/rust-1.74.1-r100.ebuild b/dev-lang/rust/rust-1.74.1-r100.ebuild
index 8f20eaf957cb..3fe183405a84 100644
--- a/dev-lang/rust/rust-1.74.1-r100.ebuild
+++ b/dev-lang/rust/rust-1.74.1-r100.ebuild
@@ -48,16 +48,16 @@ IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind +lto mi
 LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
-	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "sys-devel/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
 done
-LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'sys-devel/lld:${LLVM_SLOT}') )" )
-LLVM_DEPEND+=( "	$(llvm_gen_dep 'sys-devel/llvm:${LLVM_SLOT}')" )
+LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
+LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
 
 BDEPEND="${PYTHON_DEPS}
 	app-eselect/eselect-rust
 	|| (
 		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
+		>=llvm-core/clang-3.5
 	)
 	!system-llvm? (
 		>=dev-build/cmake-3.13.4
@@ -74,7 +74,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
@@ -176,7 +176,7 @@ pre_build_checks() {
 }
 
 llvm_check_deps() {
-	has_version -r "sys-devel/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
+	has_version -r "llvm-core/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
 }
 
 # Is LLVM being linked against libc++?
@@ -717,7 +717,7 @@ pkg_postinst() {
 
 	eselect rust update
 
-	if has_version dev-debug/gdb || has_version dev-debug/lldb; then
+	if has_version dev-debug/gdb || has_version llvm-core/lldb; then
 		elog "Rust installs helper scripts for calling GDB and LLDB,"
 		elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}."
 	fi
diff --git a/dev-lang/rust/rust-1.75.0-r100.ebuild b/dev-lang/rust/rust-1.75.0-r100.ebuild
index e3beb23ab729..32f8d4d41fe3 100644
--- a/dev-lang/rust/rust-1.75.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.75.0-r100.ebuild
@@ -47,16 +47,16 @@ IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind +lto mi
 LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
-	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "sys-devel/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
 done
-LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'sys-devel/lld:${LLVM_SLOT}') )" )
-LLVM_DEPEND+=( "	$(llvm_gen_dep 'sys-devel/llvm:${LLVM_SLOT}')" )
+LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
+LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
 
 BDEPEND="${PYTHON_DEPS}
 	app-eselect/eselect-rust
 	|| (
 		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
+		>=llvm-core/clang-3.5
 	)
 	!system-llvm? (
 		>=dev-build/cmake-3.13.4
@@ -73,7 +73,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
@@ -178,7 +178,7 @@ pre_build_checks() {
 }
 
 llvm_check_deps() {
-	has_version -r "sys-devel/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
+	has_version -r "llvm-core/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
 }
 
 # Is LLVM being linked against libc++?
@@ -719,7 +719,7 @@ pkg_postinst() {
 
 	eselect rust update
 
-	if has_version dev-debug/gdb || has_version dev-debug/lldb; then
+	if has_version dev-debug/gdb || has_version llvm-core/lldb; then
 		elog "Rust installs helper scripts for calling GDB and LLDB,"
 		elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}."
 	fi
diff --git a/dev-lang/rust/rust-1.76.0-r100.ebuild b/dev-lang/rust/rust-1.76.0-r100.ebuild
index 6dbaa9a73f61..04b921cbf7e5 100644
--- a/dev-lang/rust/rust-1.76.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.76.0-r100.ebuild
@@ -47,16 +47,16 @@ IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto mir
 LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
-	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "sys-devel/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
 done
-LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'sys-devel/lld:${LLVM_SLOT}') )" )
-LLVM_DEPEND+=( "	$(llvm_gen_dep 'sys-devel/llvm:${LLVM_SLOT}')" )
+LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
+LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
 
 BDEPEND="${PYTHON_DEPS}
 	app-eselect/eselect-rust
 	|| (
 		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
+		>=llvm-core/clang-3.5
 	)
 	!system-llvm? (
 		>=dev-build/cmake-3.13.4
@@ -73,7 +73,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
@@ -177,7 +177,7 @@ pre_build_checks() {
 }
 
 llvm_check_deps() {
-	has_version -r "sys-devel/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
+	has_version -r "llvm-core/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
 }
 
 # Is LLVM being linked against libc++?
@@ -636,7 +636,7 @@ pkg_postinst() {
 
 	eselect rust update
 
-	if has_version dev-debug/gdb || has_version dev-debug/lldb; then
+	if has_version dev-debug/gdb || has_version llvm-core/lldb; then
 		elog "Rust installs helper scripts for calling GDB and LLDB,"
 		elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}."
 	fi
diff --git a/dev-lang/rust/rust-1.77.1-r100.ebuild b/dev-lang/rust/rust-1.77.1-r100.ebuild
index 1733f374b32e..1a86dda8a2ea 100644
--- a/dev-lang/rust/rust-1.77.1-r100.ebuild
+++ b/dev-lang/rust/rust-1.77.1-r100.ebuild
@@ -47,16 +47,16 @@ IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto mir
 LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
-	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "sys-devel/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
 done
-LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'sys-devel/lld:${LLVM_SLOT}') )" )
-LLVM_DEPEND+=( "	$(llvm_gen_dep 'sys-devel/llvm:${LLVM_SLOT}')" )
+LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
+LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
 
 BDEPEND="${PYTHON_DEPS}
 	app-eselect/eselect-rust
 	|| (
 		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
+		>=llvm-core/clang-3.5
 	)
 	!system-llvm? (
 		>=dev-build/cmake-3.13.4
@@ -73,7 +73,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
@@ -176,7 +176,7 @@ pre_build_checks() {
 }
 
 llvm_check_deps() {
-	has_version -r "sys-devel/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
+	has_version -r "llvm-core/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
 }
 
 # Is LLVM being linked against libc++?
@@ -718,7 +718,7 @@ pkg_postinst() {
 
 	eselect rust update
 
-	if has_version dev-debug/gdb || has_version dev-debug/lldb; then
+	if has_version dev-debug/gdb || has_version llvm-core/lldb; then
 		elog "Rust installs helper scripts for calling GDB and LLDB,"
 		elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}."
 	fi
diff --git a/dev-lang/rust/rust-1.78.0-r100.ebuild b/dev-lang/rust/rust-1.78.0-r100.ebuild
index 110d37cfd528..feaca456180b 100644
--- a/dev-lang/rust/rust-1.78.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.78.0-r100.ebuild
@@ -47,16 +47,16 @@ IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto mir
 LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
-	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "sys-devel/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
 done
-LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'sys-devel/lld:${LLVM_SLOT}') )" )
-LLVM_DEPEND+=( "	$(llvm_gen_dep 'sys-devel/llvm:${LLVM_SLOT}')" )
+LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
+LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
 
 BDEPEND="${PYTHON_DEPS}
 	app-eselect/eselect-rust
 	|| (
 		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
+		>=llvm-core/clang-3.5
 	)
 	!system-llvm? (
 		>=dev-build/cmake-3.13.4
@@ -73,7 +73,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
@@ -176,7 +176,7 @@ pre_build_checks() {
 }
 
 llvm_check_deps() {
-	has_version -r "sys-devel/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
+	has_version -r "llvm-core/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
 }
 
 # Is LLVM being linked against libc++?
@@ -721,7 +721,7 @@ pkg_postinst() {
 
 	eselect rust update
 
-	if has_version dev-debug/gdb || has_version dev-debug/lldb; then
+	if has_version dev-debug/gdb || has_version llvm-core/lldb; then
 		elog "Rust installs helper scripts for calling GDB and LLDB,"
 		elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}."
 	fi
diff --git a/dev-lang/rust/rust-1.79.0-r100.ebuild b/dev-lang/rust/rust-1.79.0-r100.ebuild
index 110d37cfd528..feaca456180b 100644
--- a/dev-lang/rust/rust-1.79.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.79.0-r100.ebuild
@@ -47,16 +47,16 @@ IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto mir
 LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
-	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "sys-devel/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
 done
-LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'sys-devel/lld:${LLVM_SLOT}') )" )
-LLVM_DEPEND+=( "	$(llvm_gen_dep 'sys-devel/llvm:${LLVM_SLOT}')" )
+LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
+LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
 
 BDEPEND="${PYTHON_DEPS}
 	app-eselect/eselect-rust
 	|| (
 		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
+		>=llvm-core/clang-3.5
 	)
 	!system-llvm? (
 		>=dev-build/cmake-3.13.4
@@ -73,7 +73,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
@@ -176,7 +176,7 @@ pre_build_checks() {
 }
 
 llvm_check_deps() {
-	has_version -r "sys-devel/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
+	has_version -r "llvm-core/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
 }
 
 # Is LLVM being linked against libc++?
@@ -721,7 +721,7 @@ pkg_postinst() {
 
 	eselect rust update
 
-	if has_version dev-debug/gdb || has_version dev-debug/lldb; then
+	if has_version dev-debug/gdb || has_version llvm-core/lldb; then
 		elog "Rust installs helper scripts for calling GDB and LLDB,"
 		elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}."
 	fi
diff --git a/dev-lang/rust/rust-1.80.1-r100.ebuild b/dev-lang/rust/rust-1.80.1-r100.ebuild
index 4d508a08c7fa..6e2454510ddc 100644
--- a/dev-lang/rust/rust-1.80.1-r100.ebuild
+++ b/dev-lang/rust/rust-1.80.1-r100.ebuild
@@ -47,16 +47,16 @@ IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto mir
 LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
-	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "sys-devel/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
 done
-LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'sys-devel/lld:${LLVM_SLOT}') )" )
-LLVM_DEPEND+=( "	$(llvm_gen_dep 'sys-devel/llvm:${LLVM_SLOT}')" )
+LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
+LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
 
 BDEPEND="${PYTHON_DEPS}
 	app-eselect/eselect-rust
 	|| (
 		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
+		>=llvm-core/clang-3.5
 	)
 	!system-llvm? (
 		>=dev-build/cmake-3.13.4
@@ -73,7 +73,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
@@ -175,7 +175,7 @@ pre_build_checks() {
 }
 
 llvm_check_deps() {
-	has_version -r "sys-devel/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
+	has_version -r "llvm-core/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
 }
 
 # Is LLVM being linked against libc++?
@@ -718,7 +718,7 @@ pkg_postinst() {
 
 	eselect rust update
 
-	if has_version dev-debug/gdb || has_version dev-debug/lldb; then
+	if has_version dev-debug/gdb || has_version llvm-core/lldb; then
 		elog "Rust installs helper scripts for calling GDB and LLDB,"
 		elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}."
 	fi
diff --git a/dev-lang/rust/rust-1.81.0-r100.ebuild b/dev-lang/rust/rust-1.81.0-r100.ebuild
index 3d79dc11e336..5b0447c1e997 100644
--- a/dev-lang/rust/rust-1.81.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.81.0-r100.ebuild
@@ -48,16 +48,16 @@ IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto mir
 LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
-	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "sys-devel/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
 done
-LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'sys-devel/lld:${LLVM_SLOT}') )" )
-LLVM_DEPEND+=( "	$(llvm_gen_dep 'sys-devel/llvm:${LLVM_SLOT}')" )
+LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
+LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
 
 BDEPEND="${PYTHON_DEPS}
 	app-eselect/eselect-rust
 	|| (
 		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
+		>=llvm-core/clang-3.5
 	)
 	!system-llvm? (
 		>=dev-build/cmake-3.13.4
@@ -74,7 +74,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
@@ -179,7 +179,7 @@ pre_build_checks() {
 }
 
 llvm_check_deps() {
-	has_version -r "sys-devel/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
+	has_version -r "llvm-core/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
 }
 
 # Is LLVM being linked against libc++?
@@ -722,7 +722,7 @@ pkg_postinst() {
 
 	eselect rust update
 
-	if has_version dev-debug/gdb || has_version dev-debug/lldb; then
+	if has_version dev-debug/gdb || has_version llvm-core/lldb; then
 		elog "Rust installs helper scripts for calling GDB and LLDB,"
 		elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}."
 	fi
diff --git a/dev-lang/rust/rust-1.82.0-r100.ebuild b/dev-lang/rust/rust-1.82.0-r100.ebuild
index 26e89b486c4f..eca2deabe012 100644
--- a/dev-lang/rust/rust-1.82.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.82.0-r100.ebuild
@@ -47,16 +47,16 @@ IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto mir
 LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
-	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "sys-devel/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
 done
-LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'sys-devel/lld:${LLVM_SLOT}') )" )
-LLVM_DEPEND+=( "	$(llvm_gen_dep 'sys-devel/llvm:${LLVM_SLOT}')" )
+LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
+LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
 
 BDEPEND="${PYTHON_DEPS}
 	app-eselect/eselect-rust
 	|| (
 		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
+		>=llvm-core/clang-3.5
 	)
 	!system-llvm? (
 		>=dev-build/cmake-3.13.4
@@ -73,7 +73,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
@@ -174,7 +174,7 @@ pre_build_checks() {
 }
 
 llvm_check_deps() {
-	has_version -r "sys-devel/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
+	has_version -r "llvm-core/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
 }
 
 # Is LLVM being linked against libc++?
@@ -732,7 +732,7 @@ pkg_postinst() {
 
 	eselect rust update
 
-	if has_version dev-debug/gdb || has_version dev-debug/lldb; then
+	if has_version dev-debug/gdb || has_version llvm-core/lldb; then
 		elog "Rust installs helper scripts for calling GDB and LLDB,"
 		elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}."
 	fi
diff --git a/dev-lang/rust/rust-1.82.0-r101.ebuild b/dev-lang/rust/rust-1.82.0-r101.ebuild
index 125da4e2056b..84788dff3186 100644
--- a/dev-lang/rust/rust-1.82.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.82.0-r101.ebuild
@@ -47,16 +47,16 @@ IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto mir
 LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
-	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "sys-devel/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
 done
-LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'sys-devel/lld:${LLVM_SLOT}') )" )
-LLVM_DEPEND+=( "	$(llvm_gen_dep 'sys-devel/llvm:${LLVM_SLOT}')" )
+LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
+LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
 
 BDEPEND="${PYTHON_DEPS}
 	app-eselect/eselect-rust
 	|| (
 		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
+		>=llvm-core/clang-3.5
 	)
 	!system-llvm? (
 		>=dev-build/cmake-3.13.4
@@ -73,7 +73,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
@@ -175,7 +175,7 @@ pre_build_checks() {
 }
 
 llvm_check_deps() {
-	has_version -r "sys-devel/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
+	has_version -r "llvm-core/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
 }
 
 # Is LLVM being linked against libc++?
@@ -733,7 +733,7 @@ pkg_postinst() {
 
 	eselect rust update
 
-	if has_version dev-debug/gdb || has_version dev-debug/lldb; then
+	if has_version dev-debug/gdb || has_version llvm-core/lldb; then
 		elog "Rust installs helper scripts for calling GDB and LLDB,"
 		elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}."
 	fi
diff --git a/dev-lang/rust/rust-1.83.0-r1.ebuild b/dev-lang/rust/rust-1.83.0-r1.ebuild
index db171b2fb483..cc756f4e4dab 100644
--- a/dev-lang/rust/rust-1.83.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.83.0-r1.ebuild
@@ -47,16 +47,16 @@ IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto mir
 LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
-	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "sys-devel/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
 done
-LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'sys-devel/lld:${LLVM_SLOT}') )" )
-LLVM_DEPEND+=( "	$(llvm_gen_dep 'sys-devel/llvm:${LLVM_SLOT}')" )
+LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
+LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
 
 BDEPEND="${PYTHON_DEPS}
 	app-eselect/eselect-rust
 	|| (
 		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
+		>=llvm-core/clang-3.5
 	)
 	!system-llvm? (
 		>=dev-build/cmake-3.13.4
@@ -73,7 +73,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
@@ -175,7 +175,7 @@ pre_build_checks() {
 }
 
 llvm_check_deps() {
-	has_version -r "sys-devel/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
+	has_version -r "llvm-core/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
 }
 
 # Is LLVM being linked against libc++?
@@ -710,7 +710,7 @@ pkg_postinst() {
 
 	eselect rust update
 
-	if has_version dev-debug/gdb || has_version dev-debug/lldb; then
+	if has_version dev-debug/gdb || has_version llvm-core/lldb; then
 		elog "Rust installs helper scripts for calling GDB and LLDB,"
 		elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}."
 	fi