diff options
| -rw-r--r-- | dev-ruby/actionpack/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-ruby/actionpack/Manifest | 14 | ||||
| -rw-r--r-- | dev-ruby/actionpack/actionpack-2.3.10.ebuild | 9 | ||||
| -rw-r--r-- | dev-ruby/actionpack/files/actionpack-2.3.10-i18n-0.4.2.patch | 45 | ||||
| -rw-r--r-- | dev-ruby/actionpack/files/actionpack-2.3.11-rails3.patch | 13 |
5 files changed, 79 insertions, 9 deletions
diff --git a/dev-ruby/actionpack/ChangeLog b/dev-ruby/actionpack/ChangeLog index 6ffe9b85ea08..21e1e047e555 100644 --- a/dev-ruby/actionpack/ChangeLog +++ b/dev-ruby/actionpack/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-ruby/actionpack # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.169 2011/02/13 21:12:09 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.170 2011/02/20 15:55:24 graaff Exp $ + + 20 Feb 2011; Hans de Graaff <graaff@gentoo.org> actionpack-2.3.10.ebuild, + +files/actionpack-2.3.10-i18n-0.4.2.patch, + +files/actionpack-2.3.11-rails3.patch: + Fix tests with i18n-0.4.2. 13 Feb 2011; Thomas Kahle <tomka@gentoo.org> actionpack-3.0.3-r1.ebuild: keyworded ~x86 per bug 351835 diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest index d656abc927b8..ae0b06b74e9b 100644 --- a/dev-ruby/actionpack/Manifest +++ b/dev-ruby/actionpack/Manifest @@ -1,22 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX actionpack-2.2.3-strip_tags.patch 649 RMD160 d503951da305c307911dc51c84e56783712bf6f2 SHA1 76e50d0fa191502cb4f6fe25df52860b62244828 SHA256 b96743939465ed9bd042e741f888aba95d3327f97b182d41554a5b5364d3e57b +AUX actionpack-2.3.10-i18n-0.4.2.patch 2671 RMD160 20f0183e7167d9944aefbe5380dab12da9a31d64 SHA1 3b755aa2082f4625d2b2ce07eff773ac92cd6b9f SHA256 7060319a5037c3623e8c5beb36133dde6d3e358746fecfc0ee072edbec5b33e5 +AUX actionpack-2.3.11-rails3.patch 416 RMD160 2fac5e796e97397ca5414feff987c96e7e47d970 SHA1 79601cca950cc56f91fb557f33a3fe09d4461dcf SHA256 8b2dc793f9e8b996c57dc77b3898a54757f330b8c95ee94c9bdf3b0013350093 AUX actionpack-2.3.8-custom-cookie-fix.patch 3009 RMD160 ede4f92f154a36e8b25e11ab92f9ef229e8208de SHA1 d367e0aa9917ee536214a32fd35cd35d96b55b39 SHA256 9368cd7b35fbc0b5d4161e121aa9ced113ea831b738a47b6c59828bb17f24c04 DIST actionpack-2.2.3.gem 718848 RMD160 6b5407cf15a0a0874bd959d650a7f66894485a50 SHA1 cae01c4d1622286705ab9ff0d963eda6b104c96e SHA256 f00dc9b5fe33b56797550ea4e1111a44e5acd413ecb7ad8dbc184f58bd704fb5 DIST actionpack-2.3.10.gem 1082368 RMD160 7d7b5305f3218a2e80e25927c3f3c898574ea434 SHA1 14c38b6659a801ccdd39722b0d589e39ad194fc8 SHA256 394c0380831038eeb7bafa44bb6a10510acb76b094c11bedb5aad2ad45aed3bf DIST actionpack-2.3.5.gem 737792 RMD160 b9b9f1451ecdf050ca9a376e6fde020e7aebdb61 SHA1 6c46dbcbde1840202ebd2bcfa690d53047e47c9e SHA256 28630d5955c36290fdc8918966e45f1d1a48514b663b43f3459dd9453b35370c DIST rails-3.0.3.tgz 3471838 RMD160 ea484cd69bb938753fa35b19db0717a6b1e11663 SHA1 e5b66b4eee9e263305f1013929cb0662bd63c75b SHA256 b29efe183c54676ddd3f6195e60b446dc75f61e0c7b311186b2b876c43bd9f0c EBUILD actionpack-2.2.3-r1.ebuild 771 RMD160 3106d00d948464385c4c0b4f84e85925229dc397 SHA1 5779d4c7b55885cafd47acb8a1d8659912984515 SHA256 e5a14491a48fe95414da17d3217f6adbf639ba0c67d26688c29d90d2454131b1 -EBUILD actionpack-2.3.10.ebuild 1733 RMD160 101678b09381466cea3f1a9f007f88fb4f0a1b9c SHA1 66a5f42d864b3820cff9c2f0bb57be9a7e21c860 SHA256 4e81ac6d176b9c78488006a09c8a75f00d13ae71866154dfbd9b4967b971a31e +EBUILD actionpack-2.3.10.ebuild 1961 RMD160 43955f1a3b1b673385b379ed4dfad85840819265 SHA1 d4792f27de8ecaa727effbd9b5cc73374006c85b SHA256 84a48f87fbd8a6bfcdeb695b3222ce52b692211a9b03c914dd227b05e58dbeed EBUILD actionpack-2.3.5.ebuild 648 RMD160 2149e057f7fb73d5dddd8f09e938177dfe657109 SHA1 9cbbee59eb3d3e3caa5682687386f90aace08dd4 SHA256 eb10b8c2e785da75b2262a8e099a05b7fb1562035cb6a528b81652db03fdab1f EBUILD actionpack-3.0.3-r1.ebuild 1582 RMD160 60fafbccf94ffd51d8e827933e3f911e6c7a4ab1 SHA1 77182f0667faf2a2ecf61ade468207a2708c5b9d SHA256 44fe84620cd4c0098113044443e9e7d8c1c7c7a7f03765463cffb58ad4b58726 -MISC ChangeLog 22141 RMD160 87221f995905f27bb9fe1b366beda23e1b9d34be SHA1 fb7217de536357c64d4a02ef00df4f539564dafa SHA256 c3ecec0fd84f8e20c908e24255aef7ea01e4b4ffa8e71d016779aa9cbdb03d10 +MISC ChangeLog 22334 RMD160 c9fa99109572d6fdafecb49e641a889a4737fb08 SHA1 bcad3ec23ba6e0798551343955650a658d00388e SHA256 0aaa958026715f9df3f33e5992c6b52e604c0a4ff654d3e163e7db07c57576d3 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk1YR+4ACgkQnZsgo/h8kNaqRACgue/o/nJilvzCWouw9ewJsYp8 -MdAAmgLvTsMGznc6HhpwrXZCd/5fKtR8 -=104R +iF4EAREIAAYFAk1hOXcACgkQrnu0mw69JkoCPQD/VNmUKHTghq7VkMz7gtyfvk/m +hW9/MJoFfnhD+pTfopkBAIvOYBcYkxj7blnQ+/4xCIgQdbDUy3ANt8MOlruzRIcl +=j8aL -----END PGP SIGNATURE----- diff --git a/dev-ruby/actionpack/actionpack-2.3.10.ebuild b/dev-ruby/actionpack/actionpack-2.3.10.ebuild index 8f3b933bf05f..08651cb381d0 100644 --- a/dev-ruby/actionpack/actionpack-2.3.10.ebuild +++ b/dev-ruby/actionpack/actionpack-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/actionpack/actionpack-2.3.10.ebuild,v 1.2 2011/01/07 09:29:23 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/actionpack-2.3.10.ebuild,v 1.3 2011/02/20 15:55:24 graaff Exp $ EAPI=2 @@ -22,13 +22,14 @@ 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}-custom-cookie-fix.patch" ) +RUBY_PATCHES=( "${PN}-2.3.11-rails3.patch" "${P}-i18n-0.4.2.patch" ) ruby_add_rdepend "~dev-ruby/activesupport-${PV} >=dev-ruby/rack-1.1.0" ruby_add_bdepend " test? ( + >=dev-ruby/mocha-0.9.7 dev-ruby/activerecord:${SLOT} dev-ruby/actionmailer:${SLOT} !dev-ruby/test-unit:2 @@ -50,4 +51,8 @@ all_ruby_prepare() { # MemCacheStore tests no longer fail gracefully, and it's unlikely for # someone to have them running anyway, so remove them for now. rm test/controller/session/mem_cache_store_test.rb || die + + # Fix tests when run against i18n 0.4.2 which ignores locale + # definitions with an empty data section. + sed -i -e 's/, {}/, {:test => "test"}/' test/template/render_test.rb || die } diff --git a/dev-ruby/actionpack/files/actionpack-2.3.10-i18n-0.4.2.patch b/dev-ruby/actionpack/files/actionpack-2.3.10-i18n-0.4.2.patch new file mode 100644 index 000000000000..95efd54f5f42 --- /dev/null +++ b/dev-ruby/actionpack/files/actionpack-2.3.10-i18n-0.4.2.patch @@ -0,0 +1,45 @@ +Add additional shoulda expectations to cover apparently changed +semantics from i18n 0.4.1 > 0.4.2. It's not clear what changed +exactly, and it could well be a bug in actionpack which doesn't seem +to pass the locale along to all calls in some of these methods. Not +investigated further yet since all Rails development is aimed at Rails +3. + + +--- test/template/number_helper_i18n_test.rb.~1~ 2011-02-20 15:51:40.792064192 +0100 ++++ test/template/number_helper_i18n_test.rb 2011-02-20 16:42:56.067596179 +0100 +@@ -20,6 +20,8 @@ + end + + def test_number_to_currency_translates_currency_formats ++ I18n.expects(:translate).twice.with(:'number.format', {:locale => nil, :raise => true}).returns({}) ++ I18n.expects(:translate).with(:'number.precision.format', {:locale => nil, :raise => true}).returns({}) + I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults) + I18n.expects(:translate).with(:'number.currency.format', :locale => 'en', + :raise => true).returns(@currency_defaults) +@@ -27,6 +29,7 @@ + end + + def test_number_with_precision_translates_number_formats ++ I18n.expects(:translate).with(:'number.format', {:locale => nil, :raise => true}).returns({}) + I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults) + I18n.expects(:translate).with(:'number.precision.format', :locale => 'en', + :raise => true).returns(@precision_defaults) +@@ -39,6 +42,8 @@ + end + + def test_number_to_percentage_translates_number_formats ++ I18n.expects(:translate).twice.with(:'number.format', {:locale => nil, :raise => true}).returns({}) ++ I18n.expects(:translate).with(:'number.precision.format', {:locale => nil, :raise => true}).returns({}) + I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults) + I18n.expects(:translate).with(:'number.percentage.format', :locale => 'en', + :raise => true).returns(@percentage_defaults) +@@ -46,6 +51,8 @@ + end + + def test_number_to_human_size_translates_human_formats ++ I18n.expects(:translate).twice.with(:'number.format', {:locale => nil, :raise => true}).returns({}) ++ I18n.expects(:translate).with(:'number.precision.format', {:locale => nil, :raise => true}).returns({}) + I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults) + I18n.expects(:translate).with(:'number.human.format', :locale => 'en', + :raise => true).returns(@human_defaults) diff --git a/dev-ruby/actionpack/files/actionpack-2.3.11-rails3.patch b/dev-ruby/actionpack/files/actionpack-2.3.11-rails3.patch new file mode 100644 index 000000000000..b958d463fc4c --- /dev/null +++ b/dev-ruby/actionpack/files/actionpack-2.3.11-rails3.patch @@ -0,0 +1,13 @@ +--- test/abstract_unit.rb.~1~ 2011-02-10 08:12:37.551582393 +0100 ++++ test/abstract_unit.rb 2011-02-10 08:13:37.845418027 +0100 +@@ -19,6 +19,10 @@ + # Debugging disabled. `gem install ruby-debug` to enable. + end + ++gem 'activesupport', '~> 2.3' ++gem 'actionmailer', '~> 2.3' ++gem 'activerecord', '~> 2.3' ++ + require 'action_controller' + require 'action_controller/cgi_ext' + require 'action_controller/test_process' |