From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6E46059CA3 for ; Fri, 18 Mar 2016 14:50:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C9F221C00D; Fri, 18 Mar 2016 14:50:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 92E8421C00D for ; Fri, 18 Mar 2016 14:50:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E726C340C72 for ; Fri, 18 Mar 2016 14:50:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9633B853 for ; Fri, 18 Mar 2016 14:50:38 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1458312634.7e9e0a99868bcfc68b50391931e7003a55ad1be0.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/subversion/subversion-1.8.15.ebuild dev-vcs/subversion/subversion-1.9.3.ebuild X-VCS-Directories: dev-vcs/subversion/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 7e9e0a99868bcfc68b50391931e7003a55ad1be0 X-VCS-Branch: master Date: Fri, 18 Mar 2016 14:50:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4e2665ce-cc4d-40e1-916b-86c6e616f72f X-Archives-Hash: 01751383483eec0ef9efcc3832756d08 commit: 7e9e0a99868bcfc68b50391931e7003a55ad1be0 Author: Lars Wendler gentoo org> AuthorDate: Fri Mar 18 14:50:08 2016 +0000 Commit: Lars Wendler gentoo 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 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