[gentoo-commits] repo/gentoo:master commit in: dev-ruby/rspec-core/

[Hans de Graaff]

commit:     084c5260df96f9d559ca0ab3ffbf91d8c111781b
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  7 21:13:14 2016 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Mon Mar  7 21:14:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=084c5260

dev-ruby/rspec-core: add ruby23

Package-Manager: portage-2.2.26

 dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild 
b/dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild
index 20ae4ad..7f7893a 100644
--- a/dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_TEST="none"
 RUBY_FAKEGEM_TASK_DOC="none"
@@ -38,7 +38,7 @@ ruby_add_bdepend "test? (
 
 # Skip yard for ruby21 for now since we don't support ruby21 eselected
 # yet and we can't bootstrap otherwise.
-USE_RUBY=${USE_RUBY/ruby21 ruby22/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
+USE_RUBY=${USE_RUBY/ruby21 ruby22 ruby23/} ruby_add_bdepend "doc? ( 
dev-ruby/yard )"
 
 all_ruby_prepare() {
        # Don't set up bundler: it doesn't understand our setup.
@@ -58,10 +58,19 @@ all_ruby_prepare() {
        # Avoid aruba dependency so that we don't end up in dependency hell.
        sed -i -e '/aruba/ s:^:#:' -e '/Aruba/,/}/ s:^:#:' spec/spec_helper.rb 
|| die
        rm spec/command_line/order_spec.rb || die
+
+       # Avoid testing issues with rspec 3 installed
+       sed -i -e '2igem "rspec", "~> 2.0"' bin/rspec || die
 }
 
 each_ruby_prepare() {
        sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
+
+       case ${RUBY} in
+               *ruby23)
+                       sed -i -e 's/SAFE = 3/SAFE = 1/' 
spec/support/helper_methods.rb || die
+                       ;;
+       esac
 }
 
 all_ruby_compile() {