Version bump.

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

3 files changed, 92 insertions, 19 deletions

diff --git a/dev-ruby/actionpack/ChangeLog b/dev-ruby/actionpack/ChangeLog
index 310a09dc0005..b1bb5aa67241 100644
--- a/dev-ruby/actionpack/ChangeLog
+++ b/dev-ruby/actionpack/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/actionpack
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.305 2015/06/07 16:38:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.306 2015/06/16 21:11:53 graaff Exp $
+
+*actionpack-3.2.22 (16 Jun 2015)
+
+  16 Jun 2015; Hans de Graaff <graaff@gentoo.org> +actionpack-3.2.22.ebuild:
+  Version bump.
 
   07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add github to remote-id in metadata.xml
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 2a8a1834cad3..e81d5d2df417 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,32 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST rails-3.2.21.tgz 3568729 SHA256 95dcf2a848a7fd09acbb12c47e6901baeea08645c32c37e2ae04e2650cf01deb SHA512 952c799736dd2a48532a4340d97ffbbbdc2451fc509e7f86ca47c09f5c6a3f4e5cb9b87c3e803692bc8a810bc178513bbe74f3037fdf8f786c30f0c85dd26948 WHIRLPOOL a2c79df0091ea0ca6f3969a91b4d73c14f79cab9d31ec30591a640321487aedafd0318326080ad4d9be0523002eab2c3c5e9e49b2c6b0b5ef6f5dac8da0bfab5
+DIST rails-3.2.22.tgz 3569215 SHA256 a14fbd69cd1750589cb6f4a79926058595de832dab89372fb479feadc99f0aba SHA512 7321e5fa12cc3f7d6e7c2284f37c183c9bcbe1c9f067c2be5ebdd10f550b0eff561b20558cf885f30b24951bfa88287b3e0fb421eee14579a88a2bcffeaff3ce WHIRLPOOL de54798cbcbf9a0c6d66346267cfbb15991478cc6b4982f9e3a3a80db734af6553f9749b18188c4dc5fa82c60c0294312f648a0e4b5bcb46896bfee75be4dbc0
 DIST rails-4.0.13.tgz 3761572 SHA256 a693a8c5f767d153e765634cecb6356855ca51b6554b3af1a38888023a204a51 SHA512 3f2cca90187f800d1ec57fc6cbc58c1f3213113a94d1dee7d9cfd3dc0264b7f3a9c6cfc6dd95ef2fb3aa7d8ca5d6da50cedecc288ff8ff7e5305dc0309b4365d WHIRLPOOL a5b3f7f828a88d04b5687b3217b40903192ccea5eca36ca58cbb2baeec7471241fe5529f13688bd1f6396a384cf282c94bfaf54ee1cfafdf5ef400707dee7d01
 DIST rails-4.1.10.tgz 3723355 SHA256 f8060783a25002bdd8120411f3ef7f5b696b5069477135ebf481501f4b69384c SHA512 9493d52ae6d417e11dc141c9e9fa0abf5b4d1ba355d89f5cabbcf774d54128c9e2815b60467bbc0ba275cde8f771b9845c9a4cb1ba775ac8228223a87a51f807 WHIRLPOOL 1a34cd978da13ec1804791cc31aba12de4e1be67787aeda23a50eb2cc54c568a613d89e0d7d61a2969bca1e551e12ba23f362cafedd0b0bc7b0c37e12ab02c05
 DIST rails-4.2.1.tgz 4149447 SHA256 11237cc395c5d4a7f64636f2043cf8c248e862e1946f7491244f448e1c509af7 SHA512 00720fa889b7d0a25c4ef497a8dc95330393300ed05108c5de1413a8f2fa62babf9674b62a627adbd29f1f337395a7ec8c46985753dbed2550023f5159942d91 WHIRLPOOL d09243b37810d2288fe9ea64d82c15c5281b52847e7143a6b7076b5da103cbe02e705788cccdcaf366cced2e9fc6f14362da4b6ddb67df17281ac9a5d1cf5fa7
 EBUILD actionpack-3.2.21.ebuild 3010 SHA256 9bef7b189a9e87c24d1b5cd75b39a372d933ece8d849d9a940ad681e29e3b765 SHA512 210daf621a0c31e3bb20a7c5ffbed7bf90d09ed9537ff53277fc82d59ce490bb4ce4a752039f4cc68a08cfd667a65fa1ae0963fbf1989d9e09d07b769c46ec96 WHIRLPOOL 85978ad843b09b2d80ef3f90b0df4048377f8e62082748051046eb67db63572f73f25fb5581338eeef8baf57542a11b8423253bd09ad443c99d4ff695c536475
