summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2011-07-18 07:34:38 +0000
committerHans de Graaff <graaff@gentoo.org>2011-07-18 07:34:38 +0000
commitab364d587569f1f410aaa712d463370995fa82fa (patch)
treeae70eb8820b96ef7b8e5d67c678a3b9aa3f2dbf3 /dev-ruby/rspec
parentppc stable wrt #310331 (diff)
downloadhistorical-ab364d587569f1f410aaa712d463370995fa82fa.tar.gz
historical-ab364d587569f1f410aaa712d463370995fa82fa.tar.bz2
historical-ab364d587569f1f410aaa712d463370995fa82fa.zip
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.
Package-Manager: portage-2.1.10.3/cvs/Linux x86_64
Diffstat (limited to 'dev-ruby/rspec')
-rw-r--r--dev-ruby/rspec/ChangeLog6
-rw-r--r--dev-ruby/rspec/Manifest14
-rw-r--r--dev-ruby/rspec/rspec-2.6.0.ebuild12
3 files changed, 19 insertions, 13 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/Manifest b/dev-ruby/rspec/Manifest
index c171f900cc75..fd330032bba6 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
DIST rspec-1.3.1.gem 214528 RMD160 b222beb3629132957d5e00ef8301131d2cd77956 SHA1 3052cf6cf112597404aee0626110a8224091f1ef SHA256 266599abc471df01c09506e4d88e667bb623f762e3c62d794852416ba7cc93c0
DIST rspec-2.5.0.gem 5632 RMD160 ec4074b7a3bb12666689ab0203b7f24550973da7 SHA1 aad7038a482c585b18578845b30a3e5a0319c554 SHA256 418acb2d6a6c1160d6128fd17a68fb4504fa488c1493fddcc507a8bdac77afe7
@@ -7,13 +7,13 @@ DIST rspec-2.6.0.gem 5632 RMD160 504ccdac9cef1945d9122cbf0f79e16f6195848b SHA1 b
EBUILD rspec-1.3.1-r1.ebuild 2154 RMD160 bfe7387e4201bcadf6fb111ca8fcb86f3288ea5d SHA1 f0bf2cc07daf5be9c29839c455be771b6743e884 SHA256 b10e13e4d32dea59e5d6e62642fc219e1ccb110f3e397139139fd554370ed6c5
EBUILD rspec-1.3.1.ebuild 2118 RMD160 995b41a0de18e78eabc45dd3bd8f181b2fe834e2 SHA1 1076085fce863efbdfb090a70aaeee8a8132b45d SHA256 f43716d0858d6659c8a01b20b95487d8fbc79297a9cd66a2b5c1a4f7e50e5b66
EBUILD rspec-2.5.0.ebuild 741 RMD160 35e6ce9a32e4c15838f7b56693831bea2943b701 SHA1 976ce61ba087fe95c7e8a57925abefcbeb79f818 SHA256 c7e58a887cb7425decb344e33dfa4b985291f6604a1b681a727352154b2f9335
-EBUILD rspec-2.6.0.ebuild 769 RMD160 4b63d0f262d072b8684abd15f172c9a7b91d630a SHA1 39080686b0511c2618cca4b52711af3778d6d011 SHA256 42c32009be9201b3af872e49b774dcefdd5fc5bfd190e4201e12e7b5fedc1569
-MISC ChangeLog 12877 RMD160 1c50212d4b24720c2ae89e4e2864f4fdc823d2c1 SHA1 6ac826d2153860ead436f268edf215be18acac9d SHA256 24c69b554d20bcedd898a8b5b8a57143ab010799bbe15513a297cd0e708de58d
+EBUILD rspec-2.6.0.ebuild 856 RMD160 5c316c1e435d60a3a3157d640a11d6f6ce978ed7 SHA1 4512fc747905544555fe5c6c8faf164514c831b5 SHA256 0c6adfd3177878bc2fab1659dd6d0beee5b53b2022af7031cd73f73018a89284
+MISC ChangeLog 13081 RMD160 12d0ed0a851d6c8a3a59f885166d32a3e625f3e2 SHA1 737e2e22fa90c934b82921590b55ffdad6bd2f3c SHA256 294f05164d2b27d48d12b5ab58d240553d7154e295df06267bc6daafc4b12860
MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (SunOS)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk4LgC8ACgkQX3X2B8XHTonQFwCdFWl7Og4rpMl5a2XgDPcw7Ssc
-Q44An2lzp5vCCX7Tm17yKDlUpVWlWGhb
-=HJc6
+iF4EAREIAAYFAk4j4hkACgkQiIP6VqMIqNeO+wEAlW9aV69R1vI9ShHrcPzWT8HO
+qcjPpz704xTuwW29VtQA/iQ6mVSpzxyFngV/ZfHb3O3hNBnrzRMlD69xz14nRP2v
+=OG8C
-----END PGP SIGNATURE-----
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}*"