Re: [gentoo-dev] [PATCH] ruby-ng.eclass: drop support for jruby

2019-07-18 Thread Hans de Graaff
On Thu, 2019-07-18 at 08:43 -0400, Brian Evans wrote:
> 
> While I get it is no longer needed, java-utils-2 has had EAPI 7
> enabled
> since December 2018.  Just saying.

I guess that tells you when I started working on this patchset. :-(
I've updated the commit message.

Hans


signature.asc
Description: This is a digitally signed message part


Re: [gentoo-dev] [PATCH] ruby-ng.eclass: drop support for jruby

2019-07-18 Thread Brian Evans
On 7/18/2019 3:41 AM, gra...@gentoo.org wrote:
> From: Hans de Graaff 
> 
> jruby has been removed from the tree for quite some time and is not
> used at all anymore in ebuilds. This also drops an inherit of
> java-utils-2 which blocks updating to EAPI 7.

While I get it is no longer needed, java-utils-2 has had EAPI 7 enabled
since December 2018.  Just saying.

Brian




[gentoo-dev] [PATCH] ruby-ng.eclass: drop support for jruby

2019-07-18 Thread graaff
From: Hans de Graaff 

jruby has been removed from the tree for quite some time and is not
used at all anymore in ebuilds. This also drops an inherit of
java-utils-2 which blocks updating to EAPI 7.
---
 eclass/ruby-ng.eclass | 12 +---
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index 21cbc5d99595..d3264743c89a 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -73,7 +73,7 @@ case ${EAPI} in
;;
 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
 
@@ -402,8 +402,6 @@ ruby-ng_pkg_setup() {
# before doing anything; by leaving the parameters empty we know
# it's a special case.
_ruby_each_implementation
-
-   has ruby_targets_jruby ${IUSE} && use ruby_targets_jruby && 
java-pkg_setup-vm
 }
 
 # @FUNCTION: ruby-ng_src_unpack
@@ -629,9 +627,6 @@ ruby_get_implementation() {
local ruby=${RUBY:-$(type -p ruby 2>/dev/null)}
 
case $(${ruby} --version) in
-   *jruby*)
-   echo "jruby"
-   ;;
*rubinius*)
echo "rbx"
;;
@@ -713,11 +708,6 @@ ruby-ng_cucumber() {
;;
esac
 
-   if [[ ${RUBY} == *jruby ]]; then
-   ewarn "Skipping cucumber tests on JRuby (unsupported)."
-   return 0
-   fi
-
${RUBY} -S cucumber ${cucumber_params} "$@" || die "cucumber failed"
 }
 
-- 
2.21.0