Rails 4.0.4 version bump.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 85 insertions, 15 deletions

diff --git a/dev-ruby/actionpack/ChangeLog b/dev-ruby/actionpack/ChangeLog
index 5341eea96283..c0fd187bee82 100644
--- a/dev-ruby/actionpack/ChangeLog
+++ b/dev-ruby/actionpack/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/actionpack
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.269 2014/03/11 20:09:13 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.270 2014/04/05 07:39:50 graaff Exp $
+
+*actionpack-4.0.4 (05 Apr 2014)
+
+  05 Apr 2014; Hans de Graaff <graaff@gentoo.org> +actionpack-4.0.4.ebuild:
+  Rails 4.0.4 version bump.
 
   11 Mar 2014; Johannes Huber <johu@gentoo.org> actionpack-4.0.2.ebuild,
   actionpack-4.0.3.ebuild:
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index ff7b7c75a84d..309f9580511a 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -8,26 +8,18 @@ DIST rails-3.2.16.tgz 3566631 SHA256 8fe61b98496e40d8aaef5f8db217f2aad56c9add1bf
 DIST rails-3.2.17.tgz 3566537 SHA256 f94972ed71c005ae1f7520d8840852872fbdf6c834bb2eaf1516fe63e406d609 SHA512 4ad32d71108d444bd791ffb2fded25deed69a304a4d6497fb12a586e07348bf4cd1a453614eb932a907063ad6166b89f4778742cb5c2c420f17a116e11b964f6 WHIRLPOOL 0b0911120202e3152a74d31f3b7f8a24261f8e163577ad88c12fd85be088871a0f8ed46b305325250bb830f786231ff349e847b2f642cba02905a95a9a022d68
 DIST rails-4.0.2.tgz 3720518 SHA256 cd973b85cfff735da80d8ed4e11421e2242be735d96cbe4d83ac0c4b6ca7c8d1 SHA512 67d7580c0081deeec4271f96caca6d6db8f65864c876a237e7e3f0e8c6e495d299f103dcbe7627385fa4fd3699dac5015e20be90187ef3b2af49352ad9c8d6af WHIRLPOOL 5b496df36ca4de6a4b55951fab2403bd8b31b3505d17d450bf2edf084429a7689c4fdeb8d19d0be40b2d4d0ada8cefd6c3fc104c2428769d2ca8e434d97c6465
 DIST rails-4.0.3.tgz 3721788 SHA256 deed80da9b800789a718f95dde5a0a13f18fe6d0169987165a54e7b6d8edd4f8 SHA512 4ac37e5f2c3992aa33020cb7287c9415a014c475dc176b2b51e6112da8bef3b8626216134c5495a8643a9452c7bd78af9a4e2bc77e9c098f8908335d4a27a918 WHIRLPOOL 52bdd5ad2cfe74976b2565963cddc6cefd51ec95fa4f6ca6cc81fe7444271e734caa0800b3cc7a425be0f7dfa47298079b10cacc5909925072935661cfc78974
