[gentoo-dev] [PATCH 3/3] ruby-ng.eclass: Remove support for jruby in EAPI 6

[Hans de Graaff]

jruby has not been supported for some time. Removing support for it in
EAPI 6 allows us to drop the java-utils-2 eclass which in turn also
inherits eutils.
---
 eclass/ruby-ng.eclass | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index bc42e66..8a3bc18 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -76,11 +76,11 @@
 local inherits=""
 case ${EAPI} in
 	2|3|4|5)
-		inherits="eutils"
+		inherits="eutils java-utils-2"
 		;;
 esac
 
-inherit ${inherits} java-utils-2 multilib toolchain-funcs ruby-utils
+inherit ${inherits} multilib toolchain-funcs ruby-utils
 
 EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_setup
 
@@ -385,7 +385,11 @@ ruby-ng_pkg_setup() {
 	# it's a special case.
 	_ruby_each_implementation
 
-	has ruby_targets_jruby ${IUSE} && use ruby_targets_jruby && java-pkg_setup-vm
+	case ${EAPI} in
+		2|3|4|5)
+			has ruby_targets_jruby ${IUSE} && use ruby_targets_jruby && java-pkg_setup-vm
+			;;
+	esac
 }
 
 # @FUNCTION: ruby-ng_src_unpack
-- 
2.10.2