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