Make sure to depend on slot 2.3 of activesupport to not conflict with rails.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

diff --git a/dev-ruby/will_paginate/ChangeLog b/dev-ruby/will_paginate/ChangeLog
index 35c18f64bdd23574d322a2880333edf7d012fa7b..73e149dfcc3c1d0d7fe7c03fb6a76d0a7929faa8 100644 (file)
--- 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.13 2011/09/19 08:14:16 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/will_paginate/ChangeLog,v 1.14 2011/09/26 11:31:36 flameeyes Exp $
+
+  26 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  will_paginate-2.3.15.ebuild:
+  Make sure to depend on slot 2.3 of activesupport to not conflict with rails.
 
 *will_paginate-3.0.1 (19 Sep 2011)
 

diff --git a/dev-ruby/will_paginate/Manifest b/dev-ruby/will_paginate/Manifest
index b18ed11ed9264935d4894a575136b41d4c29885b..b701a55355d27c54309f6deba0262c519bae91b5 100644 (file)
--- a/dev-ruby/will_paginate/Manifest
+++ b/dev-ruby/will_paginate/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST will_paginate-2.3.15.gem 36352 RMD160 0ca6028356c8b1d91187f6d0e77e1c0bfbcd15f4 SHA1 50f6a1bb53512fdebd22ae3c78deafab85f1c7db SHA256 2ece945ba6a0cfbdad8ea895a4778c870b17239789128c116e5b7f9d3cf535a7
 DIST will_paginate-3.0.1.gem 33792 RMD160 bb496bd7e0bd5c6835f19bdb294c83adc6423a18 SHA1 ec1a88e64c63b34b997f71108e9c4401750fd436 SHA256 d89b0ec4b31c4d9a9422fc7be78d0598b5c3d7cd82331ae7825a8b2a5ca17225
-EBUILD will_paginate-2.3.15.ebuild 881 RMD160 40292371b57e8d708fcfb5d8a0ee71832f02920c SHA1 c0869872adbaf0b8c4896f6bfb31017530e1ef85 SHA256 e55d09e26bbfa5155282070e99dbb6eb4c70302dc5c8fae94c389d6f286d9efb
+EBUILD will_paginate-2.3.15.ebuild 880 RMD160 9e55135d39a333f9b0b569f23ac80471f63f5cb3 SHA1 b21a103a73af28f7ba894e6bb003dde6a747c9ef SHA256 524af13aefc0b33bef5ffcfcea941ce1bfe050af194eb6b4231cf6b3c48a7a09
 EBUILD will_paginate-3.0.1.ebuild 621 RMD160 8acb50b2ba3ab99f922d828889c59fa43c20b639 SHA1 b8cc64d12357c7d6f1fce0a5f72207a6a4943a0b SHA256 7d165bb7f81791b6a04a3ffb08d91c4c8006e5a0be268971b78ca9aa7cbe313f
-MISC ChangeLog 3683 RMD160 f84a2c854132b52a8d6380569af64ebf6b64ac52 SHA1 52825daf80800bf2cc42234e3b4aab7bf4993041 SHA256 c07030ad103722617fe260ed7a3fba3626d947678c2d19ad0f0a12d397bff673
+MISC ChangeLog 3853 RMD160 bd33a4898f76f73f987b3b71c7abfc4dad1d18dc SHA1 8c01793a507d9ede60679069c2782d08128d4a32 SHA256 7d893527b7738e4ca2783ca0e6a7209396a011e13b6389d5610f38e62725b3e6
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk52+fYACgkQiIP6VqMIqNfEEgD/UZpLBC83xQE8jX/6cpbv5og6
-PSiBvEPv0Nw4WBYYRyEA/iy6vqS79vZKW+KHx4dIgDk1subezi6a59GLJmLCDGZA
-=xPTF
+iEYEARECAAYFAk6AYpIACgkQAiZjviIA2Xi5DgCfeSYD9s96w62Bo6ZL6PLWtT+C
+tkQAoJJWg3qbBg+0q+q0D2u4EVEcL8sn
+=Nrnw
 -----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 4da55f094e7737614f67f3f1e721104c3cc3f544..5f5e8c0cb044d01491c8bcab3c0534403bbb8f95 100644 (file)
--- 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.3 2011/02/20 13:15:34 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/will_paginate/will_paginate-2.3.15.ebuild,v 1.4 2011/09/26 11:31:36 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18"
@@ -26,7 +26,7 @@ ruby_add_bdepend "
                virtual/ruby-test-unit
                !dev-ruby/test-unit:2
        )"
-ruby_add_rdepend '>=dev-ruby/activesupport-1.4.4'
+ruby_add_rdepend 'dev-ruby/activesupport:2.3'
 
 each_ruby_test() {
        # Only works with 2.3.x, so guard against rails 3 being installed