From 04890a3be394530094e92791be60ee0dab9f3085 Mon Sep 17 00:00:00 2001
From: Christopher Fore <csfore@posteo.net>
Date: Wed, 2 Apr 2025 22:59:56 -0400
Subject: [PATCH] dev-lang/rust-bin: Remove armv7 SoftFP check

This is now covered in armv7a's profile by inheriting wd40.

toolchain-funcs inherit has also been removed since it is no longer
needed.

Signed-off-by: Christopher Fore <csfore@posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/41370
Signed-off-by: Matt Jolly <kangie@gentoo.org>
---
 dev-lang/rust-bin/rust-bin-1.71.1-r102.ebuild         | 8 +-------
 dev-lang/rust-bin/rust-bin-1.74.1-r102.ebuild         | 8 +-------
 dev-lang/rust-bin/rust-bin-1.75.0-r102.ebuild         | 8 +-------
 dev-lang/rust-bin/rust-bin-1.76.0-r101.ebuild         | 8 +-------
 dev-lang/rust-bin/rust-bin-1.77.1-r102.ebuild         | 8 +-------
 dev-lang/rust-bin/rust-bin-1.78.0-r102.ebuild         | 8 +-------
 dev-lang/rust-bin/rust-bin-1.79.0-r103.ebuild         | 8 +-------
 dev-lang/rust-bin/rust-bin-1.80.1-r103.ebuild         | 8 +-------
 dev-lang/rust-bin/rust-bin-1.81.0-r103.ebuild         | 8 +-------
 dev-lang/rust-bin/rust-bin-1.82.0-r103.ebuild         | 8 +-------
 dev-lang/rust-bin/rust-bin-1.83.0-r2.ebuild           | 8 +-------
 dev-lang/rust-bin/rust-bin-1.84.0-r2.ebuild           | 8 +-------
 dev-lang/rust-bin/rust-bin-1.84.1-r2.ebuild           | 8 +-------
 dev-lang/rust-bin/rust-bin-1.85.0-r1.ebuild           | 8 +-------
 dev-lang/rust-bin/rust-bin-1.85.1.ebuild              | 8 +-------
 dev-lang/rust-bin/rust-bin-1.86.0_beta20250323.ebuild | 8 +-------
 dev-lang/rust-bin/rust-bin-9999.ebuild                | 8 +-------
 17 files changed, 17 insertions(+), 119 deletions(-)

diff --git a/dev-lang/rust-bin/rust-bin-1.71.1-r102.ebuild b/dev-lang/rust-bin/rust-bin-1.71.1-r102.ebuild
index 4a8c1bec782ee..0e1bf418b71db 100644
--- a/dev-lang/rust-bin/rust-bin-1.71.1-r102.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.71.1-r102.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( 16 )
 LLVM_OPTIONAL="yes"
 
-inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
+inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal
 
 MY_P="rust-${PV}"
 # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
