| 1 |
From: Hans de Graaff <graaff@g.o> |
| 2 |
|
| 3 |
Stop inheriting toolchain-funcs in EAPI 7. The eclass does not use |
| 4 |
this eclass and any ebuild that requires it should inherit it directly |
| 5 |
instead. |
| 6 |
|
| 7 |
Signed-off-by: Hans de Graaff <graaff@g.o> |
| 8 |
--- |
| 9 |
eclass/ruby-ng.eclass | 7 +++++-- |
| 10 |
1 file changed, 5 insertions(+), 2 deletions(-) |
| 11 |
|
| 12 |
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass |
| 13 |
index c2a09585d8ef..7fef1085a9dd 100644 |
| 14 |
--- a/eclass/ruby-ng.eclass |
| 15 |
+++ b/eclass/ruby-ng.eclass |
| 16 |
@@ -69,14 +69,17 @@ |
| 17 |
local inherits="" |
| 18 |
case ${EAPI} in |
| 19 |
4|5) |
| 20 |
- inherits="eutils" |
| 21 |
+ inherits="eutils toolchain-funcs" |
| 22 |
+ ;; |
| 23 |
+ 6) |
| 24 |
+ inherits="estack toolchain-funcs" |
| 25 |
;; |
| 26 |
*) |
| 27 |
inherits="estack" |
| 28 |
;; |
| 29 |
esac |
| 30 |
|
| 31 |
-inherit ${inherits} multilib toolchain-funcs ruby-utils |
| 32 |
+inherit ${inherits} multilib ruby-utils |
| 33 |
|
| 34 |
EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_setup |
| 35 |
|
| 36 |
-- |
| 37 |
2.21.0 |
Archives