summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2019-07-21 08:26:21 +0200
committerHans de Graaff <graaff@gentoo.org>2019-07-25 08:09:41 +0200
commitcda96c41d21a1977fc147e0bd052572fab9f8786 (patch)
treef88ca8829f097a105fdff91561bbb54cf24b3008 /eclass
parentruby-ng.eclass: add EAPI 7 support (diff)
downloadgentoo-cda96c41d21a1977fc147e0bd052572fab9f8786.tar.gz
gentoo-cda96c41d21a1977fc147e0bd052572fab9f8786.tar.bz2
gentoo-cda96c41d21a1977fc147e0bd052572fab9f8786.zip
ruby-ng.eclass: stop inheriting toolchain-funcs
Stop inheriting toolchain-funcs in EAPI 7. The eclass does not use this eclass and any ebuild that requires it should inherit it directly instead. Signed-off-by: Hans de Graaff <graaff@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ruby-ng.eclass7
1 files changed, 5 insertions, 2 deletions
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index c2a09585d8ef..7fef1085a9dd 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -69,14 +69,17 @@
local inherits=""
case ${EAPI} in
4|5)
- inherits="eutils"
+ inherits="eutils toolchain-funcs"
+ ;;
+ 6)
+ inherits="estack toolchain-funcs"
;;
*)
inherits="estack"
;;
esac
-inherit ${inherits} multilib toolchain-funcs ruby-utils
+inherit ${inherits} multilib ruby-utils
EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_setup