summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-ruby/rspec/ChangeLog6
-rw-r--r--dev-ruby/rspec/rspec-2.6.0.ebuild12
2 files changed, 12 insertions, 6 deletions
diff --git a/dev-ruby/rspec/ChangeLog b/dev-ruby/rspec/ChangeLog
index 3a8ab93371f9..e47b4c71de2f 100644
--- a/dev-ruby/rspec/ChangeLog
+++ b/dev-ruby/rspec/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-ruby/rspec
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/ChangeLog,v 1.98 2011/06/29 19:42:34 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/ChangeLog,v 1.99 2011/07/18 07:34:38 graaff Exp $
+
+ 18 Jul 2011; Hans de Graaff <graaff@gentoo.org> rspec-2.6.0.ebuild:
+ Depend on any of the 2.x versions, not the one with the same minor version.
+ Fixes dependencies now that rspec-core 2.6.0 is gone.
29 Jun 2011; Fabian Groffen <grobian@gentoo.org> rspec-2.6.0.ebuild:
Marked ~x64-solaris
diff --git a/dev-ruby/rspec/rspec-2.6.0.ebuild b/dev-ruby/rspec/rspec-2.6.0.ebuild
index 54785863679b..84c0f3ebe09a 100644
--- a/dev-ruby/rspec/rspec-2.6.0.ebuild
+++ b/dev-ruby/rspec/rspec-2.6.0.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/rspec/rspec-2.6.0.ebuild,v 1.4 2011/06/29 19:42:34 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-2.6.0.ebuild,v 1.5 2011/07/18 07:34:38 graaff Exp $
EAPI=2
USE_RUBY="ruby18 ruby19 ree18 jruby"
@@ -10,7 +10,7 @@ RUBY_FAKEGEM_TASK_TEST=""
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="README.markdown"
-inherit ruby-fakegem
+inherit ruby-fakegem versionator
DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
HOMEPAGE="http://rspec.rubyforge.org/"
@@ -20,7 +20,9 @@ SLOT="2"
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
+SUBVERSION="$(get_version_component_range 1-2)"
+
ruby_add_rdepend "
- ~dev-ruby/rspec-core-${PV}
- ~dev-ruby/rspec-expectations-${PV}
- ~dev-ruby/rspec-mocks-${PV}"
+ =dev-ruby/rspec-core-${SUBVERSION}*
+ =dev-ruby/rspec-expectations-${SUBVERSION}*
+ =dev-ruby/rspec-mocks-${SUBVERSION}*"