Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/apache-module.eclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/apache-module.eclass b/eclass/apache-module.eclass
index 5a84ffedf71a..1082726b870e 100644
--- a/eclass/apache-module.eclass
+++ b/eclass/apache-module.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: apache-module.eclass
# @MAINTAINER:
# apache-bugs@gentoo.org
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: Provides a common set of functions for apache modules
# @DESCRIPTION:
# This eclass handles apache modules in a sane way.
@@ -45,7 +45,7 @@
# @CODE

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

--
2.46.0

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

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/depend.apache.eclass | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index 8f0469931d2c..cc9fb3ee5a5b 100644
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: depend.apache.eclass
# @MAINTAINER:
# apache-bugs@gentoo.org
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: Functions to allow ebuilds to depend on apache
# @DESCRIPTION:
# This eclass handles depending on apache in a sane way and provides information
@@ -40,12 +40,9 @@
# }
# @CODE

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

# ================

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/toolchain-funcs.eclass | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index 5e36fa275dcd..b438b3c0ab7b 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -4,7 +4,7 @@
# @ECLASS: toolchain-funcs.eclass
# @MAINTAINER:
# Toolchain Ninjas <toolchain@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: functions to query common info about the toolchain
# @DESCRIPTION:
# The toolchain-funcs aims to provide a complete suite of functions
@@ -14,7 +14,7 @@
# something sane.

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

@@ -1113,7 +1113,6 @@ gen_usr_ldscript() {
ewarn "${FUNCNAME}: Please migrate to usr-ldscript.eclass"

local lib libdir=$(get_libdir) output_format="" auto=false suffix=$(get_libname)
- [[ -z ${ED+set} ]] && local ED=${D%/}${EPREFIX}/

tc-is-static-only &

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/readme.gentoo-r1.eclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/readme.gentoo-r1.eclass b/eclass/readme.gentoo-r1.eclass index 48023d9c049f..4f1728da5b6f 100644
--- a/eclass/readme.gentoo-r1.eclass
+++ b/eclass/readme.gentoo-r1.eclass
@@ -6,7 +6,7 @@
# Pacho Ramos <pacho@gentoo.org>
# @AUTHOR:
# Author: Pacho Ramos <pacho@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: install a doc file shown via elog messages
# @DESCRIPTION:
# An eclass for installing a README.gentoo doc file recording tips
@@ -21,7 +21,7 @@ if [[ -z ${_README_GENTOO_ECLASS} ]]; then
_README_GENTOO_ECLASS=1

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

@@ -78,7 +78,7 @@ readme.gentoo_create_doc() {
( # subshell to avoid pollution of calling environment
docinto .
dodoc "${T}"/README.gentoo
- ) || die
+ )
README_GENTOO_DOC_VALUE=$(< "${T}/README.gentoo")
}

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/prefix.eclass | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/prefix.eclass b/eclass/prefix.eclass
index 8d50d0ba7b6e..3df2e407bf41 100644
--- a/eclass/prefix.eclass
+++ b/eclass/prefix.eclass
@@ -1,19 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: prefix.eclass
# @MAINTAINER:
# Feel free to contact the Prefix team through <prefix@gentoo.org> if
# you have problems, suggestions or questions.
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: Eclass to provide Prefix functionality
# @DESCRIPTION:
# Gentoo Prefix allows users to install into a self defined offset
# located somewhere in the filesystem. Prefix ebuilds require
# additional functions and variables which are defined by this eclass.

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

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/tmpfiles.eclass | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/eclass/tmpfiles.eclass b/eclass/tmpfiles.eclass
index 39650401a6a0..731247bdfc7e 100644
--- a/eclass/tmpfiles.eclass
+++ b/eclass/tmpfiles.eclass
@@ -1,4 +1,4 @@
-# Copyright 2016-2022 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: tmpfiles.eclass
@@ -8,7 +8,7 @@
# @AUTHOR:
# Mike Gilbert <floppym@gentoo.org>
# William Hubbs <williamh@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: Functions related to tmpfiles.d files
# @DESCRIPTION:
# This eclass provides functionality related to installing and
@@ -32,7 +32,7 @@
# Typical usage of this eclass:
#
# @CODE
-# EAPI=6
+# EAPI=8
# inherit tmpfiles
#
# ...
@@ -52,14 +52,14 @@
#
# @CODE

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

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/virtualx.eclass | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index f7318eafc59e..88c126802990 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: virtualx.eclass
@@ -6,11 +6,11 @@
# x11@gentoo.org
# @AUTHOR:
# Original author: Martin Schlemmer <azarah@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: This eclass can be used for packages that need a working X environment to build.

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

