diff options
| -rw-r--r-- | dev-ruby/multi_json/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-ruby/multi_json/multi_json-0.0.4.ebuild | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/dev-ruby/multi_json/ChangeLog b/dev-ruby/multi_json/ChangeLog index 1a98bc22183f..8d3318e294d7 100644 --- a/dev-ruby/multi_json/ChangeLog +++ b/dev-ruby/multi_json/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ruby/multi_json # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/ChangeLog,v 1.3 2010/06/19 17:33:02 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/ChangeLog,v 1.4 2010/10/02 12:22:11 graaff Exp $ + + 02 Oct 2010; Hans de Graaff <graaff@gentoo.org> multi_json-0.0.4.ebuild: + Remove bundler code because it requires all optional dependencies to be + installed. Fix RSpec dependency. *multi_json-0.0.4 (19 Jun 2010) diff --git a/dev-ruby/multi_json/multi_json-0.0.4.ebuild b/dev-ruby/multi_json/multi_json-0.0.4.ebuild index 8a31411bb468..60f87b11cd5f 100644 --- a/dev-ruby/multi_json/multi_json-0.0.4.ebuild +++ b/dev-ruby/multi_json/multi_json-0.0.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-0.0.4.ebuild,v 1.1 2010/06/19 17:33:02 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-0.0.4.ebuild,v 1.2 2010/10/02 12:22:11 graaff Exp $ EAPI=2 @@ -27,6 +27,10 @@ ruby_add_rdepend "|| ( dev-ruby/json dev-ruby/yajl-ruby dev-ruby/activesupport ) # I've switched one of the tests from requiring yajl to requiring # json-pure since it's the only implementation that is available for # all the Ruby interpreters we support. -ruby_add_bdepend "test? ( dev-ruby/rspec dev-ruby/json )" +ruby_add_bdepend "test? ( dev-ruby/rspec:0 dev-ruby/json )" RUBY_PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) + +all_ruby_prepare() { + sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die "Unable to remove bundler." +} |