commit: 0bf9e0752ba0581a1f0e6f34fd018bd1dbede838 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sat Jul 17 08:00:21 2021 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sat Jul 17 10:25:24 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bf9e075
toolchain.eclass: leave (unused) 'eutils' inherit only for EAPI=5|6|7 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> eclass/toolchain.eclass | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index a0e5c608e2c..357c99d0921 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -7,9 +7,7 @@ DESCRIPTION="The GNU Compiler Collection" HOMEPAGE="https://gcc.gnu.org/"; -# TODO: Please audit this inherit list on future EAPI bumps and ideally -# conditonalise them where possible. -inherit eutils flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs prefix +inherit flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs prefix tc_is_live() { [[ ${PV} == *9999* ]] @@ -30,8 +28,8 @@ fi FEATURES=${FEATURES/multilib-strict/} case ${EAPI:-0} in - 5|6) inherit eapi7-ver ;; - 7) ;; + 5|6) inherit eapi7-ver eutils ;; + 7) inherit eutils ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac
