summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ruby')
-rw-r--r--dev-ruby/rspec/ChangeLog6
-rw-r--r--dev-ruby/rspec/rspec-1.3.0.ebuild4
2 files changed, 8 insertions, 2 deletions
diff --git a/dev-ruby/rspec/ChangeLog b/dev-ruby/rspec/ChangeLog
index 0b0fb0842cad..00068f2f5e43 100644
--- a/dev-ruby/rspec/ChangeLog
+++ b/dev-ruby/rspec/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-ruby/rspec
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/ChangeLog,v 1.63 2010/02/13 19:25:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/ChangeLog,v 1.64 2010/02/17 17:58:40 graaff Exp $
+
+ 17 Feb 2010; Hans de Graaff <graaff@gentoo.org> rspec-1.3.0.ebuild:
+ Block older versions of rspec-rails which are not compatible, fixes
+ #305437.
13 Feb 2010; Raúl Porcel <armin76@gentoo.org> rspec-1.3.0.ebuild:
Add ~sparc
diff --git a/dev-ruby/rspec/rspec-1.3.0.ebuild b/dev-ruby/rspec/rspec-1.3.0.ebuild
index 4fdaa4e36d5a..f70abaf9ee20 100644
--- a/dev-ruby/rspec/rspec-1.3.0.ebuild
+++ b/dev-ruby/rspec/rspec-1.3.0.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/rspec/rspec-1.3.0.ebuild,v 1.7 2010/02/13 19:25:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-1.3.0.ebuild,v 1.8 2010/02/17 17:58:40 graaff Exp $
EAPI=2
USE_RUBY="ruby18 ruby19 jruby"
@@ -23,6 +23,8 @@ IUSE=""
ruby_add_bdepend doc dev-ruby/hoe
+RDEPEND="!<dev-ruby/rspec-rails-${PV}"
+
# don't require test dependencies for jruby since we cannot run them
# for now (fakefs doesn't work).
#