summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2013-12-07 08:47:21 +0000
committerHans de Graaff <graaff@gentoo.org>2013-12-07 08:47:21 +0000
commit1fb56fd0148206fc43efb7e9197c10343d7dedac (patch)
tree2b010871fe81d899c79454a68829d49f548c9e98 /dev-ruby
parentVersion bump to 0.6.2; fixes bug #493462, proxied commit for Nikoli. (diff)
downloadgentoo-2-1fb56fd0148206fc43efb7e9197c10343d7dedac.tar.gz
gentoo-2-1fb56fd0148206fc43efb7e9197c10343d7dedac.tar.bz2
gentoo-2-1fb56fd0148206fc43efb7e9197c10343d7dedac.zip
Fix broken tests.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Diffstat (limited to 'dev-ruby')
-rw-r--r--dev-ruby/sprockets/ChangeLog5
-rw-r--r--dev-ruby/sprockets/sprockets-2.10.1.ebuild6
2 files changed, 9 insertions, 2 deletions
diff --git a/dev-ruby/sprockets/ChangeLog b/dev-ruby/sprockets/ChangeLog
index 910073f210d2..c7a5a7b34d47 100644
--- a/dev-ruby/sprockets/ChangeLog
+++ b/dev-ruby/sprockets/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-ruby/sprockets
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sprockets/ChangeLog,v 1.17 2013/11/29 14:57:04 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sprockets/ChangeLog,v 1.18 2013/12/07 08:47:21 graaff Exp $
+
+ 07 Dec 2013; Hans de Graaff <graaff@gentoo.org> sprockets-2.10.1.ebuild:
+ Fix broken tests.
29 Nov 2013; Hans de Graaff <graaff@gentoo.org> -sprockets-2.0.4.ebuild:
Remove masked Rails 3.1.
diff --git a/dev-ruby/sprockets/sprockets-2.10.1.ebuild b/dev-ruby/sprockets/sprockets-2.10.1.ebuild
index 5866898d67c9..149ea7d34132 100644
--- a/dev-ruby/sprockets/sprockets-2.10.1.ebuild
+++ b/dev-ruby/sprockets/sprockets-2.10.1.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/sprockets/sprockets-2.10.1.ebuild,v 1.1 2013/11/25 01:44:06 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sprockets/sprockets-2.10.1.ebuild,v 1.2 2013/12/07 08:47:21 graaff Exp $
EAPI=5
USE_RUBY="ruby19"
@@ -34,6 +34,7 @@ ruby_add_bdepend "test? (
dev-ruby/rack-test
=dev-ruby/coffee-script-2*
=dev-ruby/execjs-1*
+ =dev-ruby/sass-3* >=dev-ruby/sass-3.1
)"
all_ruby_prepare() {
@@ -41,4 +42,7 @@ all_ruby_prepare() {
# eco and ejs.
sed -i -e '/eco templates/,/end/ s:^:#:' \
-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
+
+ # Add missing 'json' require
+ sed -i -e '4irequire "json"' test/test_manifest.rb || die
}