gentoo auto-resync : 25:09:2022 - 23:34:28

5 files changed, 9 insertions, 9 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 3399d069bdfa..3a7f03ccef55 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index f658dbdbabc9..3d81432c2c9d 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -106,7 +106,7 @@ DIST rustc-1.63.0-src.tar.xz 136597192 BLAKE2B 52eb64ee11e7d9724a4c2654f7eea1352
 DIST rustc-1.63.0-src.tar.xz.asc 801 BLAKE2B b6c133768e368a7aeb0a4612a4c824d13f91ccdca6660feb5774ed6d79537084020780532c882ae3c9e4b6be3d36ceb0652eb134a580293ba8d8be74c4ba3c6e SHA512 f8807d46b9a3ca2a15a60f8062d63b3ee6e3210657cc752c948b3c7aa1626ec63cbd57529d010ad33f07ac47cf70dbf2cb50f200587338f77c631fc9e6786b17
 DIST rustc-1.64.0-src.tar.xz 137841332 BLAKE2B 8acd9e0a4632ba2114018a5cd3f2d544324c601c246658f60a9e0be513c40375434d0a416f0bfd4d24493eae3fec7c9f5bb52d008c88cde14de503a3b6873dd1 SHA512 919f40acd8c6eaaef399aa3248503bea19feb96697ab221aaede9ee789ce340b47cb899d1e0e41a31e5d7756653968a10d2faaa4aee83294c9f1243949b43516
 DIST rustc-1.64.0-src.tar.xz.asc 801 BLAKE2B 69f7bd7600d99794859c6fad4b44f0e98868e4e16041d6fe81d9d09a8435c75abac67a735adb0b81a2d9f85651841d404bc1ef4cd64fccd75e8a25d6d95729d0 SHA512 a831e3941849add1082c5b47b619ea87405b875d6eeb90a35f42742a511d124c29503debd17dcc8c6aa9e03a754ab51c3a15e99192bdd0dd1b8a59af9b6eb0b8
-EBUILD rust-1.62.1.ebuild 22239 BLAKE2B 71e56ea01ad7f97bb5121f3509e94fe02cea33f7d04cbe23d30efa21ce05d646409533e1f69f33b2c9867358a258155e646a01dd7b295d8c59767e8b51c2be67 SHA512 79eca27ca6013e128635a242c77a02ad5c8aa1664e6993dfee1857e56e384251a651a8254f04056e7e007987113112738c799c9052e81ca0a8906563cfd39fa9
-EBUILD rust-1.63.0-r1.ebuild 23725 BLAKE2B 9823bb99dd59ed98a406fdd234db54fa06370fc29a0171e638ad3da53489e6a0f6495308979de3c3989359ed870f77a3f1c735953b266731024c927ea3e0150b SHA512 9fcfd5e445cf9244e283ffb4ef280e4cac23972ed035909a186507feaaaf1f6a0c44b92e0a2386811f564b46c0c594066f4d98a8b60eabe0097e72ed7e3374de
-EBUILD rust-1.64.0.ebuild 23913 BLAKE2B e80bf8ccc04377c38d6a64eee177b13e421117e862e3273864f5dfcbe26ca08ecb5685ef2041a5c40a8052a6148ba9a9da0da0c2d39ef27b674bdd721e598be4 SHA512 28f780d357a7380a40f6f44ae365942e962c5185ef760d86f83552cc94d70d3ca99bacf98b3b0439c9edada9d8a3ed4e81c5707d30d2f8e7274a42320663066e
+EBUILD rust-1.62.1.ebuild 22240 BLAKE2B 62da41d8d941a772faaf207c64be6978582caf0b98a8a1963d0914a84897b7c6a8833012ac5b2c78d6689a5dc36830c2ed149fa39f11a1609f3d8309fb98645d SHA512 bfb674bcf35d761c0252033d695d9d3aea16c718db5c414004e67797f34f3db629e0efd9ed31d26e4474cc619aa558c3b95cda2d23f381ac003f5c63056b5057
+EBUILD rust-1.63.0-r1.ebuild 23726 BLAKE2B 43d3df6c7739b4d644abc0adca604351455e7cb54173e2d0b78bab6e67d89710bafe85371035956a666ca4e0bea03f0c5917cb707737951dac29497d8ed8e3eb SHA512 20d1561ae2af8da24926aa0efbdfb9ece0db1bea5954788630844cc14f351221fc8fb493cec03b038323e37bc41a8f12a40e20d34a4ff48401f1cbea7b5379bb
+EBUILD rust-1.64.0-r1.ebuild 23950 BLAKE2B b0e4684c4f939fe47b7f218113ac8193301e06e7f999a3b370daf02c9c64e49b48ac53352951535117570cdbeb3cb44d9837c32673456f8ea44734c82c9af58a SHA512 b9244272226ad5a380c624afad26e0e0e00034d130ddb10fd1332010e64ce5dcb99a4a225d47b6f0b8bdaabbd18947f8ce402dd2e2ac15aa5098be5e69e0cde8
 MISC metadata.xml 1770 BLAKE2B d5881dc5ea39a5bfff7c74fa883dc1a6370db572568e10fce81467c2f2a17018de48123dfa7993d6d9644305bfc5ef5b0f445ef40362065fce943efb4af2e761 SHA512 c914e1a0cee95fa5cb332240f3eb6fbee73e5d8baabfa6bdcdc3e852c9480fea0686e435b969e14f45d8c791655edc6e6a7df2259ac99b6a6e63af65b09fa57e
