diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-08-22 00:18:15 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-08-22 00:18:15 +0000 |
| commit | 61423e7195755d4a15b6078eb6378464b2d0af35 (patch) | |
| tree | 1aabeaa840bd98b45af9af634dcc0b3c616b5ae9 /dev-ruby | |
| parent | Stable for AMD64, wrt bug #431572 (diff) | |
| download | gentoo-2-61423e7195755d4a15b6078eb6378464b2d0af35.tar.gz gentoo-2-61423e7195755d4a15b6078eb6378464b2d0af35.tar.bz2 gentoo-2-61423e7195755d4a15b6078eb6378464b2d0af35.zip | |
Permit newer thor on railties 3.0/3.1.
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby')
| -rw-r--r-- | dev-ruby/railties/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-ruby/railties/railties-3.0.17.ebuild | 7 | ||||
| -rw-r--r-- | dev-ruby/railties/railties-3.1.8.ebuild | 5 |
3 files changed, 15 insertions, 4 deletions
diff --git a/dev-ruby/railties/ChangeLog b/dev-ruby/railties/ChangeLog index 621d8eda72f5..bd86b5d22e49 100644 --- a/dev-ruby/railties/ChangeLog +++ b/dev-ruby/railties/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ruby/railties # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/ChangeLog,v 1.35 2012/08/11 08:38:31 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/ChangeLog,v 1.36 2012/08/22 00:18:15 flameeyes Exp $ + + 22 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> railties-3.0.17.ebuild, + railties-3.1.8.ebuild: + Permit newer thor on railties 3.0/3.1. *railties-3.1.8 (11 Aug 2012) *railties-3.0.17 (11 Aug 2012) @@ -155,4 +159,3 @@ 05 Dec 2010; Hans de Graaff <graaff@gentoo.org> +railties-3.0.3.ebuild, +metadata.xml: Initial import for Rails 3. Split off from dev-ruby/rails. - diff --git a/dev-ruby/railties/railties-3.0.17.ebuild b/dev-ruby/railties/railties-3.0.17.ebuild index 82098cf8b8be..af2bc0686af3 100644 --- a/dev-ruby/railties/railties-3.0.17.ebuild +++ b/dev-ruby/railties/railties-3.0.17.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/railties/railties-3.0.17.ebuild,v 1.1 2012/08/11 08:38:31 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.0.17.ebuild,v 1.2 2012/08/22 00:18:15 flameeyes Exp $ EAPI=4 USE_RUBY="ruby18 ree18" @@ -45,3 +45,8 @@ ruby_add_bdepend " doc? ( >=dev-ruby/redcloth-4.1.1 )" + +all_ruby_prepare() { + # allow newer thor + sed -i -e '/dependency.*thor/s:~>:>=:' ${RUBY_FAKEGEM_GEMSPEC} || die +} diff --git a/dev-ruby/railties/railties-3.1.8.ebuild b/dev-ruby/railties/railties-3.1.8.ebuild index 52e18e8d4387..907213333a5c 100644 --- a/dev-ruby/railties/railties-3.1.8.ebuild +++ b/dev-ruby/railties/railties-3.1.8.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/railties/railties-3.1.8.ebuild,v 1.1 2012/08/11 08:38:31 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.1.8.ebuild,v 1.2 2012/08/22 00:18:15 flameeyes Exp $ EAPI=4 USE_RUBY="ruby18 ruby19 ree18" @@ -51,4 +51,7 @@ all_ruby_prepare() { # Remove items from the common Gemfile that we don't need for this # test run. This also requires handling some gemspecs. sed -i -e '/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\)/d' ../Gemfile || die + + # allow newer thor + sed -i -e '/dependency.*thor/s:~>:>=:' ${RUBY_FAKEGEM_GEMSPEC} || die } |