summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2016-03-18 15:50:08 +0100
committerLars Wendler <polynomial-c@gentoo.org>2016-03-18 15:50:34 +0100
commit7e9e0a99868bcfc68b50391931e7003a55ad1be0 (patch)
tree652ce30e6db6ed929ebf1d6911ac454f24233777 /dev-vcs
parentkde-apps/kde-apps-meta: Add 15.12.3 from overlay (diff)
downloadgentoo-7e9e0a99868bcfc68b50391931e7003a55ad1be0.tar.gz
gentoo-7e9e0a99868bcfc68b50391931e7003a55ad1be0.tar.bz2
gentoo-7e9e0a99868bcfc68b50391931e7003a55ad1be0.zip
dev-vcs/subversion: Fixed ruby version detection (bug #570328).
Package-Manager: portage-2.2.28 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'dev-vcs')
-rw-r--r--dev-vcs/subversion/subversion-1.8.15.ebuild6
-rw-r--r--dev-vcs/subversion/subversion-1.9.3.ebuild6
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 ffe23962a6b0..990c219cf090 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 41c8197f48bd..4bf75b301f4c 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