diff options
| author |   Repository QA checks <repo-qa-checks@gentoo.org> | 2016-11-13 15:03:44 +0000 |
|---|---|---|
| committer | Repository QA checks <repo-qa-checks@gentoo.org> | 2016-11-13 15:03:44 +0000 |
| commit | 18c49424617226affa39a6b3ae35008ddbaa4434 (patch) | |
| tree | e5d41c692408143a1e6e300422c8e1df3ced5b31 | |
| parent | 2016-11-13 14:42:34 UTC (diff) | |
| parent | eclass/ruby-ng: Remove ree18 support (diff) | |
| download | gentoo-18c49424617226affa39a6b3ae35008ddbaa4434.tar.gz gentoo-18c49424617226affa39a6b3ae35008ddbaa4434.tar.bz2 gentoo-18c49424617226affa39a6b3ae35008ddbaa4434.zip | |
Merge updates from master
| -rw-r--r-- | eclass/ruby-ng.eclass | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass index 4842e0dd9f71..f144c9ecc351 100644 --- a/eclass/ruby-ng.eclass +++ b/eclass/ruby-ng.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -15,13 +15,11 @@ # and their incorporation into the Gentoo Linux system. # # Currently available targets are: -# * ruby18 - Ruby (MRI) 1.8.x # * ruby19 - Ruby (MRI) 1.9.x # * ruby20 - Ruby (MRI) 2.0.x # * ruby21 - Ruby (MRI) 2.1.x # * ruby22 - Ruby (MRI) 2.2.x # * ruby23 - Ruby (MRI) 2.3.x -# * ree18 - Ruby Enterprise Edition 1.8.x # * jruby - JRuby # * rbx - Rubinius # @@ -142,17 +140,11 @@ _ruby_atoms_samelib_generic() { # @RETURN: the path to the given ruby implementation # @DESCRIPTION: # Not all implementations have the same command basename as the -# target; namely Ruby Enterprise 1.8 uses ree18 and rubyee18 -# respectively. This function translate between the two +# target; This function translate between the two ruby_implementation_command() { local _ruby_name=$1 - # Add all USE_RUBY values where the flag name diverts from the binary here - case $1 in - ree18) - _ruby_name=rubyee18 - ;; - esac + # Add all USE_RUBY values where the flag name diverts from the binary here echo $(type -p ${_ruby_name} 2>/dev/null) } @@ -595,9 +587,6 @@ ruby_get_implementation() { local ruby=${RUBY:-$(type -p ruby 2>/dev/null)} case $(${ruby} --version) in - *Enterprise*) - echo "ree" - ;; *jruby*) echo "jruby" ;; |