*/*: fix rust eclass usedep/mutlilib handling; inherit order

The rust eclass has been updated to directly inject a required
MULTILIB_USEDEP when requested.

RUST_USEDEP has been renamed to RUST_REQUIRED_USE to be consistent
with other eclasses.

llvm-r1 should be imported after cargo and the eclass now enables this.

Signed-off-by: Matt Jolly <kangie@gentoo.org>

8 files changed, 22 insertions, 16 deletions

diff --git a/net-libs/quiche/quiche-0.22.0-r2.ebuild b/net-libs/quiche/quiche-0.22.0-r2.ebuild
index a767d0b6925c..750b1cadd8bf 100644
--- a/net-libs/quiche/quiche-0.22.0-r2.ebuild
+++ b/net-libs/quiche/quiche-0.22.0-r2.ebuild
@@ -195,9 +195,9 @@ windows-targets@0.52.5
 ws2_32-sys@0.2.1
 "
 
-RUST_USEDEP='${MULTILIB_USEDEP}'
+RUST_MULTILIB=1
 
-inherit multilib-minimal cargo cmake flag-o-matic rust-toolchain
+inherit cargo cmake flag-o-matic multilib-minimal rust-toolchain
 
 DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
 HOMEPAGE="https://github.com/cloudflare/quiche"
diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild
index b01b0f1aace8..0433a526225c 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.ebuild
@@ -195,9 +195,9 @@ windows-targets@0.52.5
 ws2_32-sys@0.2.1
 "
 
-RUST_USEDEP='${MULTILIB_USEDEP}'
+RUST_MULTILIB=1
 
-inherit multilib-minimal cargo cmake flag-o-matic rust-toolchain
+inherit cargo cmake flag-o-matic multilib-minimal rust-toolchain
 
 DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
 HOMEPAGE="https://github.com/cloudflare/quiche"
diff --git a/net-libs/rustls-ffi/rustls-ffi-0.10.0-r2.ebuild b/net-libs/rustls-ffi/rustls-ffi-0.10.0-r2.ebuild
index 47f8f0189fb5..a263e33fb65a 100644
--- a/net-libs/rustls-ffi/rustls-ffi-0.10.0-r2.ebuild
+++ b/net-libs/rustls-ffi/rustls-ffi-0.10.0-r2.ebuild
@@ -45,8 +45,9 @@ CRATES="
 	winapi-x86_64-pc-windows-gnu@0.4.0
 	winnow@0.4.1
 "
-RUST_USEDEP='${MULTILIB_USEDEP}'
-inherit multilib-minimal cargo flag-o-matic rust-toolchain
+RUST_MULTILIB=1
+
+inherit cargo flag-o-matic multilib-minimal rust-toolchain
 
 DESCRIPTION="C-to-rustls bindings"
 HOMEPAGE="https://github.com/rustls/rustls-ffi"
diff --git a/net-libs/rustls-ffi/rustls-ffi-0.12.1-r3.ebuild b/net-libs/rustls-ffi/rustls-ffi-0.12.1-r3.ebuild
index 9bc35e508086..9b968956c58d 100644
--- a/net-libs/rustls-ffi/rustls-ffi-0.12.1-r3.ebuild
+++ b/net-libs/rustls-ffi/rustls-ffi-0.12.1-r3.ebuild
@@ -36,8 +36,9 @@ CRATES="
 	windows_x86_64_msvc@0.48.5
 	zeroize@1.7.0
 "
-RUST_USEDEP='${MULTILIB_USEDEP}'
-inherit multilib-minimal cargo flag-o-matic rust-toolchain
+RUST_MULTILIB=1
+
+inherit cargo flag-o-matic multilib-minimal rust-toolchain
 
 DESCRIPTION="C-to-rustls bindings"
 HOMEPAGE="https://github.com/rustls/rustls-ffi"
diff --git a/net-libs/rustls-ffi/rustls-ffi-0.12.2-r1.ebuild b/net-libs/rustls-ffi/rustls-ffi-0.12.2-r1.ebuild
index aebb2837d484..ce373772adc3 100644
--- a/net-libs/rustls-ffi/rustls-ffi-0.12.2-r1.ebuild
+++ b/net-libs/rustls-ffi/rustls-ffi-0.12.2-r1.ebuild
@@ -36,8 +36,9 @@ CRATES="
 	windows_x86_64_msvc@0.48.5
 	zeroize@1.7.0
 "
-RUST_USEDEP='${MULTILIB_USEDEP}'
-inherit multilib-minimal cargo flag-o-matic rust-toolchain
+RUST_MULTILIB=1
+
+inherit cargo flag-o-matic multilib-minimal rust-toolchain
 
 DESCRIPTION="C-to-rustls bindings"
 HOMEPAGE="https://github.com/rustls/rustls-ffi"
diff --git a/net-libs/rustls-ffi/rustls-ffi-0.13.0-r1.ebuild b/net-libs/rustls-ffi/rustls-ffi-0.13.0-r1.ebuild
index f745928b4ab7..e2762a66126c 100644
--- a/net-libs/rustls-ffi/rustls-ffi-0.13.0-r1.ebuild
+++ b/net-libs/rustls-ffi/rustls-ffi-0.13.0-r1.ebuild
@@ -37,8 +37,9 @@ CRATES="
 	windows_x86_64_msvc@0.48.5
 	zeroize@1.7.0
 "
-RUST_USEDEP='${MULTILIB_USEDEP}'
-inherit multilib-minimal cargo flag-o-matic rust-toolchain
+RUST_MULTILIB=1
+
+inherit cargo flag-o-matic multilib-minimal rust-toolchain
 
 DESCRIPTION="C-to-rustls bindings"
 HOMEPAGE="https://github.com/rustls/rustls-ffi"
diff --git a/net-libs/rustls-ffi/rustls-ffi-0.14.0.ebuild b/net-libs/rustls-ffi/rustls-ffi-0.14.0.ebuild
index bc429940dc68..6c632b026796 100644
--- a/net-libs/rustls-ffi/rustls-ffi-0.14.0.ebuild
+++ b/net-libs/rustls-ffi/rustls-ffi-0.14.0.ebuild
@@ -115,8 +115,9 @@ CRATES="
 	windows_x86_64_msvc@0.52.4
 	zeroize@1.7.0
 "
-RUST_USEDEP='${MULTILIB_USEDEP}'
-inherit multilib-minimal cargo flag-o-matic rust-toolchain
+RUST_MULTILIB=1
+
+inherit cargo flag-o-matic multilib-minimal rust-toolchain
 
 DESCRIPTION="C-to-rustls bindings"
 HOMEPAGE="https://github.com/rustls/rustls-ffi"
diff --git a/net-libs/rustls-ffi/rustls-ffi-0.9.1-r2.ebuild b/net-libs/rustls-ffi/rustls-ffi-0.9.1-r2.ebuild
index 878decfd7c0d..3c7a252cf9f0 100644
--- a/net-libs/rustls-ffi/rustls-ffi-0.9.1-r2.ebuild
+++ b/net-libs/rustls-ffi/rustls-ffi-0.9.1-r2.ebuild
@@ -65,8 +65,9 @@ CRATES="
 	winapi-i686-pc-windows-gnu@0.4.0
 	winapi-x86_64-pc-windows-gnu@0.4.0
 "
-RUST_USEDEP='${MULTILIB_USEDEP}'
-inherit multilib-minimal cargo flag-o-matic rust-toolchain
+RUST_MULTILIB=1
+
+inherit cargo flag-o-matic multilib-minimal rust-toolchain
 
 DESCRIPTION="C-to-rustls bindings"
 HOMEPAGE="https://github.com/rustls/rustls-ffi"