Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/ruby-scripts:master commit in: eselect-ruby/
Date: Tue, 29 Dec 2015 10:39:39
Message-Id: 1451385553.8d1eff1ae8b4e0230fefd1f7087ee22ce2c0c1d1.graaff@gentoo
1 commit: 8d1eff1ae8b4e0230fefd1f7087ee22ce2c0c1d1
2 Author: Hans de Graaff <hans <AT> degraaff <DOT> org>
3 AuthorDate: Tue Dec 29 10:39:13 2015 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 29 10:39:13 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/ruby-scripts.git/commit/?id=8d1eff1a
7
8 Add ruby23 support
9
10 eselect-ruby/ruby.eselect | 16 ++++++++--------
11 1 file changed, 8 insertions(+), 8 deletions(-)
12
13 diff --git a/eselect-ruby/ruby.eselect b/eselect-ruby/ruby.eselect
14 index 883d1ff..2dfcd33 100644
15 --- a/eselect-ruby/ruby.eselect
16 +++ b/eselect-ruby/ruby.eselect
17 @@ -4,14 +4,14 @@
18
19 DESCRIPTION="Manage Ruby symlinks"
20 MAINTAINER="a3li@g.o"
21 -SVN_DATE="20141227"
22 -VERSION="20141227"
23 +SVN_DATE="20151229"
24 +VERSION="20151229"
25
26 bindir=/usr/bin
27 man1dir=/usr/share/man/man1
28
29 find_targets() {
30 - for t in ${EROOT}${bindir}/${1:-ruby}{18,19,20,21,22} ; do
31 + for t in ${EROOT}${bindir}/${1:-ruby}{18,19,20,21,22,23} ; do
32 [[ -e $t ]] || continue
33 echo ${t}
34 done
35 @@ -62,7 +62,7 @@ create_symlinks() {
36 local target=${1} version
37
38 version=${target##*ruby}
39 -
40 +
41 local path="${EROOT}${bindir}/"
42 # these have to work
43 for f in "ruby" "irb" "erb" "ri" "testrb" "rdoc" ; do
44 @@ -108,7 +108,7 @@ do_show() {
45 write_kv_list_entry "(none)"
46 return 1
47 fi
48 -
49 +
50 write_list_start "Current Rubygems version:"
51 if [[ -L "${EROOT}${bindir}/gem" ]] ; then
52 write_kv_list_entry "$(basename $(canonicalise ${EROOT}${bindir}/gem ) )" ""
53 @@ -163,11 +163,11 @@ describe_set_parameters() {
54
55 do_set() {
56 [[ -z ${@} ]] && die -q "Parameter expected."
57 -
58 +
59 local target=$(check_target ${1})
60 -
61 +
62 [[ $target = "invalid" ]] && die -q "Can't use that profile. No suitable Ruby interpreter found."
63 -
64 +
65 remove_symlinks || \
66 die -q "Could not remove symlinks"