@@ -32,15 +32,15 @@ _VIRTUALX_ECLASS=1
# @OUTPUT_VARIABLE
# @DESCRIPTION:
# Standard dependencies string that is automatically added to BDEPEND
-# (in EAPI-6: DEPEND) unless VIRTUALX_REQUIRED

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/webapp.eclass | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass
index 5b091c84851f..ff1b956d5847 100644
--- a/eclass/webapp.eclass
+++ b/eclass/webapp.eclass
@@ -1,17 +1,17 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: webapp.eclass
# @MAINTAINER:
# web-apps@gentoo.org
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 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} in
- 6|7|8) ;;
+ 7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac

@@ -51,9 +51,9 @@ IS_REPLACE=0
INSTALL_CHECK_FILE="installed_by_webapp_eclass"
SETUP_CHECK_FILE="setup_by_webapp_eclass"

-ETC_CONF

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/perl-functions.eclass | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/perl-functions.eclass b/eclass/perl-functions.eclass
index 142fdeb8cfbd..ce511cbefa0a 100644
--- a/eclass/perl-functions.eclass
+++ b/eclass/perl-functions.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: perl-functions.eclass
@@ -157,18 +157,18 @@ perl_fix_packlist() {
einfo "Fixing packlist file /${f#${D}}"

# remove the temporary build dir path
- sed -i -e "s:${D%/}/:/:g" "${f}"
+ sed -i -e "s:${D}/:/:g" "${f}" || die

# remove duplicate entries
- sort -u "${f}" > "${packlist_temp}"
- mv "${packlist_temp}" "${f}"
+ sort -u "${f}" > "${packlist_temp}" || die
+ mv "${packlist_temp}" "${f}" || die

# remove files that dont exist
cat "${f}" | while read -r entry; do
if [[ ! -e

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/vim-spell.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/vim-spell.eclass b/eclass/vim-spell.eclass
index 607771ae8035..2e2df33e5105 100644
--- a/eclass/vim-spell.eclass
+++ b/eclass/vim-spell.eclass
@@ -6,7 +6,7 @@
# Vim Maintainers <vim@gentoo.org>
# @AUTHOR:
# Ciaran McCreesh <ciaranm@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: Eclass for managing Vim spell files.
# @DESCRIPTION:
# How to make a vim spell file package using prebuilt spell lists
@@ -63,7 +63,7 @@
# for another language rather than keeping them Gentoo-specific.

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

--
2.46.0

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

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/udev.eclass | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/eclass/udev.eclass b/eclass/udev.eclass
index ac94f98221aa..ba1ac00e51ed 100644
--- a/eclass/udev.eclass
+++ b/eclass/udev.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: udev.eclass
# @MAINTAINER:
# systemd@gentoo.org
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: Default eclass for determining udev directories.
# @DESCRIPTION:
# Default eclass for determining udev directories.
@@ -37,7 +37,7 @@
# @CODE

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

@@ -46,11 +46,7 @@ _UDEV_ECLASS=1

inherit toolchain-funcs

-if [[ ${EAPI} == [56] ]]; then
- DEPEND="virtual/pkgconfig"
-else
- BDEPEND="virtual/pkgconfig"
-fi
+BDEPEND="virtual/pkgconfig"

# @FUNCTION: _

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/systemd.eclass | 61 +++----------------------------------------
1 file changed, 4 insertions(+), 57 deletions(-)

diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass
index 03d6a82fd310..319650db44b5 100644
--- a/eclass/systemd.eclass
+++ b/eclass/systemd.eclass
@@ -1,10 +1,10 @@
-# Copyright 2011-2023 Gentoo Authors
+# Copyright 2011-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: systemd.eclass
# @MAINTAINER:
# systemd@gentoo.org
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: helper functions to install systemd units
# @DESCRIPTION:
# This eclass provides a set of functions to install unit files for
@@ -25,17 +25,13 @@
# @CODE

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

inherit toolchain-funcs

-if [[ ${EAPI} == [56] ]]; then
- DEPEND="virtual/pkgconfig"
-else
- BDEPEND="virtual/pkgconfig"
-fi
+BDEPEND="virtual/pkgcon

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/toolchain.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index ac236f3127f9..de6bd6a52214 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -2353,7 +2353,7 @@ fix_libtool_libdir_paths() {
pushd "${D}" >/dev/null || die

pushd "./${libpath}" >/dev/null || die
- local dir="${PWD#${D%/}}"
+ local dir="${PWD#${D}}"
local allarchives=$(echo *.la)
allarchives="\(${allarchives// /\\|}\)"
popd >/dev/null || die
--
2.46.0

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

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/mono-env.eclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/mono-env.eclass b/eclass/mono-env.eclass
index 48712587ff3e..263bc9b7ad29 100644
--- a/eclass/mono-env.eclass
+++ b/eclass/mono-env.eclass
@@ -1,16 +1,16 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

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

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

--
2.46.0

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

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/vcs-clean.eclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/vcs-clean.eclass b/eclass/vcs-clean.eclass
index e4c61ac7164a..ab607e8f71ae 100644
--- a/eclass/vcs-clean.eclass
+++ b/eclass/vcs-clean.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: vcs-clean.eclass
@@ -6,11 +6,11 @@
# base-system@gentoo.org
# @AUTHOR:
# Benedikt Böhm <hollow@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: helper functions to remove VCS directories

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

--
2.46.0

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

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/ruby-utils.eclass | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/ruby-utils.eclass b/eclass/ruby-utils.eclass
index 789f57ce25f6..1fdc51a29839 100644
--- a/eclass/ruby-utils.eclass
+++ b/eclass/ruby-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: ruby-utils.eclass
@@ -6,7 +6,7 @@
# Ruby team <ruby@gentoo.org>
# @AUTHOR:
# Author: Hans de Graaff <graaff@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: An eclass for supporting ruby scripts and bindings in non-ruby packages
# @DESCRIPTION:
# The ruby-utils eclass is designed to allow an easier installation of
@@ -15,12 +15,13 @@
# This eclass does not set any metadata variables nor export any phase
# functions. It can be inherited safely.

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

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/wrapper.eclass | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

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

# @ECLASS: wrapper.eclass
# @MAINTAINER:
# base-system@gentoo.org
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: create a shell wrapper script

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

@@ -55,7 +55,7 @@ make_wrapper() {
exeopts -m 0755
exeinto "${path}"
newexe "${tmpwrapper}" "${wrapper}"
- ) || die
+ )
else
newbin "${tmpwrapper}" "${wrapper}"
fi
--
2.46.0

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

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/ruby-fakegem.eclass | 50 ++++++++++++--------------------------
1 file changed, 16 insertions(+), 34 deletions(-)

diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index 40ff76ce900e..0a99406954b0 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: ruby-fakegem.eclass
@@ -8,7 +8,7 @@
# Author: Diego E. Pettenò <flameeyes@gentoo.org>
# Author: Alex Legler <a3li@gentoo.org>
# Author: Hans de Graaff <graaff@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @PROVIDES: ruby-ng
# @BLURB: An eclass for installing Ruby packages to behave like RubyGems.
# @DESCRIPTION:
@@ -17,6 +17,11 @@

inherit ruby-ng

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

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/preserve-libs.eclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/preserve-libs.eclass b/eclass/preserve-libs.eclass
index 35c65ef4436f..4e31c0ddae0b 100644
--- a/eclass/preserve-libs.eclass
+++ b/eclass/preserve-libs.eclass
@@ -1,14 +1,14 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: preserve-libs.eclass
# @MAINTAINER:
# base-system@gentoo.org
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: preserve libraries after SONAME changes

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

--
2.46.0

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

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/python-utils-r1.eclass | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 45d3da6bb98c..683f9b108aae 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -617,8 +617,8 @@ python_optimize() {
# 2) skip paths which do not exist
# (python2.6 complains about them verbosely)

- if [[ ${f} == /* && -d ${D%/}${f} ]]; then
- set -- "${D%/}${f}" "${@}"
+ if [[ ${f} == /* && -d ${D}${f} ]]; then
+ set -- "${D}${f}" "${@}"
fi
done < <(
"${PYTHON}" - <<-EOF || die
@@ -634,7 +634,7 @@ python_optimize() {
local d
for d; do
# make sure to get a nice path without //
- local instpath=${d#${D%/}}
+ local instpath=${d#${D}}
instpath=/${instpath##/}

einfo "Optimize Python modules for ${instpath}"
@@ -741,7 +741,7 @@ python_newexe() {

# don't use this at home, just call python_doscript() instead
i

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/vdr-plugin-2.eclass | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass
index dc70ca7c5761..f0cf66b51b7a 100644
--- a/eclass/vdr-plugin-2.eclass
+++ b/eclass/vdr-plugin-2.eclass
@@ -112,14 +112,14 @@ vdr_create_plugindb_file() {
# EBUILD=${CATEGORY}/${PN}
# EBUILD_V=${PVR}
# EOT
-# obsolet? fix me later...
+# obsolete? fix me later...
{
echo "VDRPLUGIN_DB=1"
echo "CREATOR=ECLASS"
echo "EBUILD=${CATEGORY}/${PN}"
echo "EBUILD_V=${PVR}"
echo "PLUGINS=\"$@\""
- } > "${D%/}/${DB_FILE}"
+ } > "${D}/${DB_FILE}" || die
}

# @FUNCTION: vdr_create_header_checksum_file
@@ -423,7 +423,7 @@ vdr-plugin-2_pkg_setup() {
if [[ -n "${VDR_LOCAL_PATCHES_DIR}" ]]; then
eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!"
eerror "Please move all your patches into"
- eerror "${EROOT%/}/etc/portage/patches/${CATEGORY}/${P}"
+ eerror "${EROOT}/etc/portage/patches/${CATEGORY}/$

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/strip-linguas.eclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/strip-linguas.eclass b/eclass/strip-linguas.eclass
index 718341b4a626..782659f02860 100644
--- a/eclass/strip-linguas.eclass
+++ b/eclass/strip-linguas.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2021 Gentoo Authors
+# Copyright 2004-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: strip-linguas.eclass
@@ -6,11 +6,11 @@
# Ulrich Müller <ulm@gentoo.org>
# @AUTHOR:
# Mike Frysinger <vapier@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: convenience function for LINGUAS support

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

--
2.46.0

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

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/vim-plugin.eclass | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/vim-plugin.eclass b/eclass/vim-plugin.eclass
index ee4f1b6e0f81..ba61bf89616e 100644
--- a/eclass/vim-plugin.eclass
+++ b/eclass/vim-plugin.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: vim-plugin.eclass
# @MAINTAINER:
# vim@gentoo.org
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: used for installing vim plugins
# @DESCRIPTION:
# This eclass simplifies installation of app-vim plugins into
@@ -13,7 +13,7 @@
# documentation, for which we make a special case via vim-doc.eclass.

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

@@ -22,7 +22,7 @@ _VIM_PLUGIN_ECLASS=1

inherit vim-doc

-[[ ${EAPI} != [67] ]] && _DEFINE_VIM_PLUGIN_SRC_PREPARE=true
+[[ ${EAPI}

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/xdg.eclass | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

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

# @ECLASS: xdg.eclass
@@ -6,7 +6,7 @@
# freedesktop-bugs@gentoo.org
# @AUTHOR:
# Original author: Gilles Dartiguelongue <eva@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @PROVIDES: xdg-utils
# @BLURB: Provides phases for XDG compliant packages.
# @DESCRIPTION:
@@ -14,7 +14,7 @@
# out in the freedesktop specs & implementations

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

@@ -30,7 +30,7 @@ inherit xdg-utils
"

case ${EAPI} in
- 6|7)
+ 7)
# src_prepare is only exported in EAPI < 8.
# @FUNCTION: xdg_src_

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/multilib.eclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index bf9c88f7e6a4..33c329c00a59 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -1,16 +1,16 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: multilib.eclass
# @MAINTAINER:
# toolchain@gentoo.org
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 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} in
- 6|7|8) ;;
+ 7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac

--
2.46.0

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

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/ruby-ng.eclass | 75 +++++++++----------------------------------
1 file changed, 16 insertions(+), 59 deletions(-)

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index d80ae96dd40b..03d3e72769b0 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: ruby-ng.eclass
@@ -8,7 +8,7 @@
# Author: Diego E. Pettenò <flameeyes@gentoo.org>
# Author: Alex Legler <a3li@gentoo.org>
# Author: Hans de Graaff <graaff@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: An eclass for installing Ruby packages with proper support for multiple Ruby slots.
# @DESCRIPTION:
# The Ruby eclass is designed to allow an easier installation of Ruby packages @@ -67,14 +67,13 @@
# passed to "grep -E" to remove reporting of these shared objects.

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

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/libtool.eclass | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass
index bd6141e1ede9..95019359da7d 100644
--- a/eclass/libtool.eclass
+++ b/eclass/libtool.eclass
@@ -4,7 +4,7 @@
# @ECLASS: libtool.eclass
# @MAINTAINER:
# base-system@gentoo.org
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: quickly update bundled libtool code
# @DESCRIPTION:
# This eclass patches ltmain.sh distributed with libtoolized packages with the @@ -14,15 +14,16 @@
# generated libtool files. We do not run the libtoolize program because that
# requires a regeneration of the main autotool files in order to work properly.

-if [[ -z ${_LIBTOOL_ECLASS} ]]; then
-_LIBTOOL_ECLASS=1
-
case ${EAPI} in
- 6) DEPEND=">=app-portage/elt-patches-20240116" ;;
- 7|8) BDEPEND=">=app-portage/elt-patches-20240116" ;;
+ 7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac

+if [[ -z ${_LIBTOOL_EC

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/out-of-source-utils.eclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/out-of-source-utils.eclass b/eclass/out-of-source-utils.eclass
index d68b21088995..ea4f2df56e33 100644
--- a/eclass/out-of-source-utils.eclass
+++ b/eclass/out-of-source-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: out-of-source-utils.eclass
@@ -6,14 +6,14 @@
# Michał Górny <mgorny@gentoo.org>
# @AUTHOR:
# Michał Górny <mgorny@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: Utility functions for building packages out-of-source
# @DESCRIPTION:
# This eclass provides a run_in_build_dir() helper that can be used
# to execute specified command inside BUILD_DIR.

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

--
2.46.0

--- SoupGate-Wi

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/multilib-minimal.eclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass index 92968b6cf213..ae4c26273b82 100644
--- a/eclass/multilib-minimal.eclass
+++ b/eclass/multilib-minimal.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 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: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @PROVIDES: multilib-build
# @BLURB: wrapper for multilib builds providing convenient multilib_src_* functions
# @DESCRIPTION:
@@ -24,7 +24,7 @@
# If you need generic install rules, use multilib_src_install_all function.

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

--
2.46.0

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/multilib-build.eclass | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
index 1774ad057430..62f8a4703796 100644
--- a/eclass/multilib-build.eclass
+++ b/eclass/multilib-build.eclass
@@ -1,4 +1,4 @@
-# Copyright 2013-2023 Gentoo Authors
+# Copyright 2013-2024 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: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: flags and utility functions for building multilib packages
# @DESCRIPTION:
# The multilib-build.eclass exports USE flags and utility functions
@@ -18,7 +18,7 @@
# to properly request multilib enabled.

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

@@ -253,8 +253,8

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/python-r1.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index adf87c2c52f7..bb7aa6452d8b 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -789,7 +789,7 @@ python_replicate_script() {
)

python_fix_shebang -q \
- "${files[@]/*\//${D%/}/${PYTHON_SCRIPTDIR}/}"
+ "${files[@]/*\//${D}${PYTHON_SCRIPTDIR}/}"
}

local files=( "${@}" )
--
2.46.0

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

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/xdg-utils.eclass | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass
index 34535a129e33..de383d88cf95 100644
--- a/eclass/xdg-utils.eclass
+++ b/eclass/xdg-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2023 Gentoo Authors
+# Copyright 2004-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: xdg-utils.eclass
@@ -7,7 +7,7 @@
# freedesktop-bugs@gentoo.org
# @AUTHOR:
# Original author: Gilles Dartiguelongue <eva@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: Auxiliary functions commonly used by XDG compliant packages.
# @DESCRIPTION:
# This eclass provides a set of auxiliary functions needed by most XDG
@@ -18,7 +18,7 @@
# * XDG mime information database management

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

@@ -68,7 +68,7 @@ xdg_desktop_database_u

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/pax-utils.eclass | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/pax-utils.eclass b/eclass/pax-utils.eclass
index 3830f03df341..de7f0193ae35 100644
--- a/eclass/pax-utils.eclass
+++ b/eclass/pax-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: pax-utils.eclass
@@ -7,7 +7,7 @@
# @AUTHOR:
# Author: Kevin F. Quinn <kevquinn@gentoo.org>
# Author: Anthony G. Basile <blueness@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: functions to provide PaX markings for hardened kernels
# @DESCRIPTION:
#
@@ -21,8 +21,8 @@
# To control what markings are made, set PAX_MARKINGS in /etc/portage/make.conf
# to contain either "PT", "XT" or "none". The default is none

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

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/vim-doc.eclass | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/vim-doc.eclass b/eclass/vim-doc.eclass
index 119ce793071d..6711dadf7617 100644
--- a/eclass/vim-doc.eclass
+++ b/eclass/vim-doc.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: vim-doc.eclass
# @MAINTAINER:
# vim@gentoo.org
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: Eclass for vim{,-plugin}.eclass to update documentation tags.
# @DESCRIPTION:
# This eclass is used by vim.eclass and vim-plugin.eclass to update
@@ -17,11 +17,12 @@
# installed by the eclass.

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

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

# @FUNCTION: update_vim_helptags
# @USAGE:
@@ -54,7 +55

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/multibuild.eclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index f15d3327c7dd..98d2c6c3923b 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: multibuild.eclass
@@ -6,7 +6,7 @@
# Michał Górny <mgorny@gentoo.org>
# @AUTHOR:
# Author: Michał Górny <mgorny@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: A generic eclass for building multiple variants of packages.
# @DESCRIPTION:
# The multibuild eclass aims to provide a generic framework for building
@@ -14,7 +14,7 @@
# implementations).

case ${EAPI} in
- 6|7|8)
+ 7|8)
# backwards compatibility for run_in_build_dir
inherit out-of-source-utils
;;
--
2.46.0

--- SoupGate-Win32 v1.05
* Origin: fsxNe

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/php-pear-r2.eclass | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/eclass/php-pear-r2.eclass b/eclass/php-pear-r2.eclass
index 9882c7dcc700..263db8d19f92 100644
--- a/eclass/php-pear-r2.eclass
+++ b/eclass/php-pear-r2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: php-pear-r2.eclass
@@ -6,7 +6,7 @@
# Gentoo PHP Team <php-bugs@gentoo.org>
# @AUTHOR:
# Author: Brian Evans <grknight@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: Provides means for an easy installation of PEAR packages.
# @DESCRIPTION:
# This eclass provides means for an easy installation of PEAR packages.
@@ -15,7 +15,7 @@
# on purpose; please use (R)DEPEND to define them correctly!

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

@@ -23,7

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/portability.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/portability.eclass b/eclass/portability.eclass
index 78da440e22dd..afc1a1828348 100644
--- a/eclass/portability.eclass
+++ b/eclass/portability.eclass
@@ -6,11 +6,11 @@
# base-system@gentoo.org
# @AUTHOR:
# Diego Pettenò <flameeyes@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: This eclass is created to avoid using non-portable GNUisms inside ebuilds

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

--
2.46.0

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

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/java-utils-2.eclass | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 9c657cc4c1f9..1b4f4f138706 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -6,7 +6,7 @@
# java@gentoo.org
# @AUTHOR:
# Thomas Matthijs <axxo@gentoo.org>, Karl Trygve Kalleberg <karltk@gentoo.org> -# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: Base eclass for Java packages
# @DESCRIPTION:
# This eclass provides functionality which is used by java-pkg-2.eclass,
@@ -18,17 +18,13 @@
# Ant-based packages.

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

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

-# EAPI 7 has version functions built-in. Use eapi7-ver for all earlier EAPIs. -# Keep versionator inheritance in case consumers are using it implicitly.
-[[ ${EAPI} == 6 ]] && inheri

Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/multiprocessing.eclass | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/multiprocessing.eclass b/eclass/multiprocessing.eclass index 13d6a92f2f2e..8857ce22104a 100644
--- a/eclass/multiprocessing.eclass
+++ b/eclass/multiprocessing.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: multiprocessing.eclass
@@ -7,7 +7,7 @@
# @AUTHOR:
# Brian Harring <ferringb@gentoo.org>
# Mike Frysinger <vapier@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: multiprocessing helper functions
# @DESCRIPTION:
# The multiprocessing eclass contains a suite of utility functions
@@ -24,8 +24,8 @@
# }
# @CODE

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

--
2.46.0

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet G

There wasn't an introduction message to this series, but I wanted to
raise the discussion.

We only JUST got rid of the last EAPI6 ebuilds in the main tree.

There are overlays that still have EAPI6 ebuilds - and depend on these
ebuilds.

When is an expected time for all of those ebuilds to migrate, and how is
that being communicated?

--
Robin Hugh Johnson
Gentoo Linux: Dev, Infra Lead, Foundation President & Treasurer
E-Mail : robbat2@gentoo.org
GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85
GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
Comment: Robbat2 @ Orbis-Terrarum Networks - The text below is a digital signature. If it doesn't make any sense to you, ignore it.

iQKTBAABCgB9FiEEveu2pS8Vb98xaNkRGTlfI8WIJsQFAmbOPxhfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEJE RUJCNkE1MkYxNTZGREYzMTY4RDkxMTE5Mzk1RjIzQzU4ODI2QzQACgkQGTlfI8WI JsREvBAAjCou3wZmzw+NTNWu0c4bXZ8FeEQoY4y+RZ59MPp30Wv5R8NNAy0G8T60 P8+pWMnwxFAzvp+AMj/NnPMEOXIx79yqVLHXV/FKahuaRhSo6JIYPgvBFm46B4Jj oJRpIN0ZK/dhBaNqZrCnEzaaK+yIdtHA/ldKgMzi+rXgNj0R+AgboMTdx9aWEYYe Lo5w4hVozSTSCHC+HmWHzk0ZYK06GaZKanbqalppbb6skLFYmH61ERHdB12atVdC XbyR+zxgJCrBQfKYrm3u+FoC33VhHXPkPXG/9QotDOIAT8Pn2BhfpgBRzhhfNmyJ 3u2LVu2Kpwat6MHFPUty8REfPirakJ6OxNIeinsYAf099E/kVpoC9yDzDEUQvyii
9t0u4oSb

This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------k1V5ziwFNMvUb00EklmuNqbA
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

On 8/27/24 5:03 PM, Robin H. Johnson wrote:

There wasn't an introduction message to this series, but I wanted to
raise the discussion.

We only JUST got rid of the last EAPI6 ebuilds in the main tree.

There are overlays that still have EAPI6 ebuilds - and depend on these ebuilds.

When is an expected time for all of those ebuilds to migrate, and how is
that being communicated?

If we were removing an eclass that only supports EAPI 6 and is being
dropped because it's useless, we'd last rite it and give people 30 days
to move.

But because the *file* isn't being removed, there is no rule how to do
it apparently?? :D The obvious answer here is to stick an ewarn in the
"if EAPI 6" branch at global scope.


(It's a bit messy when doing dependency calculation. This too is a
feature, if you think about it.)


--
Eli Schwartz


--------------k1V5ziwFNMvUb00EklmuNqbA--

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

wnsEABYIACMWIQTnFNnmK0TPZHnXm3qEp9ErcA0vVwUCZs5CEwUDAAAAAAAKCRCEp9ErcA0vV+Mz AP4mt7kQ8pGAiTAq+fWMss6dvPS+E2qOZtpudb3+6hVTJQEAyjnxmi+3NMP96ZrxekQo+zE5g9uj fWJIT6FUAb4cfwI=
=vJuK
-----END PGP SIGNATURE-----

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

Eli Schwartz <eschwartz@gentoo.org> writes:

On 8/27/24 5:03 PM, Robin H. Johnson wrote:

There wasn't an introduction message to this series, but I wanted to
raise the discussion.

We only JUST got rid of the last EAPI6 ebuilds in the main tree.

There are overlays that still have EAPI6 ebuilds - and depend on these
ebuilds.

When is an expected time for all of those ebuilds to migrate, and how is
that being communicated?

If we were removing an eclass that only supports EAPI 6 and is being
dropped because it's useless, we'd last rite it and give people 30 days
to move.

But because the *file* isn't being removed, there is no rule how to do
it apparently?? :D The obvious answer here is to stick an ewarn in the
"if EAPI 6" branch at global scope.

(It's a bit messy when doing dependency calculation. This too is a
feature, if you think about it.)

Yes, it's something which has bothered me for a while. When we ratified
GLEP 83 [0], I wanted to come back to it for handling EAPI support
deprecation in "important" eclasses but I couldn't figure out a nice
definition for that and got distracted.

I actually *do* think we should do something here, but I will note
pkgcheck will have been warning about use of DeprecatedEapi at least.

[0] https://www.gentoo.org/glep/glep-0083.html

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

On Tue, 27 Aug 2024, Robin H Johnson wrote:

We only JUST got rid of the last EAPI6 ebuilds in the main tree.

Note that the council deprecated EAPI 6 on 2021-07-11 and banned it
on 2023-07-11.

There are overlays that still have EAPI6 ebuilds - and depend on these ebuilds.

When is an expected time for all of those ebuilds to migrate, and how
is that being communicated?

I'd argue that the migration period started with the deprecation
of EAPI 6, i.e. more than three years ago.

[1] https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification#Council_approval_and_use_in_Gentoo_repository

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

iQFDBAEBCAAtFiEEtDnZ1O9xIP68rzDbUYgzUIhBXi4FAmbO8bsPHHVsbUBnZW50 b28ub3JnAAoJEFGIM1CIQV4uwlUH/RWK38VnNFckj25zOH37XA77BxSd92TpXvU9 K+BEl8zrc7OrkioQHMTbeC59gPHE5ExdeFmV9fNfnP6KdJOHLqtgqNuS4L1VAd/n iPfS+rg+fxLWnMZnYpfe+TJzmAgK4zLa9pqYs4hS/FsyPRv4tBy/du0aYK6fzniu KhOlrOXKaocs+1OKZPfw4ZUwcae08r9GmRU4IHSvpBF/W/lM99CKNonpvNH4m/QL WBR0AEB+mVne51xW71Sl+W85h76LTx74D9o9UktDtvqEUJqb672KJqmnu4m268k6 NqiDm4ThDfYOgj/PuiI1Pxns0J+Plt7V9tEXZRcxpJSSh9eqoOQ=
=WPzg
-----END PGP SIGNATURE-----

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