1. Forum
  2. Usenet
  3. LINUX.GENTOO.DEV

  • [gentoo-dev] [PATCH] eutils.eclass: Drop EAPI 7

    From =?UTF-8?q?Ulrich=20M=C3=BCller?=@21:1/5 to All on Sat Aug 26 13:00:02 2023
    Remove placeholders for emktemp, path_exists and use_if_iuse, which are
    all non-functional since more than one year.

    Signed-off-by: Ulrich Müller <ulm@gentoo.org>
    ---
    eclass/eutils.eclass | 26 ++------------------------
    1 file changed, 2 insertions(+), 24 deletions(-)

    diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
    index 3b6a90fecb81..b48c18f97904 100644
    --- a/eclass/eutils.eclass
    +++ b/eclass/eutils.eclass
    @@ -1,10 +1,10 @@
    -# Copyright 1999-2022 Gentoo Authors
    +# Copyright 1999-2023 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: eutils.eclass
    # @MAINTAINER:
    # base-system@gentoo.org
    -# @SUPPORTED_EAPIS: 6 7
    +# @SUPPORTED_EAPIS: 6
    # @BLURB: many extra (but common) functions that are used in ebuilds
    # @DEPRECATED: native package manager functions, more specific eclasses

    @@ -15,28 +15,6 @@ _EUTILS_ECLASS=1
    case ${EAPI} in
    6) inherit desktop edos2unix epatch eqawarn estack ltprune multilib \
    preserve-libs strip-linguas toolchain-funcs vcs-clean wrapper ;;
    - 7) inherit edos2unix strip-linguas wrapper ;;
    *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
    esac
    -
    -emktem
  • From Ulrich Mueller@21:1/5 to All on Wed Aug 30 12:50:01 2023
    In spite of the deprecation warning being in place for more than a year,
    this seems to have caused errors with EAPI 7 ebuilds in some overlays.

    Since we see some strange fixes, like downgrading of ebuilds to EAPI 6
    (which is banned), here's a quick recipe for overlay maintainers how to
    go for this:

    1. From a quick scan of ebuilds in overlays, it looks like eutils can
    simply be dropped from inherit in the vast majority of cases.

    2. After doing this, run "pkgcheck scan". It will report any eclasses
    that are missing.

    Hint: If in the second step, pkgcheck doesn't report any of "edos2unix", "strip-linguas" or "wrapper", then inheriting eutils was incorrect
    before, and removal of EAPI 7 from eutils.eclass only exposes that
    error.

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)