• [gentoo-dev] [PATCH 01/41] ada.eclass: drop EAPI 6 support

    From David Seifert@21:1/5 to All on Sun Dec 25 23:20:01 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/ada.eclass | 15 ++++-----------
    1 file changed, 4 insertions(+), 11 deletions(-)

    diff --git a/eclass/ada.eclass b/eclass/ada.eclass
    index bf4cd0c59bc..98f00972c54 100644
    --- a/eclass/ada.eclass
    +++ b/eclass/ada.eclass
    @@ -6,7 +6,7 @@
    # Ada team <ada@gentoo.org>
    # @AUTHOR:
    # Tupone Alfredo <tupone@gentoo.org>
    -# @SUPPORTED_EAPIS: 6 7
    +# @SUPPORTED_EAPIS: 7 8
    # @BLURB: An eclass for Ada packages
    # @DESCRIPTION:
    # This eclass set the IUSE and REQUIRED_USE to request the ADA_TARGET
    @@ -23,16 +23,9 @@
    #
    # Mostly copied from python-single-r1.eclass

    -case "${EAPI:-0}" in
    - 0|1|2|3|4|5)
    - die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
    - ;;
    - 6|7|8)
    - # EAPI=5 is required for sane USE_EXPAND dependencies
    - ;;
    - *)
    - die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
    - ;;
    +case ${EAPI} in
    + 7|8) ;;
    + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
    esac

    EXPORT_FUNCTIONS pkg_setup
    --
    2.39.0

    --- SoupGate-Win32 v1.05
    * Origin: fs
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/python-utils-r1.eclass | 45 +++++++++++------------------------
    1 file changed, 14 insertions(+), 31 deletions(-)

    diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index d7b3df6105a..568b2dbdfa4 100644
    --- a/eclass/python-utils-r1.eclass
    +++ b/eclass/python-utils-r1.eclass
    @@ -7,7 +7,7 @@
    # @AUTHOR:
    # Author: Michał Górny <mgorny@gentoo.org>
    # Based on work of: Krzysztof Pawlik <nelchael@gentoo.org>
    -# @SUPPORTED_EAPIS: 6 7 8
    +# @SUPPORTED_EAPIS: 7 8
    # @BLURB: Utility functions for packages with Python parts.
    # @DESCRIPTION:
    # A utility eclass providing functions to query Python implementations,
    @@ -22,20 +22,16 @@
    # NOTE: When dropping support for EAPIs here, we need to update
    # metadata/install-qa-check.d/60python-pyc
    # See bug #704286, bug #781878
    -case "${EAPI:-0}" in
    - [0-5]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;;
    - [6-8]) ;;
    - *) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
    -esac

    -if [[ $
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/user-info.eclass | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/eclass/user-info.eclass b/eclass/user-info.eclass
    index 5550e4f08ee..b18f280c102 100644
    --- a/eclass/user-info.eclass
    +++ b/eclass/user-info.eclass
    @@ -5,11 +5,11 @@
    # @MAINTAINER:
    # base-system@gentoo.org (Linux)
    # Michał Górny <mgorny@gentoo.org> (NetBSD)
    -# @SUPPORTED_EAPIS: 6 7 8
    +# @SUPPORTED_EAPIS: 7 8
    # @BLURB: Read-only access to user and group information

    case ${EAPI} in
    - 6|7|8) ;;
    + 7|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 Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/postgres-multi.eclass | 38 ++++++++++++++++++------------------
    1 file changed, 19 insertions(+), 19 deletions(-)

    diff --git a/eclass/postgres-multi.eclass b/eclass/postgres-multi.eclass
    index 9dcf22e64a1..d93df851cd2 100644
    --- a/eclass/postgres-multi.eclass
    +++ b/eclass/postgres-multi.eclass
    @@ -1,16 +1,12 @@
    # Copyright 1999-2022 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    -inherit multibuild postgres
    -EXPORT_FUNCTIONS pkg_setup src_prepare src_compile src_install src_test
    -
    -
    # @ECLASS: postgres-multi.eclass
    # @MAINTAINER:
    # PostgreSQL <pgsql-bugs@gentoo.org>
    # @AUTHOR:
    # Aaron W. Swenson <titanofold@gentoo.org>
    -# @SUPPORTED_EAPIS: 5 6 7
    +# @SUPPORTED_EAPIS: 7
    # @PROVIDES: multibuild postgres
    # @BLURB: An eclass to build PostgreSQL-related packages against multiple slots
    # @DESCRIPTION:
    @@ -18,12 +14,15 @@ EXPORT_FUNCTIONS pkg_setup src_prepare src_compile src_install src_test
    # build and install for one or more Po
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/usr-ldscript.eclass | 38 ++++++++++++++++++++------------------
    1 file changed, 20 insertions(+), 18 deletions(-)

    diff --git a/eclass/usr-ldscript.eclass b/eclass/usr-ldscript.eclass
    index c821abd6084..b73d538ae5b 100644
    --- a/eclass/usr-ldscript.eclass
    +++ b/eclass/usr-ldscript.eclass
    @@ -4,11 +4,11 @@
    # @ECLASS: usr-ldscript.eclass
    # @MAINTAINER:
    # Toolchain Ninjas <toolchain@gentoo.org>
    -# @SUPPORTED_EAPIS: 6 7 8
    +# @SUPPORTED_EAPIS: 7 8
    # @BLURB: Defines the gen_usr_ldscript function.

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

    @@ -84,27 +84,27 @@ gen_usr_ldscript() {
    # Ensure /lib/${lib} exists to avoid dangling scripts/symlinks.
    # This especially is for AIX where $(get_libname) can return ".a",
    # so /lib/${lib} might be moved to /usr/lib/${lib} (by accident).
    - [[ -r ${ED%/}/${libdir}/${lib} ]] || continue
    + [[ -r ${ED}/${libdir}/${lib} ]] || continue
    #TODO: better die here?
    fi
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/gnustep-base.eclass | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/eclass/gnustep-base.eclass b/eclass/gnustep-base.eclass
    index 5e839bd0702..f967a527282 100644
    --- a/eclass/gnustep-base.eclass
    +++ b/eclass/gnustep-base.eclass
    @@ -172,7 +172,7 @@ egnustep_env() {
    # Make utilizing GNUstep Makefiles
    egnustep_make() {
    if [[ -f ./Makefile || -f ./makefile || -f ./GNUmakefile ]] ; then
    - emake ${*} "${GS_ENV[@]}" all || die "package make failed"
    + emake ${*} "${GS_ENV[@]}" all
    return 0
    fi
    die "no Makefile found"
    @@ -185,7 +185,7 @@ egnustep_install() {
    mkdir -p "${D}"${GNUSTEP_SYSTEM_TOOLS}
    fi
    if [[ -f ./[mM]akefile || -f ./GNUmakefile ]] ; then
    - emake ${*} "${GS_ENV[@]}" install || die "package install failed"
    + emake ${*} "${GS_ENV[@]}" install
    return 0
    fi
    die "no Makefile found"
    @@ -197,8 +197,8 @@ egnustep_doc() {
    # Check documentation presence
    pushd "${S}"/Documentation || die
    if [[ -f ./[mM]akefile ||
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/ruby-single.eclass | 19 ++++++-------------
    1 file changed, 6 insertions(+), 13 deletions(-)

    diff --git a/eclass/ruby-single.eclass b/eclass/ruby-single.eclass
    index 476d16b5cae..035675c4810 100644
    --- a/eclass/ruby-single.eclass
    +++ b/eclass/ruby-single.eclass
    @@ -7,7 +7,7 @@
    # @AUTHOR:
    # Author: Hans de Graaff <graaff@gentoo.org>
    # Based on python-single-r1 by: Michał Górny <mgorny@gentoo.org>
    -# @SUPPORTED_EAPIS: 4 5 6 7 8
    +# @SUPPORTED_EAPIS: 7 8
    # @PROVIDES: ruby-utils
    # @BLURB: An eclass for Ruby packages not installed for multiple implementations.
    # @DESCRIPTION:
    @@ -23,18 +23,13 @@
    # RDEPEND="${RUBY_DEPS}"
    # @CODE

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

    -if [[ ! ${_RUBY_SINGLE} ]]; then
    +if [[ ! ${_RUBY_SINGL
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:02 2022
    Closes: https://bugs.gentoo.org/778812
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/selinux-policy-2.eclass | 49 +++++++++++++++++-----------------
    1 file changed, 25 insertions(+), 24 deletions(-)

    diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass index f00e3555b6b..84e95678a67 100644
    --- a/eclass/selinux-policy-2.eclass
    +++ b/eclass/selinux-policy-2.eclass
    @@ -7,7 +7,7 @@
    # @ECLASS: selinux-policy-2.eclass
    # @MAINTAINER:
    # selinux@gentoo.org
    -# @SUPPORTED_EAPIS: 6 7
    +# @SUPPORTED_EAPIS: 7
    # @BLURB: This eclass supports the deployment of the various SELinux modules in sec-policy
    # @DESCRIPTION:
    # The selinux-policy-2.eclass supports deployment of the various SELinux modules
    @@ -18,6 +18,14 @@
    # Also, it supports for bundling patches to make the whole thing just a bit more
    # manageable.

    +case ${EAPI} in
    + 7) ;;
    + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
    +esac
    +
    +if [[ ! ${_SELINUX_POLICY_2_ECLASS} ]]; then
    +_SELINUX_POLICY_2_ECLASS=1
    +
    # @ECLASS_VARIABLE: MODS
    # @DESCRIPTION:
    # This variable contai
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/xemacs-packages.eclass | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/eclass/xemacs-packages.eclass b/eclass/xemacs-packages.eclass index 91621f5f52d..648f5146f47 100644
    --- a/eclass/xemacs-packages.eclass
    +++ b/eclass/xemacs-packages.eclass
    @@ -4,7 +4,7 @@
    # @ECLASS: xemacs-packages.eclass
    # @MAINTAINER:
    # xemacs@gentoo.org
    -# @SUPPORTED_EAPIS: 6 7 8
    +# @SUPPORTED_EAPIS: 8
    # @BLURB: Eclass to support elisp packages distributed by XEmacs.
    # @DESCRIPTION:
    # This eclass supports ebuilds for packages distributed by XEmacs.
    @@ -25,12 +25,10 @@
    # they may not be well-tested.

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

    -EXPORT_FUNCTIONS src_unpack src_install
    -
    if [[ -z ${_XEMACS_PACKAGES_ECLASS} ]] ; then
    _XEMACS_PACKAGES_ECLASS=1

    @@ -65,3 +63,5 @@ xemacs-packages_src_install() {
    }

    fi
    +
    +EXPORT_FUNCTIONS src_unpack src_install
    --
    2.39.0

    --- SoupGate-Win32 v1.05
    *
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/rocm.eclass | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/eclass/rocm.eclass b/eclass/rocm.eclass
    index 4c8fd39f249..dcddd262e59 100644
    --- a/eclass/rocm.eclass
    +++ b/eclass/rocm.eclass
    @@ -6,7 +6,7 @@
    # Gentoo Science Project <sci@gentoo.org>
    # @AUTHOR:
    # Yiyang Wu <xgreenlandforwyy@gmail.com>
    -# @SUPPORTED_EAPIS: 7 8
    +# @SUPPORTED_EAPIS: 8
    # @BLURB: Common functions and variables for ROCm packages written in HIP
    # @DESCRIPTION:
    # ROCm packages such as sci-libs/<roc|hip>*, and packages built on top of ROCm @@ -83,9 +83,10 @@
    # @CODE

    if [[ ! ${_ROCM_ECLASS} ]]; then
    +_ROCM_ECLASS=1

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

    @@ -219,5 +220,4 @@ check_amdgpu() {
    done
    }

    -_ROCM_ECLASS=1
    fi
    --
    2.39.0

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/rust-toolchain.eclass | 8 +++-----
    1 file changed, 3 insertions(+), 5 deletions(-)

    diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass
    index 75b15a7088b..0bbdf46df1f 100644
    --- a/eclass/rust-toolchain.eclass
    +++ b/eclass/rust-toolchain.eclass
    @@ -4,7 +4,7 @@
    # @ECLASS: rust-toolchain.eclass
    # @MAINTAINER:
    # Rust Project <rust@gentoo.org>
    -# @SUPPORTED_EAPIS: 6 7 8
    +# @SUPPORTED_EAPIS: 8
    # @BLURB: helps map gentoo arches to rust ABIs
    # @DESCRIPTION:
    # This eclass contains a src_unpack default phase function, and
    @@ -12,10 +12,8 @@
    # gentoo arches.

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

    inherit multilib-build
    --
    2.39.0

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/php-ext-pecl-r3.eclass | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/eclass/php-ext-pecl-r3.eclass b/eclass/php-ext-pecl-r3.eclass index b1b9429e8a2..11ae34429fb 100644
    --- a/eclass/php-ext-pecl-r3.eclass
    +++ b/eclass/php-ext-pecl-r3.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: php-ext-pecl-r3.eclass
    # @MAINTAINER:
    # Gentoo PHP team <php-bugs@gentoo.org>
    -# @SUPPORTED_EAPIS: 6 7 8
    +# @SUPPORTED_EAPIS: 7 8
    # @PROVIDES: php-ext-source-r3
    # @BLURB: A uniform way to install PECL extensions
    # @DESCRIPTION:
    @@ -13,7 +13,7 @@
    # see https://pecl.php.net/

    case ${EAPI:-0} in
    - 6|7|8) ;;
    + 7|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 Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/waf-utils.eclass | 19 +++++++++++++------
    1 file changed, 13 insertions(+), 6 deletions(-)

    diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass
    index 2f4a20cd457..1be02bbea3c 100644
    --- a/eclass/waf-utils.eclass
    +++ b/eclass/waf-utils.eclass
    @@ -8,20 +8,23 @@
    # Original Author: Gilles Dartiguelongue <eva@gentoo.org>
    # Various improvements based on cmake-utils.eclass: Tomáš Chvátal <scarabeus@gentoo.org>
    # Proper prefix support: Jonathan Callen <jcallen@gentoo.org>
    -# @SUPPORTED_EAPIS: 6 7 8
    +# @SUPPORTED_EAPIS: 7 8
    # @BLURB: common ebuild functions for waf-based packages
    # @DESCRIPTION:
    # The waf-utils eclass contains functions that make creating ebuild for
    # waf-based packages much easier.
    # Its main features are support of common portage default settings.

    -inherit multilib toolchain-funcs multiprocessing
    -
    -case ${EAPI:-0} in
    - 6|7|8) EXPORT_FUNCTIONS src_configure src_compile src_install ;;
    - *) die "EAPI=${EAPI} is not supported" ;;
    +case ${EAPI
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/gnome2.eclass | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
    index e80a517ee0d..a701b58fd9e 100644
    --- a/eclass/gnome2.eclass
    +++ b/eclass/gnome2.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: gnome2.eclass
    @@ -235,7 +235,7 @@ gnome2_src_install() {
    # create bogus directories in /var/lib/
    if has ${EAPI} 5; then
    dodir "${sk_tmp_dir}" || die "dodir failed"
    - emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" install || die "install failed"
    + emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" install
    else
    default
    fi
    --
    2.39.0

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/qmail.eclass | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
    index ed53bca56fa..67069087376 100644
    --- a/eclass/qmail.eclass
    +++ b/eclass/qmail.eclass
    @@ -121,12 +121,12 @@ qmail_src_postunpack() {

    qmail_src_compile() {
    cd "${S}"
    - emake it man "$@" || die "make failed"
    + emake it man "$@"
    }

    qmail_spp_src_compile() {
    cd "${GENQMAIL_S}"/spp/
    - emake || die "make spp failed"
    + emake
    }

    qmail_base_install() {
    --
    2.39.0

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/toolchain-autoconf.eclass | 22 ++++++++--------------
    1 file changed, 8 insertions(+), 14 deletions(-)

    diff --git a/eclass/toolchain-autoconf.eclass b/eclass/toolchain-autoconf.eclass
    index 2c8184f894c..2ba27638468 100644
    --- a/eclass/toolchain-autoconf.eclass
    +++ b/eclass/toolchain-autoconf.eclass
    @@ -1,29 +1,22 @@
    -# Copyright 1999-2019 Gentoo Authors
    +# Copyright 1999-2022 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: toolchain-autoconf.eclass
    # @MAINTAINER:
    # <base-system@gentoo.org>
    -# @SUPPORTED_EAPIS: 6 7
    +# @SUPPORTED_EAPIS: 7 8
    # @BLURB: Common code for sys-devel/autoconf ebuilds
    # @DESCRIPTION:
    # This eclass contains the common phase functions migrated from
    # sys-devel/autoconf eblits.

    -case ${EAPI:-0} in
    - [0-5])
    - die "${ECLASS} is banned in EAPI ${EAPI:-0}"
    - ;;
    - [6-7])
    - ;;
    - *)
    - die "Unknown EAPI ${EAPI:-0}"
    - ;;
    +case ${EAPI} in
    + 7|8) ;;
    + *) die "${ECLASS}: EAPI ${EAPI:-0} not supp
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/ruby-ng-gnome2.eclass | 18 ++++++++++--------
    1 file changed, 10 insertions(+), 8 deletions(-)

    diff --git a/eclass/ruby-ng-gnome2.eclass b/eclass/ruby-ng-gnome2.eclass
    index 487e3268e36..4c48e94df70 100644
    --- a/eclass/ruby-ng-gnome2.eclass
    +++ b/eclass/ruby-ng-gnome2.eclass
    @@ -6,21 +6,21 @@
    # Ruby herd <ruby@gentoo.org>
    # @AUTHOR:
    # Author: Hans de Graaff <graaff@gentoo.org>
    -# @SUPPORTED_EAPIS: 6 7
    +# @SUPPORTED_EAPIS: 7
    # @PROVIDES: ruby-ng
    # @BLURB: An eclass to simplify handling of various ruby-gnome2 parts.
    # @DESCRIPTION:
    # This eclass simplifies installation of the various pieces of
    # ruby-gnome2 since they share a very common installation procedure.

    -case "${EAPI:-0}" in
    - 6) inherit eapi7-ver ;;
    - 7) ;;
    - *)
    - die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
    - ;;
    +case ${EAPI} in
    + 7) ;;
    + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
    esac

    +if [[ ! ${_RUBY_NG_GNOME2_ECLASS} ]]; then
    +_RUBY_NG_GNOME2_ECLASS=1
    +
    RUBY_FAKEGEM_N
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/xorg-3.eclass | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass
    index 0d35c0a8ebf..a63655e10ec 100644
    --- a/eclass/xorg-3.eclass
    +++ b/eclass/xorg-3.eclass
    @@ -415,7 +415,7 @@ xorg-3_src_configure() {
    }

    multilib_src_compile() {
    - emake "$@" || die 'emake failed'
    + emake "$@"
    }

    # @FUNCTION: xorg-3_src_compile
    @@ -427,12 +427,12 @@ xorg-3_src_compile() {
    if [[ ${XORG_MULTILIB} == yes ]]; then
    multilib-minimal_src_compile "$@"
    else
    - emake "$@" || die 'emake failed'
    + emake "$@"
    fi
    }

    multilib_src_install() {
    - emake DESTDIR="${D}" "${install_args[@]}" "$@" install || die "emake install failed"
    + emake DESTDIR="${D}" "${install_args[@]}" "$@" install
    }

    # @FUNCTION: xorg-3_src_install
    @@ -446,7 +446,7 @@ xorg-3_src_install() {
    if [[ ${XORG_MULTILIB} == yes ]]; then
    multilib-minimal_src_install "$@"
    else
    - emake DESTDIR="${D}" "${install_args[@]}" "$@" install || die "
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/docs.eclass | 2 +-
    eclass/mate.eclass | 2 +-
    eclass/python-any-r1.eclass | 2 +-
    eclass/python-r1.eclass | 27 ++++++++-------------------
    eclass/python-single-r1.eclass | 2 +-
    eclass/scons-utils.eclass | 2 +-
    eclass/waf-utils.eclass | 2 +-
    7 files changed, 14 insertions(+), 25 deletions(-)

    diff --git a/eclass/docs.eclass b/eclass/docs.eclass
    index 859e8048893..f4663c3575f 100644
    --- a/eclass/docs.eclass
    +++ b/eclass/docs.eclass
    @@ -153,7 +153,7 @@ _DOCS_ECLASS=1
    case ${DOCS_BUILDER} in
    "sphinx"|"mkdocs")
    # We need the python_gen_any_dep function
    - if [[ ! ${_PYTHON_R1} && ! ${_PYTHON_ANY_R1_ECLASS} && ! ${_PYTHON_SINGLE_R1} ]]; then
    + if [[ ! ${_PYTHON_R1_ECLASS} && ! ${_PYTHON_ANY_R1_ECLASS} && ! ${_PYTHON_SINGLE_R1} ]]; then
    die "distutils-r1, python-r1, python-single-r1 or python-any-r1 needs to be inherited to use python based documentation builders"
    fi
    ;;
    diff --git a/eclass/mate.eclass b/eclas
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/docs.eclass | 6 +++---
    eclass/python-any-r1.eclass | 2 +-
    eclass/python-r1.eclass | 2 +-
    eclass/python-single-r1.eclass | 26 ++++++++------------------
    eclass/scons-utils.eclass | 4 ++--
    eclass/waf-utils.eclass | 4 ++--
    6 files changed, 17 insertions(+), 27 deletions(-)

    diff --git a/eclass/docs.eclass b/eclass/docs.eclass
    index f4663c3575f..cbf35068de3 100644
    --- a/eclass/docs.eclass
    +++ b/eclass/docs.eclass
    @@ -153,7 +153,7 @@ _DOCS_ECLASS=1
    case ${DOCS_BUILDER} in
    "sphinx"|"mkdocs")
    # We need the python_gen_any_dep function
    - if [[ ! ${_PYTHON_R1_ECLASS} && ! ${_PYTHON_ANY_R1_ECLASS} && ! ${_PYTHON_SINGLE_R1} ]]; then
    + if [[ ! ${_PYTHON_R1_ECLASS} && ! ${_PYTHON_ANY_R1_ECLASS} && ! ${_PYTHON_SINGLE_R1_ECLASS} ]]; then
    die "distutils-r1, python-r1, python-single-r1 or python-any-r1 needs to be inherited to use python based documentation builders"
    fi
    ;;
    @@ -221,7 +221,7 @@ sphinx_deps() {
    elif [[ ${DOCS_AUTOD
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/mozlinguas-v2.eclass | 25 +++++++++++++------------
    1 file changed, 13 insertions(+), 12 deletions(-)

    diff --git a/eclass/mozlinguas-v2.eclass b/eclass/mozlinguas-v2.eclass
    index 155b894edc5..063430e1cb7 100644
    --- a/eclass/mozlinguas-v2.eclass
    +++ b/eclass/mozlinguas-v2.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: mozlinguas-v2.eclass
    @@ -7,25 +7,22 @@
    # @AUTHOR:
    # Nirbheek Chauhan <nirbheek@gentoo.org>
    # Ian Stakenvicius <axs@gentoo.org>
    -# @SUPPORTED_EAPIS: 6 7 8
    +# @SUPPORTED_EAPIS: 8
    # @BLURB: Handle language packs for mozilla products
    # @DESCRIPTION:
    # Sets IUSE according to MOZ_LANGS (language packs available). Also exports
    # src_unpack, src_compile and src_install for use in ebuilds, and provides
    # supporting functions for langpack generation and installation.

    -inherit mozextension
    -
    -case "${EAPI:-0}" in
    - 6)
    - inh
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/docs.eclass | 2 +-
    eclass/python-any-r1.eclass | 21 ++++++++-------------
    eclass/python-r1.eclass | 2 +-
    eclass/python-single-r1.eclass | 2 +-
    eclass/scons-utils.eclass | 4 ++--
    eclass/waf-utils.eclass | 4 ++--
    6 files changed, 15 insertions(+), 20 deletions(-)

    diff --git a/eclass/docs.eclass b/eclass/docs.eclass
    index ed1558bc9a8..859e8048893 100644
    --- a/eclass/docs.eclass
    +++ b/eclass/docs.eclass
    @@ -153,7 +153,7 @@ _DOCS_ECLASS=1
    case ${DOCS_BUILDER} in
    "sphinx"|"mkdocs")
    # We need the python_gen_any_dep function
    - if [[ ! ${_PYTHON_R1} && ! ${_PYTHON_ANY_R1} && ! ${_PYTHON_SINGLE_R1} ]]; then
    + if [[ ! ${_PYTHON_R1} && ! ${_PYTHON_ANY_R1_ECLASS} && ! ${_PYTHON_SINGLE_R1} ]]; then
    die "distutils-r1, python-r1, python-single-r1 or python-any-r1 needs to be inherited to use python based documentation builders"
    fi
    ;;
    diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
    index 558f725f74b..bec15
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/ninja-utils.eclass | 13 +++++--------
    1 file changed, 5 insertions(+), 8 deletions(-)

    diff --git a/eclass/ninja-utils.eclass b/eclass/ninja-utils.eclass
    index 9be502fa8ad..eb2fb62f6c3 100644
    --- a/eclass/ninja-utils.eclass
    +++ b/eclass/ninja-utils.eclass
    @@ -8,7 +8,7 @@
    # @AUTHOR:
    # Michał Górny <mgorny@gentoo.org>
    # Mike Gilbert <floppym@gentoo.org>
    -# @SUPPORTED_EAPIS: 5 6 7 8
    +# @SUPPORTED_EAPIS: 7 8
    # @BLURB: common bits to run dev-util/ninja builder
    # @DESCRIPTION:
    # This eclass provides a single function -- eninja -- that can be used
    @@ -19,7 +19,7 @@
    # Meson).

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

    @@ -76,16 +76,13 @@ get_NINJAOPTS() {
    # @USAGE: [<args>...]
    # @DESCRIPTION:
    # Call Ninja, passing the NINJAOPTS (or converted MAKEOPTS), followed
    -# by the supplied arguments. This function dies if ninja fails. Starting
    -# with EAPI 6, it also supports being called via 'nonfatal'.
    +# by
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/mozcoreconf-v6.eclass | 25 +++++++++----------------
    1 file changed, 9 insertions(+), 16 deletions(-)

    diff --git a/eclass/mozcoreconf-v6.eclass b/eclass/mozcoreconf-v6.eclass
    index 45069777340..ecf1c1f6720 100644
    --- a/eclass/mozcoreconf-v6.eclass
    +++ b/eclass/mozcoreconf-v6.eclass
    @@ -1,10 +1,10 @@
    # Copyright 1999-2022 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2
    -#
    +
    # @ECLASS: mozcoreconf-v6.eclass
    # @MAINTAINER:
    # Mozilla team <mozilla@gentoo.org>
    -# @SUPPORTED_EAPIS: 6 7 8
    +# @SUPPORTED_EAPIS: 8
    # @BLURB: core options and configuration functions for mozilla
    # @DESCRIPTION:
    #
    @@ -15,7 +15,13 @@
    # This is an eclass-generated variable that defines the rpath that the mozilla
    # product will be installed in. Read-only

    -if [[ ! ${_MOZCORECONF} ]]; then
    +case ${EAPI} in
    + 8) ;;
    + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
    +esac
    +
    +if [[ ! ${_MOZCORECONF_V6_ECLASS} ]]; then
    +_MOZCORECONF_V6_ECLASS=1

    inher
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:02 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/postgres.eclass | 18 +++++++++++-------
    1 file changed, 11 insertions(+), 7 deletions(-)

    diff --git a/eclass/postgres.eclass b/eclass/postgres.eclass
    index 8e204e2ade8..e94ab56a40a 100644
    --- a/eclass/postgres.eclass
    +++ b/eclass/postgres.eclass
    @@ -1,14 +1,12 @@
    # Copyright 1999-2022 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    -EXPORT_FUNCTIONS pkg_setup
    -
    # @ECLASS: postgres.eclass
    # @MAINTAINER:
    # PostgreSQL <pgsql-bugs@gentoo.org>
    # @AUTHOR:
    # Aaron W. Swenson <titanofold@gentoo.org>
    -# @SUPPORTED_EAPIS: 5 6 7
    +# @SUPPORTED_EAPIS: 7
    # @BLURB: An eclass for PostgreSQL-related packages
    # @DESCRIPTION:
    # This eclass provides common utility functions that many
    @@ -16,12 +14,14 @@ EXPORT_FUNCTIONS pkg_setup
    # currently selected PostgreSQL slot is within a range, adding a system
    # user to the postgres system group, and generating dependencies.

    -
    -case ${EAPI:-0} in
    - 5|6|7) ;;
    - *) die "Unsupported EAPI=${EAPI} (unk
  • From David Seifert@21:1/5 to All on Sun Dec 25 23:30:03 2022
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/php-ext-source-r3.eclass | 25 +++++++++++++------------
    1 file changed, 13 insertions(+), 12 deletions(-)

    diff --git a/eclass/php-ext-source-r3.eclass b/eclass/php-ext-source-r3.eclass index b60d5528d52..7179ab756f6 100644
    --- a/eclass/php-ext-source-r3.eclass
    +++ b/eclass/php-ext-source-r3.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: php-ext-source-r3.eclass
    # @MAINTAINER:
    # Gentoo PHP team <php-bugs@gentoo.org>
    -# @SUPPORTED_EAPIS: 6 7 8
    +# @SUPPORTED_EAPIS: 7 8
    # @BLURB: Compile and install standalone PHP extensions.
    # @DESCRIPTION:
    # A unified interface for compiling and installing standalone PHP
    @@ -12,11 +12,9 @@

    inherit autotools

    -case ${EAPI:-0} in
    - 6) inherit eapi7-ver ;;
    +case ${EAPI} in
    7|8) ;;
    - *)
    - die "${ECLASS} is not compatible with EAPI=${EAPI}"
    + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
  • From Ulrich Mueller@21:1/5 to All on Sun Dec 25 23:40:01 2022
    EAPI 7 should be kept for this one, in order not to break the Emacs
    overlay.

    -----BEGIN PGP SIGNATURE-----

    iQFDBAEBCAAtFiEEtDnZ1O9xIP68rzDbUYgzUIhBXi4FAmOo0B4PHHVsbUBnZW50 b28ub3JnAAoJEFGIM1CIQV4uPFMH/3Xgo8oFF6w3Meod75S4IBhvsFRMpKaTW09b N+EH3X0DqVGO3uQr2Mj9rwaT5ORKy9pxXloT0b4U39Ke8UwLc9DBjl4kr1elNFw5 S3MxgcInBQJ4vSPu7fwE1FXrju+9GFP0wCK5t7KYTNPkq/gRJm6HffBpq2QaTD+j gswv1wj5R/fZAdei51ZqfQuwQYubiVxbDmdfanzBuSwQlNw6ch7kqXIGIyyxOhM5 YR+smvgIAjn4xut1KU0f9i4CL87yBpFZ8tZbSm5MgS2wZJq/Scnr0PnqN3e3sO57 DPlgMR9XqEjM87sGkAFkzzjyy8kbEIMam1+j4afk9JEPl5ii9vc=
    =W9Sc
    -----END PGP SIGNATURE-----

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Ulrich Mueller@21:1/5 to All on Tue Dec 27 14:30:01 2022
    On Sun, 25 Dec 2022, Ulrich Mueller wrote:

    EAPI 7 should be kept for this one, in order not to break the Emacs
    overlay.

    Never mind, overlay has been updated.

    -----BEGIN PGP SIGNATURE-----

    iQFDBAEBCAAtFiEEtDnZ1O9xIP68rzDbUYgzUIhBXi4FAmOq8b4PHHVsbUBnZW50 b28ub3JnAAoJEFGIM1CIQV4uJAsIAMKm0w0/8te6wS2z6cumYNo5dJ+EObRhairy f1KBBgEfeR+hF1OmkHvm+yIdi2UFjxNH/1vZXDENIjj0cqOMSJG0errfbFqHARAA WOfAO355UzLnWL/CX4Sr7eslOTSwPzozqO601/Wn5N7E/SP211k0i1pUsdZn8ISL sNr2ddHyspCtAVQJer7084JpSe0mT8kJgN5d7ALFzoRf9Ipw8IhcDZWsIKzqYLWq rrZMmwFyvIQcLBOSj5cRB/nnZXEJ4QXRXRz8isIOAvwpF2W/Meo8oDF4TQoCE2TK XIyCxcUpDSyauDU+zhH3M5vIHHp9ktjyHWVGz6RrSvFVd+syq2s=
    =7AzG
    -----END PGP SIGNATURE-----

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