| 1 |
commit: 084c5260df96f9d559ca0ab3ffbf91d8c111781b |
| 2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 7 21:13:14 2016 +0000 |
| 4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 7 21:14:16 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=084c5260 |
| 7 |
|
| 8 |
dev-ruby/rspec-core: add ruby23 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
|
| 12 |
dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild | 13 +++++++++++-- |
| 13 |
1 file changed, 11 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
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 |
| 16 |
index 20ae4ad..7f7893a 100644 |
| 17 |
--- a/dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild |
| 18 |
+++ b/dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild |
| 19 |
@@ -3,7 +3,7 @@ |
| 20 |
# $Id$ |
| 21 |
|
| 22 |
EAPI=5 |
| 23 |
-USE_RUBY="ruby20 ruby21 ruby22" |
| 24 |
+USE_RUBY="ruby20 ruby21 ruby22 ruby23" |
| 25 |
|
| 26 |
RUBY_FAKEGEM_TASK_TEST="none" |
| 27 |
RUBY_FAKEGEM_TASK_DOC="none" |
| 28 |
@@ -38,7 +38,7 @@ ruby_add_bdepend "test? ( |
| 29 |
|
| 30 |
# Skip yard for ruby21 for now since we don't support ruby21 eselected |
| 31 |
# yet and we can't bootstrap otherwise. |
| 32 |
-USE_RUBY=${USE_RUBY/ruby21 ruby22/} ruby_add_bdepend "doc? ( dev-ruby/yard )" |
| 33 |
+USE_RUBY=${USE_RUBY/ruby21 ruby22 ruby23/} ruby_add_bdepend "doc? ( dev-ruby/yard )" |
| 34 |
|
| 35 |
all_ruby_prepare() { |
| 36 |
# Don't set up bundler: it doesn't understand our setup. |
| 37 |
@@ -58,10 +58,19 @@ all_ruby_prepare() { |
| 38 |
# Avoid aruba dependency so that we don't end up in dependency hell. |
| 39 |
sed -i -e '/aruba/ s:^:#:' -e '/Aruba/,/}/ s:^:#:' spec/spec_helper.rb || die |
| 40 |
rm spec/command_line/order_spec.rb || die |
| 41 |
+ |
| 42 |
+ # Avoid testing issues with rspec 3 installed |
| 43 |
+ sed -i -e '2igem "rspec", "~> 2.0"' bin/rspec || die |
| 44 |
} |
| 45 |
|
| 46 |
each_ruby_prepare() { |
| 47 |
sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die |
| 48 |
+ |
| 49 |
+ case ${RUBY} in |
| 50 |
+ *ruby23) |
| 51 |
+ sed -i -e 's/SAFE = 3/SAFE = 1/' spec/support/helper_methods.rb || die |
| 52 |
+ ;; |
| 53 |
+ esac |
| 54 |
} |
| 55 |
|
| 56 |
all_ruby_compile() { |
Archives