• [gentoo-dev] [PATCH v2 1/2] cargo.eclass: Drop EAPI 7 support

    From James Le Cuirot@21:1/5 to All on Tue Jun 11 15:50:02 2024
    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@gentoo.org>
    ---
    eclass/cargo.eclass | 19 ++-----------------
    1 file changed, 2 insertions(+), 17 deletions(-)

    diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
    index a685cd99fb38b..72c740cda9065 100644
    --- a/eclass/cargo.eclass
    +++ b/eclass/cargo.eclass
    @@ -7,11 +7,11 @@
    # @AUTHOR:
    # Doug Goldstein <cardoe@gentoo.org>
    # Georgy Yakovlev <gyakovlev@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-sta