diff options
| -rw-r--r-- | dev-ruby/radiant/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-ruby/radiant/files/radiant-1.0.0_rc3-deps.patch | 6 | ||||
| -rw-r--r-- | dev-ruby/radiant/radiant-1.0.0_rc3-r1.ebuild (renamed from dev-ruby/radiant/radiant-1.0.0_rc3.ebuild) | 5 |
3 files changed, 16 insertions, 5 deletions
diff --git a/dev-ruby/radiant/ChangeLog b/dev-ruby/radiant/ChangeLog index 0b7277cda014..ddf3e1d5708f 100644 --- a/dev-ruby/radiant/ChangeLog +++ b/dev-ruby/radiant/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-ruby/radiant # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/radiant/ChangeLog,v 1.22 2011/12/05 20:52:44 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/radiant/ChangeLog,v 1.23 2011/12/08 19:41:44 flameeyes Exp $ + +*radiant-1.0.0_rc3-r1 (08 Dec 2011) + + 08 Dec 2011; Diego E. Pettenò <flameeyes@gentoo.org> + +radiant-1.0.0_rc3-r1.ebuild, -radiant-1.0.0_rc3.ebuild, + files/radiant-1.0.0_rc3-deps.patch: + Version bump; add a dependency over the new revision of activesupport so that + it actually works (and force a rebuild due to bundler). *radiant-1.0.0_rc3 (05 Dec 2011) diff --git a/dev-ruby/radiant/files/radiant-1.0.0_rc3-deps.patch b/dev-ruby/radiant/files/radiant-1.0.0_rc3-deps.patch index 09b72c12a07b..4b283afd171e 100644 --- a/dev-ruby/radiant/files/radiant-1.0.0_rc3-deps.patch +++ b/dev-ruby/radiant/files/radiant-1.0.0_rc3-deps.patch @@ -2,13 +2,15 @@ Index: radiant/Gemfile =================================================================== --- radiant.orig/Gemfile +++ radiant/Gemfile -@@ -7,8 +7,8 @@ source :rubygems +@@ -7,8 +7,10 @@ source :rubygems # requires radiant and therefore pulls in every # dependency mentioned in radiant.gemspec. # -gem 'rails', '2.3.14' -gem 'sqlite3', '1.3.4' -+gem 'rails', '~> 2.3.14' ++%w{rails activesupport activerecord activeresource actionpack actionmailer}.each do |g| ++ gem g, '~> 2.3.14' ++end +gem 'sqlite3', '~> 1.3.4' # When radiant is installed as a gem you can run all of diff --git a/dev-ruby/radiant/radiant-1.0.0_rc3.ebuild b/dev-ruby/radiant/radiant-1.0.0_rc3-r1.ebuild index 9bd9983746b4..27580886ea12 100644 --- a/dev-ruby/radiant/radiant-1.0.0_rc3.ebuild +++ b/dev-ruby/radiant/radiant-1.0.0_rc3-r1.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/radiant/radiant-1.0.0_rc3.ebuild,v 1.1 2011/12/05 20:52:44 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/radiant/radiant-1.0.0_rc3-r1.ebuild,v 1.1 2011/12/08 19:41:44 flameeyes Exp $ EAPI="2" USE_RUBY="ruby18" @@ -38,7 +38,8 @@ ruby_add_rdepend ">=dev-ruby/redcloth-4.0.0 =dev-ruby/will_paginate-2.3* dev-ruby/rack-cache >=dev-ruby/sqlite3-ruby-1.3.4 - dev-ruby/bundler" + dev-ruby/bundler + >=dev-ruby/activesupport-2.3.14-r1:2.3" # Remove code from vendor that we support as an external dependency. all_ruby_prepare() { |