*/*: 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>

12 files changed, 122 insertions, 127 deletions

diff --git a/media-gfx/darktable/darktable-4.6.0.ebuild b/media-gfx/darktable/darktable-4.6.0.ebuild
index 860bbe9e07a7..1271ff136222 100644
--- a/media-gfx/darktable/darktable-4.6.0.ebuild
+++ b/media-gfx/darktable/darktable-4.6.0.ebuild
@@ -47,7 +47,7 @@ RESTRICT="!test? ( test )"
 # in BDEPEND. This has not been done *on purpose*, for the following reason:
 #  - darktable can also be built with sys-devel/clang so we'd have to have that, as an alternative,
 #    in BDEPEND too
-#  - there are at least two darktable dependencies (media-libs/mesa and virtual/rust) which
+#  - there are at least two darktable dependencies (media-libs/mesa and dev-lang/rust) which
 #    by default pull in sys-devel/clang
 #  - as a result of the above, for most gcc users adding the above to BDEPEND is a no-op
 #    (and curiously enough, empirical observations suggest current versions of Portage are
diff --git a/media-gfx/darktable/darktable-4.6.1.ebuild b/media-gfx/darktable/darktable-4.6.1.ebuild
index 43f3c82865fb..9bbb75a3f2c2 100644
--- a/media-gfx/darktable/darktable-4.6.1.ebuild
+++ b/media-gfx/darktable/darktable-4.6.1.ebuild
@@ -47,7 +47,7 @@ RESTRICT="!test? ( test )"
 # in BDEPEND. This has not been done *on purpose*, for the following reason:
 #  - darktable can also be built with sys-devel/clang so we'd have to have that, as an alternative,
 #    in BDEPEND too
-#  - there are at least two darktable dependencies (media-libs/mesa and virtual/rust) which
+#  - there are at least two darktable dependencies (media-libs/mesa and dev-lang/rust) which
 #    by default pull in sys-devel/clang
 #  - as a result of the above, for most gcc users adding the above to BDEPEND is a no-op
 #    (and curiously enough, empirical observations suggest current versions of Portage are
diff --git a/media-gfx/darktable/darktable-4.8.0.ebuild b/media-gfx/darktable/darktable-4.8.0.ebuild
index b3eeef397175..0fe2792ac25b 100644
--- a/media-gfx/darktable/darktable-4.8.0.ebuild
+++ b/media-gfx/darktable/darktable-4.8.0.ebuild
@@ -47,7 +47,7 @@ RESTRICT="!test? ( test )"
 # in BDEPEND. This has not been done *on purpose*, for the following reason:
 #  - darktable can also be built with sys-devel/clang so we'd have to have that, as an alternative,
 #    in BDEPEND too
-#  - there are at least two darktable dependencies (media-libs/mesa and virtual/rust) which
+#  - there are at least two darktable dependencies (media-libs/mesa and dev-lang/rust) which
 #    by default pull in sys-devel/clang
 #  - as a result of the above, for most gcc users adding the above to BDEPEND is a no-op
 #    (and curiously enough, empirical observations suggest current versions of Portage are
diff --git a/media-gfx/fotema/fotema-1.14.2-r1.ebuild b/media-gfx/fotema/fotema-1.14.2-r2.ebuild
index 34219ad68ea2..34219ad68ea2 100644
--- a/media-gfx/fotema/fotema-1.14.2-r1.ebuild
+++ b/media-gfx/fotema/fotema-1.14.2-r2.ebuild
diff --git a/media-gfx/fotema/fotema-1.14.3.ebuild b/media-gfx/fotema/fotema-1.14.3-r1.ebuild
index 34219ad68ea2..34219ad68ea2 100644
--- a/media-gfx/fotema/fotema-1.14.3.ebuild
+++ b/media-gfx/fotema/fotema-1.14.3-r1.ebuild
diff --git a/media-gfx/fotema/fotema-1.14.4.ebuild b/media-gfx/fotema/fotema-1.14.4-r1.ebuild
index 34219ad68ea2..34219ad68ea2 100644
--- a/media-gfx/fotema/fotema-1.14.4.ebuild
+++ b/media-gfx/fotema/fotema-1.14.4-r1.ebuild
diff --git a/media-gfx/libimagequant/libimagequant-4.2.2.ebuild b/media-gfx/libimagequant/libimagequant-4.2.2-r1.ebuild
index 5a96622a9881..33b4d2ef906f 100644
--- a/media-gfx/libimagequant/libimagequant-4.2.2.ebuild
+++ b/media-gfx/libimagequant/libimagequant-4.2.2-r1.ebuild
@@ -57,7 +57,6 @@ KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~s390 sparc"
 
 BDEPEND="
 	>=dev-util/cargo-c-0.9.11
-	>=virtual/rust-1.60
 "
 
 QA_FLAGS_IGNORED="usr/lib.*/libimagequant.so.*"
