summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2015-02-21 09:37:48 +0000
committerHans de Graaff <graaff@gentoo.org>2015-02-21 09:37:48 +0000
commit651f874a90ae30d6aeac286cb7f50277d1d3fba3 (patch)
tree0c67d38070165a63831ed485993d232e433bc07c /dev-ruby/rspec-expectations
parentAdd ruby22. Add missing coderay (testing) dependency. (diff)
downloadgentoo-2-651f874a90ae30d6aeac286cb7f50277d1d3fba3.tar.gz
gentoo-2-651f874a90ae30d6aeac286cb7f50277d1d3fba3.tar.bz2
gentoo-2-651f874a90ae30d6aeac286cb7f50277d1d3fba3.zip
Add ruby22.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Diffstat (limited to 'dev-ruby/rspec-expectations')
-rw-r--r--dev-ruby/rspec-expectations/ChangeLog6
-rw-r--r--dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild6
-rw-r--r--dev-ruby/rspec-expectations/rspec-expectations-3.2.0.ebuild13
3 files changed, 19 insertions, 6 deletions
diff --git a/dev-ruby/rspec-expectations/ChangeLog b/dev-ruby/rspec-expectations/ChangeLog
index a1c40068fc26..edc56c45c15c 100644
--- a/dev-ruby/rspec-expectations/ChangeLog
+++ b/dev-ruby/rspec-expectations/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-ruby/rspec-expectations
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/ChangeLog,v 1.86 2015/02/15 07:12:21 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/ChangeLog,v 1.87 2015/02/21 09:37:48 graaff Exp $
+
+ 21 Feb 2015; Hans de Graaff <graaff@gentoo.org>
+ rspec-expectations-2.99.2.ebuild, rspec-expectations-3.2.0.ebuild:
+ Add ruby22.
*rspec-expectations-3.2.0 (15 Feb 2015)
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
index bf22b9393de6..d9a7a0518947 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild,v 1.4 2014/11/25 11:35:56 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild,v 1.5 2015/02/21 09:37:48 graaff Exp $
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.2.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.2.0.ebuild
index 1e63067191a2..e8ef0fd52424 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.2.0.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.2.0.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/rspec-expectations-3.2.0.ebuild,v 1.1 2015/02/15 07:12:21 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/rspec-expectations-3.2.0.ebuild,v 1.2 2015/02/21 09:37:48 graaff Exp $
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -51,3 +51,12 @@ all_ruby_prepare() {
# Avoid a weird, and failing, test testing already installed code.
sed -e '/has an up-to-date caller_filter file/,/end/ s:^:#:' -i spec/rspec/expectations_spec.rb || die
}
+
+each_ruby_prepare() {
+ case ${RUBY} in
+ *ruby22)
+ # The rubygems version bundled with ruby 2.2 causes warnings.
+ sed -i -e '/a library that issues no warnings when loaded/,/^ end/ s:^:#:' spec/rspec/expectations_spec.rb || die
+ ;;
+ esac
+}