Fix tests when Rails 3 is also present.

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

4 files changed, 26 insertions, 8 deletions

diff --git a/dev-ruby/actionmailer/ChangeLog b/dev-ruby/actionmailer/ChangeLog
index f1946d9e613b..2fc9784d0cba 100644
--- a/dev-ruby/actionmailer/ChangeLog
+++ b/dev-ruby/actionmailer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/actionmailer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.152 2011/02/13 21:18:21 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.153 2011/02/21 19:42:10 graaff Exp $
+
+  21 Feb 2011; Hans de Graaff <graaff@gentoo.org>
+  actionmailer-2.3.10.ebuild, +files/actionmailer-2.3.10-rails3.patch:
+  Fix tests when Rails 3 is also present.
 
   13 Feb 2011; Thomas Kahle <tomka@gentoo.org> actionmailer-3.0.3.ebuild:
   keyworded ~x86 per bug 351835
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 1a100e6b63f1..5d71f3616b5b 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,21 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX actionmailer-2.3.10-rails3.patch 431 RMD160 9c68052473169ed9892b613c8bd69aa43229b4d6 SHA1 1bc3be9b16f7c759119646a87e68fadedf181d41 SHA256 4eec1446601ffef54a0e8e210ed53b1d72676ab035cf0ab1d8844f11b5611cde
 AUX actionmailer-2.3.9-require-uri.patch 507 RMD160 5097fb23ba4a8c4b0409ddd54cdfa179fe09d2e3 SHA1 999549e67b20f7eedd66d4bf59cdc9e19c55b462 SHA256 8aa2121eecea068632f38cc03cedf694e22896f1e57dd9bca912585c5fb14efe
 DIST actionmailer-2.2.3.gem 109568 RMD160 c018c78c48d891001efc081a42aae57f7d63049e SHA1 41aa9537d12ddc2dd923a6154e18b419f06682db SHA256 94a649dea98c33604d832414e8a94b6c9d91edb2b2f75380e9fabd564bc417e8
 DIST actionmailer-2.3.10.gem 273408 RMD160 4f966eeb53306aa6fee74bcf364a1b9100e3636f SHA1 2023dc0fd10be2498c21b02e7ac3ffe596e9187d SHA256 df917d8ffebbfc4bdd6052d8a418afb448c8b2c4b8ce1bde2a10537eb6997b78
 DIST actionmailer-2.3.5.gem 111104 RMD160 cca42177ba90b0e04d5cd2acece93268183b2ec2 SHA1 fc0302d56425b0133cdc67c9ccddd03a53260ee6 SHA256 7d3d867b7668e555ba81f25c1784d53c2fa15d5bb300815e0eb8bbec3ee5ec66
 DIST rails-3.0.3.tgz 3471838 RMD160 ea484cd69bb938753fa35b19db0717a6b1e11663 SHA1 e5b66b4eee9e263305f1013929cb0662bd63c75b SHA256 b29efe183c54676ddd3f6195e60b446dc75f61e0c7b311186b2b876c43bd9f0c
 EBUILD actionmailer-2.2.3.ebuild 525 RMD160 d8a014467b5073c0c3f65168ea47a95a9216072f SHA1 42ef73acb25869c05de80fab4ef8707c853961b4 SHA256 d5883a9ae8a632ed81c9e919d41ab802a52704996ffa1c3d3d8c02442384f1eb