diff --git a/dev-lang/rust/rust-1.62.1.ebuild b/dev-lang/rust/rust-1.62.1.ebuild
index a7b45bc3646b..40f43f8dbd0b 100644
--- a/dev-lang/rust/rust-1.62.1.ebuild
+++ b/dev-lang/rust/rust-1.62.1.ebuild
@@ -73,7 +73,7 @@ LLVM_DEPEND+=" )
 # most of the time previous versions fail to bootstrap with newer
 # for example 1.47.x, requires at least 1.46.x, 1.47.x is ok,
 # but it fails to bootstrap with 1.48.x
-# https://github.com/rust-lang/rust/blob/${PV}/src/stage0.txt
+# https://github.com/rust-lang/rust/blob/${PV}/src/stage0.json
 RUST_DEP_PREV="$(ver_cut 1).$(($(ver_cut 2) - 1))*"
 RUST_DEP_CURR="$(ver_cut 1).$(ver_cut 2)*"
 BOOTSTRAP_DEPEND="||
diff --git a/dev-lang/rust/rust-1.63.0-r1.ebuild b/dev-lang/rust/rust-1.63.0-r1.ebuild
index 9397a6ae451c..6c8d2717b4a9 100644
--- a/dev-lang/rust/rust-1.63.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.63.0-r1.ebuild
@@ -73,7 +73,7 @@ LLVM_DEPEND+=" )
 # most of the time previous versions fail to bootstrap with newer
 # for example 1.47.x, requires at least 1.46.x, 1.47.x is ok,
 # but it fails to bootstrap with 1.48.x
-# https://github.com/rust-lang/rust/blob/${PV}/src/stage0.txt
+# https://github.com/rust-lang/rust/blob/${PV}/src/stage0.json
 RUST_DEP_PREV="$(ver_cut 1).$(($(ver_cut 2) - 1))*"
 RUST_DEP_CURR="$(ver_cut 1).$(ver_cut 2)*"
 BOOTSTRAP_DEPEND="||
diff --git a/dev-lang/rust/rust-1.64.0.ebuild b/dev-lang/rust/rust-1.64.0-r1.ebuild
index 9f7e86a87d56..92c592d49b21 100644
--- a/dev-lang/rust/rust-1.64.0.ebuild
+++ b/dev-lang/rust/rust-1.64.0-r1.ebuild
@@ -73,7 +73,7 @@ LLVM_DEPEND+=" )
 # most of the time previous versions fail to bootstrap with newer
 # for example 1.47.x, requires at least 1.46.x, 1.47.x is ok,
 # but it fails to bootstrap with 1.48.x
-# https://github.com/rust-lang/rust/blob/${PV}/src/stage0.txt
+# https://github.com/rust-lang/rust/blob/${PV}/src/stage0.json
 RUST_DEP_PREV="$(ver_cut 1).$(($(ver_cut 2) - 1))*"
 RUST_DEP_CURR="$(ver_cut 1).$(ver_cut 2)*"
 BOOTSTRAP_DEPEND="||
@@ -148,6 +148,7 @@ QA_SONAME="
 
 QA_PRESTRIPPED="
 	usr/lib/${PN}/${PV}/lib/rustlib/.*/bin/rust-llvm-dwp
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/self-contained/crtn.o
 "
 
 # An rmeta file is custom binary format that contains the metadata for the crate.
@@ -294,14 +295,13 @@ src_prepare() {
 }
 
 src_configure() {
-	use system-llvm && filter-flags '-flto*' # https://bugs.gentoo.org/862109
+	filter-flags '-flto*' # https://bugs.gentoo.org/862109 https://bugs.gentoo.org/866231
 
 	local rust_target="" rust_targets="" arch_cflags use_libcxx="false"
-	local chost_target="$(get_abi_CHOST ${v##*.})"
 
 	# Collect rust target names to compile standard libs for all ABIs.
 	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_targets+=",\"$(rust_abi ${chost_target})\""
+		rust_targets+=",\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
 	done
 	if use wasm; then
 		rust_targets+=",\"wasm32-unknown-unknown\""