diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2011-02-20 13:15:34 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2011-02-20 13:15:34 +0000 |
| commit | 5885c6e769ef5480b82fac3b0978fcd3c2b4022c (patch) | |
| tree | 2da05dacbbe14db91ab5e4a1885751cb84e3d265 /dev-ruby | |
| parent | Always depend on dev-ruby/rake since we use it to build the package. Fixes bu... (diff) | |
| download | historical-5885c6e769ef5480b82fac3b0978fcd3c2b4022c.tar.gz historical-5885c6e769ef5480b82fac3b0978fcd3c2b4022c.tar.bz2 historical-5885c6e769ef5480b82fac3b0978fcd3c2b4022c.zip | |
Fix tests in the presence of Rails 3.
Package-Manager: portage-2.1.9.25/cvs/Linux x86_64
Diffstat (limited to 'dev-ruby')
| -rw-r--r-- | dev-ruby/will_paginate/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-ruby/will_paginate/Manifest | 12 | ||||
| -rw-r--r-- | dev-ruby/will_paginate/will_paginate-2.3.15.ebuild | 10 |
3 files changed, 19 insertions, 9 deletions
diff --git a/dev-ruby/will_paginate/ChangeLog b/dev-ruby/will_paginate/ChangeLog index cf2ac7760f7f..27f720d6403e 100644 --- a/dev-ruby/will_paginate/ChangeLog +++ b/dev-ruby/will_paginate/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ruby/will_paginate # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/will_paginate/ChangeLog,v 1.11 2011/01/10 18:18:36 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/will_paginate/ChangeLog,v 1.12 2011/02/20 13:15:34 graaff Exp $ + + 20 Feb 2011; Hans de Graaff <graaff@gentoo.org> + will_paginate-2.3.15.ebuild: + Fix tests in the presence of Rails 3. 10 Jan 2011; Hans de Graaff <graaff@gentoo.org> will_paginate-2.3.15.ebuild: diff --git a/dev-ruby/will_paginate/Manifest b/dev-ruby/will_paginate/Manifest index f0c047dbf960..bd95cbb7e41d 100644 --- a/dev-ruby/will_paginate/Manifest +++ b/dev-ruby/will_paginate/Manifest @@ -2,13 +2,13 @@ Hash: SHA256 DIST will_paginate-2.3.15.gem 36352 RMD160 0ca6028356c8b1d91187f6d0e77e1c0bfbcd15f4 SHA1 50f6a1bb53512fdebd22ae3c78deafab85f1c7db SHA256 2ece945ba6a0cfbdad8ea895a4778c870b17239789128c116e5b7f9d3cf535a7 -EBUILD will_paginate-2.3.15.ebuild 725 RMD160 33ef38d32db78203d011fabe3e01e703f8c1b3b3 SHA1 36d3980f0c5d2c241c9cde8064597b5746f6b55b SHA256 12eeff035d229aedf38f254c6833c735e76bdc334f7ef46c8c62b3f6e7dc8078 -MISC ChangeLog 3429 RMD160 6f51dd10c0f5f1c3baead64a169458eeac9fce58 SHA1 31db2cf76fc18090aadffc73fb088125648838b5 SHA256 6b17101b3170f25151f44f47c06089ca912fec01580a0d43f56f37ad1f6d7208 +EBUILD will_paginate-2.3.15.ebuild 881 RMD160 40292371b57e8d708fcfb5d8a0ee71832f02920c SHA1 c0869872adbaf0b8c4896f6bfb31017530e1ef85 SHA256 e55d09e26bbfa5155282070e99dbb6eb4c70302dc5c8fae94c389d6f286d9efb +MISC ChangeLog 3551 RMD160 f92a01bab2dd1a42b88ed7f1a8ae3ef0c2071384 SHA1 6a7d8246be3d2ba55999fabae0a2c3f1f02d77e6 SHA256 e2491f4fb42021ad9679e404b485c7f4cf143e6db085256d99ef17eff332bd42 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk0rTYEACgkQrnu0mw69JkrSzwEAhMDZZmm6pMowyuIsN1WBbcgF -M47JWn/A0EW7Vg7hUPIBAIIh45KUaz8cz0mlJOWmMhll8gvJRmywZQeDpDGdDlZG -=H1te +iF4EAREIAAYFAk1hE/wACgkQrnu0mw69JkrlpwEAhOYtPDjXQpzcJDXFIkul2xcO +hhcDMNPSAV0RXgUNYckA/3+mf0TvzFeRysC61C95ZzUJfCKdojpE7nHQMB201FD3 +=z6Mj -----END PGP SIGNATURE----- diff --git a/dev-ruby/will_paginate/will_paginate-2.3.15.ebuild b/dev-ruby/will_paginate/will_paginate-2.3.15.ebuild index 45391366bb81..4da55f094e77 100644 --- a/dev-ruby/will_paginate/will_paginate-2.3.15.ebuild +++ b/dev-ruby/will_paginate/will_paginate-2.3.15.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/will_paginate/will_paginate-2.3.15.ebuild,v 1.2 2011/01/10 18:18:36 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/will_paginate/will_paginate-2.3.15.ebuild,v 1.3 2011/02/20 13:15:34 graaff Exp $ EAPI=2 USE_RUBY="ruby18" @@ -22,8 +22,14 @@ ruby_add_bdepend " test? ( dev-ruby/mocha dev-ruby/rack - dev-ruby/activerecord + dev-ruby/rails:2.3 virtual/ruby-test-unit !dev-ruby/test-unit:2 )" ruby_add_rdepend '>=dev-ruby/activesupport-1.4.4' + +each_ruby_test() { + # Only works with 2.3.x, so guard against rails 3 being installed + # already. + RAILS_VERSION="~>2.3.5" rake test || die "Tests failed." +} |