public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/scx/, app-editors/zed/, app-crypt/rpm-sequoia/, sys-process/below/, ...
@ 2024-11-11  8:53 Matt Jolly
  0 siblings, 0 replies; only message in thread
From: Matt Jolly @ 2024-11-11  8:53 UTC (permalink / raw
  To: gentoo-commits

commit:     20c78cda3f6a7edfb22c791e0e16c5d5ca20bdb3
Author:     Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 01:24:12 2024 +0000
Commit:     Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Mon Nov 11 08:49:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20c78cda

*/*: 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 <AT> gentoo.org>

 app-crypt/rpm-sequoia/rpm-sequoia-1.6.0-r1.ebuild                    | 2 +-
 app-crypt/rpm-sequoia/rpm-sequoia-1.7.0-r1.ebuild                    | 2 +-
 .../sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.0-r1.ebuild | 2 +-
 .../sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.1-r1.ebuild | 2 +-
 .../sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.8.0-r1.ebuild  | 2 +-
 .../sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.9.0-r1.ebuild  | 2 +-
 app-crypt/sequoia-sq/sequoia-sq-0.35.0-r1.ebuild                     | 2 +-
 app-crypt/sequoia-sq/sequoia-sq-0.36.0-r1.ebuild                     | 2 +-
 app-crypt/sequoia-sq/sequoia-sq-0.37.0-r1.ebuild                     | 2 +-
 app-crypt/sequoia-sqv/sequoia-sqv-1.2.1-r1.ebuild                    | 2 +-
 app-editors/zed/zed-0.155.2-r1.ebuild                                | 2 +-
 app-editors/zed/zed-0.159.10-r1.ebuild                               | 2 +-
 app-editors/zed/zed-0.160.7-r1.ebuild                                | 2 +-
 gnome-base/librsvg/librsvg-2.57.3-r2.ebuild                          | 4 ++--
 gnome-base/librsvg/librsvg-2.58.2-r2.ebuild                          | 4 ++--
 gnome-base/librsvg/librsvg-2.58.5.ebuild                             | 4 ++--
 media-libs/libdovi/libdovi-3.3.1-r1.ebuild                           | 5 +++--
 media-sound/helvum/helvum-0.4.1-r1.ebuild                            | 2 +-
 media-sound/helvum/helvum-0.5.1-r3.ebuild                            | 2 +-
 net-libs/quiche/quiche-0.22.0-r2.ebuild                              | 4 ++--
 net-libs/quiche/quiche-9999.ebuild                                   | 4 ++--
 net-libs/rustls-ffi/rustls-ffi-0.10.0-r2.ebuild                      | 5 +++--
 net-libs/rustls-ffi/rustls-ffi-0.12.1-r3.ebuild                      | 5 +++--
 net-libs/rustls-ffi/rustls-ffi-0.12.2-r1.ebuild                      | 5 +++--
 net-libs/rustls-ffi/rustls-ffi-0.13.0-r1.ebuild                      | 5 +++--
 net-libs/rustls-ffi/rustls-ffi-0.14.0.ebuild                         | 5 +++--
 net-libs/rustls-ffi/rustls-ffi-0.9.1-r2.ebuild                       | 5 +++--
 sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.15-r1.ebuild              | 2 +-
 sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.16-r1.ebuild              | 2 +-
 sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild                   | 2 +-
 sys-apps/uutils-findutils/uutils-findutils-9999.ebuild               | 2 +-
 .../thin-provisioning-tools/thin-provisioning-tools-1.0.14-r1.ebuild | 2 +-
 .../thin-provisioning-tools/thin-provisioning-tools-1.1.0-r2.ebuild  | 2 +-
 sys-fs/bcachefs-tools/bcachefs-tools-1.11.0-r1.ebuild                | 2 +-
 sys-fs/bcachefs-tools/bcachefs-tools-1.13.0-r1.ebuild                | 2 +-
 sys-fs/bcachefs-tools/bcachefs-tools-1.7.0-r1.ebuild                 | 2 +-
 sys-fs/bcachefs-tools/bcachefs-tools-1.9.4-r1.ebuild                 | 2 +-
 sys-kernel/scx/scx-1.0.5-r2.ebuild                                   | 2 +-
 sys-process/below/below-0.8.1-r1.ebuild                              | 2 +-
 39 files changed, 58 insertions(+), 51 deletions(-)

diff --git a/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0-r1.ebuild b/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0-r1.ebuild
index 1563c0d6977e..afd0c9eb297b 100644
--- a/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0-r1.ebuild
+++ b/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0-r1.ebuild
@@ -238,7 +238,7 @@ CRATES="
 LLVM_COMPAT=( 17 )
 RUST_NEEDS_LLVM=1
 
-inherit llvm-r1 cargo
+inherit cargo llvm-r1
 
 DESCRIPTION="Implementation of the RPM PGP interface using Sequoia"
 HOMEPAGE="https://sequoia-pgp.org/ https://github.com/rpm-software-management/rpm-sequoia"

diff --git a/app-crypt/rpm-sequoia/rpm-sequoia-1.7.0-r1.ebuild b/app-crypt/rpm-sequoia/rpm-sequoia-1.7.0-r1.ebuild
index c5c225f601ba..6c85a5471878 100644
--- a/app-crypt/rpm-sequoia/rpm-sequoia-1.7.0-r1.ebuild
+++ b/app-crypt/rpm-sequoia/rpm-sequoia-1.7.0-r1.ebuild
@@ -252,7 +252,7 @@ LLVM_COMPAT=( 17 18 )
 RUST_MIN_VER="1.74.1"
 RUST_NEEDS_LLVM=1
 
-inherit llvm-r1 cargo
+inherit cargo llvm-r1
 
 DESCRIPTION="Implementation of the RPM PGP interface using Sequoia"
 HOMEPAGE="https://sequoia-pgp.org/ https://github.com/rpm-software-management/rpm-sequoia"

diff --git a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.0-r1.ebuild b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.0-r1.ebuild
index d9f7fe6ff6c5..64b191ed02db 100644
--- a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.0-r1.ebuild
+++ b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.0-r1.ebuild
@@ -397,7 +397,7 @@ CRATES="
 LLVM_COMPAT=( 17 18 )
 RUST_NEEDS_LLVM=1
 
-inherit llvm-r1 cargo xdg-utils
+inherit cargo llvm-r1 xdg-utils
 
 DESCRIPTION="Sequoia's reimplementation of the GnuPG interface"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/"

diff --git a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.1-r1.ebuild b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.1-r1.ebuild
index 0e7e1f4a83bc..afaeb7fd6362 100644
--- a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.1-r1.ebuild
+++ b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.1-r1.ebuild
@@ -395,7 +395,7 @@ CRATES="
 LLVM_COMPAT=( 17 18 )
 RUST_NEEDS_LLVM=1
 
-inherit llvm-r1 cargo xdg-utils
+inherit cargo llvm-r1 xdg-utils
 
 DESCRIPTION="Sequoia's reimplementation of the GnuPG interface"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/"

diff --git a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.8.0-r1.ebuild b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.8.0-r1.ebuild
index 9d7e03abe6f4..95658418e7e9 100644
--- a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.8.0-r1.ebuild
+++ b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.8.0-r1.ebuild
@@ -368,7 +368,7 @@ CRATES="
 LLVM_COMPAT=( 17 18 )
 RUST_NEEDS_LLVM=1
 
-inherit llvm-r1 cargo xdg-utils
+inherit cargo llvm-r1 xdg-utils
 
 DESCRIPTION="Sequoia's reimplementation of the GnuPG interface"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/"

diff --git a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.9.0-r1.ebuild b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.9.0-r1.ebuild
index 15f622ec15e0..e1f74372c492 100644
--- a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.9.0-r1.ebuild
+++ b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.9.0-r1.ebuild
@@ -371,7 +371,7 @@ CRATES="
 LLVM_COMPAT=( 17 18 )
 RUST_NEEDS_LLVM=1
 
-inherit llvm-r1 cargo xdg-utils
+inherit cargo llvm-r1 xdg-utils
 
 DESCRIPTION="Sequoia's reimplementation of the GnuPG interface"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/"

diff --git a/app-crypt/sequoia-sq/sequoia-sq-0.35.0-r1.ebuild b/app-crypt/sequoia-sq/sequoia-sq-0.35.0-r1.ebuild
index 17375661ac23..bac089222857 100644
--- a/app-crypt/sequoia-sq/sequoia-sq-0.35.0-r1.ebuild
+++ b/app-crypt/sequoia-sq/sequoia-sq-0.35.0-r1.ebuild
@@ -487,7 +487,7 @@ CRATES="
 
 LLVM_COMPAT=( {16..17} )
 
-inherit llvm-r1 cargo shell-completion
+inherit cargo llvm-r1 shell-completion
 
 DESCRIPTION="CLI of the Sequoia OpenPGP implementation"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-sq"

diff --git a/app-crypt/sequoia-sq/sequoia-sq-0.36.0-r1.ebuild b/app-crypt/sequoia-sq/sequoia-sq-0.36.0-r1.ebuild
index 9a186810fb28..784b920e5d85 100644
--- a/app-crypt/sequoia-sq/sequoia-sq-0.36.0-r1.ebuild
+++ b/app-crypt/sequoia-sq/sequoia-sq-0.36.0-r1.ebuild
@@ -491,7 +491,7 @@ CRATES="
 
 LLVM_COMPAT=( {16..18} )
 
-inherit llvm-r1 cargo shell-completion
+inherit cargo llvm-r1 shell-completion
 
 DESCRIPTION="CLI of the Sequoia OpenPGP implementation"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-sq"

diff --git a/app-crypt/sequoia-sq/sequoia-sq-0.37.0-r1.ebuild b/app-crypt/sequoia-sq/sequoia-sq-0.37.0-r1.ebuild
index c51436d42641..16c18d31960d 100644
--- a/app-crypt/sequoia-sq/sequoia-sq-0.37.0-r1.ebuild
+++ b/app-crypt/sequoia-sq/sequoia-sq-0.37.0-r1.ebuild
@@ -517,7 +517,7 @@ CRATES="
 
 LLVM_COMPAT=( {16..18} )
 
-inherit llvm-r1 cargo shell-completion
+inherit cargo llvm-r1 shell-completion
 
 DESCRIPTION="CLI of the Sequoia OpenPGP implementation"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-sq"

diff --git a/app-crypt/sequoia-sqv/sequoia-sqv-1.2.1-r1.ebuild b/app-crypt/sequoia-sqv/sequoia-sqv-1.2.1-r1.ebuild
index cd4d8540631c..980514150d8f 100644
--- a/app-crypt/sequoia-sqv/sequoia-sqv-1.2.1-r1.ebuild
+++ b/app-crypt/sequoia-sqv/sequoia-sqv-1.2.1-r1.ebuild
@@ -253,7 +253,7 @@ CRATES="
 LLVM_COMPAT=( {17..18} )
 RUST_NEEDS_LLVM=1
 
-inherit bash-completion-r1 llvm-r1 cargo
+inherit bash-completion-r1 cargo llvm-r1
 
 DESCRIPTION="A simple OpenPGP signature verification program"
 HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-sqv"

diff --git a/app-editors/zed/zed-0.155.2-r1.ebuild b/app-editors/zed/zed-0.155.2-r1.ebuild
index 7ac2746fed38..d48523bf4511 100644
--- a/app-editors/zed/zed-0.155.2-r1.ebuild
+++ b/app-editors/zed/zed-0.155.2-r1.ebuild
@@ -34,7 +34,7 @@ LLVM_COMPAT=( 18 )
 RUST_MIN_VER="1.80.1"
 RUST_NEEDS_LLVM=1
 
-inherit llvm-r1 cargo check-reqs desktop flag-o-matic toolchain-funcs xdg
+inherit cargo check-reqs desktop flag-o-matic llvm-r1 toolchain-funcs xdg
 
 DESCRIPTION="The fast, collaborative code editor"
 HOMEPAGE="https://zed.dev https://github.com/zed-industries/zed"

diff --git a/app-editors/zed/zed-0.159.10-r1.ebuild b/app-editors/zed/zed-0.159.10-r1.ebuild
index 6b5c07a29c86..3fc90c2cbb66 100644
--- a/app-editors/zed/zed-0.159.10-r1.ebuild
+++ b/app-editors/zed/zed-0.159.10-r1.ebuild
@@ -58,7 +58,7 @@ LLVM_COMPAT=( 18 )
 RUST_MIN_VER="1.80.1"
 RUST_NEEDS_LLVM=1
 
-inherit llvm-r1 cargo check-reqs desktop flag-o-matic toolchain-funcs xdg
+inherit cargo check-reqs desktop flag-o-matic llvm-r1 toolchain-funcs xdg
 
 DESCRIPTION="The fast, collaborative code editor"
 HOMEPAGE="https://zed.dev https://github.com/zed-industries/zed"

diff --git a/app-editors/zed/zed-0.160.7-r1.ebuild b/app-editors/zed/zed-0.160.7-r1.ebuild
index 6b5c07a29c86..3fc90c2cbb66 100644
--- a/app-editors/zed/zed-0.160.7-r1.ebuild
+++ b/app-editors/zed/zed-0.160.7-r1.ebuild
@@ -58,7 +58,7 @@ LLVM_COMPAT=( 18 )
 RUST_MIN_VER="1.80.1"
 RUST_NEEDS_LLVM=1
 
-inherit llvm-r1 cargo check-reqs desktop flag-o-matic toolchain-funcs xdg
+inherit cargo check-reqs desktop flag-o-matic llvm-r1 toolchain-funcs xdg
 
 DESCRIPTION="The fast, collaborative code editor"
 HOMEPAGE="https://zed.dev https://github.com/zed-industries/zed"

diff --git a/gnome-base/librsvg/librsvg-2.57.3-r2.ebuild b/gnome-base/librsvg/librsvg-2.57.3-r2.ebuild
index 92a57c008000..a35436c7e717 100644
--- a/gnome-base/librsvg/librsvg-2.57.3-r2.ebuild
+++ b/gnome-base/librsvg/librsvg-2.57.3-r2.ebuild
@@ -278,9 +278,9 @@ CRATES="
 	yeslogic-fontconfig-sys@4.0.1
 "
 
-RUST_USEDEP='${MULTILIB_USEDEP}'
+RUST_MULTILIB=1
 
-inherit multilib-minimal cargo gnome2 python-any-r1 rust-toolchain vala
+inherit cargo gnome2 multilib-minimal python-any-r1 rust-toolchain vala
 
 DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
 HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"

diff --git a/gnome-base/librsvg/librsvg-2.58.2-r2.ebuild b/gnome-base/librsvg/librsvg-2.58.2-r2.ebuild
index 494eefff7652..92733bc702cb 100644
--- a/gnome-base/librsvg/librsvg-2.58.2-r2.ebuild
+++ b/gnome-base/librsvg/librsvg-2.58.2-r2.ebuild
@@ -289,9 +289,9 @@ CRATES="
 "
 
 RUST_MIN_VER="1.71.1"
-RUST_USEDEP='${MULTILIB_USEDEP}'
+RUST_MULTILIB=1
 
-inherit multilib-minimal cargo gnome2 python-any-r1 rust-toolchain vala
+inherit cargo gnome2 multilib-minimal python-any-r1 rust-toolchain vala
 
 DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
 HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"

diff --git a/gnome-base/librsvg/librsvg-2.58.5.ebuild b/gnome-base/librsvg/librsvg-2.58.5.ebuild
index ca992d8e036d..6a89dfe6a9f9 100644
--- a/gnome-base/librsvg/librsvg-2.58.5.ebuild
+++ b/gnome-base/librsvg/librsvg-2.58.5.ebuild
@@ -288,9 +288,9 @@ CRATES="
 "
 
 RUST_MIN_VER="1.71.1"
-RUST_USEDEP='${MULTILIB_USEDEP}'
+RUST_MULTILIB=1
 
-inherit multilib-minimal cargo gnome2 python-any-r1 rust-toolchain vala
+inherit cargo gnome2 multilib-minimal python-any-r1 rust-toolchain vala
 
 DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
 HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"

diff --git a/media-libs/libdovi/libdovi-3.3.1-r1.ebuild b/media-libs/libdovi/libdovi-3.3.1-r1.ebuild
index 6a4caf5acf88..0131e18bb74d 100644
--- a/media-libs/libdovi/libdovi-3.3.1-r1.ebuild
+++ b/media-libs/libdovi/libdovi-3.3.1-r1.ebuild
@@ -89,8 +89,9 @@ CRATES="
 	windows_x86_64_msvc@0.52.6
 	wyz@0.5.1
 "
-RUST_USEDEP='${MULTILIB_USEDEP}'
-inherit multilib-minimal cargo edo rust-toolchain
+RUST_MULTILIB=1
+
+inherit cargo edo multilib-minimal rust-toolchain
 
 DESCRIPTION="Dolby Vision metadata parsing and writing"
 HOMEPAGE="https://github.com/quietvoid/dovi_tool/"

diff --git a/media-sound/helvum/helvum-0.4.1-r1.ebuild b/media-sound/helvum/helvum-0.4.1-r1.ebuild
index 4105dfcddf13..9c050e19315e 100644
--- a/media-sound/helvum/helvum-0.4.1-r1.ebuild
+++ b/media-sound/helvum/helvum-0.4.1-r1.ebuild
@@ -108,7 +108,7 @@ CRATES="
 
 LLVM_COMPAT=( {16..18} )
 
-inherit llvm-r1 cargo desktop xdg
+inherit cargo desktop llvm-r1 xdg
 
 DESCRIPTION="A GTK patchbay for pipewire"
 HOMEPAGE="https://gitlab.freedesktop.org/pipewire/helvum"

diff --git a/media-sound/helvum/helvum-0.5.1-r3.ebuild b/media-sound/helvum/helvum-0.5.1-r3.ebuild
index c82f7a102563..30ab46f249aa 100644
--- a/media-sound/helvum/helvum-0.5.1-r3.ebuild
+++ b/media-sound/helvum/helvum-0.5.1-r3.ebuild
@@ -111,7 +111,7 @@ CRATES="
 
 LLVM_COMPAT=( {16..18} )
 
-inherit llvm-r1 cargo desktop xdg
+inherit cargo desktop llvm-r1 xdg
 
 DESCRIPTION="A GTK patchbay for pipewire"
 HOMEPAGE="https://gitlab.freedesktop.org/pipewire/helvum"

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"

diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.15-r1.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.15-r1.ebuild
index 4dd6b1e8e90e..7f11b210e234 100644
--- a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.15-r1.ebuild
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.15-r1.ebuild
@@ -7,7 +7,7 @@ CRATES=" "
 LLVM_COMPAT=( {17..18} )
 RUST_MIN_VER="1.77.1"
 
-inherit edo llvm-r1 cargo
+inherit cargo edo llvm-r1
 
 DESCRIPTION="pkgcraft-based tools for Gentoo"
 HOMEPAGE="https://pkgcraft.github.io/"

diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.16-r1.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.16-r1.ebuild
index 4dd6b1e8e90e..7f11b210e234 100644
--- a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.16-r1.ebuild
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.16-r1.ebuild
@@ -7,7 +7,7 @@ CRATES=" "
 LLVM_COMPAT=( {17..18} )
 RUST_MIN_VER="1.77.1"
 
-inherit edo llvm-r1 cargo
+inherit cargo edo llvm-r1
 
 DESCRIPTION="pkgcraft-based tools for Gentoo"
 HOMEPAGE="https://pkgcraft.github.io/"

diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
index 3739b1a925c3..f2ec46605d6d 100644
--- a/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
@@ -7,7 +7,7 @@ CRATES=" "
 LLVM_COMPAT=( {17..18} )
 RUST_MIN_VER="1.77.1"
 
-inherit edo llvm-r1 cargo
+inherit cargo edo llvm-r1
 
 DESCRIPTION="pkgcraft-based tools for Gentoo"
 HOMEPAGE="https://pkgcraft.github.io/"

diff --git a/sys-apps/uutils-findutils/uutils-findutils-9999.ebuild b/sys-apps/uutils-findutils/uutils-findutils-9999.ebuild
index f8a83a5773bb..e9bd9e6cd60b 100644
--- a/sys-apps/uutils-findutils/uutils-findutils-9999.ebuild
+++ b/sys-apps/uutils-findutils/uutils-findutils-9999.ebuild
@@ -133,7 +133,7 @@ CRATES="
 "
 
 LLVM_COMPAT=( {17..18} )
-inherit llvm-r1 cargo
+inherit cargo llvm-r1
 
 DESCRIPTION="GNU findutils rewritten in Rust"
 HOMEPAGE="https://uutils.github.io/findutils/ https://github.com/uutils/findutils"

diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.14-r1.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.14-r1.ebuild
index b7d67783148e..c3920bb0d0ec 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.14-r1.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.14-r1.ebuild
@@ -149,7 +149,7 @@ declare -A GIT_CRATES=(
 
 LLVM_COMPAT=( {17..18} )
 
-inherit llvm-r1 cargo
+inherit cargo llvm-r1
 
 DESCRIPTION="A suite of tools for thin provisioning on Linux"
 HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"

diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.1.0-r2.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.1.0-r2.ebuild
index 226c8272ce46..198b0bb7c620 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.1.0-r2.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.1.0-r2.ebuild
@@ -150,7 +150,7 @@ declare -A GIT_CRATES=(
 
 LLVM_COMPAT=( {17..18} )
 
-inherit llvm-r1 cargo
+inherit cargo llvm-r1
 
 DESCRIPTION="A suite of tools for thin provisioning on Linux"
 HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"

diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.11.0-r1.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.11.0-r1.ebuild
index a15809aa8729..5206e7db0647 100644
--- a/sys-fs/bcachefs-tools/bcachefs-tools-1.11.0-r1.ebuild
+++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.11.0-r1.ebuild
@@ -99,7 +99,7 @@ CRATES="
 LLVM_COMPAT=( {16..18} )
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit llvm-r1 cargo flag-o-matic python-any-r1 shell-completion toolchain-funcs unpacker
+inherit cargo flag-o-matic llvm-r1 python-any-r1 shell-completion toolchain-funcs unpacker
 
 DESCRIPTION="Tools for bcachefs"
 HOMEPAGE="https://bcachefs.org/"

diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.13.0-r1.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.13.0-r1.ebuild
index da8e0cb0bcd2..77446216158b 100644
--- a/sys-fs/bcachefs-tools/bcachefs-tools-1.13.0-r1.ebuild
+++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.13.0-r1.ebuild
@@ -91,7 +91,7 @@ LLVM_COMPAT=( {16..18} )
 PYTHON_COMPAT=( python3_{10..13} )
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kentoverstreet.asc
 
-inherit llvm-r1 cargo flag-o-matic python-any-r1 shell-completion toolchain-funcs unpacker verify-sig
+inherit cargo flag-o-matic  llvm-r1 python-any-r1 shell-completion toolchain-funcs unpacker verify-sig
 
 DESCRIPTION="Tools for bcachefs"
 HOMEPAGE="https://bcachefs.org/"

diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.7.0-r1.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.7.0-r1.ebuild
index 413ed976120b..8e3a3edaebac 100644
--- a/sys-fs/bcachefs-tools/bcachefs-tools-1.7.0-r1.ebuild
+++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.7.0-r1.ebuild
@@ -95,7 +95,7 @@ CRATES="
 LLVM_COMPAT=( {16..18} )
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit llvm-r1 cargo flag-o-matic multiprocessing python-any-r1 shell-completion toolchain-funcs unpacker
+inherit cargo flag-o-matic llvm-r1 multiprocessing python-any-r1 shell-completion toolchain-funcs unpacker
 
 DESCRIPTION="Tools for bcachefs"
 HOMEPAGE="https://bcachefs.org/"

diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.9.4-r1.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.9.4-r1.ebuild
index 7a9612a910b2..3df9428b78c0 100644
--- a/sys-fs/bcachefs-tools/bcachefs-tools-1.9.4-r1.ebuild
+++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.9.4-r1.ebuild
@@ -102,7 +102,7 @@ CRATES="
 LLVM_COMPAT=( {16..18} )
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit llvm-r1 cargo flag-o-matic multiprocessing python-any-r1 shell-completion toolchain-funcs unpacker
+inherit cargo flag-o-matic  llvm-r1 multiprocessing python-any-r1 shell-completion toolchain-funcs unpacker
 
 DESCRIPTION="Tools for bcachefs"
 HOMEPAGE="https://bcachefs.org/"

diff --git a/sys-kernel/scx/scx-1.0.5-r2.ebuild b/sys-kernel/scx/scx-1.0.5-r2.ebuild
index b2528d6fa81e..91efbfa1f343 100644
--- a/sys-kernel/scx/scx-1.0.5-r2.ebuild
+++ b/sys-kernel/scx/scx-1.0.5-r2.ebuild
@@ -296,7 +296,7 @@ CRATES="
 
 RUST_MIN_VER="1.74.1"
 
-inherit llvm-r1 cargo linux-info meson rust-toolchain
+inherit cargo linux-info llvm-r1 meson rust-toolchain
 
 DESCRIPTION="sched_ext schedulers and tools"
 HOMEPAGE="https://github.com/sched-ext/scx"

diff --git a/sys-process/below/below-0.8.1-r1.ebuild b/sys-process/below/below-0.8.1-r1.ebuild
index 95c1f45c601e..9adeeff32e98 100644
--- a/sys-process/below/below-0.8.1-r1.ebuild
+++ b/sys-process/below/below-0.8.1-r1.ebuild
@@ -294,7 +294,7 @@ CRATES="
 	zstd@0.13.0
 "
 
-RUST_USEDEP="rustfmt"
+RUST_REQ_USE="rustfmt"
 
 inherit cargo systemd
 


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2024-11-11  8:53 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-11  8:53 [gentoo-commits] repo/gentoo:master commit in: sys-kernel/scx/, app-editors/zed/, app-crypt/rpm-sequoia/, sys-process/below/, Matt Jolly

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox