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

  • [gentoo-dev] [PATCH 1/2] s6.eclass: drop EAPI 5, 6 and 7 support

    From David Seifert@21:1/5 to All on Sun Jan 1 20:50:02 2023
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/s6.eclass | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/eclass/s6.eclass b/eclass/s6.eclass
    index 25960ba4a1d..f4d7ebf2c31 100644
    --- a/eclass/s6.eclass
    +++ b/eclass/s6.eclass
    @@ -1,10 +1,10 @@
    -# Copyright 1999-2019 Gentoo Authors
    +# Copyright 1999-2023 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: s6.eclass
    # @MAINTAINER:
    # William Hubbs <williamh@gentoo.org>
    -# @SUPPORTED_EAPIS: 5 6 7 8
    +# @SUPPORTED_EAPIS: 8
    # @BLURB: helper functions to install s6 services
    # @DESCRIPTION:
    # This eclass provides helpers to install s6 services.
    @@ -26,7 +26,7 @@
    # @CODE

    case ${EAPI} in
    - 5|6|7|8) ;;
    + 8) ;;
    *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
    esac

    --
    2.39.0

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From David Seifert@21:1/5 to All on Sun Jan 1 20:50:01 2023
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/s6.eclass | 42 ++++++++++++++++++++----------------------
    1 file changed, 20 insertions(+), 22 deletions(-)

    diff --git a/eclass/s6.eclass b/eclass/s6.eclass
    index f4d7ebf2c31..56b321f178f 100644
    --- a/eclass/s6.eclass
    +++ b/eclass/s6.eclass
    @@ -42,7 +42,7 @@ _s6_get_servicedir() {
    # @DESCRIPTION:
    # Output the path for the s6 service directory (not including ${D}).
    s6_get_servicedir() {
    - debug-print-function ${FUNCNAME} "${@}"
    + debug-print-function ${FUNCNAME} "$@"

    echo "${EPREFIX}$(_s6_get_servicedir)"
    }
    @@ -55,22 +55,22 @@ s6_get_servicedir() {
    # run is the run script for the service.
    # finish is the optional finish script for the service.
    s6_install_service() {
    - debug-print-function ${FUNCNAME} "${@}"
    + debug-print-function ${FUNCNAME} "$@"

    local name="$1"
    local run="$2"
    local finish="$3"

    - [[ $name ]] ||
    + [[ -z ${name} ]] &&
    die "${ECLASS}.eclass: you must specify the s6 service name"
    - [[ $run ]] ||
    + [[ -z ${run} ]] &&
    die "${ECLA