*/*: update for slotted Rust

Tidyups:

- $(cargo_crate_uris)
- Rust BDEPENDS come from the eclass except in very rare
  circumstances (RUST_OPTIONAL=1)
- RUST_M{AX,IN}_VER where required.
- Suboptimal crate separator (`-` -> `@`)

Signed-off-by: Matt Jolly <kangie@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/39218
Signed-off-by: Matt Jolly <kangie@gentoo.org>

4 files changed, 306 insertions, 309 deletions

diff --git a/media-video/rav1e/rav1e-0.6.6-r1.ebuild b/media-video/rav1e/rav1e-0.6.6-r1.ebuild
new file mode 100644
index 000000000000..47b94206729a
--- /dev/null
+++ b/media-video/rav1e/rav1e-0.6.6-r1.ebuild
@@ -0,0 +1,306 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.6.2
+
+EAPI=8
+
+CRATES="
+	addr2line@0.19.0
+	adler@1.0.2
+	aho-corasick@1.0.1
+	anes@0.1.6
+	anyhow@1.0.71
+	aom-sys@0.3.2
+	arbitrary@0.4.7
+	arg_enum_proc_macro@0.3.2
+	arrayvec@0.7.2
+	assert_cmd@2.0.8
+	atty@0.2.14
+	autocfg@1.1.0
+	av-metrics@0.9.0
+	av1-grain@0.2.2
+	backtrace@0.3.67
+	bindgen@0.61.0
+	bitflags@1.3.2
+	bitstream-io@1.6.0
+	bstr@1.4.0
+	built@0.5.2
+	bumpalo@3.12.2
+	bytemuck@1.13.1
+	byteorder@1.4.3
+	cargo-lock@8.0.3
+	cast@0.3.0
+	cc@1.0.79
+	cexpr@0.6.0
+	cfg-expr@0.15.1
+	cfg-if@1.0.0
+	ciborium@0.2.1
+	ciborium-io@0.2.1
+	ciborium-ll@0.2.1
+	clang-sys@1.6.1
+	clap@3.2.25
+	clap@4.0.32
+	clap_complete@4.0.7
+	clap_derive@4.0.21
+	clap_lex@0.2.4
+	clap_lex@0.3.0
+	cmake@0.1.50
+	color_quant@1.1.0
+	console@0.15.5
+	crc32fast@1.3.2
+	criterion@0.4.0
+	criterion-plot@0.5.0
+	crossbeam@0.8.2
+	crossbeam-channel@0.5.8
+	crossbeam-deque@0.8.3
+	crossbeam-epoch@0.9.14
+	crossbeam-queue@0.3.8
+	crossbeam-utils@0.8.15
+	ctor@0.1.26
+	dav1d-sys@0.7.1
+	diff@0.1.13
+	difflib@0.4.0
+	doc-comment@0.3.3
+	either@1.8.1
+	encode_unicode@0.3.6
+	env_logger@0.8.4
+	errno@0.3.1
+	errno-dragonfly@0.1.2
+	fdeflate@0.3.0
+	fern@0.6.2
+	flate2@1.0.26
+	float-cmp@0.9.0
+	form_urlencoded@1.1.0
+	getrandom@0.2.9
+	gimli@0.27.2
+	git2@0.15.0
+	glob@0.3.1
+	half@1.8.2
+	hashbrown@0.12.3
+	heck@0.4.1
+	hermit-abi@0.1.19
+	hermit-abi@0.2.6
+	hermit-abi@0.3.1
+	idna@0.3.0
+	image@0.24.6
+	indexmap@1.9.3
+	interpolate_name@0.2.3
+	io-lifetimes@1.0.10
+	is-terminal@0.4.7
+	itertools@0.10.5
+	itertools@0.8.2
+	itoa@1.0.6
+	jobserver@0.1.26
+	js-sys@0.3.63
+	lab@0.11.0
+	lazy_static@1.4.0
+	lazycell@1.3.0
+	libc@0.2.144
+	libfuzzer-sys@0.3.5
+	libgit2-sys@0.14.2+1.5.1
+	libloading@0.7.4
+	libz-sys@1.1.9
+	linux-raw-sys@0.3.7
+	log@0.4.17
+	maybe-rayon@0.1.1
+	memchr@2.5.0
+	memoffset@0.8.0
+	minimal-lexical@0.2.1
+	miniz_oxide@0.6.2
+	miniz_oxide@0.7.1
+	nasm-rs@0.2.5
+	new_debug_unreachable@1.0.4
+	nom@7.1.3
+	noop_proc_macro@0.3.0
+	normalize-line-endings@0.3.0
+	num-bigint@0.4.3
+	num-derive@0.3.3
+	num-integer@0.1.45
+	num-rational@0.4.1
+	num-traits@0.2.15
+	num_cpus@1.15.0
+	object@0.30.3
+	once_cell@1.17.1
+	oorandom@11.1.3
+	os_str_bytes@6.5.0
+	output_vt100@0.1.3
+	paste@1.0.12
+	peeking_take_while@0.1.2
+	percent-encoding@2.2.0
+	pkg-config@0.3.27
+	plotters@0.3.4
+	plotters-backend@0.3.4
+	plotters-svg@0.3.3
+	png@0.17.8
+	ppv-lite86@0.2.17
+	predicates@2.1.5
+	predicates-core@1.0.5
+	predicates-tree@1.0.7
+	pretty_assertions@1.3.0
+	proc-macro-error@1.0.4
+	proc-macro-error-attr@1.0.4
+	proc-macro2@1.0.57
+	quickcheck@1.0.3
+	quickcheck_macros@1.0.0
+	quote@1.0.27
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	rayon@1.7.0
+	rayon-core@1.11.0
+	regex@1.8.1
+	regex-automata@0.1.10
+	regex-syntax@0.7.1
+	rust_hawktracer@0.7.0
+	rust_hawktracer_normal_macro@0.4.1
+	rust_hawktracer_proc_macro@0.4.1
+	rust_hawktracer_sys@0.4.2
+	rustc-demangle@0.1.23
+	rustc-hash@1.1.0
+	rustc_version@0.4.0
+	rustix@0.37.19
+	ryu@1.0.13
+	same-file@1.0.6
+	scan_fmt@0.2.6
+	scopeguard@1.1.0
+	semver@1.0.17
+	serde@1.0.163
+	serde-big-array@0.4.1
+	serde_derive@1.0.163
+	serde_json@1.0.96
+	serde_spanned@0.6.1
+	shlex@1.1.0
+	signal-hook@0.3.15
+	signal-hook-registry@1.4.1
+	simd-adler32@0.3.5
+	simd_helpers@0.1.0
+	smallvec@1.10.0
+	syn@1.0.109
+	syn@2.0.16
+	system-deps@6.1.0
+	target-lexicon@0.12.7
+	termcolor@1.2.0
+	terminal_size@0.2.6
+	termtree@0.4.1
+	textwrap@0.16.0
+	thiserror@1.0.40
+	thiserror-impl@1.0.40
+	tinytemplate@1.2.1
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.1
+	toml@0.5.11
+	toml@0.7.3
+	toml_datetime@0.6.1
+	toml_edit@0.19.8
+	unicode-bidi@0.3.13
+	unicode-ident@1.0.8
+	unicode-normalization@0.1.22
+	unicode-width@0.1.10
+	url@2.3.1
+	v_frame@0.3.3
+	vcpkg@0.2.15
+	version-compare@0.1.1
+	version_check@0.9.4
+	wait-timeout@0.2.0
+	walkdir@2.3.3
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen@0.2.86
+	wasm-bindgen-backend@0.2.86
+	wasm-bindgen-macro@0.2.86
+	wasm-bindgen-macro-support@0.2.86
+	wasm-bindgen-shared@0.2.86
+	web-sys@0.3.63
+	which@4.4.0
+	winapi@0.3.9
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.5
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	windows-sys@0.42.0
+	windows-sys@0.48.0
+	windows-targets@0.48.0
+	windows_aarch64_gnullvm@0.42.2
+	windows_aarch64_gnullvm@0.48.0
+	windows_aarch64_msvc@0.42.2
+	windows_aarch64_msvc@0.48.0
+	windows_i686_gnu@0.42.2
+	windows_i686_gnu@0.48.0
+	windows_i686_msvc@0.42.2
+	windows_i686_msvc@0.48.0
+	windows_x86_64_gnu@0.42.2
+	windows_x86_64_gnu@0.48.0
+	windows_x86_64_gnullvm@0.42.2
+	windows_x86_64_gnullvm@0.48.0
+	windows_x86_64_msvc@0.42.2
+	windows_x86_64_msvc@0.48.0
+	winnow@0.4.1
+	y4m@0.8.0
+	yansi@0.5.1
+"
+
+inherit cargo
+
+DESCRIPTION="The fastest and safest AV1 encoder"
+HOMEPAGE="https://github.com/xiph/rav1e/"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/xiph/rav1e.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/xiph/rav1e/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		${CARGO_CRATE_URIS}"
+	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
+fi
+
+LICENSE="BSD-2"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
+	Unicode-DFS-2016
+"
+SLOT="0"
+IUSE="+capi"
+
+ASM_DEP=">=dev-lang/nasm-2.15"
+BDEPEND="
+	amd64? ( ${ASM_DEP} )
+	capi? ( >=dev-util/cargo-c-0.6.3 )
+"
+
+# Rust
+QA_FLAGS_IGNORED="usr/lib.*/librav1e.* usr/bin/rav1e"
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		default
+		cargo_src_unpack
+	fi
+}
+
+src_compile() {
+	cargo_src_compile
+
+	if use capi; then
+		local args=$(usev !debug --release)
+		cargo cbuild ${args} --target-dir="capi" \
+			--prefix="/usr" --libdir="/usr/$(get_libdir)" \
+			--library-type=cdylib \
+			|| die "cargo cbuild failed"
+	fi
+}
+
+src_install() {
+	export CARGO_HOME="${ECARGO_HOME}"
+	local args=$(usev debug --debug)
+
+	if use capi; then
+		cargo cinstall ${args} --target-dir="capi" \
+			--prefix="/usr" --libdir="/usr/$(get_libdir)" --destdir="${ED}" \
+			--library-type=cdylib \
+			|| die "cargo cinstall failed"
+	fi
+
+	cargo_src_install
+}
diff --git a/media-video/rav1e/rav1e-0.6.6.ebuild b/media-video/rav1e/rav1e-0.6.6.ebuild
deleted file mode 100644
index 7de235fa58a7..000000000000
--- a/media-video/rav1e/rav1e-0.6.6.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.6.2
-
-EAPI=8
-
-CRATES="
-	addr2line-0.19.0
-	adler-1.0.2
-	aho-corasick-1.0.1
-	anes-0.1.6
-	anyhow-1.0.71
-	aom-sys-0.3.2
-	arbitrary-0.4.7
-	arg_enum_proc_macro-0.3.2
-	arrayvec-0.7.2
-	assert_cmd-2.0.8
-	atty-0.2.14
-	autocfg-1.1.0
-	av-metrics-0.9.0
-	av1-grain-0.2.2
-	backtrace-0.3.67
-	bindgen-0.61.0
-	bitflags-1.3.2
-	bitstream-io-1.6.0
-	bstr-1.4.0
-	built-0.5.2
-	bumpalo-3.12.2
-	bytemuck-1.13.1
-	byteorder-1.4.3
-	cargo-lock-8.0.3
-	cast-0.3.0
-	cc-1.0.79
-	cexpr-0.6.0
-	cfg-expr-0.15.1
-	cfg-if-1.0.0
-	ciborium-0.2.1
-	ciborium-io-0.2.1
-	ciborium-ll-0.2.1
-	clang-sys-1.6.1
-	clap-3.2.25
-	clap-4.0.32
-	clap_complete-4.0.7
-	clap_derive-4.0.21
-	clap_lex-0.2.4
-	clap_lex-0.3.0
-	cmake-0.1.50
-	color_quant-1.1.0
-	console-0.15.5
-	crc32fast-1.3.2
-	criterion-0.4.0
-	criterion-plot-0.5.0
-	crossbeam-0.8.2
-	crossbeam-channel-0.5.8
-	crossbeam-deque-0.8.3
-	crossbeam-epoch-0.9.14
-	crossbeam-queue-0.3.8
-	crossbeam-utils-0.8.15
-	ctor-0.1.26
-	dav1d-sys-0.7.1
-	diff-0.1.13
-	difflib-0.4.0
-	doc-comment-0.3.3
-	either-1.8.1
-	encode_unicode-0.3.6
-	env_logger-0.8.4
-	errno-0.3.1
-	errno-dragonfly-0.1.2
-	fdeflate-0.3.0
-	fern-0.6.2
-	flate2-1.0.26
-	float-cmp-0.9.0
-	form_urlencoded-1.1.0
-	getrandom-0.2.9
-	gimli-0.27.2
-	git2-0.15.0
-	glob-0.3.1
-	half-1.8.2
-	hashbrown-0.12.3
-	heck-0.4.1
-	hermit-abi-0.1.19
-	hermit-abi-0.2.6
-	hermit-abi-0.3.1
-	idna-0.3.0
-	image-0.24.6
-	indexmap-1.9.3
-	interpolate_name-0.2.3
-	io-lifetimes-1.0.10
-	is-terminal-0.4.7
-	itertools-0.10.5
-	itertools-0.8.2
-	itoa-1.0.6
-	jobserver-0.1.26
-	js-sys-0.3.63
-	lab-0.11.0
-	lazy_static-1.4.0
-	lazycell-1.3.0
-	libc-0.2.144
-	libfuzzer-sys-0.3.5
-	libgit2-sys-0.14.2+1.5.1
-	libloading-0.7.4
-	libz-sys-1.1.9
-	linux-raw-sys-0.3.7
-	log-0.4.17
-	maybe-rayon-0.1.1
-	memchr-2.5.0
-	memoffset-0.8.0
-	minimal-lexical-0.2.1
-	miniz_oxide-0.6.2
-	miniz_oxide-0.7.1
-	nasm-rs-0.2.5
-	new_debug_unreachable-1.0.4
-	nom-7.1.3
-	noop_proc_macro-0.3.0
-	normalize-line-endings-0.3.0
-	num-bigint-0.4.3
-	num-derive-0.3.3
-	num-integer-0.1.45
-	num-rational-0.4.1
-	num-traits-0.2.15
-	num_cpus-1.15.0
-	object-0.30.3
-	once_cell-1.17.1
-	oorandom-11.1.3
-	os_str_bytes-6.5.0
-	output_vt100-0.1.3
-	paste-1.0.12
-	peeking_take_while-0.1.2
-	percent-encoding-2.2.0
-	pkg-config-0.3.27
-	plotters-0.3.4
-	plotters-backend-0.3.4
-	plotters-svg-0.3.3
-	png-0.17.8
-	ppv-lite86-0.2.17
-	predicates-2.1.5
-	predicates-core-1.0.5
-	predicates-tree-1.0.7
-	pretty_assertions-1.3.0
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro2-1.0.57
-	quickcheck-1.0.3
-	quickcheck_macros-1.0.0
-	quote-1.0.27
-	rand-0.8.5
-	rand_chacha-0.3.1
-	rand_core-0.6.4
-	rayon-1.7.0
-	rayon-core-1.11.0
-	regex-1.8.1
-	regex-automata-0.1.10
-	regex-syntax-0.7.1
-	rust_hawktracer-0.7.0
-	rust_hawktracer_normal_macro-0.4.1
-	rust_hawktracer_proc_macro-0.4.1
-	rust_hawktracer_sys-0.4.2
-	rustc-demangle-0.1.23
-	rustc-hash-1.1.0
-	rustc_version-0.4.0
-	rustix-0.37.19
-	ryu-1.0.13
-	same-file-1.0.6
-	scan_fmt-0.2.6
-	scopeguard-1.1.0
-	semver-1.0.17
-	serde-1.0.163
-	serde-big-array-0.4.1
-	serde_derive-1.0.163
-	serde_json-1.0.96
-	serde_spanned-0.6.1
-	shlex-1.1.0
-	signal-hook-0.3.15
-	signal-hook-registry-1.4.1
-	simd-adler32-0.3.5
-	simd_helpers-0.1.0
-	smallvec-1.10.0
-	syn-1.0.109
-	syn-2.0.16
-	system-deps-6.1.0
-	target-lexicon-0.12.7
-	termcolor-1.2.0
-	terminal_size-0.2.6
-	termtree-0.4.1
-	textwrap-0.16.0
-	thiserror-1.0.40
-	thiserror-impl-1.0.40
-	tinytemplate-1.2.1
-	tinyvec-1.6.0
-	tinyvec_macros-0.1.1
-	toml-0.5.11
-	toml-0.7.3
-	toml_datetime-0.6.1
-	toml_edit-0.19.8
-	unicode-bidi-0.3.13
-	unicode-ident-1.0.8
-	unicode-normalization-0.1.22
-	unicode-width-0.1.10
-	url-2.3.1
-	v_frame-0.3.3
-	vcpkg-0.2.15
-	version-compare-0.1.1
-	version_check-0.9.4
-	wait-timeout-0.2.0
-	walkdir-2.3.3
-	wasi-0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-0.2.86
-	wasm-bindgen-backend-0.2.86
-	wasm-bindgen-macro-0.2.86
-	wasm-bindgen-macro-support-0.2.86
-	wasm-bindgen-shared-0.2.86
-	web-sys-0.3.63
-	which-4.4.0
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	windows-sys-0.42.0
-	windows-sys-0.48.0
-	windows-targets-0.48.0
-	windows_aarch64_gnullvm-0.42.2
-	windows_aarch64_gnullvm-0.48.0
-	windows_aarch64_msvc-0.42.2
-	windows_aarch64_msvc-0.48.0
-	windows_i686_gnu-0.42.2
-	windows_i686_gnu-0.48.0
-	windows_i686_msvc-0.42.2
-	windows_i686_msvc-0.48.0
-	windows_x86_64_gnu-0.42.2
-	windows_x86_64_gnu-0.48.0
-	windows_x86_64_gnullvm-0.42.2
-	windows_x86_64_gnullvm-0.48.0
-	windows_x86_64_msvc-0.42.2
-	windows_x86_64_msvc-0.48.0
-	winnow-0.4.1
-	y4m-0.8.0
-	yansi-0.5.1
-"
-
-inherit cargo
-
-DESCRIPTION="The fastest and safest AV1 encoder"
-HOMEPAGE="https://github.com/xiph/rav1e/"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/xiph/rav1e.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/xiph/rav1e/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		$(cargo_crate_uris ${CRATES})"
-	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-fi
-
-LICENSE="BSD-2"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
-	Unicode-DFS-2016
-"
-SLOT="0"
-IUSE="+capi"
-
-ASM_DEP=">=dev-lang/nasm-2.15"
-BDEPEND="
-	>=virtual/rust-1.65.0
-	amd64? ( ${ASM_DEP} )
-	capi? ( >=dev-util/cargo-c-0.6.3 )
-"
-
-# Rust
-QA_FLAGS_IGNORED="usr/lib.*/librav1e.* usr/bin/rav1e"
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		default
-		cargo_src_unpack
-	fi
-}
-
-src_compile() {
-	cargo_src_compile
-
-	if use capi; then
-		local args=$(usev !debug --release)
-		cargo cbuild ${args} --target-dir="capi" \
-			--prefix="/usr" --libdir="/usr/$(get_libdir)" \
-			--library-type=cdylib \
-			|| die "cargo cbuild failed"
-	fi
-}
-
-src_install() {
-	export CARGO_HOME="${ECARGO_HOME}"
-	local args=$(usev debug --debug)
-
-	if use capi; then
-		cargo cinstall ${args} --target-dir="capi" \
-			--prefix="/usr" --libdir="/usr/$(get_libdir)" --destdir="${ED}" \
-			--library-type=cdylib \
-			|| die "cargo cinstall failed"
-	fi
-
-	cargo_src_install
-}
diff --git a/media-video/rav1e/rav1e-0.7.1.ebuild b/media-video/rav1e/rav1e-0.7.1-r1.ebuild
index 23fc76363178..e6606d8a4078 100644
--- a/media-video/rav1e/rav1e-0.7.1.ebuild
+++ b/media-video/rav1e/rav1e-0.7.1-r1.ebuild
@@ -261,7 +261,6 @@ IUSE="+capi"
 
 ASM_DEP=">=dev-lang/nasm-2.15"
 BDEPEND="
-	>=virtual/rust-1.70.0
 	amd64? ( ${ASM_DEP} )
 	capi? ( >=dev-util/cargo-c-0.6.3 )
 "
diff --git a/media-video/rav1e/rav1e-9999.ebuild b/media-video/rav1e/rav1e-9999.ebuild
index 6e51df483cb6..3cd6190b455f 100644
--- a/media-video/rav1e/rav1e-9999.ebuild
+++ b/media-video/rav1e/rav1e-9999.ebuild
@@ -261,7 +261,6 @@ IUSE="+capi"
 
 ASM_DEP=">=dev-lang/nasm-2.15"
 BDEPEND="
-	>=virtual/rust-1.70.0
 	amd64? ( ${ASM_DEP} )
 	capi? ( >=dev-util/cargo-c-0.6.3 )
 "