From 55a7866dd6169a108d3a9e8d6696a970dea8a0b6 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 23 Sep 2022 11:29:49 +0100
Subject: gentoo auto-resync : 23:09:2022 - 11:29:49

---
 dev-lang/rust/Manifest           |  2 +-
 dev-lang/rust/rust-1.64.0.ebuild | 23 -----------------------
 2 files changed, 1 insertion(+), 24 deletions(-)

(limited to 'dev-lang/rust')

diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 1ad5ae2d0b2b..17fe6e8a2bea 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -219,5 +219,5 @@ EBUILD rust-1.61.0-r2.ebuild 22375 BLAKE2B 6662f32074219bff329268ce638d622bb982f
 EBUILD rust-1.62.0.ebuild 22245 BLAKE2B 569dfa03db6a73f66162ced3171af6a49a36c56fbf3100fd1c42825a565275c69fba473f831daf293061bf9b7a10723d4f94e2b8a5800ff683154e37e221faa3 SHA512 7d9e9847594e8da16cac61a6129782c37e6362ecb0ee7886728ddb33318ce6afb32575fdd3c0ef201d90c577d46ed2ba3dd5ce1003cd20ff744e33a05167b826
 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 24233 BLAKE2B 42bb6df105d313f57f4a1c328f52cdb938cfc8e0805cc52ad2df680e2f661f31f75cb46e0a446bf3980d02afbba7c6c70c41f34ddf38502436dead0f9d0166c1 SHA512 3b51dee7d7609ddfc8f6435a835c79c9b10e29a02062a11347a4b9c099d19282587e319ffc59e4e3a9bad2ae2ad7804959dc9330b9f8a5bb932a826be3345158
+EBUILD rust-1.64.0.ebuild 23274 BLAKE2B 3c8167740f2be30fd3f308c2037ca27fca36b6944ebd49aedb60451d8ad0e68195fc530d0f1febafecd271ec9916a09b3398c3e5a0e380abec294f3fbfe9d892 SHA512 5653200cc65be6d7e4f309db7b9fd0b0cee66e1894a936b43669edd7501942e688e2a71b861ef8e3e9847f9dc9464b3d4d8a820f64b8f4044f4ee89047f8c16c
 MISC metadata.xml 1770 BLAKE2B d5881dc5ea39a5bfff7c74fa883dc1a6370db572568e10fce81467c2f2a17018de48123dfa7993d6d9644305bfc5ef5b0f445ef40362065fce943efb4af2e761 SHA512 c914e1a0cee95fa5cb332240f3eb6fbee73e5d8baabfa6bdcdc3e852c9480fea0686e435b969e14f45d8c791655edc6e6a7df2259ac99b6a6e63af65b09fa57e
diff --git a/dev-lang/rust/rust-1.64.0.ebuild b/dev-lang/rust/rust-1.64.0.ebuild
index 1ff74e470d00..69b586f8f355 100644
--- a/dev-lang/rust/rust-1.64.0.ebuild
+++ b/dev-lang/rust/rust-1.64.0.ebuild
@@ -163,7 +163,6 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/rust.asc
 PATCHES=(
 	"${FILESDIR}"/1.55.0-ignore-broken-and-non-applicable-tests.patch
 	"${FILESDIR}"/1.62.1-musl-dynamic-linking.patch
-	"${FILESDIR}"/1.61.0-gentoo-musl-target-specs.patch
 )
 
 S="${WORKDIR}/${MY_P}-src"
@@ -293,11 +292,6 @@ src_configure() {
 	for v in $(multilib_get_enabled_abi_pairs); do
 		rust_targets+=",\"$(rust_abi ${chost_target})\""
 	done
-	if use elibc_musl; then
-		# we also want to build our -gentoo- target on musl, in addition to
-		# -unknown- one provided by upstream
-		rust_targets+="${rust_targets//-unknown-/-gentoo-}"
-	fi
 	if use wasm; then
 		rust_targets+=",\"wasm32-unknown-unknown\""
 		if use system-llvm; then
@@ -459,27 +453,10 @@ src_configure() {
 		fi
 		# by default librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true;
 		# but we patch it and set to false here as well
-		# also we enable extra -gentoo- vendor triplet target with same settings as above
-		# musl-sysroot needs to be defined because rust treats it like an extra cross target
-		# so HOST still stays -unknown-, but --tagrget xx-gentoo-linux-musl will have stdlib.
 		if use elibc_musl; then
 			cat <<- _EOF_ >> "${S}"/config.toml
 				crt-static = false
-				[target.${rust_target//-unknown-/-gentoo-}]
-				musl-root = "${ESYSROOT}/usr"
-				ar = "$(tc-getAR)"
-				cc = "$(tc-getCC)"
-				cxx = "$(tc-getCXX)"
-				linker = "$(tc-getCC)"
-				ranlib = "$(tc-getRANLIB)"
-				llvm-libunwind = "$(usex llvm-libunwind $(usex system-llvm system in-tree) no)"
 			_EOF_
-			if use system-llvm; then
-				cat <<- _EOF_ >> "${S}"/config.toml
-					llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
-				_EOF_
-			fi
-
 		fi
 	done
 	if use wasm; then
-- 
cgit v1.2.3