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

  • [gentoo-dev] [PATCH 1/2] rpm.eclass: Drop support for EAPI 5

    From =?UTF-8?q?Ulrich=20M=C3=BCller?=@21:1/5 to All on Fri Jun 16 10:30:01 2023
    Signed-off-by: Ulrich Müller <ulm@gentoo.org>
    ---
    eclass/rpm.eclass | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    diff --git a/eclass/rpm.eclass b/eclass/rpm.eclass
    index c97e23144c2b..d03493466e1e 100644
    --- a/eclass/rpm.eclass
    +++ b/eclass/rpm.eclass
    @@ -1,14 +1,14 @@
    -# Copyright 1999-2021 Gentoo Authors
    +# Copyright 1999-2023 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: rpm.eclass
    # @MAINTAINER:
    # base-system@gentoo.org
    -# @SUPPORTED_EAPIS: 5 6 7 8
    +# @SUPPORTED_EAPIS: 6 7 8
    # @BLURB: convenience class for extracting RPMs

    case ${EAPI} in
    - 5|6) inherit epatch eutils ;; # eutils for eqawarn
    + 6) inherit epatch eutils ;; # eutils for eqawarn
    7) inherit eutils ;; # not needed, but ebuilds may still rely on it
    8) ;;
    *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
    @@ -20,7 +20,7 @@ _RPM_ECLASS=1
    inherit estack

    case ${EAPI} in
    - 5|6) DEPEND="app-arch/rpm2targz" ;;
    + 6) DEPEND="app-arch/rpm2targz" ;;
    *) BDEPEND="app-arch/rpm2targz" ;;
  • From =?UTF-8?q?Ulrich=20M=C3=BCller?=@21:1/5 to All on Fri Jun 16 10:30:01 2023
    None of the ebuilds inheriting rpm in EAPI 7 needs any of the remaining
    eutils features.

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

    diff --git a/eclass/rpm.eclass b/eclass/rpm.eclass
    index d03493466e1e..d8bb0ad2814d 100644
    --- a/eclass/rpm.eclass
    +++ b/eclass/rpm.eclass
    @@ -9,8 +9,7 @@

    case ${EAPI} in
    6) inherit epatch eutils ;; # eutils for eqawarn
    - 7) inherit eutils ;; # not needed, but ebuilds may still rely on it
    - 8) ;;
    + 7|8) ;;
    *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
    esac

    --
    2.41.0

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