diff --git a/media-gfx/libimagequant/libimagequant-4.3.0.ebuild b/media-gfx/libimagequant/libimagequant-4.3.0-r1.ebuild
index 55609484950f..710c7dc0634f 100644
--- a/media-gfx/libimagequant/libimagequant-4.3.0.ebuild
+++ b/media-gfx/libimagequant/libimagequant-4.3.0-r1.ebuild
@@ -23,7 +23,6 @@ KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~s390 sparc"
 
 BDEPEND="
 	>=dev-util/cargo-c-0.9.14
-	>=virtual/rust-1.64
 "
 
 QA_FLAGS_IGNORED="usr/lib.*/libimagequant.so.*"
diff --git a/media-gfx/oxipng/oxipng-8.0.0-r1.ebuild b/media-gfx/oxipng/oxipng-8.0.0-r1.ebuild
new file mode 100644
index 000000000000..40831163d730
--- /dev/null
+++ b/media-gfx/oxipng/oxipng-8.0.0-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.5.3-dev
+
+EAPI=8
+
+CRATES="
+	adler@1.0.2
+	adler32@1.2.0
+	atty@0.2.14
+	autocfg@1.1.0
+	bitflags@1.3.2
+	bitvec@1.0.1
+	bytemuck@1.12.3
+	byteorder@1.4.3
+	cc@1.0.78
+	cfg-if@1.0.0
+	clap@3.2.23
+	clap_lex@0.2.4
+	color_quant@1.1.0
+	crc@3.0.0
+	crc-catalog@2.1.0
+	crc32fast@1.3.2
+	crossbeam-channel@0.5.6
+	crossbeam-deque@0.8.2
+	crossbeam-epoch@0.9.13
+	crossbeam-utils@0.8.14
+	either@1.8.0
+	filetime@0.2.19
+	flate2@1.0.25
+	funty@2.0.0
+	glob@0.3.0
+	hashbrown@0.12.3
+	hermit-abi@0.1.19
+	hermit-abi@0.2.6
+	image@0.24.5
+	indexmap@1.9.2
+	iter-read@0.3.1
+	itertools@0.10.5
+	libc@0.2.139
+	libdeflate-sys@0.11.0
+	libdeflater@0.11.0
+	log@0.4.17
+	memoffset@0.7.1
+	miniz_oxide@0.6.2
+	num-integer@0.1.45
+	num-rational@0.4.1
+	num-traits@0.2.15
+	num_cpus@1.15.0
+	once_cell@1.16.0
+	os_str_bytes@6.4.1
+	png@0.17.7
+	radium@0.7.0
+	rayon@1.6.1
+	rayon-core@1.10.1
+	redox_syscall@0.2.16
+	rgb@0.8.34
+	rustc-hash@1.1.0
+	rustc_version@0.4.0
+	scopeguard@1.1.0
+	semver@1.0.16
+	stderrlog@0.5.4
+	strsim@0.10.0
+	tap@1.0.1
+	termcolor@1.1.3
+	textwrap@0.16.0
+	thread_local@1.1.4
+	typed-arena@2.0.1
+	wild@2.1.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_aarch64_gnullvm@0.42.0
+	windows_aarch64_msvc@0.42.0
+	windows_i686_gnu@0.42.0
+	windows_i686_msvc@0.42.0
+	windows_x86_64_gnu@0.42.0
+	windows_x86_64_gnullvm@0.42.0
+	windows_x86_64_msvc@0.42.0
+	wyz@0.5.1
+	zopfli@0.7.1
+"
+
+inherit cargo flag-o-matic
+
+DESCRIPTION="Multithreaded lossless PNG compression optimizer written in Rust"
+HOMEPAGE="https://github.com/shssoichiro/oxipng"
+SRC_URI="https://github.com/shssoichiro/oxipng/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		${CARGO_CRATE_URIS}
+"
+
+LICENSE="
+	|| ( 0BSD Apache-2.0 MIT )
+	Apache-2.0
+	|| ( Apache-2.0 MIT )
+	|| ( Apache-2.0 MIT ZLIB )
+	MIT
+	|| ( MIT Unlicense )
+	ZLIB
+"
+SLOT="0"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
+
+QA_FLAGS_IGNORED="usr/bin/oxipng"
+
+src_configure() {
+	filter-lto # 860063 file format not recognized with cloudflare-zlib-sys
+}
+
+src_install() {
+	cargo_src_install
+
+	dodoc CHANGELOG.md README.md
+}
diff --git a/media-gfx/oxipng/oxipng-8.0.0.ebuild b/media-gfx/oxipng/oxipng-8.0.0.ebuild
deleted file mode 100644
index c94033fde23f..000000000000
--- a/media-gfx/oxipng/oxipng-8.0.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Auto-Generated by cargo-ebuild 0.5.3-dev
-
-EAPI=8
-
-CRATES="
-	adler-1.0.2
-	adler32-1.2.0
-	atty-0.2.14
-	autocfg-1.1.0
-	bitflags-1.3.2
-	bitvec-1.0.1
-	bytemuck-1.12.3
-	byteorder-1.4.3
-	cc-1.0.78
-	cfg-if-1.0.0
-	clap-3.2.23
-	clap_lex-0.2.4
-	color_quant-1.1.0
-	crc-3.0.0
-	crc-catalog-2.1.0
-	crc32fast-1.3.2
-	crossbeam-channel-0.5.6
-	crossbeam-deque-0.8.2
-	crossbeam-epoch-0.9.13
-	crossbeam-utils-0.8.14
-	either-1.8.0
-	filetime-0.2.19
-	flate2-1.0.25
-	funty-2.0.0
-	glob-0.3.0
-	hashbrown-0.12.3
-	hermit-abi-0.1.19
-	hermit-abi-0.2.6
-	image-0.24.5
-	indexmap-1.9.2
-	iter-read-0.3.1
-	itertools-0.10.5
-	libc-0.2.139
-	libdeflate-sys-0.11.0
-	libdeflater-0.11.0
-	log-0.4.17
-	memoffset-0.7.1
-	miniz_oxide-0.6.2
-	num-integer-0.1.45
-	num-rational-0.4.1
-	num-traits-0.2.15
-	num_cpus-1.15.0
-	once_cell-1.16.0
-	os_str_bytes-6.4.1
-	png-0.17.7
-	radium-0.7.0
-	rayon-1.6.1
-	rayon-core-1.10.1
-	redox_syscall-0.2.16
-	rgb-0.8.34
-	rustc-hash-1.1.0
-	rustc_version-0.4.0
-	scopeguard-1.1.0
-	semver-1.0.16
-	stderrlog-0.5.4
-	strsim-0.10.0
-	tap-1.0.1
-	termcolor-1.1.3
-	textwrap-0.16.0
-	thread_local-1.1.4
-	typed-arena-2.0.1
-	wild-2.1.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_aarch64_gnullvm-0.42.0
-	windows_aarch64_msvc-0.42.0
-	windows_i686_gnu-0.42.0
-	windows_i686_msvc-0.42.0
-	windows_x86_64_gnu-0.42.0
-	windows_x86_64_gnullvm-0.42.0
-	windows_x86_64_msvc-0.42.0
-	wyz-0.5.1
-	zopfli-0.7.1
-"
-
-inherit cargo flag-o-matic
-
-DESCRIPTION="Multithreaded lossless PNG compression optimizer written in Rust"
-HOMEPAGE="https://github.com/shssoichiro/oxipng"
-SRC_URI="https://github.com/shssoichiro/oxipng/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" $(cargo_crate_uris ${CRATES})"
-
-LICENSE="
-	|| ( 0BSD Apache-2.0 MIT )
-	Apache-2.0
-	|| ( Apache-2.0 MIT )
-	|| ( Apache-2.0 MIT ZLIB )
-	MIT
-	|| ( MIT Unlicense )
-	ZLIB
-"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv ~x86"
-
-BDEPEND=">=virtual/rust-1.61.0"
-
-QA_FLAGS_IGNORED="usr/bin/oxipng"
-
-src_configure() {
-	filter-lto # 860063 file format not recognized with cloudflare-zlib-sys
-}
-
-src_install() {
-	cargo_src_install
-
-	dodoc CHANGELOG.md README.md
-}
diff --git a/media-gfx/oxipng/oxipng-9.0.0.ebuild b/media-gfx/oxipng/oxipng-9.0.0-r1.ebuild
index dc57177ddd22..f94d2b560cd1 100644
--- a/media-gfx/oxipng/oxipng-9.0.0.ebuild
+++ b/media-gfx/oxipng/oxipng-9.0.0-r1.ebuild
@@ -109,8 +109,6 @@ LICENSE="
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 
-BDEPEND=">=virtual/rust-1.66.0"
-
 QA_FLAGS_IGNORED="usr/bin/${PN}"
 
 src_install() {
diff --git a/media-gfx/oxipng/oxipng-9.1.2.ebuild b/media-gfx/oxipng/oxipng-9.1.2-r1.ebuild
index 8504fd85f18f..3b199b4f6e39 100644
--- a/media-gfx/oxipng/oxipng-9.1.2.ebuild
+++ b/media-gfx/oxipng/oxipng-9.1.2-r1.ebuild
@@ -90,6 +90,8 @@ CRATES="
 	zopfli@0.8.0
 "
 
+RUST_MIN_VER="1.74.0"
+
 inherit cargo
 
 DESCRIPTION="Multithreaded lossless PNG compression optimizer written in Rust"
@@ -106,8 +108,6 @@ LICENSE="
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 
-BDEPEND=">=virtual/rust-1.74.0"
-
 # rust does not use *FLAGS from make.conf, silence portage warning
 # update with proper path to binaries this crate installs, omit leading /
 QA_FLAGS_IGNORED="usr/bin/${PN}"