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

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

diff --git a/dev-vcs/subversion/subversion-1.8.15.ebuild b/dev-vcs/subversion/subversion-1.8.15.ebuild
index ffe23962a6b0c4ce07ebc8835d78a7141046c703..990c219cf090f20f54a7faf8603950a3758dc022 100644 (file)
--- 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 41c8197f48bd663a7df3be0d878a6f877a5a4ce6..4bf75b301f4c54081dc6b80cb719904173f22054 100644 (file)
--- 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