summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2013-10-14 06:21:09 +0000
committerHans de Graaff <graaff@gentoo.org>2013-10-14 06:21:09 +0000
commit390696ccd3001ada9e652db4d68a60ea806a4f04 (patch)
tree9c210d834189c67076b525b4f8f45c106fa986e2 /dev-ruby
parentStable for ppc, wrt bug #472302 (diff)
downloadgentoo-2-390696ccd3001ada9e652db4d68a60ea806a4f04.tar.gz
gentoo-2-390696ccd3001ada9e652db4d68a60ea806a4f04.tar.bz2
gentoo-2-390696ccd3001ada9e652db4d68a60ea806a4f04.zip
Use a version of minitest that is compatible with Rails 4.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Diffstat (limited to 'dev-ruby')
-rw-r--r--dev-ruby/haml/ChangeLog5
-rw-r--r--dev-ruby/haml/haml-4.0.3.ebuild8
2 files changed, 9 insertions, 4 deletions
diff --git a/dev-ruby/haml/ChangeLog b/dev-ruby/haml/ChangeLog
index 3983b5857bd9..03f2fa2f4834 100644
--- a/dev-ruby/haml/ChangeLog
+++ b/dev-ruby/haml/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-ruby/haml
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/ChangeLog,v 1.89 2013/10/07 06:26:10 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/ChangeLog,v 1.90 2013/10/14 06:21:09 graaff Exp $
+
+ 14 Oct 2013; Hans de Graaff <graaff@gentoo.org> haml-4.0.3.ebuild:
+ Use a version of minitest that is compatible with Rails 4.
*haml-3.1.8-r2 (07 Oct 2013)
diff --git a/dev-ruby/haml/haml-4.0.3.ebuild b/dev-ruby/haml/haml-4.0.3.ebuild
index 2942a7d52b10..21af54517a5e 100644
--- a/dev-ruby/haml/haml-4.0.3.ebuild
+++ b/dev-ruby/haml/haml-4.0.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/haml-4.0.3.ebuild,v 1.2 2013/10/07 06:26:10 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/haml-4.0.3.ebuild,v 1.3 2013/10/14 06:21:09 graaff Exp $
EAPI=5
@@ -29,7 +29,7 @@ ruby_add_rdepend "dev-ruby/tilt"
ruby_add_bdepend "
test? (
- dev-ruby/minitest
+ dev-ruby/minitest:0
dev-ruby/nokogiri
dev-ruby/rails
)
@@ -39,5 +39,7 @@ ruby_add_bdepend "
)"
all_ruby_prepare() {
- sed -i -e '/bundler/ s:^:#:' test/test_helper.rb || die
+ sed -i -e '/bundler/ s:^:#:' \
+ -e 's/gem "minitest"/gem "minitest", "~>4.0"/' \
+ test/test_helper.rb || die
}