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

3 files changed, 176 insertions, 176 deletions

diff --git a/net-news/newsboat/newsboat-2.30.1-r1.ebuild b/net-news/newsboat/newsboat-2.30.1-r1.ebuild
new file mode 100644
index 000000000000..bb2748631b77
--- /dev/null
+++ b/net-news/newsboat/newsboat-2.30.1-r1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 2017-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	addr2line@0.17.0
+	adler@1.0.2
+	aho-corasick@0.7.19
+	android_system_properties@0.1.5
+	autocfg@1.1.0
+	backtrace@0.3.66
+	bitflags@1.3.2
+	bit-set@0.5.3
+	bit-vec@0.6.3
+	block@0.1.6
+	bumpalo@3.11.0
+	byteorder@1.4.3
+	cc@1.0.73
+	cfg-if@1.0.0
+	chrono@0.4.23
+	codespan-reporting@0.11.1
+	core-foundation-sys@0.8.3
+	curl-sys-0.4.59+curl@7.86.0
+	cxx@1.0.85
+	cxxbridge-flags@1.0.85
+	cxxbridge-macro@1.0.85
+	cxx-build@1.0.85
+	dirs@4.0.0
+	dirs-sys@0.3.7
+	fastrand@1.8.0
+	fnv@1.0.7
+	form_urlencoded@1.1.0
+	getrandom@0.2.7
+	gettext-rs@0.7.0
+	gettext-sys@0.21.3
+	gimli@0.26.2
+	iana-time-zone@0.1.50
+	idna@0.3.0
+	instant@0.1.12
+	js-sys@0.3.60
+	lazy_static@1.4.0
+	lexopt@0.2.1
+	libc@0.2.139
+	libz-sys@1.1.8
+	link-cplusplus@1.0.7
+	locale_config@0.3.0
+	log@0.4.17
+	malloc_buf@0.0.6
+	md5@0.7.0
+	memchr@2.5.0
+	minimal-lexical@0.2.1
+	miniz_oxide@0.5.4
+	natord@1.0.9
+	nom@7.1.1
+	num-integer@0.1.45
+	num-traits@0.2.15
+	objc@0.2.7
+	objc-foundation@0.1.1
+	objc_id@0.1.1
+	object@0.29.0
+	once_cell@1.16.0
+	percent-encoding@2.2.0
+	pkg-config@0.3.25
+	ppv-lite86@0.2.16
+	proc-macro2@1.0.44
+	proptest@1.0.0
+	quick-error@1.2.3
+	quick-error@2.0.1
+	quote@1.0.21
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	rand_xorshift@0.3.0
+	redox_syscall@0.2.16
+	redox_users@0.4.3
+	regex@1.6.0
+	regex-syntax@0.6.27
+	remove_dir_all@0.5.3
+	rustc-demangle@0.1.21
+	rusty-fork@0.3.0
+	scratch@1.0.2
+	section_testing@0.0.5
+	syn@1.0.100
+	temp-dir@0.1.11
+	tempfile@3.3.0
+	termcolor@1.1.3
+	thiserror@1.0.36
+	thiserror-impl@1.0.36
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.0
+	unicode-bidi@0.3.8
+	unicode-ident@1.0.4
+	unicode-normalization@0.1.22
+	unicode-width@0.1.10
+	url@2.3.1
+	vcpkg@0.2.15
+	wait-timeout@0.2.0
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen@0.2.83
+	wasm-bindgen-backend@0.2.83
+	wasm-bindgen-macro@0.2.83
+	wasm-bindgen-macro-support@0.2.83
+	wasm-bindgen-shared@0.2.83
+	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
+	xdg@2.4.1
+"
+
+inherit flag-o-matic toolchain-funcs cargo
+
+DESCRIPTION="An RSS/Atom feed reader for text terminals"
+HOMEPAGE="https://newsboat.org/ https://github.com/newsboat/newsboat"
+SRC_URI="
+	https://newsboat.org/releases/${PV}/${P}.tar.xz
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD MIT Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+
+RDEPEND="
+	>=dev-db/sqlite-3.5:3
+	>=dev-libs/json-c-0.11:=
+	>=dev-libs/stfl-0.21
+	>=net-misc/curl-7.21.6
+	dev-libs/libxml2
+	dev-libs/openssl:=
+	sys-libs/ncurses:=[unicode(+)]
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+BDEPEND="
+	app-alternatives/awk
+	>=dev-ruby/asciidoctor-1.5.3
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-13.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s/WARNFLAGS=-Werror -Wall/WARNFLAGS=-Wall/" \
+		-e "s/BARE_CXXFLAGS=-std=c++11 -O2 -ggdb/BARE_CXXFLAGS=-std=c++11/" \
+		Makefile || die
+}
+
+src_configure() {
+	filter-lto  # bug #877657
+	./config.sh || die
+}
+
+src_compile() {
+	export CARGO_HOME="${ECARGO_HOME}"
+	emake prefix="/usr" CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+}
+
+src_test() {
+	emake CC="${tc-getCC}" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" check || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="/usr" docdir="/usr/share/doc/${PF}" install
+	einstalldocs
+}
diff --git a/net-news/newsboat/newsboat-2.30.1.ebuild b/net-news/newsboat/newsboat-2.30.1.ebuild
deleted file mode 100644
index 894a2fb34e88..000000000000
--- a/net-news/newsboat/newsboat-2.30.1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 2017-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-addr2line-0.17.0
-adler-1.0.2
-aho-corasick-0.7.19
-android_system_properties-0.1.5
-autocfg-1.1.0
-backtrace-0.3.66
-bitflags-1.3.2
-bit-set-0.5.3
-bit-vec-0.6.3
-block-0.1.6
-bumpalo-3.11.0
-byteorder-1.4.3
-cc-1.0.73
-cfg-if-1.0.0
-chrono-0.4.23
-codespan-reporting-0.11.1
-core-foundation-sys-0.8.3
-curl-sys-0.4.59+curl-7.86.0
-cxx-1.0.85
-cxxbridge-flags-1.0.85
-cxxbridge-macro-1.0.85
-cxx-build-1.0.85
-dirs-4.0.0
-dirs-sys-0.3.7
-fastrand-1.8.0
-fnv-1.0.7
-form_urlencoded-1.1.0
-getrandom-0.2.7
-gettext-rs-0.7.0
-gettext-sys-0.21.3
-gimli-0.26.2
-iana-time-zone-0.1.50
-idna-0.3.0
-instant-0.1.12
-js-sys-0.3.60
-lazy_static-1.4.0
-lexopt-0.2.1
-libc-0.2.139
-libz-sys-1.1.8
-link-cplusplus-1.0.7
-locale_config-0.3.0
-log-0.4.17
-malloc_buf-0.0.6
-md5-0.7.0
-memchr-2.5.0
-minimal-lexical-0.2.1
-miniz_oxide-0.5.4
-natord-1.0.9
-nom-7.1.1
-num-integer-0.1.45
-num-traits-0.2.15
-objc-0.2.7
-objc-foundation-0.1.1
-objc_id-0.1.1
-object-0.29.0
-once_cell-1.16.0
-percent-encoding-2.2.0
-pkg-config-0.3.25
-ppv-lite86-0.2.16
-proc-macro2-1.0.44
-proptest-1.0.0
-quick-error-1.2.3
-quick-error-2.0.1
-quote-1.0.21
-rand-0.8.5
-rand_chacha-0.3.1
-rand_core-0.6.4
-rand_xorshift-0.3.0
-redox_syscall-0.2.16
-redox_users-0.4.3
-regex-1.6.0
-regex-syntax-0.6.27
-remove_dir_all-0.5.3
-rustc-demangle-0.1.21
-rusty-fork-0.3.0
-scratch-1.0.2
-section_testing-0.0.5
-syn-1.0.100
-temp-dir-0.1.11
-tempfile-3.3.0
-termcolor-1.1.3
-thiserror-1.0.36
-thiserror-impl-1.0.36
-tinyvec-1.6.0
-tinyvec_macros-0.1.0
-unicode-bidi-0.3.8
-unicode-ident-1.0.4
-unicode-normalization-0.1.22
-unicode-width-0.1.10
-url-2.3.1
-vcpkg-0.2.15
-wait-timeout-0.2.0
-wasi-0.11.0+wasi-snapshot-preview1
-wasm-bindgen-0.2.83
-wasm-bindgen-backend-0.2.83
-wasm-bindgen-macro-0.2.83
-wasm-bindgen-macro-support-0.2.83
-wasm-bindgen-shared-0.2.83
-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
-xdg-2.4.1
-"
-
-inherit flag-o-matic toolchain-funcs cargo
-
-DESCRIPTION="An RSS/Atom feed reader for text terminals"
-HOMEPAGE="https://newsboat.org/ https://github.com/newsboat/newsboat"
-SRC_URI="
-	https://newsboat.org/releases/${PV}/${P}.tar.xz
-	$(cargo_crate_uris ${CRATES})
-"
-
-LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD MIT Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	>=dev-db/sqlite-3.5:3
-	>=dev-libs/json-c-0.11:=
-	>=dev-libs/stfl-0.21
-	>=net-misc/curl-7.21.6
-	dev-libs/libxml2
-	dev-libs/openssl:=
-	sys-libs/ncurses:=[unicode(+)]
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-BDEPEND="
-	app-alternatives/awk
-	>=dev-ruby/asciidoctor-1.5.3
-	virtual/pkgconfig
-	>=virtual/rust-1.62.0
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-13.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s/WARNFLAGS=-Werror -Wall/WARNFLAGS=-Wall/" \
-		-e "s/BARE_CXXFLAGS=-std=c++11 -O2 -ggdb/BARE_CXXFLAGS=-std=c++11/" \
-		Makefile || die
-}
-
-src_configure() {
-	filter-lto  # bug #877657
-	./config.sh || die
-}
-
-src_compile() {
-	export CARGO_HOME="${ECARGO_HOME}"
-	emake prefix="/usr" CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-}
-
-src_test() {
-	emake CC="${tc-getCC}" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" check || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="/usr" docdir="/usr/share/doc/${PF}" install
-	einstalldocs
-}
diff --git a/net-news/newsboat/newsboat-2.34.ebuild b/net-news/newsboat/newsboat-2.34-r1.ebuild
index 00ce79f68b8e..cec9141d479a 100644
--- a/net-news/newsboat/newsboat-2.34.ebuild
+++ b/net-news/newsboat/newsboat-2.34-r1.ebuild
@@ -121,6 +121,8 @@ CRATES="
 	xdg@2.5.2
 "
 
+RUST_MIN_VER="1.74.1"
+
 inherit cargo flag-o-matic toolchain-funcs xdg
 
 DESCRIPTION="An RSS/Atom feed reader for text terminals"
@@ -163,7 +165,6 @@ BDEPEND="
 	app-alternatives/awk
 	sys-devel/gettext
 	virtual/pkgconfig
-	>=virtual/rust-1.74.0
 "
 
 src_prepare() {