• [gentoo-dev] [PATCH 01/22] apache-module.eclass: remove EAPI 5

    From David Seifert@21:1/5 to All on Tue Mar 14 21:00:01 2023
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/apache-module.eclass | 11 +++++------
    1 file changed, 5 insertions(+), 6 deletions(-)

    diff --git a/eclass/apache-module.eclass b/eclass/apache-module.eclass
    index 60631171ed91..8074aff5ddcb 100644
    --- a/eclass/apache-module.eclass
    +++ b/eclass/apache-module.eclass
    @@ -1,18 +1,17 @@
    -# Copyright 1999-2021 Gentoo Authors
    +# Copyright 1999-2023 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: apache-module.eclass
    # @MAINTAINER:
    # apache-bugs@gentoo.org
    -# @SUPPORTED_EAPIS: 5 6 7
    +# @SUPPORTED_EAPIS: 6 7
    # @BLURB: Provides a common set of functions for apache modules
    # @DESCRIPTION:
    # This eclass handles apache modules in a sane way.
    #
    # To make use of this eclass simply call one of the need/want_apache functions
    # described in depend.apache.eclass. Make sure you use the need/want_apache call
    -# after you have defined DEPEND and RDEPEND. Also note that you can not rely on
    -# the automatic RDEPEND=DEPEND that portage does
  • From David Seifert@21:1/5 to All on Tue Mar 14 21:00:01 2023
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/db.eclass | 132 ++++++++++++++++++++++-------------------------
    1 file changed, 61 insertions(+), 71 deletions(-)

    diff --git a/eclass/db.eclass b/eclass/db.eclass
    index 96669c6d8938..ac1e73e03bc4 100644
    --- a/eclass/db.eclass
    +++ b/eclass/db.eclass
    @@ -1,4 +1,4 @@
    -# Copyright 1999-2021 Gentoo Authors
    +# Copyright 1999-2023 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: db.eclass
    @@ -6,19 +6,23 @@
    # base-system@gentoo.org
    # @BLURB: Internal eclass used by sys-libs/db ebuilds

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

    -IUSE="doc test examples"
    +if [[ -z ${_DB_ECLASS} ]]; then
    +_DB_ECLASS=1

    -EXPORT_FUNCTIONS src_test
    +inherit multilib multiprocessing

    -DEPEND="test? ( >=dev-lang/tcl-8.4 )"
    +IUSE="doc tcl test examples"
    +REQUIRED_USE="test? ( tcl )"

    -RDEPEND=""
    +BDEPEND="test? ( >=dev-lang/tcl-8.4 )"

    db_fix_so() {
    - has
  • From David Seifert@21:1/5 to All on Tue Mar 14 21:10:02 2023
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/eapi8-dosym.eclass | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/eclass/eapi8-dosym.eclass b/eclass/eapi8-dosym.eclass
    index 52f0ffe3e62b..4e3977ef54cf 100644
    --- a/eclass/eapi8-dosym.eclass
    +++ b/eclass/eapi8-dosym.eclass
    @@ -1,4 +1,4 @@
    -# Copyright 2020 Gentoo Authors
    +# Copyright 2020-2023 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: eapi8-dosym.eclass
    @@ -6,7 +6,7 @@
    # PMS team <pms@gentoo.org>
    # @AUTHOR:
    # Ulrich Müller <ulm@gentoo.org>
    -# @SUPPORTED_EAPIS: 5 6 7
    +# @SUPPORTED_EAPIS: 7
    # @BLURB: Testing implementation of EAPI 8 dosym -r option
    # @DESCRIPTION:
    # A stand-alone implementation of the dosym command aimed for EAPI 8.
    @@ -17,8 +17,8 @@
    # https://bugs.gentoo.org/708360

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

    # @FUNCTION: _dosym8_canonicalize
    --
    2.
  • From David Seifert@21:1/5 to All on Tue Mar 14 21:10:02 2023
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/sword-module.eclass | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/eclass/sword-module.eclass b/eclass/sword-module.eclass
    index 565110d2dd0b..be3725a6ec55 100644
    --- a/eclass/sword-module.eclass
    +++ b/eclass/sword-module.eclass
    @@ -1,6 +1,7 @@
    -# Copyright 1999-2021 Gentoo Authors
    +# Copyright 1999-2023 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    +# @DEAD
    # @ECLASS: sword-module.eclass
    # @MAINTAINER:
    # Marek Szuba <marecki@gentoo.org>
    --
    2.40.0

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From David Seifert@21:1/5 to All on Tue Mar 14 21:10:01 2023
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/webapp.eclass | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass
    index 3bc177dc3e78..9fb646613426 100644
    --- a/eclass/webapp.eclass
    +++ b/eclass/webapp.eclass
    @@ -1,22 +1,20 @@
    -# Copyright 1999-2022 Gentoo Authors
    +# Copyright 1999-2023 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: webapp.eclass
    # @MAINTAINER:
    # web-apps@gentoo.org
    -# @SUPPORTED_EAPIS: 5 6 7 8
    +# @SUPPORTED_EAPIS: 6 7 8
    # @BLURB: functions for installing applications to run under a web server
    # @DESCRIPTION:
    # The webapp eclass contains functions to handle web applications with
    # webapp-config. Part of the implementation of GLEP #11

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

    -EXPORT_FUNCTIONS pkg_postinst pkg_setup src_install pkg_prerm
    -
    if [[ -z ${_WEBAPP_ECLASS} ]]; then
    _WEBAPP_ECLAS
  • From David Seifert@21:1/5 to All on Tue Mar 14 21:10:02 2023
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/mono-env.eclass | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/eclass/mono-env.eclass b/eclass/mono-env.eclass
    index 8cec214e615f..48712587ff3e 100644
    --- a/eclass/mono-env.eclass
    +++ b/eclass/mono-env.eclass
    @@ -1,21 +1,19 @@
    -# Copyright 1999-2021 Gentoo Authors
    +# Copyright 1999-2023 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: mono-env.eclass
    # @MAINTAINER:
    # maintainer-needed@gentoo.org
    -# @SUPPORTED_EAPIS: 5 6 7
    +# @SUPPORTED_EAPIS: 6 7
    # @BLURB: Set environment variables commonly used by dotnet packages.
    # @DESCRIPTION:
    # Set environment variables commonly used by dotnet packages.

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

    -EXPORT_FUNCTIONS pkg_setup
    -
    if [[ -z ${_MONO_ENV_ECLASS} ]] ; then
    _MONO_ENV_ECLASS=1

    @@ -48,3 +46,5 @@ mono-env_pkg_setup() {
    }

    fi
    +
    +EXPORT_FUNCTIONS pkg_se
  • From David Seifert@21:1/5 to All on Tue Mar 14 21:10:02 2023
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/golang-vcs.eclass | 24 ++++++++++--------------
    1 file changed, 10 insertions(+), 14 deletions(-)

    diff --git a/eclass/golang-vcs.eclass b/eclass/golang-vcs.eclass
    index 595412ea0c88..7eb60e5f2453 100644
    --- a/eclass/golang-vcs.eclass
    +++ b/eclass/golang-vcs.eclass
    @@ -1,10 +1,10 @@
    -# Copyright 1999-2021 Gentoo Authors
    +# Copyright 1999-2023 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: golang-vcs.eclass
    # @MAINTAINER:
    # William Hubbs <williamh@gentoo.org>
    -# @SUPPORTED_EAPIS: 5 6 7
    +# @SUPPORTED_EAPIS: 6 7
    # @PROVIDES: golang-base
    # @BLURB: Eclass for fetching and unpacking go repositories.
    # @DEPRECATED: go-module.eclass
    @@ -12,21 +12,15 @@
    # This eclass is written to ease the maintenance of live ebuilds
    # of software written in the Go programming language.

    -inherit estack eutils golang-base
    -
    -case "${EAPI:-0}" in
    - 5|6|7)
    - ;;
    - *)
    - die "${ECLASS}: Unsupported eapi (EAPI=${EAPI})"
    - ;;
    +case ${EAPI
  • From David Seifert@21:1/5 to All on Tue Mar 14 21:10:03 2023
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/gnome2.eclass | 154 +++++++++----------------------------------
    1 file changed, 31 insertions(+), 123 deletions(-)

    diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
    index a701b58fd9e7..37fbb94e55cd 100644
    --- a/eclass/gnome2.eclass
    +++ b/eclass/gnome2.eclass
    @@ -1,35 +1,34 @@
    -# Copyright 1999-2022 Gentoo Authors
    +# Copyright 1999-2023 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: gnome2.eclass
    # @MAINTAINER:
    # gnome@gentoo.org
    -# @SUPPORTED_EAPIS: 5 6 7 8
    +# @SUPPORTED_EAPIS: 6 7 8
    # @PROVIDES: gnome2-utils
    # @BLURB: Provides phases for Gnome/Gtk+ based packages.
    # @DESCRIPTION:
    # Exports portage base functions used by ebuilds written for packages using the
    # GNOME framework. For additional functions, see gnome2-utils.eclass.

    +case ${EAPI} in
    + 6|7|8) ;;
    + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
    +esac
    +
    +if [[ -z ${_GNOME2_ECLASS} ]]; then
    +_GNOME2_ECLASS=1
    +
    # @ECLASS_VARIABLE: GNOME2
  • From David Seifert@21:1/5 to All on Tue Mar 14 21:10:03 2023
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/subversion.eclass | 44 ++++++++++++++++++++--------------------
    1 file changed, 22 insertions(+), 22 deletions(-)

    diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass
    index 349878618427..48ee15105adc 100644
    --- a/eclass/subversion.eclass
    +++ b/eclass/subversion.eclass
    @@ -1,4 +1,4 @@
    -# Copyright 1999-2022 Gentoo Authors
    +# Copyright 1999-2023 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: subversion.eclass
    @@ -6,28 +6,26 @@
    # Akinori Hattori <hattya@gentoo.org>
    # @AUTHOR:
    # Original Author: Akinori Hattori <hattya@gentoo.org>
    -# @SUPPORTED_EAPIS: 6 7 8
    +# @SUPPORTED_EAPIS: 7 8
    # @BLURB: Fetch software sources from subversion repositories
    # @DESCRIPTION:
    # The subversion eclass provides functions to fetch software sources
    # from subversion repositories.

    case ${EAPI} in
    - 6|7|8) inherit estack ;;
    - *) die "${ECLASS}: EAPI ${EAPI:-0} is not supported" ;;
    + 7|8) inherit estack ;;
    + *) die "${ECLASS}:
  • From David Seifert@21:1/5 to All on Tue Mar 14 21:10:02 2023
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/xdg.eclass | 65 ++++++++++++++++++++++++-----------------------
    1 file changed, 33 insertions(+), 32 deletions(-)

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

    # @ECLASS: xdg.eclass
    @@ -6,56 +6,54 @@
    # freedesktop-bugs@gentoo.org
    # @AUTHOR:
    # Original author: Gilles Dartiguelongue <eva@gentoo.org>
    -# @SUPPORTED_EAPIS: 5 6 7 8
    +# @SUPPORTED_EAPIS: 6 7 8
    # @PROVIDES: xdg-utils
    # @BLURB: Provides phases for XDG compliant packages.
    # @DESCRIPTION:
    # Utility eclass to update the desktop, icon and shared mime info as laid
    # out in the freedesktop specs & implementations

    -inherit xdg-utils
    -
    -_DEFINE_XDG_SRC_PREPARE=false
    -case "${EAPI}" in
    - 5|6|7)
    - # src_prepare is only exported in EAPI < 8.
    - EXPORT_FUNCTI
  • From David Seifert@21:1/5 to All on Tue Mar 14 21:10:02 2023
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/acct-group.eclass | 9 +++++----
    eclass/acct-user.eclass | 10 +++++-----
    eclass/ada.eclass | 7 ++++++-
    eclass/ant-tasks.eclass | 11 ++++++++---
    eclass/autotools.eclass | 16 +++++++---------
    eclass/bzr.eclass | 8 ++++----
    eclass/cargo.eclass | 23 +++++++++++------------
    eclass/check-reqs.eclass | 10 +++++-----
    eclass/chromium-2.eclass | 4 ++--
    eclass/cmake-multilib.eclass | 4 ++--
    eclass/cmake.eclass | 2 +-
    eclass/common-lisp-3.eclass | 10 +++++-----
    eclass/cuda.eclass | 25 +++++++++----------------
    eclass/cvs.eclass | 12 ++++++------
    eclass/distutils-r1.eclass | 20 ++++++++------------
    eclass/docs.eclass | 4 ++--
    eclass/ecm.eclass | 4 ++--
    eclass/elisp.eclass | 8 ++++----
    eclass/fcaps.eclass |
  • From David Seifert@21:1/5 to All on Tue Mar 14 21:10:02 2023
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/office-ext-r1.eclass | 22 +++++++++++++---------
    1 file changed, 13 insertions(+), 9 deletions(-)

    diff --git a/eclass/office-ext-r1.eclass b/eclass/office-ext-r1.eclass
    index 8cf472fe5bcc..abc0cabaa310 100644
    --- a/eclass/office-ext-r1.eclass
    +++ b/eclass/office-ext-r1.eclass
    @@ -1,4 +1,4 @@
    -# Copyright 1999-2021 Gentoo Authors
    +# Copyright 1999-2023 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: office-ext-r1.eclass
    @@ -6,18 +6,18 @@
    # The office team <office@gentoo.org>
    # @AUTHOR:
    # Tomáš Chvátal <scarabeus@gentoo.org>
    -# @SUPPORTED_EAPIS: 5 7
    +# @SUPPORTED_EAPIS: 7
    # @BLURB: Eclass for installing libreoffice extensions
    # @DESCRIPTION:
    # Eclass for easing maintenance of libreoffice extensions.

    -case "${EAPI:-0}" in
    - 5) inherit eutils multilib ;;
    - 7) inherit eutils ;;
    - *) die "EAPI=${EAPI} is not supported" ;;
    +case ${EAPI} in
    + 7) ;;
    + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
    esac

    -EXP
  • From David Seifert@21:1/5 to All on Tue Mar 14 21:10:02 2023
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/vdr-plugin-2.eclass | 69 ++++++++++++++------------------------
    1 file changed, 26 insertions(+), 43 deletions(-)

    diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass
    index 546dbb803bf1..a56b1d41c882 100644
    --- a/eclass/vdr-plugin-2.eclass
    +++ b/eclass/vdr-plugin-2.eclass
    @@ -1,4 +1,4 @@
    -# Copyright 1999-2022 Gentoo Authors
    +# Copyright 1999-2023 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: vdr-plugin-2.eclass
    @@ -9,7 +9,7 @@
    # Joerg Bornkessel <hd_brummy@gentoo.org>
    # Christian Ruppert <idl0r@gentoo.org>
    # (undisclosed contributors)
    -# @SUPPORTED_EAPIS: 5 6 7 8
    +# @SUPPORTED_EAPIS: 6 7 8
    # @BLURB: common vdr plugin ebuild functions
    # @DESCRIPTION:
    # Eclass for easing maintenance of vdr plugin ebuilds
    @@ -60,29 +60,16 @@
    # PO_SUBDIR="bla foo/bla"
    # @CODE

    -# Applying your own local/user patches:
    -# This is done by using the
    -# (EAPI = 5) epatch_user() function of the eutils.eclass,
    -# (EAPI
  • From David Seifert@21:1/5 to All on Tue Mar 14 21:10:02 2023
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/libtool.eclass | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass
    index a38f41588289..9797b22aabff 100644
    --- a/eclass/libtool.eclass
    +++ b/eclass/libtool.eclass
    @@ -1,4 +1,4 @@
    -# Copyright 1999-2021 Gentoo Authors
    +# Copyright 1999-2023 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: libtool.eclass
    @@ -17,10 +17,10 @@
    if [[ -z ${_LIBTOOL_ECLASS} ]]; then
    _LIBTOOL_ECLASS=1

    -case ${EAPI:-0} in
    - 5|6) DEPEND=">=app-portage/elt-patches-20170815" ;;
    +case ${EAPI} in
    + 6) DEPEND=">=app-portage/elt-patches-20170815" ;;
    7|8) BDEPEND=">=app-portage/elt-patches-20170815" ;;
    - *) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
    + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
    esac

    inherit toolchain-funcs
    --
    2.40.0

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From David Seifert@21:1/5 to All on Tue Mar 14 21:10:02 2023
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/qmail.eclass | 59 ++++++++++++++++++++++++---------------------
    1 file changed, 31 insertions(+), 28 deletions(-)

    diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
    index b647ac5d8e3a..149bfa0c25f3 100644
    --- a/eclass/qmail.eclass
    +++ b/eclass/qmail.eclass
    @@ -1,18 +1,18 @@
    -# Copyright 1999-2022 Gentoo Authors
    +# Copyright 1999-2023 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: qmail.eclass
    # @MAINTAINER:
    # Rolf Eike Beer <eike@sf-mail.de>
    -# @SUPPORTED_EAPIS: 6 7 8
    +# @SUPPORTED_EAPIS: 7 8
    # @BLURB: common qmail functions

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

    -if [[ -z ${_QMAIL_ECLASS} ]] ; then
    +if [[ -z ${_QMAIL_ECLASS} ]]; then
    _QMAIL_ECLASS=1

    inherit flag-o-matic toolchain-funcs fixheadtails
    @@ -58,7 +58,7 @@ is_prime() {

    dospp() {
    exeinto "${QMAIL_HOME}"/plugins/
    - newexe ${1} ${2:-$(basename ${1})}
    + newex
  • From David Seifert@21:1/5 to All on Tue Mar 14 21:10:02 2023
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/golang-build.eclass | 24 ++++++++++--------------
    1 file changed, 10 insertions(+), 14 deletions(-)

    diff --git a/eclass/golang-build.eclass b/eclass/golang-build.eclass
    index f24029a1a9fd..235313bd70f5 100644
    --- a/eclass/golang-build.eclass
    +++ b/eclass/golang-build.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: golang-build.eclass
    # @MAINTAINER:
    # William Hubbs <williamh@gentoo.org>
    -# @SUPPORTED_EAPIS: 5 6 7
    +# @SUPPORTED_EAPIS: 6 7
    # @PROVIDES: golang-base
    # @BLURB: Eclass for compiling go packages.
    # @DEPRECATED: go-module.eclass
    @@ -12,21 +12,15 @@
    # This eclass provides default src_compile, src_test and src_install
    # functions for software written in the Go programming language.

    -inherit golang-base
    -
    -case "${EAPI:-0}" in
    - 5|6|7)
    - ;;
    - *)
    - die "${ECLASS}: Unsupported eapi (EAPI=${EAPI})"
    - ;;
    +case ${EAPI} i
  • From David Seifert@21:1/5 to All on Tue Mar 14 21:10:02 2023
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/golang-vcs-snapshot.eclass | 23 ++++++++++++++---------
    1 file changed, 14 insertions(+), 9 deletions(-)

    diff --git a/eclass/golang-vcs-snapshot.eclass b/eclass/golang-vcs-snapshot.eclass
    index 5140064a651e..9c199bbbd8c5 100644
    --- a/eclass/golang-vcs-snapshot.eclass
    +++ b/eclass/golang-vcs-snapshot.eclass
    @@ -1,10 +1,10 @@
    -# Copyright 1999-2021 Gentoo Authors
    +# Copyright 1999-2023 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: golang-vcs-snapshot.eclass
    # @MAINTAINER:
    # William Hubbs <williamh@gentoo.org>
    -# @SUPPORTED_EAPIS: 5 6 7
    +# @SUPPORTED_EAPIS: 6 7
    # @PROVIDES: golang-base
    # @BLURB: eclass to unpack VCS snapshot tarballs for Go software
    # @DEPRECATED: go-module.eclass
    @@ -44,14 +44,15 @@
    # ${WORKDIR}/${P}/src/github.com/user/package
    # and add the vendored tarballs to ${WORKDIR}/src/${EGO_PN}/vendor

    -inherit golang-base
    -
    -case ${EAPI:-0} in
    - 5|6|7) ;;
    - *) die "${ECLASS} API in EAPI ${EAPI} not yet
  • From David Seifert@21:1/5 to All on Tue Mar 14 21:10:02 2023
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/linux-info.eclass | 20 +++++++++++++++-----
    1 file changed, 15 insertions(+), 5 deletions(-)

    diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
    index a65d0c441ba2..ce04a0dc66a7 100644
    --- a/eclass/linux-info.eclass
    +++ b/eclass/linux-info.eclass
    @@ -1,9 +1,10 @@
    -# Copyright 1999-2022 Gentoo Authors
    +# Copyright 1999-2023 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: linux-info.eclass
    # @MAINTAINER:
    # kernel@gentoo.org
    +# @SUPPORTED_EAPIS: 6 7 8
    # @AUTHOR:
    # Original author: John Mylchreest <johnm@gentoo.org>
    # @BLURB: eclass used for accessing kernel related information
    @@ -26,6 +27,14 @@
    # get_version
    # get_running_version

    +case ${EAPI} in
    + 6|7|8) ;;
    + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
    +esac
    +
    +if [[ -z ${_LINUX_INFO_ECLASS} ]]; then
    +_LINUX_INFO_ECLASS=1
    +
    # A Couple of env vars are available to effect usage of this eclass
    # These are as follows:

    @@ -151,9 +160,7 @
  • From David Seifert@21:1/5 to All on Tue Mar 14 21:10:02 2023
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/findlib.eclass | 16 ++++++++--------
    1 file changed, 8 insertions(+), 8 deletions(-)

    diff --git a/eclass/findlib.eclass b/eclass/findlib.eclass
    index 52e3655b3e84..fdcaa0c1b77c 100644
    --- a/eclass/findlib.eclass
    +++ b/eclass/findlib.eclass
    @@ -1,4 +1,4 @@
    -# Copyright 1999-2022 Gentoo Authors
    +# Copyright 1999-2023 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: findlib.eclass
    @@ -6,13 +6,13 @@
    # ML <ml@gentoo.org>
    # @AUTHOR:
    # Original author: Matthieu Sozeau <mattam@gentoo.org> (retired)
    -# @SUPPORTED_EAPIS: 6 7 8
    +# @SUPPORTED_EAPIS: 7 8
    # @BLURB: ocamlfind (a.k.a. findlib) eclass
    # @DESCRIPTION:
    # ocamlfind (a.k.a. findlib) eclass

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

    @@ -35,7 +35,7 @@ RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
    # @DESCRIPTION:
    # Die if ocamlfind is not found
    check_ocamlfind() {
    - if [ ! -x "${EPREFIX}"/usr/
  • From David Seifert@21:1/5 to All on Tue Mar 14 21:10:02 2023
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/git-r3.eclass | 97 +++++++++++++++++++++-----------------------
    1 file changed, 47 insertions(+), 50 deletions(-)

    diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
    index bdb28565e2f9..5c7dc29627cb 100644
    --- a/eclass/git-r3.eclass
    +++ b/eclass/git-r3.eclass
    @@ -1,27 +1,26 @@
    -# Copyright 1999-2021 Gentoo Authors
    +# Copyright 1999-2023 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: git-r3.eclass
    # @MAINTAINER:
    # Michał Górny <mgorny@gentoo.org>
    -# @SUPPORTED_EAPIS: 5 6 7 8
    +# @SUPPORTED_EAPIS: 6 7 8
    # @BLURB: Eclass for fetching and unpacking git repositories.
    # @DESCRIPTION:
    # Third generation eclass for easing maintenance of live ebuilds using
    # git as remote repository.

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

    -EXPORT_FUNCTIONS src_unpack
    -
    -if [[ ! ${_GIT_R3} ]]; then
    +if [[ -z ${_GIT_R3_ECLASS} ]]; then
    +_GIT_R3