summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2014-09-24 07:21:25 +0000
committerHans de Graaff <graaff@gentoo.org>2014-09-24 07:21:25 +0000
commit2f1140249caad16f2a1c0f32c08e7068ccd09665 (patch)
tree5107063ba44888852fd28667a294db507bfc7d38 /dev-ruby/ammeter
parentEAPI bump, depend on dev-lang/perl:= (bug #523582). (diff)
downloadgentoo-2-2f1140249caad16f2a1c0f32c08e7068ccd09665.tar.gz
gentoo-2-2f1140249caad16f2a1c0f32c08e7068ccd09665.tar.bz2
gentoo-2-2f1140249caad16f2a1c0f32c08e7068ccd09665.zip
Add ruby21.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Diffstat (limited to 'dev-ruby/ammeter')
-rw-r--r--dev-ruby/ammeter/ChangeLog5
-rw-r--r--dev-ruby/ammeter/ammeter-0.2.9-r1.ebuild7
2 files changed, 9 insertions, 3 deletions
diff --git a/dev-ruby/ammeter/ChangeLog b/dev-ruby/ammeter/ChangeLog
index 525280453219..6ee37c701560 100644
--- a/dev-ruby/ammeter/ChangeLog
+++ b/dev-ruby/ammeter/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-ruby/ammeter
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ammeter/ChangeLog,v 1.14 2014/05/27 07:42:17 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ammeter/ChangeLog,v 1.15 2014/09/24 07:21:25 graaff Exp $
+
+ 24 Sep 2014; Hans de Graaff <graaff@gentoo.org> ammeter-0.2.9-r1.ebuild:
+ Add ruby21.
*ammeter-0.2.9-r1 (27 May 2014)
diff --git a/dev-ruby/ammeter/ammeter-0.2.9-r1.ebuild b/dev-ruby/ammeter/ammeter-0.2.9-r1.ebuild
index 1c59f78d19b4..7f3ba27f6613 100644
--- a/dev-ruby/ammeter/ammeter-0.2.9-r1.ebuild
+++ b/dev-ruby/ammeter/ammeter-0.2.9-r1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ammeter/ammeter-0.2.9-r1.ebuild,v 1.1 2014/05/27 07:42:17 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ammeter/ammeter-0.2.9-r1.ebuild,v 1.2 2014/09/24 07:21:25 graaff Exp $
EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby19 ruby20 ruby21"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_RECIPE_TEST="rspec"
@@ -56,6 +56,9 @@ all_ruby_prepare() {
# Specs are not compatible with Rails 4.1
sed -i -e '23i s.add_development_dependency "rails", "<4.1"' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+ # Avoid spec that returns a different but valid response on ruby21
+ sed -e '/when the file is not there/,/^ end/ s:^:#:' -i spec/ammeter/rspec/generator/matchers/contain_spec.rb || die
}
each_ruby_test() {