summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2015-02-21 09:38:20 +0000
committerHans de Graaff <graaff@gentoo.org>2015-02-21 09:38:20 +0000
commit76dafe2a4783c742529593445a397e93aa0e82c2 (patch)
tree0f7441503bdd9ef34b26581bd7a5a3ecdabee1ac /dev-ruby
parentAdd ruby22. (diff)
downloadgentoo-2-76dafe2a4783c742529593445a397e93aa0e82c2.tar.gz
gentoo-2-76dafe2a4783c742529593445a397e93aa0e82c2.tar.bz2
gentoo-2-76dafe2a4783c742529593445a397e93aa0e82c2.zip
Add ruby22.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Diffstat (limited to 'dev-ruby')
-rw-r--r--dev-ruby/rspec-mocks/ChangeLog6
-rw-r--r--dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild15
-rw-r--r--dev-ruby/rspec-mocks/rspec-mocks-3.2.0.ebuild13
3 files changed, 28 insertions, 6 deletions
diff --git a/dev-ruby/rspec-mocks/ChangeLog b/dev-ruby/rspec-mocks/ChangeLog
index b50a9c2ef3ed..0cde23c28d24 100644
--- a/dev-ruby/rspec-mocks/ChangeLog
+++ b/dev-ruby/rspec-mocks/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-ruby/rspec-mocks
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/ChangeLog,v 1.92 2015/02/15 07:12:19 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/ChangeLog,v 1.93 2015/02/21 09:38:20 graaff Exp $
+
+ 21 Feb 2015; Hans de Graaff <graaff@gentoo.org> rspec-mocks-2.99.2.ebuild,
+ rspec-mocks-3.2.0.ebuild:
+ Add ruby22.
*rspec-mocks-3.2.0 (15 Feb 2015)
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
index ec1d1e343c9a..9dd2292835a1 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-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-mocks/rspec-mocks-2.99.2.ebuild,v 1.3 2014/11/11 11:02:09 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild,v 1.4 2015/02/21 09:38:20 graaff Exp $
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
@@ -41,3 +41,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/mocks_spec.rb || die
}
+
+each_ruby_prepare() {
+ case ${RUBY} in
+ *ruby22)
+ # Psych and Syck are not supported by default anymore on ruby22.
+ rm spec/rspec/mocks/serialization_spec.rb || die
+ ;;
+ esac
+}
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.2.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.2.0.ebuild
index 3518b5aab090..63a11ef0610d 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.2.0.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-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-mocks/rspec-mocks-3.2.0.ebuild,v 1.1 2015/02/15 07:12:19 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-3.2.0.ebuild,v 1.2 2015/02/21 09:38:20 graaff Exp $
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -52,3 +52,12 @@ all_ruby_prepare() {
# rspec-3 introduction for now.
rm spec/rspec/mocks/and_yield_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/mocks_spec.rb || die
+ ;;
+ esac
+}