+DIST rails-4.0.4.tgz 3742294 SHA256 301c7320cf2609a52c230b72f694a669637e39625bbbc42286903b1ebcbc9816 SHA512 781fc5b19ff20da39793ee99761db476de30d55c6b82af040a8f6c69ee608780c14fb91047cd5dbc1d0ba44d2f1b3e862de45210a2373d98fc9bd2beb526e282 WHIRLPOOL 9535db2609e56e0c161beaf50e798334b6619ffc90c09b7dd54cd7b1e0a04b7095d8a21da99a4c6978390f09f1a43341e9e810d13e0eeb2ee54dfaf04f07a139
 EBUILD actionpack-3.2.16.ebuild 2858 SHA256 3e8c5cd7b27264c8170df6ec7f09377050df9166c6f8954760f59fca3a076b0d SHA512 628b22915c8285aefdfd643f729e97b6097aa0e3875e55b61749e1718081a9b8be362207096efed2ebd44d2bdef091c2f826626a7cdcfb67bc13b758d37e3eec WHIRLPOOL 264d516b1204bbc46a8d64209d3716f19d487b64b5a324d05b9f1bb5a1c83e3cc6989bc81a91ab2ab57144faf7831a8a8931020fec3de00bbb1b7369ba64b39e
 EBUILD actionpack-3.2.17.ebuild 2858 SHA256 39680c182930a724b832fb8fa39f0ceccf5250344d0fdd86a677ee5f5a2a6231 SHA512 fe025dbb94cfc31c109fc6a4ec3a692c37073a975eac3e1f6b1fd8972fb1c7a2c3ed02aaf1ff0ceca5b77e4c1f0029282ac2eff824e990695a433b494f129508 WHIRLPOOL 339917d255d090af5db3cf68ea096d1f385e849469c0951d3e90b38e3d5ff0e950bf65cd5aff5892456d1c9c8150c971c6e2db6c3c913e44bcfe3a6870709af4
 EBUILD actionpack-4.0.2.ebuild 2771 SHA256 154242dda15d2b88158beb2a0e8a8510076e0cc47023ec42e0922e216928fe7e SHA512 9410c79058de56c62ecb3bf70933185240fb0a37fd38423946e43a62aa59c5eab6df08d3af4955def2a576b4e67c45ffe10626e1d263b2a718b31a456fe50270 WHIRLPOOL 315c8f4926d78aeb5daa6a7ddcc62d300e5ba591176cd0a8d1496b1bbf74fe57d43bd07d02f82b248ed5be214b43efe1e127718121f796d1b958e3680ffe5e45
 EBUILD actionpack-4.0.3.ebuild 2771 SHA256 ebeec611db2676836b269a492cef7bd0d11f02f5ecdc972e0941e03741470bab SHA512 a7f7de5cf3e9b1a24e79fceea840f8d6dbb6487a7ed69e3c29e27cd198a182631bf918706b5ab3bbdb0accda8007c5d4e0929d45a3ec546136ba3690c0830a72 WHIRLPOOL 9f58a9541a1830ce5a4cafd9781117ec0e51859e259e327d5d6b07ff63db26f4d4bb3daf31a7043c7902bebb9373a39908615c6a860773672378dc666ea3bd38
