diff options
| -rw-r--r-- | dev-ruby/actionmailer/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-ruby/actionmailer/actionmailer-3.0.11-r2.ebuild (renamed from dev-ruby/actionmailer/actionmailer-3.0.11-r1.ebuild) | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/dev-ruby/actionmailer/ChangeLog b/dev-ruby/actionmailer/ChangeLog index 654114f9e5a5..d6b630804e9c 100644 --- a/dev-ruby/actionmailer/ChangeLog +++ b/dev-ruby/actionmailer/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-ruby/actionmailer # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.178 2012/01/20 10:06:40 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.179 2012/02/25 13:18:12 flameeyes Exp $ + +*actionmailer-3.0.11-r2 (25 Feb 2012) + + 25 Feb 2012; Diego E. Pettenò <flameeyes@gentoo.org> + +actionmailer-3.0.11-r2.ebuild, -actionmailer-3.0.11-r1.ebuild: + Fix gemspec so that it loads fine with bundler when mail 2.3 is installed. *actionmailer-3.0.11-r1 (20 Jan 2012) diff --git a/dev-ruby/actionmailer/actionmailer-3.0.11-r1.ebuild b/dev-ruby/actionmailer/actionmailer-3.0.11-r2.ebuild index dea1adadc20b..a785d154e8ab 100644 --- a/dev-ruby/actionmailer/actionmailer-3.0.11-r1.ebuild +++ b/dev-ruby/actionmailer/actionmailer-3.0.11-r2.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/actionmailer/actionmailer-3.0.11-r1.ebuild,v 1.1 2012/01/20 10:06:40 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/actionmailer-3.0.11-r2.ebuild,v 1.1 2012/02/25 13:18:12 flameeyes Exp $ EAPI=4 USE_RUBY="ruby18 ree18" @@ -35,6 +35,8 @@ all_ruby_prepare() { rm "${S}/../Gemfile" || die "Unable to remove Gemfile" sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths" + sed -i -e '/dependency.*mail/s:~>:>=:' "${RUBY_FAKEGEM_GEMSPEC}" || die + # Rename private method to avoid conflict with the simple_format # TextHelper. Already fixed in Rails 3.1. sed -i -e 's/simple_format/format_paragraph/' lib/action_mailer/mail_helper.rb || die |