[gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/

[Lars Wendler]

commit:     7e9e0a99868bcfc68b50391931e7003a55ad1be0
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 14:50:08 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 14:50:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e9e0a99

dev-vcs/subversion: Fixed ruby version detection (bug #570328).

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-vcs/subversion/subversion-1.8.15.ebuild | 6 +++---
 dev-vcs/subversion/subversion-1.9.3.ebuild  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-vcs/subversion/subversion-1.8.15.ebuild 
b/dev-vcs/subversion/subversion-1.8.15.ebuild
index ffe2396..990c219 100644
--- a/dev-vcs/subversion/subversion-1.8.15.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.15.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby22 ruby21 ruby20 ruby19"
+USE_RUBY="ruby22 ruby21 ruby20"
 DISTUTILS_OPTIONAL=1
 WANT_AUTOMAKE="none"
 GENTOO_DEPEND_ON_PERL="no"
@@ -117,7 +117,7 @@ pkg_setup() {
        if use ruby ; then
                local rbslot
                RB_VER=""
-               for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@' 
<<< ${USE_RUBY/ruby}) ; do
+               for rbslot in $(sed 
's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
                        if has_version dev-lang/ruby:${rbslot} ;  then
                                RB_VER="${rbslot/.}"
                                break

diff --git a/dev-vcs/subversion/subversion-1.9.3.ebuild 
b/dev-vcs/subversion/subversion-1.9.3.ebuild
index 41c8197..4bf75b3 100644
--- a/dev-vcs/subversion/subversion-1.9.3.ebuild
+++ b/dev-vcs/subversion/subversion-1.9.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby22 ruby21 ruby20 ruby19"
+USE_RUBY="ruby23 ruby22 ruby21 ruby20"
 DISTUTILS_OPTIONAL=1
 WANT_AUTOMAKE="none"
 GENTOO_DEPEND_ON_PERL="no"
@@ -117,7 +117,7 @@ pkg_setup() {
        if use ruby ; then
                local rbslot
                RB_VER=""
-               for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@' 
<<< ${USE_RUBY/ruby}) ; do
+               for rbslot in $(sed 
's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
                        if has_version dev-lang/ruby:${rbslot} ;  then
                                RB_VER="${rbslot/.}"
                                break