+EBUILD actionpack-3.2.22.ebuild 3053 SHA256 d62335448654a676e6a0b589b5469d7501abc0d287d60ab961dda6ee93fae2e3 SHA512 4a03b8872a59771d0f92c65852dbce48150d438db0f4c3498e0abe64a01359910605e97d80ca2abc6b0c783b8b43df1afbb6508c346eca5aabc0e1fa1633a2ea WHIRLPOOL e4e9bb4b2c2e0adde47f09d222a9c0f90ec087065fb0d51753734d4888de64671919d8d43baeec5980c85aea3793cc61dc18ab0bc3dfa358547e89cd65f7344d
 EBUILD actionpack-4.0.13.ebuild 2210 SHA256 36d6b6bb454f003b50a48d5c528fc89fc01d9f3f8413873bb656f24b93f0d7fe SHA512 93b043dbeb60f824f9f6ec40e040ed445d77afe63b81bd6e6f7f6dd27b83399719f460b3d8ed191d87be1699ff80b5d3b70b47ad7b81b311eacd6246cda0743c WHIRLPOOL f0b203942855883baf4e315bc03f5590c19d792f177f578e78dff2dfe976024c2f28b05ece85f873c4bdcc33d8f3688ddb46e6251f7997ebda721dc6a019ab94
 EBUILD actionpack-4.1.10.ebuild 1502 SHA256 db8a5a9ace8a5b232f4465e1a69afde97c4ea1d119595e67753170f1f85bdda6 SHA512 6a78185aae6f4b78032180a95b2e3b44a63591c05f2d06f180be672aec4318f6ed96a01e9d467b1bcdf134ad2998fd084c2354106cd3fc761215aa402687226f WHIRLPOOL 4c2846d9eafef8e87d585fd02bdd7641b46ad65cf48350a0b2848f0405500b172ba055a25f306804f6bb04f8495ad17b61e25f8d67671b6f6334ca6b3005e3ac
 EBUILD actionpack-4.2.1.ebuild 1620 SHA256 9c3db419d0ad79aed963cfcc8cd1627fd766527014a46da8c7f6fb7bfdebbfbc SHA512 dc8d73d26ddeb397fabfd9be241699c4374c47cab3c42c17f3aa77dbaeaee420bfc79f9233789647b989aa9fdcf6a0543b5a1ee3195ab0d7cadd6c408a8ccf89 WHIRLPOOL 7338cdc270b30a28dd7986a8fe494186287ef1e0d58b376176a306c9601b91c66ff7cd211a77bde4b258b49aedd18f9eeca7623b2025ef192602ce3729d5e37c
-MISC ChangeLog 42027 SHA256 d50f32e73a68e73a808a3a9b765af47f4d9f91a94160923e3b408a24874b3e0b SHA512 c8d5330497309489efc17950106b1ea47b78773bab87539029c6eb20f637985f64b98cb8b3141651b06e81482b5f15bbe7692048a3e18cd0f85db5b08f0e7ef6 WHIRLPOOL 320d36ebf5b0eb0cbfc7a63c26628cb3f2989e5d0c47be7a8d80a38fe39fb4c7c9ea5b8b563ba1e625ccb47efbd71c8674abb3bf3b0f92dd246398e890f23bde
+MISC ChangeLog 42157 SHA256 60d2a00a0b46f3bffa69ca120866696df1f5c8dd88b1fc41970a045c6aaa7643 SHA512 a03278c77be485703ec1f6e21280e1d13f377162ff7a2f74622e81d59abe6f5e6444d06e25423f222dce6af093d00b803ffa6d2469cd308525cf393f9970672b WHIRLPOOL 3581cc0979ee7fe16e6a813aad4d6d2c168a4e7c8a357248f8ec330e69e42f0f6e58ae643dd6c84e3c2895d643e45b3c6ba26df4f01ec08ce2415a66b171c599
 MISC metadata.xml 239 SHA256 601a5b0fce4b301bb2c349bd1132c36c4a6504f8fadc36403aceb00d3fe45634 SHA512 56fb328eed48436d955df5dafd091e1be8345692fae2d30793166b6d5e2a70a4ba78ec0319601facd2e2c206d4c4089ff6392dd2c25efc26fa084b6b0d1663cb WHIRLPOOL 8a394bfb78d7fdca910776e32b6ca9c9e7c140173d73a2dbdceb03b6e101554650f025034ba2385a0dc1f8b7ce70914308fe15db0a2aa550baa365181f24f2c6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdHOHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmigHIP/1trPf2yUNvIK9HBzs0XIa/q
