Add slot to jquery-rails dependency for forthcoming Rails 3.2-only versions.

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 15 insertions, 11 deletions

diff --git a/dev-ruby/rails/ChangeLog b/dev-ruby/rails/ChangeLog
index 93619611bb7c..0eb95b43ef2a 100644
--- a/dev-ruby/rails/ChangeLog
+++ b/dev-ruby/rails/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/rails
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/ChangeLog,v 1.215 2012/04/04 11:52:41 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/ChangeLog,v 1.216 2012/04/08 08:44:06 graaff Exp $
+
+  08 Apr 2012; Hans de Graaff <graaff@gentoo.org> rails-3.1.3-r1.ebuild,
+  rails-3.1.4.ebuild:
+  Add slot to jquery-rails dependency for forthcoming Rails 3.2-only versions.
 
 *rails-3.1.4 (04 Apr 2012)
 
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index 918cb8a0254e..5fab088badad 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -11,15 +11,15 @@ EBUILD rails-2.3.14.ebuild 1711 RMD160 1f9935bb31e1b64c112cf9d53a3c0fc6c5ba486a
 EBUILD rails-3.0.10.ebuild 1138 RMD160 aee11709ee79fce019b23c66cff6023a852e282a SHA1 f426384dc48381035e59fb90f73ee5045f7584c2 SHA256 2bd2bfa283b92782f5dfcfd303d86a4b99711a6871859cb0a262ac781e75d847
 EBUILD rails-3.0.11.ebuild 1138 RMD160 1f72c8dea1d57c3e8d1b62c71f0d38aa19bbffeb SHA1 20f221ee9ce2b592a5fb5b6906405c36ede4cfce SHA256 f7d1ebc05fc7d7c33e80100fabae2b24578e38eccd2f4fc675793994e4fb988f
 EBUILD rails-3.0.12.ebuild 1138 RMD160 a2bf2b52b4cd65efa4b70ec14b250ae936b41fe1 SHA1 7303ea759598f2b7c87c4ea4fb533ec872ef6b83 SHA256 a09a38d949a6abaf90ae159e58f32134168ed8dc2190808e776832078fe6a9e7
-EBUILD rails-3.1.3-r1.ebuild 1270 RMD160 7c438c4408366ec9856f50225e0540bf57a89165 SHA1 2b559ba73df2f521b789bcc78b8cc1281fce1379 SHA256 85ad160df246c6d795eb18d152ae55c0b5332ff31f09f312335dc8f4c3ca6b8e
+EBUILD rails-3.1.3-r1.ebuild 1272 RMD160 37d970b8db17a6f01c33e06e82efb04314011574 SHA1 7c069b0767ffe1877750ee77dd99684b079f62dd SHA256 00c9e76de7528d0e2b702cf3a215195e64357d54c20251bf0010372cdf6c1ceb
 EBUILD rails-3.1.3.ebuild 1147 RMD160 3073638609436e5d64f9df9af90d93852652fb78 SHA1 68275e25936876fe95aabc659d96f61465778114 SHA256 7b6080bd46e2d4947618f58be883b6bbeaa9f09c7d1cd0cfe265db91780e7ebd
-EBUILD rails-3.1.4.ebuild 1267 RMD160 cf818185fe731e3506e1830998ddcc63870eb682 SHA1 c368db6042d72449ef4b96aa4a109c7377612873 SHA256 f8a053edbdcc68ee53db5eb28caa10bffb67f0e02da26db27ef9c7d6d0f9628e
-MISC ChangeLog 28400 RMD160 cbba571a510b36d81c64ee3fa696c7926aabe633 SHA1 c86bd379091cedba0506359b34aa536ee0811cb7 SHA256 684f53ff04dccbb48ead4ad21cdf2e273369fc17cb43473740ccd69a83159b22
+EBUILD rails-3.1.4.ebuild 1269 RMD160 46438b30b15eb74f4fc0f91b1d9bea5d85f75e07 SHA1 db4189803d6fa162f1a24ca263d687da2dc2f3a8 SHA256 6346e8fefe2a0462d2e6af0fc5a09d84c7dd04248a8a76aa0c8d297b5de1d66e
+MISC ChangeLog 28575 RMD160 ecd6ae3d5fc01ccc299044b230348cffa04bf65d SHA1 732b747f33e3655eea1ae2757c6a1b27474bd068 SHA256 f104537b04e8f6e28753a91e7716c73bb7ba520e884a91fcc7dcf9b5a51c1d66
 MISC metadata.xml 393 RMD160 a339f72fe37b0eac6949aa44388c3527e9a4292f SHA1 8acfd56b88cec635ddfc3758dedd9f050e0acbe0 SHA256 ab0c7d6f591fe1803349f791b02e9be652e39232117c98f1b173c7ffb0854dee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk98Ng4ACgkQiIP6VqMIqNffQwEAhUD72EFG8eN0ivVZiWkO/pVl
-gFLGY6H/kXEf1TZpmlMA/2AJhZlY88QQgzOkLkWROGz6NVVZUl7FYprXrQZ7Qgv5
-=/r0r
+iF4EAREIAAYFAk+BT9wACgkQiIP6VqMIqNebggD/bg16bAlrvDJxHKzlH3eheJDj
++KmlRszwUxEhvWzcWOIA/iB5XI6t3HmSd81yhq9TVGKblWmsW+xf2+bG6E8egM3D
+=dPAd
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rails/rails-3.1.3-r1.ebuild b/dev-ruby/rails/rails-3.1.3-r1.ebuild
index 80c9871d8002..6e5638ea1dcf 100644
--- a/dev-ruby/rails/rails-3.1.3-r1.ebuild
+++ b/dev-ruby/rails/rails-3.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-3.1.3-r1.ebuild,v 1.1 2012/01/02 20:15:45 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-3.1.3-r1.ebuild,v 1.2 2012/04/08 08:44:06 graaff Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
@@ -32,7 +32,7 @@ ruby_add_rdepend "
 	=dev-ruby/bundler-1*
 	~dev-ruby/railties-${PV}
 	asset-pipeline? (
-		dev-ruby/jquery-rails
+		dev-ruby/jquery-rails:0
 		dev-ruby/sass-rails
 		dev-ruby/uglifier
 		dev-ruby/coffee-rails
diff --git a/dev-ruby/rails/rails-3.1.4.ebuild b/dev-ruby/rails/rails-3.1.4.ebuild
index 6c722ff230c9..092875d7cf43 100644
--- a/dev-ruby/rails/rails-3.1.4.ebuild
+++ b/dev-ruby/rails/rails-3.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-3.1.4.ebuild,v 1.1 2012/04/04 11:52:41 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-3.1.4.ebuild,v 1.2 2012/04/08 08:44:06 graaff Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
@@ -32,7 +32,7 @@ ruby_add_rdepend "
 	=dev-ruby/bundler-1*
 	~dev-ruby/railties-${PV}
 	asset-pipeline? (
-		dev-ruby/jquery-rails
+		dev-ruby/jquery-rails:0
 		dev-ruby/sass-rails
 		dev-ruby/uglifier
 		dev-ruby/coffee-rails