@@ -74,12 +74,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc"
 
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
 src_unpack() {
 	# sadly rust-src tarball does not have corresponding .asc file
 	# so do partial verification
diff --git a/dev-lang/rust-bin/rust-bin-1.74.1-r102.ebuild b/dev-lang/rust-bin/rust-bin-1.74.1-r102.ebuild
index e7490ef7bbbf0..c81cc6ffbdd63 100644
--- a/dev-lang/rust-bin/rust-bin-1.74.1-r102.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.74.1-r102.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( 17 )
 LLVM_OPTIONAL="yes"
 
-inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
+inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal
 
 MY_P="rust-${PV}"
 # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
@@ -70,12 +70,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc"
 
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
 src_unpack() {
 	# sadly rust-src tarball does not have corresponding .asc file
 	# so do partial verification
diff --git a/dev-lang/rust-bin/rust-bin-1.75.0-r102.ebuild b/dev-lang/rust-bin/rust-bin-1.75.0-r102.ebuild
index bb60f0c714ad4..be6823b603c55 100644
--- a/dev-lang/rust-bin/rust-bin-1.75.0-r102.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.75.0-r102.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( 17 )
 LLVM_OPTIONAL="yes"
 
-inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
+inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal
 
 MY_P="rust-${PV}"
 # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
@@ -70,12 +70,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc"
 
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
 src_unpack() {
 	# sadly rust-src tarball does not have corresponding .asc file
 	# so do partial verification
diff --git a/dev-lang/rust-bin/rust-bin-1.76.0-r101.ebuild b/dev-lang/rust-bin/rust-bin-1.76.0-r101.ebuild
index a1a14f6304026..6139f1a663e7b 100644
--- a/dev-lang/rust-bin/rust-bin-1.76.0-r101.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.76.0-r101.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( 17 )
 LLVM_OPTIONAL="yes"
 
-inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
+inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal
 
 MY_P="rust-${PV}"
 # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
@@ -57,12 +57,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc"
 
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
 src_unpack() {
 	# sadly rust-src tarball does not have corresponding .asc file
 	# so do partial verification
diff --git a/dev-lang/rust-bin/rust-bin-1.77.1-r102.ebuild b/dev-lang/rust-bin/rust-bin-1.77.1-r102.ebuild
index 701e6ea246057..d2f7a34c76536 100644
--- a/dev-lang/rust-bin/rust-bin-1.77.1-r102.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.77.1-r102.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( 17 )
 LLVM_OPTIONAL="yes"
 
-inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
+inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal
 
 MY_P="rust-${PV}"
 # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
@@ -70,12 +70,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc"
 
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
 src_unpack() {
 	# sadly rust-src tarball does not have corresponding .asc file
 	# so do partial verification
diff --git a/dev-lang/rust-bin/rust-bin-1.78.0-r102.ebuild b/dev-lang/rust-bin/rust-bin-1.78.0-r102.ebuild
index 1b42457944251..21708bd51e285 100644
--- a/dev-lang/rust-bin/rust-bin-1.78.0-r102.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.78.0-r102.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( 18 )
 LLVM_OPTIONAL="yes"
 
-inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
+inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal
 
 MY_P="rust-${PV}-r101"
 # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
@@ -77,12 +77,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc"
 
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
 src_unpack() {
 	# sadly rust-src tarball does not have corresponding .asc file
 	# so do partial verification
diff --git a/dev-lang/rust-bin/rust-bin-1.79.0-r103.ebuild b/dev-lang/rust-bin/rust-bin-1.79.0-r103.ebuild
index 1b42457944251..21708bd51e285 100644
--- a/dev-lang/rust-bin/rust-bin-1.79.0-r103.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.79.0-r103.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( 18 )
 LLVM_OPTIONAL="yes"
 
-inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
+inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal
 
 MY_P="rust-${PV}-r101"
 # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
@@ -77,12 +77,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc"
 
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
 src_unpack() {
 	# sadly rust-src tarball does not have corresponding .asc file
 	# so do partial verification
diff --git a/dev-lang/rust-bin/rust-bin-1.80.1-r103.ebuild b/dev-lang/rust-bin/rust-bin-1.80.1-r103.ebuild
index 9f33d6b279764..106d346771124 100644
--- a/dev-lang/rust-bin/rust-bin-1.80.1-r103.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.80.1-r103.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( 18 )
 LLVM_OPTIONAL="yes"
 
-inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
+inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal
 
 MY_P="rust-${PV}-r101"
 # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
@@ -77,12 +77,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc"
 
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
 src_unpack() {
 	# sadly rust-src tarball does not have corresponding .asc file
 	# so do partial verification
diff --git a/dev-lang/rust-bin/rust-bin-1.81.0-r103.ebuild b/dev-lang/rust-bin/rust-bin-1.81.0-r103.ebuild
index 1f1b15fc8244f..9a5f6a563c14f 100644
--- a/dev-lang/rust-bin/rust-bin-1.81.0-r103.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.81.0-r103.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( 18 )
 LLVM_OPTIONAL="yes"
 
-inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature
+inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal optfeature
 
 MY_P="rust-${PV}-r101"
 # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
@@ -77,12 +77,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc"
 
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
 src_unpack() {
 	# sadly rust-src tarball does not have corresponding .asc file
 	# so do partial verification
diff --git a/dev-lang/rust-bin/rust-bin-1.82.0-r103.ebuild b/dev-lang/rust-bin/rust-bin-1.82.0-r103.ebuild
index 9ac8de92f2e87..de51bd867a308 100644
--- a/dev-lang/rust-bin/rust-bin-1.82.0-r103.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.82.0-r103.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( 19 )
 LLVM_OPTIONAL="yes"
 
-inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature
+inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal optfeature
 
 MY_P="rust-${PV}-r102"
 # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
@@ -77,12 +77,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc"
 
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
 src_unpack() {
 	# sadly rust-src tarball does not have corresponding .asc file
 	# so do partial verification
diff --git a/dev-lang/rust-bin/rust-bin-1.83.0-r2.ebuild b/dev-lang/rust-bin/rust-bin-1.83.0-r2.ebuild
index 6f9f25068b5f6..8d5e2520190ee 100644
--- a/dev-lang/rust-bin/rust-bin-1.83.0-r2.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.83.0-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( 19 )
 LLVM_OPTIONAL="yes"
 
-inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature
+inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal optfeature
 
 MY_P="rust-${PV}-r2"
 # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
@@ -77,12 +77,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc"
 
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
 src_unpack() {
 	# sadly rust-src tarball does not have corresponding .asc file
 	# so do partial verification
diff --git a/dev-lang/rust-bin/rust-bin-1.84.0-r2.ebuild b/dev-lang/rust-bin/rust-bin-1.84.0-r2.ebuild
index 99ff19978b18b..8db5ba3471385 100644
--- a/dev-lang/rust-bin/rust-bin-1.84.0-r2.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.84.0-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( 19 )
 LLVM_OPTIONAL="yes"
 
-inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature
+inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal optfeature
 
 MY_P="rust-${PV}-r1"
 # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
@@ -77,12 +77,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc"
 
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
 src_unpack() {
 	# sadly rust-src tarball does not have corresponding .asc file
 	# so do partial verification
diff --git a/dev-lang/rust-bin/rust-bin-1.84.1-r2.ebuild b/dev-lang/rust-bin/rust-bin-1.84.1-r2.ebuild
index c55c998662ee8..6a6e4ce8b3d24 100644
--- a/dev-lang/rust-bin/rust-bin-1.84.1-r2.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.84.1-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( 19 )
 LLVM_OPTIONAL="yes"
 
-inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature
+inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal optfeature
 
 MY_P="rust-${PV}-r1"
 # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
@@ -77,12 +77,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc"
 
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
 src_unpack() {
 	# sadly rust-src tarball does not have corresponding .asc file
 	# so do partial verification
diff --git a/dev-lang/rust-bin/rust-bin-1.85.0-r1.ebuild b/dev-lang/rust-bin/rust-bin-1.85.0-r1.ebuild
index f76a83693d43f..eefb281545496 100644
--- a/dev-lang/rust-bin/rust-bin-1.85.0-r1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.85.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( 19 )
 LLVM_OPTIONAL="yes"
 
-inherit edo llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature
+inherit edo llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal optfeature
 
 if [[ ${PV} == *9999* ]]; then
 	# We need to fetch a tarball in src_unpack
@@ -98,12 +98,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc"
 
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
 src_unpack() {
 	if [[ ${PV} == *9999* ]]; then
 		# We need to fetch the latest nightly listing and get the apprapriate src_uri for our arch
diff --git a/dev-lang/rust-bin/rust-bin-1.85.1.ebuild b/dev-lang/rust-bin/rust-bin-1.85.1.ebuild
index 614b762194a83..a16975a344204 100644
--- a/dev-lang/rust-bin/rust-bin-1.85.1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.85.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( 19 )
 LLVM_OPTIONAL="yes"
 
-inherit edo llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature
+inherit edo llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal optfeature
 
 if [[ ${PV} == *9999* ]]; then
 	# We need to fetch a tarball in src_unpack
@@ -98,12 +98,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc"
 
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
 src_unpack() {
 	if [[ ${PV} == *9999* ]]; then
 		# We need to fetch the latest nightly listing and get the apprapriate src_uri for our arch
diff --git a/dev-lang/rust-bin/rust-bin-1.86.0_beta20250323.ebuild b/dev-lang/rust-bin/rust-bin-1.86.0_beta20250323.ebuild
index 97bd2bca573d7..cfb49ccbed4f1 100644
--- a/dev-lang/rust-bin/rust-bin-1.86.0_beta20250323.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.86.0_beta20250323.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( 19 )
 LLVM_OPTIONAL="yes"
 
-inherit edo llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature
+inherit edo llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal optfeature
 
 if [[ ${PV} == *9999* ]]; then
 	# We need to fetch a tarball in src_unpack
@@ -93,12 +93,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc"
 
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
 src_unpack() {
 	if [[ ${PV} == *9999* ]]; then
 		# We need to fetch the latest nightly listing and get the apprapriate src_uri for our arch
diff --git a/dev-lang/rust-bin/rust-bin-9999.ebuild b/dev-lang/rust-bin/rust-bin-9999.ebuild
index 6338d2da24192..e00494d54b3bb 100644
--- a/dev-lang/rust-bin/rust-bin-9999.ebuild
+++ b/dev-lang/rust-bin/rust-bin-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( 20 )
 LLVM_OPTIONAL="yes"
 
-inherit edo llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature
+inherit edo llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal optfeature
 
 if [[ ${PV} == *9999* ]]; then
 	# We need to fetch a tarball in src_unpack
@@ -96,12 +96,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc"
 
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
 src_unpack() {
 	if [[ ${PV} == *9999* ]]; then
 		# We need to fetch the latest nightly listing and get the apprapriate src_uri for our arch