• [gentoo-dev] [PATCH v2 1/5] multilib-minimal.eclass: remove EAPI 5

    From David Seifert@21:1/5 to All on Tue Jan 11 23:30:01 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/multilib-minimal.eclass | 19 ++++++++++---------
    1 file changed, 10 insertions(+), 9 deletions(-)

    diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass index 9a1efe2cc46..97c8d618c42 100644
    --- a/eclass/multilib-minimal.eclass
    +++ b/eclass/multilib-minimal.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: multilib-minimal.eclass
    # @MAINTAINER:
    # Michał Górny <mgorny@gentoo.org>
    -# @SUPPORTED_EAPIS: 5 6 7 8
    +# @SUPPORTED_EAPIS: 6 7 8
    # @PROVIDES: multilib-build
    # @BLURB: wrapper for multilib builds providing convenient multilib_src_* functions
    # @DESCRIPTION:
    @@ -23,18 +23,15 @@
    #
    # If you need generic install rules, use multilib_src_install_all function.

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

    -
    -[[ ${EAPI} == 5 ]]
  • From David Seifert@21:1/5 to All on Tue Jan 11 23:30:01 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/multilib-build.eclass | 44 +++++-------------------------------
    1 file changed, 6 insertions(+), 38 deletions(-)

    diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
    index 17cd7da0d18..a4121ad42f1 100644
    --- a/eclass/multilib-build.eclass
    +++ b/eclass/multilib-build.eclass
    @@ -1,4 +1,4 @@
    -# Copyright 2013-2021 Gentoo Authors
    +# Copyright 2013-2022 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: multilib-build.eclass
    @@ -6,7 +6,7 @@
    # Michał Górny <mgorny@gentoo.org>
    # @AUTHOR:
    # Author: Michał Górny <mgorny@gentoo.org>
    -# @SUPPORTED_EAPIS: 5 6 7 8
    +# @SUPPORTED_EAPIS: 6 7 8
    # @PROVIDES: multibuild
    # @BLURB: flags and utility functions for building multilib packages
    # @DESCRIPTION:
    @@ -18,15 +18,14 @@
    # dependencies shall use the USE dependency string in ${MULTILIB_USEDEP}
    # to properly request multilib enabled.

    -case ${EAPI} in
    - 5|6|7|8) ;;
    +case ${EAPI:-0} in
    + 6|7|8) ;;
    *) die "$
  • From David Seifert@21:1/5 to All on Tue Jan 11 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/multibuild.eclass | 42 +++++++---------------------------------
    1 file changed, 7 insertions(+), 35 deletions(-)

    diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
    index 4699ebc43fb..039041af694 100644
    --- a/eclass/multibuild.eclass
    +++ b/eclass/multibuild.eclass
    @@ -6,25 +6,20 @@
    # Michał Górny <mgorny@gentoo.org>
    # @AUTHOR:
    # Author: Michał Górny <mgorny@gentoo.org>
    -# @SUPPORTED_EAPIS: 4 5 6 7 8
    +# @SUPPORTED_EAPIS: 6 7 8
    # @BLURB: A generic eclass for building multiple variants of packages.
    # @DESCRIPTION:
    # The multibuild eclass aims to provide a generic framework for building
    # multiple 'variants' of a package (e.g. multilib, Python
    # implementations).

    -case "${EAPI:-0}" in
    - [0-3])
    - die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
    - ;;
    - [4-8])
    - ;;
    - *)
    - die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
    - ;;
    +case ${EAPI:-0} in
    + 6|7|8) ;;
    + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
    esac

    -if [[
  • From David Seifert@21:1/5 to All on Tue Jan 11 23:30:01 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/multibuild.eclass | 36 +++++++-----------------------------
    1 file changed, 7 insertions(+), 29 deletions(-)

    diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
    index cbd48b1eeb6..4699ebc43fb 100644
    --- a/eclass/multibuild.eclass
    +++ b/eclass/multibuild.eclass
    @@ -192,15 +192,10 @@ multibuild_copy_sources() {

    einfo "Will copy sources from ${_MULTIBUILD_INITIAL_BUILD_DIR}"

    - local cp_args=()
    - if cp --reflink=auto --version &>/dev/null; then
    - # enable reflinking if possible to make this faster
    - cp_args+=( --reflink=auto )
    - fi
    -
    _multibuild_create_source_copy() {
    einfo "${MULTIBUILD_VARIANT}: copying to ${BUILD_DIR}"
    - cp -p -R "${cp_args[@]}" \
    + # enable reflinking if possible to make this faster
    + cp -p -R --reflink=auto \
    "${_MULTIBUILD_INITIAL_BUILD_DIR}" "${BUILD_DIR}" || die
    }

    @@ -234,31 +229,14 @@ run_in_build_dir() {
    # (the real root). Both directories have to be real, absolute paths
    # (i.e. including ${D}). Source root wi
  • From David Seifert@21:1/5 to All on Tue Jan 11 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/multibuild.eclass | 35 ++++++++++++-----------------------
    1 file changed, 12 insertions(+), 23 deletions(-)

    diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
    index 37568ebf87c..cbd48b1eeb6 100644
    --- a/eclass/multibuild.eclass
    +++ b/eclass/multibuild.eclass
    @@ -1,4 +1,4 @@
    -# Copyright 1999-2021 Gentoo Authors
    +# Copyright 1999-2022 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: multibuild.eclass
    @@ -238,33 +238,22 @@ multibuild_merge_root() {
    local dest=${2}

    local ret
    + local cp_args=()

    - if use userland_BSD; then
    - # Most of BSD variants fail to copy broken symlinks, #447370
    - # also, they do not support --version
    -
    - tar -C "${src}" -f - -c . \
    - | tar -x -f - -C "${dest}"
    - [[ ${PIPESTATUS[*]} == '0 0' ]]
    - ret=${?}
    + if cp -a --version &>/dev/null; then
    + cp_args+=( -a )
    else
    - local cp_args=()
    -
    - if cp -a --version &>/dev/null; then
    - cp_args+=( -a )
    - else
    - cp_args
  • From Ulrich Mueller@21:1/5 to All on Wed Jan 12 09:30:02 2022
    On Tue, 11 Jan 2022, David Seifert wrote:

    -case ${EAPI} in
    - 5|6|7|8) ;;
    +case ${EAPI:-0} in

    The :- substitution isn't necessary here.
    Same for the other eclasses in the patch series.

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

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