[gentoo-commits] repo/gentoo:master commit in: eclass/

[David Seifert]

commit:     c7082538536c5fceab8d67da2365a938391c0d94
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  8 15:31:38 2024 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Oct  8 15:31:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7082538

toolchain.eclass: drop support for EAPI 6

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 eclass/toolchain.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 34f595bcd1bc..6bad1def19f4 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -11,14 +11,14 @@
 # GNAT for Ada). If not building GCC itself, please use toolchain-funcs.eclass
 # instead.
 
+if [[ -z ${_TOOLCHAIN_ECLASS} ]]; then
+_TOOLCHAIN_ECLASS=1
+
 case ${EAPI} in
        7|8) ;;
        *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_TOOLCHAIN_ECLASS} ]]; then
-_TOOLCHAIN_ECLASS=1
-
 DESCRIPTION="The GNU Compiler Collection"
 HOMEPAGE="https://gcc.gnu.org/";
 
@@ -2647,7 +2647,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