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

  • [gentoo-dev] [PATCH 0/7] Drop support for EAPI 5 in eutils and its frie

    From =?UTF-8?q?Ulrich=20M=C3=BCller?=@21:1/5 to All on Tue Jun 28 19:30:02 2022
    Obviously, the series can only be merged when the last EAPI 5 ebuild
    is gone. Current status is that we're down to 3 packages with EAPI 5
    which are all last-rited.

    Ulrich Müller (7):
    eutils.eclass: Drop support for EAPI 5
    eutils.eclass: Remove use_if_iuse
    eutils.eclass: Remove emktemp
    autotools.eclass: Drop support for EAPI 5
    flag-o-matic.eclass: Drop support for EAPI 5
    multilib.eclass: Drop support for EAPIs 0 and 5
    toolchain-funcs.eclass: Drop support for EAPIs 0 and 5

    eclass/autotools.eclass | 14 ++--
    eclass/eutils.eclass | 152 +++-------------------------------
    eclass/flag-o-matic.eclass | 17 ++--
    eclass/multilib.eclass | 33 +-------
    eclass/toolchain-funcs.eclass | 7 +-
    5 files changed, 33 insertions(+), 190 deletions(-)

    --
    2.35.1

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From =?UTF-8?q?Ulrich=20M=C3=BCller?=@21:1/5 to All on Tue Jun 28 19:30:02 2022
    Signed-off-by: Ulrich Müller <[email protected]>
    ---
    eclass/flag-o-matic.eclass | 17 ++++++++---------
    1 file changed, 8 insertions(+), 9 deletions(-)

    diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
    index 0e15d7423547..0dd2c1191273 100644
    --- a/eclass/flag-o-matic.eclass
    +++ b/eclass/flag-o-matic.eclass
    @@ -4,16 +4,15 @@
    # @ECLASS: flag-o-matic.eclass
    # @MAINTAINER:
    # [email protected]
    -# @SUPPORTED_EAPIS: 5 6 7 8
    +# @SUPPORTED_EAPIS: 6 7 8
    # @BLURB: common functions to manipulate and query toolchain flags
    # @DESCRIPTION:
    # This eclass contains a suite of functions to help developers sanely
    # and safely manage toolchain flags in their builds.

    -case ${EAPI:-0} in
    - 0|1|2|3|4) die "flag-o-matic.eclass: EAPI ${EAPI} is too old." ;;
    - 5|6|7|8) ;;
    - *) die "EAPI ${EAPI} is not supported by flag-o-matic.eclass." ;;
    +case ${EAPI} in
    + 6|7|8) ;;
    + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
    esac

    if [[ -z ${_FLAG_O_MATIC_ECLASS} ]]; then
    @@ -21,7 +20,7 @@ _FLAG_O_MATIC_ECLASS=1

    inherit t
  • From =?UTF-8?q?Ulrich=20M=C3=BCller?=@21:1/5 to All on Tue Jun 28 19:30:02 2022
    Signed-off-by: Ulrich Müller <[email protected]>
    ---
    eclass/toolchain-funcs.eclass | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index 17c075895d55..b21eb5542208 100644
    --- a/eclass/toolchain-funcs.eclass
    +++ b/eclass/toolchain-funcs.eclass
    @@ -4,7 +4,7 @@
    # @ECLASS: toolchain-funcs.eclass
    # @MAINTAINER:
    # Toolchain Ninjas <[email protected]>
    -# @SUPPORTED_EAPIS: 5 6 7 8
    +# @SUPPORTED_EAPIS: 6 7 8
    # @BLURB: functions to query common info about the toolchain
    # @DESCRIPTION:
    # The toolchain-funcs aims to provide a complete suite of functions
    @@ -13,9 +13,8 @@
    # in such a way that you can rely on the function always returning
    # something sane.

    -case ${EAPI:-0} in
    - # EAPI=0 is still used by crossdev, bug #797367
    - 0|5|6|7|8) ;;
    +case ${EAPI} in
    + 6|7|8) ;;
    *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
    esac

    --
    2.35.1

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From =?UTF-8?q?Ulrich=20M=C3=BCller?=@21:1/5 to All on Tue Jun 28 19:30:02 2022
    Signed-off-by: Ulrich Müller <[email protected]>
    ---
    eclass/eutils.eclass | 100 +++----------------------------------------
    1 file changed, 5 insertions(+), 95 deletions(-)

    diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
    index 207d05e7f975..0b84e3c82c00 100644
    --- a/eclass/eutils.eclass
    +++ b/eclass/eutils.eclass
    @@ -1,10 +1,10 @@
    -# Copyright 1999-2021 Gentoo Authors
    +# Copyright 1999-2022 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: eutils.eclass
    # @MAINTAINER:
    # [email protected]
    -# @SUPPORTED_EAPIS: 5 6 7
    +# @SUPPORTED_EAPIS: 6 7
    # @BLURB: many extra (but common) functions that are used in ebuilds
    # @DESCRIPTION:
    # The eutils eclass contains a suite of functions that complement
    @@ -24,10 +24,8 @@ _EUTILS_ECLASS=1

    # implicitly inherited (now split) eclasses
    case ${EAPI} in
    - 5|6)
    - inherit desktop edos2unix epatch estack ltprune multilib \
    - preserve-libs strip-linguas toolchain-funcs vcs-clean wrapper
    - ;;
    + 6) inherit desktop edos2unix epatch es
  • From =?UTF-8?q?Ulrich=20M=C3=BCller?=@21:1/5 to All on Tue Jun 28 19:30:02 2022
    Signed-off-by: Ulrich Müller <[email protected]>
    ---
    eclass/multilib.eclass | 33 +++------------------------------
    1 file changed, 3 insertions(+), 30 deletions(-)

    diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
    index 8590bbdfbff0..e3c0d78a6e43 100644
    --- a/eclass/multilib.eclass
    +++ b/eclass/multilib.eclass
    @@ -4,14 +4,13 @@
    # @ECLASS: multilib.eclass
    # @MAINTAINER:
    # [email protected]
    -# @SUPPORTED_EAPIS: 5 6 7 8
    +# @SUPPORTED_EAPIS: 6 7 8
    # @BLURB: This eclass is for all functions pertaining to handling multilib configurations.
    # @DESCRIPTION:
    # This eclass is for all functions pertaining to handling multilib configurations.

    -case ${EAPI:-0} in
    - # EAPI=0 is still used by crossdev, bug #797367
    - 0|5|6|7|8) ;;
    +case ${EAPI} in
    + 6|7|8) ;;
    *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
    esac

    @@ -40,32 +39,6 @@ has_multilib_profile() {
    [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ]
    }

    -# @FUNCTION: get_libdir
    -# @RETURN: the libdir for the selected ABI
    -# @DESCRI
  • From =?UTF-8?q?Ulrich=20M=C3=BCller?=@21:1/5 to All on Tue Jun 28 19:30:02 2022
    Signed-off-by: Ulrich Müller <[email protected]>
    ---
    eclass/eutils.eclass | 15 ++++-----------
    1 file changed, 4 insertions(+), 11 deletions(-)

    diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
    index 0b84e3c82c00..e2b3ce0482a9 100644
    --- a/eclass/eutils.eclass
    +++ b/eclass/eutils.eclass
    @@ -74,18 +74,11 @@ path_exists() {
    die "path_exists is banned"
    }

    -# @FUNCTION: use_if_iuse
    -# @USAGE: <flag>
    -# @DESCRIPTION:
    -# Return true if the given flag is in USE and IUSE.
    -#
    -# Note that this function should not be used in the global scope.
    use_if_iuse() {
    - eqawarn "use_if_iuse is deprecated."
    - eqawarn "Define it as a local function, or inline it:"
    - eqawarn " in_iuse foo && use foo"
    - in_iuse $1 || return 1
    - use $1
    + eerror "use_if_iuse has been removed."
    + eerror "Define it as a local function, or inline it:"
    + eerror " in_iuse foo && use foo"
    + die "use_if_iuse is banned"
    }

    # @FUNCTION: eqawarn
    --
    2.35.1

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From =?UTF-8?q?Ulrich=20M=C3=BCller?=@21:1/5 to All on Tue Jun 28 19:30:02 2022
    Signed-off-by: Ulrich Müller <[email protected]>
    ---
    eclass/autotools.eclass | 14 +++++++-------
    1 file changed, 7 insertions(+), 7 deletions(-)

    diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
    index d6c5b7f0ec0d..caf425b9d9a5 100644
    --- a/eclass/autotools.eclass
    +++ b/eclass/autotools.eclass
    @@ -4,7 +4,7 @@
    # @ECLASS: autotools.eclass
    # @MAINTAINER:
    # [email protected]
    -# @SUPPORTED_EAPIS: 5 6 7 8
    +# @SUPPORTED_EAPIS: 6 7 8
    # @BLURB: Regenerates auto* build scripts
    # @DESCRIPTION:
    # This eclass is for safely handling autotooled software packages that need to @@ -27,7 +27,7 @@ if [[ -z ${_AUTOTOOLS_ECLASS} ]] ; then
    _AUTOTOOLS_ECLASS=1

    case ${EAPI} in
    - 5|6)
    + 6)
    # Needed for eqawarn
    inherit eutils
    ;;
    @@ -130,7 +130,7 @@ RDEPEND=""
    : ${AUTOTOOLS_AUTO_DEPEND:=yes}
    if [[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] ; then
    case ${EAPI} in
    - 5|6) DEPEND=${AUTOTOOLS_DEPEND} ;;
    + 6) DEPEND=${AUTOTOOLS_DEPEND} ;;
    *) BDEPEND=${AUTOTOOLS_DEPEND} ;;
    esac
    fi
    @@ -336,7 +336,7 @@ eaclocal() {
  • From =?UTF-8?q?Ulrich=20M=C3=BCller?=@21:1/5 to All on Sun Jul 3 17:20:01 2022
    Signed-off-by: Ulrich Müller <[email protected]>
    ---
    eclass/epatch.eclass | 90 ++------------------------------------------
    1 file changed, 4 insertions(+), 86 deletions(-)

    diff --git a/eclass/epatch.eclass b/eclass/epatch.eclass
    index 6a9c460da0a3..17526653673a 100644
    --- a/eclass/epatch.eclass
    +++ b/eclass/epatch.eclass
    @@ -4,7 +4,7 @@
    # @ECLASS: epatch.eclass
    # @MAINTAINER:
    # [email protected]
    -# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6
    +# @SUPPORTED_EAPIS: 6
    # @BLURB: easy patch application functions
    # @DEPRECATED: eapply from EAPI 7
    # @DESCRIPTION:
    @@ -13,11 +13,9 @@

    if [[ -z ${_EPATCH_ECLASS} ]]; then

    -case ${EAPI:-0} in
    - 0|1|2|3|4|5|6)
    - ;;
    - *)
    - die "${ECLASS}: banned in EAPI=${EAPI}; use eapply* instead";; +case ${EAPI} in
    + 6) ;;
    + *) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
    esac

    inherit estack
    @@ -386,85 +384,5 @@ epatch() {
    : # everything worked
    }

    -case ${EAPI:-0} in
    -0|1|2|3|4|5)
    -
    -# @ECLASS_VARIABLE: EPATCH_USER_SOURCE
    -# @USER_VARIABLE
    -# @DESCRIPTION:
    -# Location for user pa
  • From David Seifert@21:1/5 to All on Mon Jul 4 00:20:01 2022
    On Tue, 2022-06-28 at 19:24 +0200, Ulrich Müller wrote:
    Obviously, the series can only be merged when the last EAPI 5 ebuild
    is gone. Current status is that we're down to 3 packages with EAPI 5
    which are all last-rited.

    Ulrich Müller (7):
      eutils.eclass: Drop support for EAPI 5
      eutils.eclass: Remove use_if_iuse
      eutils.eclass: Remove emktemp
      autotools.eclass: Drop support for EAPI 5
      flag-o-matic.eclass: Drop support for EAPI 5
      multilib.eclass: Drop support for EAPIs 0 and 5
      toolchain-funcs.eclass: Drop support for EAPIs 0 and 5

     eclass/autotools.eclass       |  14 ++--  eclass/eutils.eclass          | 152 +++------------------------------
    -
     eclass/flag-o-matic.eclass    |  17 ++--  eclass/multilib.eclass        |  33 +-------  eclass/toolchain-funcs.eclass |   7 +-
     5 files changed, 33 insertions(+), 190 deletions(-)


    The whole series looks good, let's merge it ASAP.

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