-MISC ChangeLog 36259 SHA256 5545b32b078d3149d22403d81f6ca1c96286f3dad09ed74fac6a87e09495bcce SHA512 ccecb9ffda88bf6906d1be6622851d69198ce245534f129f923deb1f8046ee39ab59676eafce97ab645905a684618603bb7e6e2e95c057bae61f681e3adcf713 WHIRLPOOL c8077088fef82c0b8c21725ac4a1fdfcb14d611e20270d738f937828167c1752114e3e6b69a713d926eab655a95a61757c6f8509b81515ba1c597fbffadcb490
+EBUILD actionpack-4.0.4.ebuild 2741 SHA256 1a3bed4ca7ff07516e4347e4d1d9219acedcf15c2c9aa078a3c872a99fff08a9 SHA512 2972121f9c2f842c2c315ec6843aba837c73143fc98897c72238ec413bec348bbaf24d581754a67a20eb2c3c39f352475bec66961107f393cb1bd48a9101ca3d WHIRLPOOL 3ef115e3ea4362044a563a40c5d643a744b5e577000e0b736f6d06be2f392262202d3fa6c64649c8730071f3ee0621afc1b029cc251555029222aa95837f1d07
+MISC ChangeLog 36399 SHA256 f3d9413b709b7dd439cf06c5b8cea741ae2d90a92c3436f54a510a5fd6091f95 SHA512 0ae0d4d4abc45bfe8309470d05baea3cff14c0f1c2010286a2360ee94060a69cbe0ba0aeb37235c6f969155608d672a13c9d429ec16e0f452958c85cfaeede66 WHIRLPOOL 0c2f156ca2412005b74787f5dc8a608123c0afea5980feaa0695642f8e3e5666a2e6b3ad2b0eb45551c845fe1ff3dd3af47a14df24a5a8237524de00688a30da
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTH21qAAoJEGVpnaTzz9K9h18P+wZtE9OAVAWOcb9/4XbDGTto
-1rQAbuoxqB5WlA5WIU+6ws0oow0UBF8SVkp8lhgKVaUobfA6ghNFtZ39HEO7pJjb
-aETSUnS7s0ibU/I/3KNmv6t9vKeYcT5LDVOzFg9aWcO071UdctzbKpSJbTVDG2Wd
-b/Cwek43Pg0L6ACohbTX8h3zOZGPJc47VMjyMwTb+bb5pkb82CILkUON2pusEFoF
-s3HnPdxMtYBcSos//nszq02xmnKSj4DD2strNYKQH6okwPg11gRwpr1/t+7c8aNM
-B770E7FjQIqyl2WDU2ELxXC3AAlg1XHzsRO9WejAW8jkNqG2r37NaRkl5snfHZoz
-5ndIpIG1F5iaqG89/VGrX0DAnnYTWUNz9BEYEXkEuzZBtFgn3/erkciY9TTBuXGO
-j/Ks4oLdgGoa2rkdvB6YQbtGyq8PiHv49iPPtJKQPn7gCxzlInVlCZvm5N+QBQl+
-boZj4UeZLKOl9WT4QwBaqMt38MHHVOj0S6oYf7CyASTkOXsyIXqB/TvZaBMylLoA
-Yqvs9YV6G5j5gz+VuPfBPjaXVA1+CgtnnMWQd5tQ674XUnU4JKjNeNCUHC0zI1Fl
-TJwhdM//LQHfQUtdAosPxuwISP06WTEDmVRNRJfXbUfqAASxT7UwtOZ5Sq2S5LWy
-uDflklikCIqFHNW01xWd
-=xLgC
+iF4EAREIAAYFAlM/s0cACgkQiIP6VqMIqNfotgEAiT6ujVRlP4GFzh4AQii56G+8
+lTNlOCFUT93PSytZ9/MA/iFzI6FJl3fuUp6EpJdVf5ri8fEQmt5nDkPxLSTiBCPO
+=GaZg
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionpack/actionpack-4.0.4.ebuild b/dev-ruby/actionpack/actionpack-4.0.4.ebuild
new file mode 100644
index 000000000000..5fa2d58261ff
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-4.0.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/actionpack-4.0.4.ebuild,v 1.1 2014/04/05 07:39:50 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19"
+
+# The default test task tries to test activerecord with SQLite as well.
+RUBY_FAKEGEM_TASK_TEST="test_action_pack"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Eases web-request routing, handling, and response."
+HOMEPAGE="http://rubyforge.org/projects/actionpack/"
+SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1.0:3.1
+	>=dev-ruby/rack-1.5.2:1.5
+	>=dev-ruby/rack-test-0.6.2:0.6
+	>=dev-ruby/erubis-2.7.0"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.13
+		dev-ruby/bundler
+		~dev-ruby/activemodel-${PV}
+		~dev-ruby/activerecord-${PV}
+		~dev-ruby/actionmailer-${PV}
+		dev-ruby/sprockets-rails:2.0
+		>=dev-ruby/tzinfo-0.3.29:0
+		>=dev-ruby/uglifier-1.0.3
+	)"
+
+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 "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\)/d" ../Gemfile || die
+
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
+
+	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
+
+	# Add back json in the Gemfile because we dropped some dependencies
+	# earlier that implicitly required it.
+	sed -i -e '$agem "json"' ../Gemfile || die
+
+	# Avoid fragile tests depending on hash ordering
+	sed -i -e '/cookie_3=chocolate/ s:^:#:' test/controller/integration_test.rb || die
+	sed -i -e '/test_to_s/,/end/ s:^:#:' test/template/html-scanner/tag_node_test.rb || die
+	sed -i -e '/"name":"david"/ s:^:#:' test/controller/mime_responds_test.rb || die
+	sed -i -e '/test_option_html_attributes_with_multiple_element_hash/, / end/ s:^:#:' test/template/form_options_helper_test.rb || die
+	sed -i -e '/test_option_html_attributes_with_multiple_hashes/, / end/ s:^:#:' test/template/form_options_helper_test.rb || die
+
+	# Avoid fragile test that gets more output than it expects.
+	sed -i -e '/test_locals_option_to_assert_template_is_not_supported/,/end/ s:^:#:'  test/controller/render_test.rb || die
+}