summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2012-04-08 08:44:06 +0000
committerHans de Graaff <graaff@gentoo.org>2012-04-08 08:44:06 +0000
commita7de69c16cc099bcda1dacda8b09ef56168dac92 (patch)
tree39d77e49a9ef79daffd2958ad5fba4565a069095 /dev-ruby
parentVersion bump. (diff)
downloadgentoo-2-a7de69c16cc099bcda1dacda8b09ef56168dac92.tar.gz
gentoo-2-a7de69c16cc099bcda1dacda8b09ef56168dac92.tar.bz2
gentoo-2-a7de69c16cc099bcda1dacda8b09ef56168dac92.zip
Add slot to jquery-rails dependency for forthcoming Rails 3.2-only versions.
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby')
-rw-r--r--dev-ruby/rails/ChangeLog6
-rw-r--r--dev-ruby/rails/rails-3.1.3-r1.ebuild4
-rw-r--r--dev-ruby/rails/rails-3.1.4.ebuild4
3 files changed, 9 insertions, 5 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/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