commit: e274b7b2ebe1261cb204064880be78c13300d13d Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Fri Jun 7 16:57:37 2024 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Wed Jun 12 13:18:00 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e274b7b2
cargo.eclass: Drop EAPI 7 support It is going to inherit rust-toolchain, which is EAPI 8 only. Closes: https://bugs.gentoo.org/715890 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> eclass/cargo.eclass | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass index a685cd99fb38..72c740cda906 100644 --- a/eclass/cargo.eclass +++ b/eclass/cargo.eclass @@ -7,11 +7,11 @@ # @AUTHOR: # Doug Goldstein <car...@gentoo.org> # Georgy Yakovlev <gyakov...@gentoo.org> -# @SUPPORTED_EAPIS: 7 8 +# @SUPPORTED_EAPIS: 8 # @BLURB: common functions and variables for cargo builds case ${EAPI} in - 7|8) ;; + 8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -23,10 +23,6 @@ _CARGO_ECLASS=1 RUST_DEPEND="virtual/rust" case ${EAPI} in - 7) - # 1.37 added 'cargo vendor' subcommand and net.offline config knob - RUST_DEPEND=">=virtual/rust-1.37.0" - ;; 8) # 1.39 added --workspace # 1.46 added --target dir @@ -556,17 +552,6 @@ cargo_src_install() { rm -f "${ED}/usr/.crates.toml" || die rm -f "${ED}/usr/.crates2.json" || die - - # it turned out to be non-standard dir, so get rid of it future EAPI - # and only run for EAPI=7 - # https://bugs.gentoo.org/715890 - case ${EAPI:-0} in - 7) - if [ -d "${S}/man" ]; then - doman "${S}/man" || return 0 - fi - ;; - esac } # @FUNCTION: cargo_src_test
