From: Hans de Graaff Date: Sun, 21 Jul 2019 06:26:21 +0000 (+0200) Subject: ruby-ng.eclass: stop inheriting toolchain-funcs X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=cda96c41d21a1977fc147e0bd052572fab9f8786;p=gentoo.git 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 --- 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