-8CLDCcVpxV3QYm1mNs+EQcTad75MJNdQpsDSgs86uI8BBGXpKVx4nV3+UHvE+rX0
-CyXHHP122e8u5v5bM6+V3QHL0IR4gdm8R1zY7DaGV1G4JoblhDXZiALu7+CzKmBi
-Oik+Lf8Cz3LuJ0rSaINp8uGMhL5JocEWHRLW3l7C3EEocs3udkffwXFy+tCStiZU
-wCbJMaIWHBXyx4GpFUvTPGOhaWB93GGDyLtalc2i+ObKf+BvDGWgFdmV71Gh4efN
-YL4loYOYy943nZi6jKo9dPnBRcJiUsyczCnVulWffFSj7mJPe+SwuaWDye+4NpLf
-kGU8fWKsnhmQwdfNzOuDN9au9HcWufiRwA8prCse09krXcXHESlW/jNZQSw4wWde
-ELNvzgRgydtL6RzuDGftPGTgjm9LS97eYMjMfv5pWW/p+6K2zJ50kPYUYM0wlrny
-ebIk05ShWzBR5bfxbEQoiY6JdhwXf52jMN2yB1L3bHWo54bxJFzjb7oEWTegYKQ9
-dYUuMn0XX9mFLvfQylK78ScdpOXJ1U97aLl76ikivsyEFQszXw/rDKlKfcLGGY2d
-j1NAY+K+gKla8E0Oq9h9ablvReVMZzsr79QEw28NhxqP0yP0elyoOQ89mbEiZdvl
-/AOfFX69tU0ohYoom2+j
-=jfl8
+iF4EAREIAAYFAlWAkRoACgkQiIP6VqMIqNf7QgD+Jd58v8X00JZDSZrVNcr5v4C2
+eTmcDSAKAZFmRH9bT3YA/16kt3uf08eB9BjveJ3ZZ0Mxde+TTNiG0nk8ku7DWdJF
+=MYlQ
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionpack/actionpack-3.2.22.ebuild b/dev-ruby/actionpack/actionpack-3.2.22.ebuild
new file mode 100644
index 000000000000..79a553df6b5e
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-3.2.22.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/actionpack-3.2.22.ebuild,v 1.1 2015/06/16 21:11:53 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+# 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="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/rack-cache-1.2
+	>=dev-ruby/builder-3.0.0:3
+	>=dev-ruby/rack-1.4.5:1.4
+	>=dev-ruby/rack-test-0.6.1:0.6
+	>=dev-ruby/journey-1.0.4:1.0
+	>=dev-ruby/sprockets-2.2.1:2.2
+	>=dev-ruby/erubis-2.7.0"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.13
+		dev-ruby/bundler
+		~dev-ruby/activerecord-${PV}
+		~dev-ruby/actionmailer-${PV}
+		>=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\|nokogiri\)/d" \
+		-e 'agem "i18n", "~>0.6.11"' ../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
+
+	# 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
+
+	# Avoid test broken by security updates in i18n.
+	sed -i -e '/test_number_to_i18n_currency/,/end/ s:^:#:' test/template/number_helper_i18n_test.rb || die
+
+	# Avoid test that chokes on bad UTF-8.
+	sed -i -e '/test_handles_urls_with_bad_encoding/,/^  end/ s:^:#:' test/dispatch/static_test.rb || die
+}