[gentoo-commits] repo/gentoo:master commit in: eclass/

[Hans de Graaff]

commit:     cda96c41d21a1977fc147e0bd052572fab9f8786
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 21 06:26:21 2019 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 06:09:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cda96c41

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 <AT> gentoo.org>

 eclass/ruby-ng.eclass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index c2a09585d8e..7fef1085a9d 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