-EBUILD actionmailer-2.3.10.ebuild 906 RMD160 5ac21fd8d82f9b5d7ec14a132ea2f3da85179d9d SHA1 97035148c206fe4850c1969e8fbfcf8c302a4f6f SHA256 b56b55caf3e13ba019051f2eee32ab60d43dcf6c5b859d69b19b6cb9b3b0b7c5
+EBUILD actionmailer-2.3.10.ebuild 944 RMD160 bdec1355c8f4a3b531a9861a950cf1fdd1f4ad1a SHA1 b25c3ba8503a1b12efd4d5da1702ec20e167877e SHA256 363e5dc609b1d87af1f9126e8c2ba97c1c88fe2739d66e53066ac99e87fbc7a7
 EBUILD actionmailer-2.3.5.ebuild 622 RMD160 a10de9a0c52a0b0b0e61c2550f1777aa1dbfa805 SHA1 d0d48805331ac426e2c4ed3de02ed5267be5fcbe SHA256 9343bc88ddaf0a90af1c31cf41be6a6308e85c9a40cf9f31ea0a66e9a425b6d2
 EBUILD actionmailer-3.0.3.ebuild 1112 RMD160 5cde1ee8d92fce3349998615c189c0c33531306b SHA1 a5c769e697851c661cd25f1568fdef3be39d6b30 SHA256 132737804e31668d189891979baf4493689c1ab5763698feb9edfb1c1551eb81
-MISC ChangeLog 19680 RMD160 6b4d7cc816964daec165f3e7eb401860ff02206b SHA1 ea2f913db84ddeacf43c1f9bb234ee280be8a64a SHA256 3605a6705fa7cd54e4093721c30adeab5f653fd86cbeb49f3a70a40d9340fe6e
+MISC ChangeLog 19845 RMD160 47c69a0a3a3b70b054c69d2e00fc2fe970221abb SHA1 ffe73a0fd358247a2afade6b06befeb42c6f23ea SHA256 1c0518343e0a189c09ccc8e6d7086795d9ed881f0b84b75d42f62e39aca7dcca
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1YSWUACgkQnZsgo/h8kNapjwCfVSH1ax9TjmPKM0AVWW4Q97Z3
-OjgAoJk8R3gZkg8aT3ucDgDUsSF9Zt9o
-=ebjz
+iF4EAREIAAYFAk1iwB4ACgkQrnu0mw69JkoA+gEAhDtvecr2wAzxPof4GsOe94LS
++pa5jVcb4/KXEn/vfhIA/3HHVL6PKk5bDoC3Z0RpV2g4VfH5cKNvsGrmAliQi/Gr
+=McRJ
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionmailer/actionmailer-2.3.10.ebuild b/dev-ruby/actionmailer/actionmailer-2.3.10.ebuild
index b1efb96eab4e..244541f71e23 100644
--- a/dev-ruby/actionmailer/actionmailer-2.3.10.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-2.3.10.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/actionmailer/actionmailer-2.3.10.ebuild,v 1.2 2011/01/07 09:30:36 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/actionmailer-2.3.10.ebuild,v 1.3 2011/02/21 19:42:10 graaff Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18 jruby"
@@ -18,6 +18,8 @@ SLOT="2.3"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
+RUBY_PATCHES=( "${P}-rails3.patch" )
+
 ruby_add_rdepend "~dev-ruby/actionpack-${PV}
 	>=dev-ruby/text-format-0.6.3
 	>=dev-ruby/tmail-1.2.3"
diff --git a/dev-ruby/actionmailer/files/actionmailer-2.3.10-rails3.patch b/dev-ruby/actionmailer/files/actionmailer-2.3.10-rails3.patch
new file mode 100644
index 000000000000..8e0bf276f5b3
--- /dev/null
+++ b/dev-ruby/actionmailer/files/actionmailer-2.3.10-rails3.patch
@@ -0,0 +1,11 @@
+--- test/abstract_unit.rb.~1~	2011-02-21 20:35:21.775255045 +0100
++++ test/abstract_unit.rb	2011-02-21 20:39:26.051025768 +0100
+@@ -1,6 +1,8 @@
+ require 'rubygems'
+ require 'test/unit'
+ 
++gem 'activesupport', '~>2.3'
++gem 'actionpack', '~>2.3'
+ $:.unshift File.expand_path('../../lib', __FILE__)
+ $:.unshift File.expand_path('../../../activesupport/lib', __FILE__)
+ $:.unshift File.expand_path('../../../actionpack/lib', __FILE__)