Fix tests when Rails 3 is also present.

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

4 files changed, 23 insertions, 8 deletions

diff --git a/dev-ruby/activerecord/ChangeLog b/dev-ruby/activerecord/ChangeLog
index b37c69144b06..25cb11cbbca4 100644
--- a/dev-ruby/activerecord/ChangeLog
+++ b/dev-ruby/activerecord/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/activerecord
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.149 2011/02/13 21:17:27 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.150 2011/02/21 19:55:35 graaff Exp $
+
+  21 Feb 2011; Hans de Graaff <graaff@gentoo.org>
+  activerecord-2.3.10.ebuild, +files/activerecord-2.3.10-rails3.patch:
+  Fix tests when Rails 3 is also present.
 
   13 Feb 2011; Thomas Kahle <tomka@gentoo.org> activerecord-3.0.3.ebuild:
   keyworded ~x86 per bug 351835
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 745edac4f488..344cca5ea15a 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,21 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX activerecord-2.3.10-rails3.patch 295 RMD160 5891a9d9a1e25bb430cbc51e5fbdf76c9eab3550 SHA1 15b991948c8b890be80971f6d98da0af9129f20e SHA256 96422289122ca769d24f488bc9ab9af9cdda4162ad83a3fe27894b04106d8567
 AUX activerecord-2.3.8-add-index-with-symbol.patch 2588 RMD160 d1cc83d8b13cab18ae92adec027bc0db203f87bf SHA1 2c5cea51ce571183a1ee7e29c1eee575e457564c SHA256 792750e8a065d78235d72d6549694bef3f2b3ffb537c699cd598d19d436a70cd
 DIST activerecord-2.2.3.gem 502784 RMD160 0932353f44e970e16909485de1e45ea196838aa0 SHA1 3c9b3d013775c7367247e5ecd120b1eb211520dd SHA256 49061503098a1abaa50de2498875361b4052354c7900d563d1f89a030d33fd10
 DIST activerecord-2.3.10.gem 572928 RMD160 ec649a857933bede759420a1bb3a9d9f0e2c2540 SHA1 bfc5e21989bc281f5f17c3a39fa16fb4286ff055 SHA256 28436bed664df2be221c655381692b1a7f9bb606bcaf5a0e4938400b8ac9b50d
 DIST activerecord-2.3.5.gem 546304 RMD160 be3bee034c5d56128a7a6c10470b92fdb167e569 SHA1 f411a1ad8aeef78a464b00663eecdc22e0e4266c SHA256 0b03d539c75ba735c507b3d8269d07f70ffc46ad86fdbfe6a2bfef82deb728db
 DIST rails-3.0.3.tgz 3471838 RMD160 ea484cd69bb938753fa35b19db0717a6b1e11663 SHA1 e5b66b4eee9e263305f1013929cb0662bd63c75b SHA256 b29efe183c54676ddd3f6195e60b446dc75f61e0c7b311186b2b876c43bd9f0c
 EBUILD activerecord-2.2.3.ebuild 752 RMD160 805222255f40e1b3521743d320b8a5ce4ff131a3 SHA1 bd6c700159afdb29cb13e8caaed4a4bd5ad57d4a SHA256 3bf99459836dae1dd3abe47326dc896f3ddc12559ea6676cf49b04973470446a
-EBUILD activerecord-2.3.10.ebuild 1400 RMD160 849d21737554a12f9e84acf10546ddf0d1ec6aae SHA1 6bd64e6375a8918f29a4a14827e2a6be02bdc1cb SHA256 c5898ae10564a0ce10ed0f4021ce6307245f21ae6bf1ba9bdef559c594502788
+EBUILD activerecord-2.3.10.ebuild 1441 RMD160 994e294bf38c22d878725b9eb5130d41ee0a0447 SHA1 7e6c48e68e987ec19d92c1761df689bef61f7de0 SHA256 181433f31447fbb4bc46068fa8f9bf1221d588c16ec48dd20a009200f7a5acb2
 EBUILD activerecord-2.3.5.ebuild 759 RMD160 423882174ebb5f77589be12b48d9cee534b3510e SHA1 7c2ea43fa600e4fe892e50b828a5629ae882a4f6 SHA256 e6450804168fbd6756e9b2c7783d10bf01db54889e0219df34128454e282d15e
 EBUILD activerecord-3.0.3.ebuild 1678 RMD160 cd0e7d94ed4f2e5cdb5bac00d6783ad2d1c9c5e1 SHA1 4b28016aac0d69201de2701412c0eaae8b103bce SHA256 33981ca77492103f69b57121503eceea5a6000cddcc9555dbed8fece6f59cd4b
-MISC ChangeLog 19744 RMD160 10685c4b973b9db95b55d66412da1a89e7d75d96 SHA1 33519047c857da1a2911f905a1360626e48cdf44 SHA256 6c83be3e6ec3b59a71ca6b9142b83149805bb15ff8b3296f016eefa0d7908537
+MISC ChangeLog 19909 RMD160 cfb67b21bb8099fa974eb8704d756f1a209cfe30 SHA1 26b3f5abd5a3c144294cdc17bbb7122c54c35dfd SHA256 674789bea6fcea57f7f1f45c063c9d2437c0e1c261a9cc7c29e9496dc4f4bcd3
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1YSS8ACgkQnZsgo/h8kNZHxwCgiZJ90KLf1uWyhE4HMD/naptp
-mgsAnA5kR8wvw6bcJusoo4DDl8k4eEd6
-=yQXx
+iF4EAREIAAYFAk1iwz0ACgkQrnu0mw69JkqAygD+P9k2afYfuo8KM1BnuIXYnfUp
+GnVAatAunUWkbTmqmXAA/2bStfl8X63jEiDNK5/D6pNaUqFqyyz8gKEbT/ZA4QW2
+=i67g
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/activerecord/activerecord-2.3.10.ebuild b/dev-ruby/activerecord/activerecord-2.3.10.ebuild
index ed1f62029ce5..ccf0b8719ae3 100644
--- a/dev-ruby/activerecord/activerecord-2.3.10.ebuild
+++ b/dev-ruby/activerecord/activerecord-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/activerecord/activerecord-2.3.10.ebuild,v 1.3 2011/01/07 09:32:11 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-2.3.10.ebuild,v 1.4 2011/02/21 19:55:35 graaff Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18 jruby"
@@ -38,6 +38,8 @@ ruby_add_bdepend "
 	)"
 
 all_ruby_prepare() {
+	epatch "${FILESDIR}/${P}-rails3.patch"
+
 	# Custom template not found in package
 	sed -i -e '/horo/d' Rakefile || die
 }
diff --git a/dev-ruby/activerecord/files/activerecord-2.3.10-rails3.patch b/dev-ruby/activerecord/files/activerecord-2.3.10-rails3.patch
new file mode 100644
index 000000000000..cf98f192a2ef
--- /dev/null
+++ b/dev-ruby/activerecord/files/activerecord-2.3.10-rails3.patch
@@ -0,0 +1,8 @@
+--- test/cases/helper.rb.~1~	2011-02-21 20:49:54.892128120 +0100
++++ test/cases/helper.rb	2011-02-21 20:50:49.833465960 +0100
+@@ -1,3 +1,5 @@
++gem 'activesupport', '~>2.3'
++
+ $:.unshift(File.dirname(__FILE__) + '/../../lib')
+ $:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib')
+