summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2011-11-05 17:43:44 +0000
committerHans de Graaff <graaff@gentoo.org>2011-11-05 17:43:44 +0000
commit13dff45893eb47f0b9269957a9d0dd5613d7939f (patch)
tree071fecaf1243d3ccc77a49fb4cca1e9c86d42d3e
parentUse xorg-2.eclass in order to support USE="static-libs" and to remove useless... (diff)
downloadgentoo-2-13dff45893eb47f0b9269957a9d0dd5613d7939f.tar.gz
gentoo-2-13dff45893eb47f0b9269957a9d0dd5613d7939f.tar.bz2
gentoo-2-13dff45893eb47f0b9269957a9d0dd5613d7939f.zip
dev-ruby/yajl-ruby is mandatory when testing for all targets except jruby.
(Portage version: 2.1.10.11/cvs/Linux x86_64)
-rw-r--r--dev-ruby/multi_json/ChangeLog5
-rw-r--r--dev-ruby/multi_json/multi_json-1.0.3.ebuild6
2 files changed, 9 insertions, 2 deletions
diff --git a/dev-ruby/multi_json/ChangeLog b/dev-ruby/multi_json/ChangeLog
index cdb99512c68b..363fdccc020d 100644
--- a/dev-ruby/multi_json/ChangeLog
+++ b/dev-ruby/multi_json/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-ruby/multi_json
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/ChangeLog,v 1.6 2011/07/19 04:43:26 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/ChangeLog,v 1.7 2011/11/05 17:43:44 graaff Exp $
+
+ 05 Nov 2011; Hans de Graaff <graaff@gentoo.org> multi_json-1.0.3.ebuild:
+ dev-ruby/yajl-ruby is mandatory when testing for all targets except jruby.
*multi_json-1.0.3 (19 Jul 2011)
diff --git a/dev-ruby/multi_json/multi_json-1.0.3.ebuild b/dev-ruby/multi_json/multi_json-1.0.3.ebuild
index 9772aa8d861f..0617db5f5259 100644
--- a/dev-ruby/multi_json/multi_json-1.0.3.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.0.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-1.0.3.ebuild,v 1.1 2011/07/19 04:43:26 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-1.0.3.ebuild,v 1.2 2011/11/05 17:43:44 graaff Exp $
EAPI=2
@@ -35,6 +35,10 @@ RUBY_PATCHES=( "${FILESDIR}/${P}-gentoo.patch" )
ruby_add_bdepend "test? ( dev-ruby/rspec:2 dev-ruby/json )"
+USE_RUBY=ruby18 ruby_add_bdepend "test? ( dev-ruby/yajl-ruby )"
+USE_RUBY=ruby19 ruby_add_bdepend "test? ( dev-ruby/yajl-ruby )"
+USE_RUBY=ree18 ruby_add_bdepend "test? ( dev-ruby/yajl-ruby )"
+
all_ruby_prepare() {
sed -i -e '/[Bb]undler/d' Rakefile spec/helper.rb || die "Unable to remove bundler."
rm Gemfile || die "Unable to remove bundler Gemfile."