Version bump.

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

27 files changed, 602 insertions, 59 deletions

diff --git a/dev-ruby/actionmailer/ChangeLog b/dev-ruby/actionmailer/ChangeLog
index 342bb33dd931..b9495cd27a98 100644
--- a/dev-ruby/actionmailer/ChangeLog
+++ b/dev-ruby/actionmailer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/actionmailer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.288 2015/06/16 21:35:53 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.289 2015/06/16 21:59:06 graaff Exp $
+
+*actionmailer-4.2.2 (16 Jun 2015)
+
+  16 Jun 2015; Hans de Graaff <graaff@gentoo.org> +actionmailer-4.2.2.ebuild:
+  Version bump.
 
 *actionmailer-4.1.11 (16 Jun 2015)
 
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 6c6be66a98f9..1d9773e7edb5 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -7,18 +7,20 @@ DIST rails-4.0.13.tgz 3761572 SHA256 a693a8c5f767d153e765634cecb6356855ca51b6554
 DIST rails-4.1.10.tgz 3723355 SHA256 f8060783a25002bdd8120411f3ef7f5b696b5069477135ebf481501f4b69384c SHA512 9493d52ae6d417e11dc141c9e9fa0abf5b4d1ba355d89f5cabbcf774d54128c9e2815b60467bbc0ba275cde8f771b9845c9a4cb1ba775ac8228223a87a51f807 WHIRLPOOL 1a34cd978da13ec1804791cc31aba12de4e1be67787aeda23a50eb2cc54c568a613d89e0d7d61a2969bca1e551e12ba23f362cafedd0b0bc7b0c37e12ab02c05
 DIST rails-4.1.11.tgz 3723586 SHA256 3a59ba7a4020ba4dd54907a4927d1b9b9a60f5098ccd0bc3220b77ec6fca0bc1 SHA512 1df57853b3f80ec0fa1f7c08f3109ff64a42cfc7044ff229b9bde4b52025d21fee2d6631e86440adf12346a26cb67f8c812c869b64e1eec219bb9132610d62b9 WHIRLPOOL cdb08fb137a01f14dc32f268fbaa52667141bbe2384e2515256719eba27498aabb88572e693ab798e7821a1a8027074e7d67d6dab6cb01f2bd3e9138d3ec79d7
 DIST rails-4.2.1.tgz 4149447 SHA256 11237cc395c5d4a7f64636f2043cf8c248e862e1946f7491244f448e1c509af7 SHA512 00720fa889b7d0a25c4ef497a8dc95330393300ed05108c5de1413a8f2fa62babf9674b62a627adbd29f1f337395a7ec8c46985753dbed2550023f5159942d91 WHIRLPOOL d09243b37810d2288fe9ea64d82c15c5281b52847e7143a6b7076b5da103cbe02e705788cccdcaf366cced2e9fc6f14362da4b6ddb67df17281ac9a5d1cf5fa7
+DIST rails-4.2.2.tgz 4149494 SHA256 e8a0b1f96e2bf0bf24b2f28a5b5eabed7886b056119bd51c01ed451db4f35932 SHA512 707fddfcabf960ebccac9aa8c88067b1adedee341eed80a60c07044145f67047a91eb6d52b05c18d0693f0e575ec51b494b3095df755067f7cacd3a62275189f WHIRLPOOL 6b9296edbcaf95c20adf2981f877cf0b6febc4e2f33873826ab36ff0cdff68308c8e748bd9fdfb56f1d4e72c1588e25b826103ab7df9d74dd0e4e756d61d648a
 EBUILD actionmailer-3.2.21.ebuild 1392 SHA256 9218fb41b537b549d7426ae6b415dd28b51ca78b5386ce8bc0774aa45f0c8c1c SHA512 af93488d125fe74d06f035484e52edce06950856ae1f5eac705a2e9caff0c7f90d92a678ed1baa6779335f5dab92bf32f3aeb35f239aaa9ed802ff00d51182b0 WHIRLPOOL 3b0e7a9e96802729b1090c790f62daf31f17cff6c18cd9323dc84d38b46d59da2ed12e9f2e88d0d2db792b96d9c8a9e386c2153957826369bd32f0400defddfd
 EBUILD actionmailer-3.2.22.ebuild 1538 SHA256 56b92a278228892679ac4183fc8f543b28f2fc86633c058d2721d56140696569 SHA512 bb579e4465cfddb46cb78619facaac196206c948c3d503680066554fd229c6dadc4011f79eb705c8bc3cc328af0e7f600494236a1a4909e054e0415971c39884 WHIRLPOOL c6da795144fed57cf6ab2160a618c8dc5edfa1e49ee8a40177a9ce34da8fa8396601a24f2299a71dcb34864c4e2314b60d5af78a370306d82374bf790b5f0a15
 EBUILD actionmailer-4.0.13.ebuild 1425 SHA256 d3b5698cc6faec0a445a1029ad3c7faef43dc5b6b83634d0185eb18c2828e631 SHA512 90bd4fc25a1451620306f5d83d5c84264bca0ef1b6083e37ea3cfb684622e89c3ef4d970759940d029ea02ce52db98c44cd91bcc82559fceb6ca0dd1311a2209 WHIRLPOOL 9724e28c2f6d1fe73f332d59115d6bb382fe6b9e202a8cc172a766b3e4e248f58ba72d12a0607eac26a62c0782344edd9d099c070ce3a96a2c8f86cb0679ca25
 EBUILD actionmailer-4.1.10.ebuild 1712 SHA256 d02dad84fc4699e759bc5bf91f6f5505e10e5179c06bd9b6a93d81a0d31325af SHA512 a2d792a9b5d96d3291be60068432d4bf8fb489337c97ef00b2cd4d7213687e4093e20c2a614bdff6b5310f64395db8ebe0a88562257ccb61c9d13287c97a2ce3 WHIRLPOOL eae3ee64afd4da7261457efb7e93c34f29e77b10c0a398637401857b560142dc01328b2c5f5b4c3be9373b05bb332b53ff4c5233d4d79b9219e01cceda924faf
 EBUILD actionmailer-4.1.11.ebuild 1712 SHA256 4aacac72c94d214e5ff4087c8207e853ec7c6b70010028492d4494f1d0243a51 SHA512 1df1e36ef16c788cc304799b4cfd1721f80f1048c539c99be5073c78384ae205efcb7685faca5caa7c1f6c2e735ab477e543582f3fba994a6d04fd475f7efd71 WHIRLPOOL b469434fe395f0b79eea669717a81b025ce1f67596fbc335f2c4be011fbd07c8ec4ba8227e6880e0edead898f69f398bcdcbd4f3090446bea7c0e8e097bf5a27
 EBUILD actionmailer-4.2.1.ebuild 1565 SHA256 53ee5b17d1a157f9978388326f1e3f2599aa13f70449be24926943c93eecbb94 SHA512 6984bf14b76fcae4fef7b6a68954152f25d8f714ab091fc02211d1a0166340407d1e68826cb22c4ded352e538649320e018e9df83f441b74f18d02f22357fca1 WHIRLPOOL e33fdfb64ac538b97763680ee5d00621fc4fbd7e4ece06a26dc49153ebeb4fbbfde430c5dfb2b01f15511bebbb9a4fab9a46b2f5b42ab5f9a72b6f47148890eb
-MISC ChangeLog 40225 SHA256 3dda6ae0f593d9d9994ace63732a77ae903850b147be22455c39fa3077f958a3 SHA512 3910c870f6e80a6f147b4bc1ee30c8e7a493f8d3be2ac6dacc3fe82b51bd6905776865804bb439b18872e7ec721d3a0ccbddab06ece93d039ddabe6f47037f56 WHIRLPOOL 58aa36a39177363cbb49b22cdb715eeb097af7a40ce2b7eb7d4b9c6f2b15183375f586742d160b4b6ca6835d2f3fbbbac454ae6c6424e52ceae1a803fad2f1ab
+EBUILD actionmailer-4.2.2.ebuild 1566 SHA256 c106d0cd549bec91fe0843be4b18ce199261e768153a669d7e95249dc4835c05 SHA512 00c891c3d45c9827d42ce694835b154e8715477044d56f99e5b73a07b3295205eb81c36209d5b6fd9fe7d4dd0b108e0334e1d629a823f3a1b7c22cc118b63bb9 WHIRLPOOL b75531e95c2a4bbe3685adba0d52d6b459e8253b3c2923b0ddc74fa05314c97b85d8b8a9de57d1cd0d96d8cf5a147ec3bd3bfd7f9a1c13bc9552d6e628f80afd
+MISC ChangeLog 40355 SHA256 2f986cf4203fa4a1a475c146f004ee7a92a19411fe5e4a35966e1604f774abb1 SHA512 c5c08e913c59df9c8f48fc5ebe6a57e00a5388480ddab849290aa9ac29f118b5fdc673a506077e61b2469ba4a1b1affab4b934371335f79bc2e218f0ec3a182e WHIRLPOOL 3b4c546b9cd41ed1e277ed4713bccf37090626ab7858c6f3decf610b27269742de9751cede2408ae1a7a5b2a39a9054bd2815cf02000c3f87bba243066e698c7
 MISC metadata.xml 239 SHA256 601a5b0fce4b301bb2c349bd1132c36c4a6504f8fadc36403aceb00d3fe45634 SHA512 56fb328eed48436d955df5dafd091e1be8345692fae2d30793166b6d5e2a70a4ba78ec0319601facd2e2c206d4c4089ff6392dd2c25efc26fa084b6b0d1663cb WHIRLPOOL 8a394bfb78d7fdca910776e32b6ca9c9e7c140173d73a2dbdceb03b6e101554650f025034ba2385a0dc1f8b7ce70914308fe15db0a2aa550baa365181f24f2c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlWAlroACgkQiIP6VqMIqNcB6gD/clEyTiALqQmmg0QnKcLSE7AI
-LD3N3JUjCHcmdaxy234A/RoJ4dw3OvoTBaLzmWZeRx306AiR5rXX3OYLaMowkzEX
-=cxEp
+iF4EAREIAAYFAlWAnCsACgkQiIP6VqMIqNdWqwD/cfUxDjuRa4FKO4z7eGOfuT1J
+hLL58IbkssygGpUOwk4BAJXEdboEoXUBhvv5i+Wo/GbZC3aYe3MNWkJS85tYiYF7
+=eF6g
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionmailer/actionmailer-4.2.2.ebuild b/dev-ruby/actionmailer/actionmailer-4.2.2.ebuild
new file mode 100644
index 000000000000..0ba0c4a0b9b4
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-4.2.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/actionmailer-4.2.2.ebuild,v 1.1 2015/06/16 21:59:06 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Framework for designing email-service layers"
+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"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	>=dev-ruby/mail-2.5.4:2.5
+	>=dev-ruby/rails-dom-testing-1.0.5:1"
+
+ruby_add_bdepend "test? (
+	dev-ruby/test-unit:2
+	dev-ruby/mocha:0.14
+)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Make sure we use the test-unit gem since ruby18 does not provide
+	# all the test-unit features needed.
+	sed -i -e '1igem "test-unit"' test/abstract_unit.rb || die
+
+	# Avoid a test failing only on attachment ordering, since this is a
+	# security release.
+	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
+}
diff --git a/dev-ruby/actionpack/ChangeLog b/dev-ruby/actionpack/ChangeLog
index cfb363bbc226..ccda6b790b5c 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.307 2015/06/16 21:35:36 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.308 2015/06/16 21:58:48 graaff Exp $
+
+*actionpack-4.2.2 (16 Jun 2015)
+
+  16 Jun 2015; Hans de Graaff <graaff@gentoo.org> +actionpack-4.2.2.ebuild:
+  Version bump.
 
 *actionpack-4.1.11 (16 Jun 2015)
 
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 14c81b076549..b8b92f405858 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -7,18 +7,20 @@ DIST rails-4.0.13.tgz 3761572 SHA256 a693a8c5f767d153e765634cecb6356855ca51b6554
 DIST rails-4.1.10.tgz 3723355 SHA256 f8060783a25002bdd8120411f3ef7f5b696b5069477135ebf481501f4b69384c SHA512 9493d52ae6d417e11dc141c9e9fa0abf5b4d1ba355d89f5cabbcf774d54128c9e2815b60467bbc0ba275cde8f771b9845c9a4cb1ba775ac8228223a87a51f807 WHIRLPOOL 1a34cd978da13ec1804791cc31aba12de4e1be67787aeda23a50eb2cc54c568a613d89e0d7d61a2969bca1e551e12ba23f362cafedd0b0bc7b0c37e12ab02c05
 DIST rails-4.1.11.tgz 3723586 SHA256 3a59ba7a4020ba4dd54907a4927d1b9b9a60f5098ccd0bc3220b77ec6fca0bc1 SHA512 1df57853b3f80ec0fa1f7c08f3109ff64a42cfc7044ff229b9bde4b52025d21fee2d6631e86440adf12346a26cb67f8c812c869b64e1eec219bb9132610d62b9 WHIRLPOOL cdb08fb137a01f14dc32f268fbaa52667141bbe2384e2515256719eba27498aabb88572e693ab798e7821a1a8027074e7d67d6dab6cb01f2bd3e9138d3ec79d7
 DIST rails-4.2.1.tgz 4149447 SHA256 11237cc395c5d4a7f64636f2043cf8c248e862e1946f7491244f448e1c509af7 SHA512 00720fa889b7d0a25c4ef497a8dc95330393300ed05108c5de1413a8f2fa62babf9674b62a627adbd29f1f337395a7ec8c46985753dbed2550023f5159942d91 WHIRLPOOL d09243b37810d2288fe9ea64d82c15c5281b52847e7143a6b7076b5da103cbe02e705788cccdcaf366cced2e9fc6f14362da4b6ddb67df17281ac9a5d1cf5fa7
+DIST rails-4.2.2.tgz 4149494 SHA256 e8a0b1f96e2bf0bf24b2f28a5b5eabed7886b056119bd51c01ed451db4f35932 SHA512 707fddfcabf960ebccac9aa8c88067b1adedee341eed80a60c07044145f67047a91eb6d52b05c18d0693f0e575ec51b494b3095df755067f7cacd3a62275189f WHIRLPOOL 6b9296edbcaf95c20adf2981f877cf0b6febc4e2f33873826ab36ff0cdff68308c8e748bd9fdfb56f1d4e72c1588e25b826103ab7df9d74dd0e4e756d61d648a
 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.1.11.ebuild 1491 SHA256 8470ec2324b2a54653d73fb736b5c896a281504f290e439e7107d6130243a743 SHA512 6820b590439d2fce1ed24fdd44737ac27af361661c56a2867351218fc211c96ebeaa69a7e6d9a9f0190899819e34f2ef4ee64aa9e763304db6b1549eb0a0426f WHIRLPOOL 82b857a61cbbc56935f2f96909eaea5490a137ab956bc0cc6c295ff0f04f40a73709df732000444eed55bdf3670acef0901b7643d8ba6d97f4691536b1a3d89c
 EBUILD actionpack-4.2.1.ebuild 1620 SHA256 9c3db419d0ad79aed963cfcc8cd1627fd766527014a46da8c7f6fb7bfdebbfbc SHA512 dc8d73d26ddeb397fabfd9be241699c4374c47cab3c42c17f3aa77dbaeaee420bfc79f9233789647b989aa9fdcf6a0543b5a1ee3195ab0d7cadd6c408a8ccf89 WHIRLPOOL 7338cdc270b30a28dd7986a8fe494186287ef1e0d58b376176a306c9601b91c66ff7cd211a77bde4b258b49aedd18f9eeca7623b2025ef192602ce3729d5e37c
-MISC ChangeLog 42285 SHA256 6a197cf10ff51107d356eb98677126ad02d3d33e940c58c1e078c67ea44c513a SHA512 af196d02408de24bbc7e79904173c44c5c58457b8fad27197f2cc97dbdac0c01190d36fc9e9b6fbbd9c44de203434e61b50f1d7dbb16fc4ce11847a3488bc3fe WHIRLPOOL 3d8775bc977def126588f018660673d6c09f7f8c5c21fce57ccc725c6cc04e2142f8ab4a9b3a47abbfe6d910ea75be5f5606fe34fd329a212ebc961f84565fc4
+EBUILD actionpack-4.2.2.ebuild 1610 SHA256 aab6e3b5732a701b7d516d39f9f84415d2079dd5d384781f5ead111baeff1368 SHA512 f6775b2995c0604f2abe69ead58278bb96d33b9ab304a129c078c0802716aab68e684370f04e3e7f7293e521eee9effa8f957eb313050741b1d5ac629124c47a WHIRLPOOL d647190836b5e95fd26bf75c1a9439991f1038d9230644319e214bc887dec4b750bb880bd3eb478102abe45a10cbafa4755627da358367c6e3bf581d8beb1bf3
+MISC ChangeLog 42411 SHA256 72ce2d6ba2c661fec7974338a10945d8f0739022472eebe3e5a6723eeade371b SHA512 596d89d20405a6de7fd90a98334ffabaa2ab3e069b391518ee19a75bca4da86602bb8220211618bcc2bf26a6b874457080d285fb1a72ebbc176d209d9478fd0e WHIRLPOOL 234194a5dc49328c5b418c40ffb22a887d56732eca2bbbc690b834416fa8b8db44674807837e86e311c84f2fc552a46d957aa249dead07bab3487b43bf5c7879
 MISC metadata.xml 239 SHA256 601a5b0fce4b301bb2c349bd1132c36c4a6504f8fadc36403aceb00d3fe45634 SHA512 56fb328eed48436d955df5dafd091e1be8345692fae2d30793166b6d5e2a70a4ba78ec0319601facd2e2c206d4c4089ff6392dd2c25efc26fa084b6b0d1663cb WHIRLPOOL 8a394bfb78d7fdca910776e32b6ca9c9e7c140173d73a2dbdceb03b6e101554650f025034ba2385a0dc1f8b7ce70914308fe15db0a2aa550baa365181f24f2c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlWAlqkACgkQiIP6VqMIqNcZ+QD/b05R+y9pmR2/Nk+TiH2ARetA
-u+iGAqjAlUh/w7gm1tsA/2iqxkXd+CJFMLMb/q88lPY6IU7I28ecHd5V+bjnn5/b
-=E/fX
+iF4EAREIAAYFAlWAnBkACgkQiIP6VqMIqNcJWAD/ZrhgJc+CHEr5ArttAr+uZM9L
+MgU+LLjHEm3DQWu/RwMA/i+FZHkazxrjAJW3D6l7uV9Lb/MTktMFtZf+yMTGPgq9
+=Ehdy
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionpack/actionpack-4.2.2.ebuild b/dev-ruby/actionpack/actionpack-4.2.2.ebuild
new file mode 100644
index 000000000000..17c07611a9ab
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-4.2.2.ebuild
@@ -0,0 +1,52 @@
+# 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-4.2.2.ebuild,v 1.1 2015/06/16 21:58:48 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+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"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionview-${PV}
+	>=dev-ruby/rack-1.6.0:1.6
+	>=dev-ruby/rack-test-0.6.2:0.6
+	>=dev-ruby/rails-html-sanitizer-1.0.1:1
+	>=dev-ruby/rails-dom-testing-1.0.5:1
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.14
+		dev-ruby/bundler
+		~dev-ruby/activemodel-${PV}
+		>=dev-ruby/rack-cache-1.2:1.2
+	)"
+
+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\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
diff --git a/dev-ruby/actionview/ChangeLog b/dev-ruby/actionview/ChangeLog
index fd09dc9d5504..8bff0a1856eb 100644
--- a/dev-ruby/actionview/ChangeLog
+++ b/dev-ruby/actionview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/actionview
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionview/ChangeLog,v 1.23 2015/06/16 21:35:15 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionview/ChangeLog,v 1.24 2015/06/16 21:58:27 graaff Exp $
+
+*actionview-4.2.2 (16 Jun 2015)
+
+  16 Jun 2015; Hans de Graaff <graaff@gentoo.org> +actionview-4.2.2.ebuild:
+  Version bump.
 
 *actionview-4.1.11 (16 Jun 2015)
 
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 4869338be903..7ec01f8a16e4 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -4,15 +4,17 @@ Hash: SHA256
 DIST rails-4.1.10.tgz 3723355 SHA256 f8060783a25002bdd8120411f3ef7f5b696b5069477135ebf481501f4b69384c SHA512 9493d52ae6d417e11dc141c9e9fa0abf5b4d1ba355d89f5cabbcf774d54128c9e2815b60467bbc0ba275cde8f771b9845c9a4cb1ba775ac8228223a87a51f807 WHIRLPOOL 1a34cd978da13ec1804791cc31aba12de4e1be67787aeda23a50eb2cc54c568a613d89e0d7d61a2969bca1e551e12ba23f362cafedd0b0bc7b0c37e12ab02c05
 DIST rails-4.1.11.tgz 3723586 SHA256 3a59ba7a4020ba4dd54907a4927d1b9b9a60f5098ccd0bc3220b77ec6fca0bc1 SHA512 1df57853b3f80ec0fa1f7c08f3109ff64a42cfc7044ff229b9bde4b52025d21fee2d6631e86440adf12346a26cb67f8c812c869b64e1eec219bb9132610d62b9 WHIRLPOOL cdb08fb137a01f14dc32f268fbaa52667141bbe2384e2515256719eba27498aabb88572e693ab798e7821a1a8027074e7d67d6dab6cb01f2bd3e9138d3ec79d7
 DIST rails-4.2.1.tgz 4149447 SHA256 11237cc395c5d4a7f64636f2043cf8c248e862e1946f7491244f448e1c509af7 SHA512 00720fa889b7d0a25c4ef497a8dc95330393300ed05108c5de1413a8f2fa62babf9674b62a627adbd29f1f337395a7ec8c46985753dbed2550023f5159942d91 WHIRLPOOL d09243b37810d2288fe9ea64d82c15c5281b52847e7143a6b7076b5da103cbe02e705788cccdcaf366cced2e9fc6f14362da4b6ddb67df17281ac9a5d1cf5fa7
+DIST rails-4.2.2.tgz 4149494 SHA256 e8a0b1f96e2bf0bf24b2f28a5b5eabed7886b056119bd51c01ed451db4f35932 SHA512 707fddfcabf960ebccac9aa8c88067b1adedee341eed80a60c07044145f67047a91eb6d52b05c18d0693f0e575ec51b494b3095df755067f7cacd3a62275189f WHIRLPOOL 6b9296edbcaf95c20adf2981f877cf0b6febc4e2f33873826ab36ff0cdff68308c8e748bd9fdfb56f1d4e72c1588e25b826103ab7df9d74dd0e4e756d61d648a
 EBUILD actionview-4.1.10.ebuild 1468 SHA256 0d25324f097cfbd592352a94189b1feca00b12bef55c8725e68d8a28ecf51d19 SHA512 3bd29ddea77d3b46203e3a9813a83717a0a96188401941530a8f984b126d8c3137a674d14152e58fc6b38d0f0aa494b4c48ea67a81436b613dd4e27d2943d5e3 WHIRLPOOL 519c0cc1c92131726ae76d95643f4a21aa844465305484bc8c826885d96066da85da93e21d4d8a47a82631b2194b9843dc30be59377fa0ac48855000202c6441
 EBUILD actionview-4.1.11.ebuild 1468 SHA256 6eb02c39bd8c51d1e9bd4627fa7354615eb6906ab265c8d7f9526c4363aa56f8 SHA512 fe2501833f60289b9217c1802a83546da0d5716567d45712a52449a981e6fffe7ae44c4373c00592e559b0cdcaac0de6f83e660193d45646760bdf6096fb99cc WHIRLPOOL 049f9e0d1a50e8b6597648f9ea27ac1e351db093d2d0bfc1d512f741a499e7150dccfbf3a14a8164135f37f2b010a305590938601a7bbfffceb4824065d75266
 EBUILD actionview-4.2.1.ebuild 1585 SHA256 48a886ac4081a158b8ecefccd55e0af848986a69534114ddcdf86717f7781b41 SHA512 089daf1bc955cfaa91f0d5fe11acb877cf6e5a693aa8922b0dfc649148ea42732afc405db5638036ac776f5c96eacbb84f438741fa62e719338135d6976733cb WHIRLPOOL 483310d6678284ba711dbead890a0314ed7d0fbde16d41ddcca152ffd1a0016ad15bb40950a3a2b55a744bedb95384b262136209fa1289648b66f767fc343a91
-MISC ChangeLog 3310 SHA256 971e9cc5aa61fc7568d852a60ef8a500f38c31f56d78f9e4c6bc54325fb6c62f SHA512 bf136d82415c63262afa207f1fda5f87741d2269aadc061651d8378b6dc827b790cf1d7cca14ce841139b06f6f2c6b388e40fdfb294623f5d3d4fea2fc715450 WHIRLPOOL e07d69133d5b7eb1713a40cfe7493644363a46761e55f61fdaaeae9d37470b4a29ecf4ef87289b00199641bcb6a373f681cfdf5dbacd51ca2681e7e450cad911
+EBUILD actionview-4.2.2.ebuild 1589 SHA256 6ea164fd877f01f49ac4262fbf29c75ad3d4fff716c9881b6c21a6478f85eca9 SHA512 f23d7598a9a651f1d907b069601d4abfff9d77bb725dd74c4745de9b48bfa987566f77e8adbe2be5550e2a09d739814d77527f6fd4351faf62bd2bb283bbd74a WHIRLPOOL 727097256905a65b902233da57c343cebc09eab87eef3dfea0f2de472a9117bc8f37f881de03995669df9026f3a76a7830fcf4443894edd8c104c649cf8dc9f6
+MISC ChangeLog 3436 SHA256 eace3e5c34433dc7d7ec77dc9ada30ab108a9ab4b53e1cc24e965f9fa29f0b9d SHA512 9b9c3a6827e55d3c0196ff64c6c3cdc80e4d914d3f773cf80f6ce73a93747651e567cd9feaff6d0b504447f25564d3c75d1ff5fa4f923d889f5b063cb2208085 WHIRLPOOL efc737a653f5fe9c91cc406ced8339c8e5d9a4cf95e52ea35a5c94b89097050a437fd93c431d8d53f1dc92175975dedcd768011b9376de88c988479bca5c15de
 MISC metadata.xml 239 SHA256 601a5b0fce4b301bb2c349bd1132c36c4a6504f8fadc36403aceb00d3fe45634 SHA512 56fb328eed48436d955df5dafd091e1be8345692fae2d30793166b6d5e2a70a4ba78ec0319601facd2e2c206d4c4089ff6392dd2c25efc26fa084b6b0d1663cb WHIRLPOOL 8a394bfb78d7fdca910776e32b6ca9c9e7c140173d73a2dbdceb03b6e101554650f025034ba2385a0dc1f8b7ce70914308fe15db0a2aa550baa365181f24f2c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlWAlpQACgkQiIP6VqMIqNeQ4wD+JnrDNJWgIZ0zEr56Lh6BODtU
-G8HQK8mW3o9psngwDv0A/1EdzccyoCq21Qe9C3OKnRKG0ecSZDvTdWpYws3W+rRo
-=asL+
+iF4EAREIAAYFAlWAnAQACgkQiIP6VqMIqNfT/QD9FsCfeF7//RNyfDZugOJc3wYV
+xSecjXMZSENMN/zNpQkBAJQoweTzfph/KjyyLgbDwonJYG3w82Gw8uG90qlme7vq
+=AgZX
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionview/actionview-4.2.2.ebuild b/dev-ruby/actionview/actionview-4.2.2.ebuild
new file mode 100644
index 000000000000..79018024e892
--- /dev/null
+++ b/dev-ruby/actionview/actionview-4.2.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionview/actionview-4.2.2.ebuild,v 1.1 2015/06/16 21:58:27 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
+HOMEPAGE="https://github.com/rails/rails/"
+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 ~ppc ~ppc64"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+	>=dev-ruby/erubis-2.7.0
+	>=dev-ruby/rails-html-sanitizer-1.0.1:1
+	>=dev-ruby/rails-dom-testing-1.0.5:1
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.14
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/activemodel-${PV}
+	)"
+
+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\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
diff --git a/dev-ruby/activejob/ChangeLog b/dev-ruby/activejob/ChangeLog
index 3734eb3c989b..64e8f0ccaaab 100644
--- a/dev-ruby/activejob/ChangeLog
+++ b/dev-ruby/activejob/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/activejob
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activejob/ChangeLog,v 1.6 2015/06/07 16:39:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activejob/ChangeLog,v 1.7 2015/06/16 21:58:12 graaff Exp $
+
+*activejob-4.2.2 (16 Jun 2015)
+
+  16 Jun 2015; Hans de Graaff <graaff@gentoo.org> +activejob-4.2.2.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/activejob/Manifest b/dev-ruby/activejob/Manifest
index 4355c1332a44..c62c863e041c 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,26 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST rails-4.2.1.tgz 4149447 SHA256 11237cc395c5d4a7f64636f2043cf8c248e862e1946f7491244f448e1c509af7 SHA512 00720fa889b7d0a25c4ef497a8dc95330393300ed05108c5de1413a8f2fa62babf9674b62a627adbd29f1f337395a7ec8c46985753dbed2550023f5159942d91 WHIRLPOOL d09243b37810d2288fe9ea64d82c15c5281b52847e7143a6b7076b5da103cbe02e705788cccdcaf366cced2e9fc6f14362da4b6ddb67df17281ac9a5d1cf5fa7
+DIST rails-4.2.2.tgz 4149494 SHA256 e8a0b1f96e2bf0bf24b2f28a5b5eabed7886b056119bd51c01ed451db4f35932 SHA512 707fddfcabf960ebccac9aa8c88067b1adedee341eed80a60c07044145f67047a91eb6d52b05c18d0693f0e575ec51b494b3095df755067f7cacd3a62275189f WHIRLPOOL 6b9296edbcaf95c20adf2981f877cf0b6febc4e2f33873826ab36ff0cdff68308c8e748bd9fdfb56f1d4e72c1588e25b826103ab7df9d74dd0e4e756d61d648a
 EBUILD activejob-4.2.1.ebuild 1175 SHA256 5091381a2fd23d1b65bc96c4d3bfac2fee3e87623a08d174cf0ee2b1ae66a95d SHA512 b064e40b332b4f8eeaed498132b2d0da02f6138be67eb5ac3941ebeddd93bb78dd396555bc211b97726937f891596f4391c5d16c9bbb1d9ee2bca6360a4cedfc WHIRLPOOL 36c2cc044a524d5b793ffbc16dca69f57cdb5afc7cbfcdabf44090bd44f78c8a14f1193261bcdcadaedb24721cd54cf7963292a6e4ea8bbc3e1f9441437bb58d
-MISC ChangeLog 906 SHA256 eb257a84a56106c5e3e02c258130fcdea4500f5d239c288a72ebb5ae1bf3039e SHA512 05b1e1107458d166bd7b110f05774a77f60425f65498b7a8a820c813507e199830ce07efd74f48940ef66fa77f4bc80f058fbb8baf893fb48cf2b3f495f31e95 WHIRLPOOL 86c6d60b4212fb6f13c986d121d30d58099047f659c31c0798f020b5cdd1f39e503e49a9ed5a0e2098749c6ae8ec0e94d6883d5c00ef7ad25a6ffcdbf094e3dd
+EBUILD activejob-4.2.2.ebuild 1177 SHA256 b5915d2f6b05d63e183f7caf97fbbf165d3a3e186642cf5779b4d196acaea0ae SHA512 4552bb071e5d6a28f479427472081ebf333b32b0d7da705b1a0dac75e09b93a3baa2133ecb9dd9652624339982443c6aa2d3396f7d703f147e422570ab9ca180 WHIRLPOOL e313902a62eaaa7d8747efa1354b596d7d2fe6b95c90191714a91fcf3453d865ce55c0546564033dec62f4a917db487a37b7865e8fdd4dfbf31ac68f3c6ff4ba
+MISC ChangeLog 1032 SHA256 3c48ab8772acff5bd18c06f06e179c9cab77e1a8d6ad66fc85655f2a0ac747d8 SHA512 c6e9561b4fd3dc9bb8297be880573fff4d36d03e0c1f3c29250569f78dff5e9a47f8722c59b5dc9272294f96867ff6e7574721d49adaf62e875bde524489d1d4 WHIRLPOOL 250c83a78a9bb8a89b937d34e4e0ccff8bf62809afda8dc37b35e8b17d9aef82a1eeeeab290946a9e7f1ae6a437cfb60058adb807daaf88cef5c7945afb6f81e
 MISC metadata.xml 239 SHA256 601a5b0fce4b301bb2c349bd1132c36c4a6504f8fadc36403aceb00d3fe45634 SHA512 56fb328eed48436d955df5dafd091e1be8345692fae2d30793166b6d5e2a70a4ba78ec0319601facd2e2c206d4c4089ff6392dd2c25efc26fa084b6b0d1663cb WHIRLPOOL 8a394bfb78d7fdca910776e32b6ca9c9e7c140173d73a2dbdceb03b6e101554650f025034ba2385a0dc1f8b7ce70914308fe15db0a2aa550baa365181f24f2c6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdHPBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiJw0P/2ig33YNM416OlDL/9KfofBe
-NO4gvP2GiifzXjDfaZthrkXc7WijFtLWkLKjCgayZHhaoPxtS9DFtrRK5v3STw9Q
-qqFUV3oWkmFXzOvoeHBUU3y6eOWUO0Q+WHa3Ab6ylFrcWjmvRyd8eOz9akhkIjhh
-2q+qwoBp3EuShh0ShoyfXuurITyYAsi6gjF1ZvaBRi4fEhCvdB6qx56tUL+ycoZ5
-+onXtck8DMtjw3uZUFWWZibTzzEnD09f0ScnpwnYL61oQELAh6yDyp65fOk3eLud
-p0dRXaiPTzM64fvckaZO3cxfK/b4qzoRbWnbXkibutsIiGXM0COc5jLfzjkJ16+h
-rprPQMAlY02/5ENuoE9gGrBWoxhboBLnfYPpFJNp07fx2bJK9k2TUcUd/jbk6ywS
-XhW1dzayeuUqSSrR3GwdqiVPPw4CbUzsggp8VdaD2koQFn/y9MKBBmIB8wz6E36t
-3QN+5sQzRkkZIG3jBJGr+ZnvT2Al+/dm3+L7NYlcNs1444BaqvNjQJL9YycninqZ
-AIK+tDd9407ojSuRYNA5ANXJ0VSuZPB4pV7yJdZqk8tPYaakEFZnbxl1i9R7Phkr
-ZntEn2ScxYR2bVUrvGFVy2NaQMoU9osTKMf3LO1INi6X5lVddYSMXoGVA4Gh6GCS
-52ajNp3VTT5esCw9D0As
-=AZiQ
+iF4EAREIAAYFAlWAm/UACgkQiIP6VqMIqNfzSQD9HX9eMyrVOOq3uBtXNl3NW6gV
+yP2q659XUCWMqkEFOiYA/iziKd/c3hdaHaE0Th+YhRceUA1DGMopZu9T0VM0/i5J
+=CHSK
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/activejob/activejob-4.2.2.ebuild b/dev-ruby/activejob/activejob-4.2.2.ebuild
new file mode 100644
index 000000000000..c07f08f82d4d
--- /dev/null
+++ b/dev-ruby/activejob/activejob-4.2.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activejob/activejob-4.2.2.ebuild,v 1.1 2015/06/16 21:58:12 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Job framework with pluggable queues"
+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"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/globalid-0.3.0
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/mocha-0.14.0:0.14
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
+
+	# Remove all currently unpackaged queues.
+	sed -i -e 's/delayed_job qu que queue_classic resque sidekiq sneakers sucker_punch backburner//' Rakefile || die
+}
diff --git a/dev-ruby/activemodel/ChangeLog b/dev-ruby/activemodel/ChangeLog
index 8e3bed73eecd..d106a39eb591 100644
--- a/dev-ruby/activemodel/ChangeLog
+++ b/dev-ruby/activemodel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/activemodel
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/ChangeLog,v 1.106 2015/06/16 21:34:35 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/ChangeLog,v 1.107 2015/06/16 21:58:00 graaff Exp $
+
+*activemodel-4.2.2 (16 Jun 2015)
+
+  16 Jun 2015; Hans de Graaff <graaff@gentoo.org> +activemodel-4.2.2.ebuild:
+  Version bump.
 
 *activemodel-4.1.11 (16 Jun 2015)
 
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index c5fc04727519..57018a97e374 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -7,18 +7,20 @@ DIST rails-4.0.13.tgz 3761572 SHA256 a693a8c5f767d153e765634cecb6356855ca51b6554
 DIST rails-4.1.10.tgz 3723355 SHA256 f8060783a25002bdd8120411f3ef7f5b696b5069477135ebf481501f4b69384c SHA512 9493d52ae6d417e11dc141c9e9fa0abf5b4d1ba355d89f5cabbcf774d54128c9e2815b60467bbc0ba275cde8f771b9845c9a4cb1ba775ac8228223a87a51f807 WHIRLPOOL 1a34cd978da13ec1804791cc31aba12de4e1be67787aeda23a50eb2cc54c568a613d89e0d7d61a2969bca1e551e12ba23f362cafedd0b0bc7b0c37e12ab02c05
 DIST rails-4.1.11.tgz 3723586 SHA256 3a59ba7a4020ba4dd54907a4927d1b9b9a60f5098ccd0bc3220b77ec6fca0bc1 SHA512 1df57853b3f80ec0fa1f7c08f3109ff64a42cfc7044ff229b9bde4b52025d21fee2d6631e86440adf12346a26cb67f8c812c869b64e1eec219bb9132610d62b9 WHIRLPOOL cdb08fb137a01f14dc32f268fbaa52667141bbe2384e2515256719eba27498aabb88572e693ab798e7821a1a8027074e7d67d6dab6cb01f2bd3e9138d3ec79d7
 DIST rails-4.2.1.tgz 4149447 SHA256 11237cc395c5d4a7f64636f2043cf8c248e862e1946f7491244f448e1c509af7 SHA512 00720fa889b7d0a25c4ef497a8dc95330393300ed05108c5de1413a8f2fa62babf9674b62a627adbd29f1f337395a7ec8c46985753dbed2550023f5159942d91 WHIRLPOOL d09243b37810d2288fe9ea64d82c15c5281b52847e7143a6b7076b5da103cbe02e705788cccdcaf366cced2e9fc6f14362da4b6ddb67df17281ac9a5d1cf5fa7
+DIST rails-4.2.2.tgz 4149494 SHA256 e8a0b1f96e2bf0bf24b2f28a5b5eabed7886b056119bd51c01ed451db4f35932 SHA512 707fddfcabf960ebccac9aa8c88067b1adedee341eed80a60c07044145f67047a91eb6d52b05c18d0693f0e575ec51b494b3095df755067f7cacd3a62275189f WHIRLPOOL 6b9296edbcaf95c20adf2981f877cf0b6febc4e2f33873826ab36ff0cdff68308c8e748bd9fdfb56f1d4e72c1588e25b826103ab7df9d74dd0e4e756d61d648a
 EBUILD activemodel-3.2.21.ebuild 1436 SHA256 4f7ab645606fe935b14828212a791a637cc188e0a751cac3aa269463e05562d2 SHA512 803ee1d918ad900b659b87676b12c875c01938c909d6281ef89b4fbd63b7cb1cbe27fc3c1e935202d63441ec293512f04688299026eb799f4c550f610c287570 WHIRLPOOL d2286a35c64e3fe573735719bcbd4e3f8be6604d00766d9cec4781b866de1b8b082aead4b7fab31adc20b79e23e95af3ab2ccaf08470e4c1abf9dc0a090f2e03
 EBUILD activemodel-3.2.22.ebuild 1438 SHA256 eae47665373bba097b9a6d0ae41fc25c35c999ae55f14e88186e09722ecea035 SHA512 86d18d6ede186de3b55bec0cc6f51b40721c57b170b8e945dcec5c374a542be92a804f7f915d7fca1d5942d61b934b7e23f7e57cde73de84ad758dd32214d375 WHIRLPOOL 7b56ae121319598f2671a3053f92aab417482d0051b78fc0f78a27392ebf8f680e4ba666e39a00040943ef0de673a7ac776747da5484fde3f96cac82efd79778
 EBUILD activemodel-4.0.13.ebuild 1626 SHA256 782e4397c51ada4b34f2fa9dfef4460fb603f6669136cce2c1884020df79e700 SHA512 7d9d14d8549db5f9b903dc0164edfa70007274a00948aaef9d0a63e1d0dda0336dfdbbf196fd4e492f1dfe0a53b899b84afdb5035d3593e0a76679445d453df3 WHIRLPOOL 2d49c0e6ee277f5da5f958f671499356ba765577fcc70812271844989edcc6eb7d69b0c10ff5b7538178dee440a78661db33b4c778ba9430b2c5e794e69e0bbe
 EBUILD activemodel-4.1.10.ebuild 1469 SHA256 4789ab89042b2bb9732264a690acdbbe166ac56ca5ac6e70178d00dbab1ff80c SHA512 ec0e8ab3a8c73cd6a584c7103d0126e624caa37ef5a213af0b0af3d06fff1b58ebab9a98a5bd11ce191750691e48d55080dc48ffd8d7f89cc60743d2a69cd458 WHIRLPOOL c21d1af6a1973f8c0440d9c9934f328469bb2710022fbcad2dae23d8311a52676d09ea05540a4d2908fd8d4b06810010b3181bfdeca5ca257288e18fbe88184f
 EBUILD activemodel-4.1.11.ebuild 1469 SHA256 69304e27330c4780c926119e01d5e2a0acd58bcef5a8c49beb0e02a114e6ae7e SHA512 8f1ed0d18147c2edef37bf51e60060cf054025da1599fe2c23a6f09d81641abc45eab1813ad7fe0390ec74c5c736b7b824d672afaf3a4d7dbe9b16cfd57cc97a WHIRLPOOL 382dd43aee7d25ae20fa144d93ffc43bd7ae279467356c18e873d74a642201e513abcdbc9359556a8b4c808310b2d95aedec7cff425b496a5c52b8432f455eff
 EBUILD activemodel-4.2.1.ebuild 1183 SHA256 ceba23dc11f10b60f1b9af82982362b2a3f884959e53ecc091727d365f65f659 SHA512 66bffb590517fd19a95cd06a26934aeb4c78be087a5cde6822f4ffbc7f071492b96f2603d388c9b28362356b0a78c9cceb294176450c885ff9b1575b35ed125f WHIRLPOOL 03a609594f180b2acd0cd16854446cbb796c36e856167a4c384a43340b61938fefffa21f21b5b5c2f00008e813f4d97ecb2571fef3b2aad28bcba897318505a0
-MISC ChangeLog 16183 SHA256 2634d00286d7891c5ed9708903cf8320b73b552ac78ea549f2fc80ad0e2aa368 SHA512 682855b1099f57d491d09965ddd6b32a4354d2042a987652e96a8865262af445513cab8bda92b5e594551edf571488919e1bb36b916972ddb3b3de8b2c8bb53b WHIRLPOOL 09c4eba6f94e6546b54359384ecc1c5c382d901ffd7e3e6a120609fa07ba7cd52df3a7e67d80195480d669b2aa0370fa06bad1fbcf3f19d1f8ae3a80f998d0ae
+EBUILD activemodel-4.2.2.ebuild 1189 SHA256 1fb4e6a7722223929f7f84a2359632955d274ea11942419ff8b5001f0077cf07 SHA512 5e82f0566c5f4d990840257d045bda5bf559034be081cff267359b2c04cb86a64494c34dc0c1b73d49e9511b663a4c6af76571a6c8c8501c665a270d163c5b15 WHIRLPOOL 95a536de021f72378b17937289bce87dfd69e651711249a3f1d37d9b391a49c35b8b37fd41fd2fef0e631d407969161db22d1e0fc4a1853cef70eed62a72170e
+MISC ChangeLog 16311 SHA256 faece011575686f6365af7f4255de72ca4cbc6b80a304537cd990d5416676245 SHA512 4229c91fa04f787f47df9b88ddacc6e615b91cc930410dd67e69aa7c27d27c03dd0e2d688a3a096a3a28895f58f2fa5d1d2b80d4a0f713e8ea9fdcbb8f7daf3d WHIRLPOOL b74fe8c31d2b81b010771e5e8170ee7636e920b91766c0928922c5800214d0fe9fbc421dae57d646e53c80ea35bf02cce45cb4fcc46c9a1acea97dacd65212c9
 MISC metadata.xml 239 SHA256 601a5b0fce4b301bb2c349bd1132c36c4a6504f8fadc36403aceb00d3fe45634 SHA512 56fb328eed48436d955df5dafd091e1be8345692fae2d30793166b6d5e2a70a4ba78ec0319601facd2e2c206d4c4089ff6392dd2c25efc26fa084b6b0d1663cb WHIRLPOOL 8a394bfb78d7fdca910776e32b6ca9c9e7c140173d73a2dbdceb03b6e101554650f025034ba2385a0dc1f8b7ce70914308fe15db0a2aa550baa365181f24f2c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlWAlmwACgkQiIP6VqMIqNc2MAD7BQEALffoAEB0D1UU3nCg0E96
-a2xpxeQGqTvqyU9G5AABAIYLK8UCPJKNvt0/T1Cqd/vnEc+LEfzlr/+4ZbEqHHSd
-=+p+W
+iF4EAREIAAYFAlWAm+kACgkQiIP6VqMIqNcM/gD+IxrBC1u1rkZtUONE9/4duJLH
+dgS1E6a6CYhhnr77bq4A/R019q6OQp5lKOLd/mXi9Az9o1ZH9GVENNGLuTz/ot8s
+=QXC5
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/activemodel/activemodel-4.2.2.ebuild b/dev-ruby/activemodel/activemodel-4.2.2.ebuild
new file mode 100644
index 000000000000..3da1e28a56c3
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-4.2.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/activemodel-4.2.2.ebuild,v 1.1 2015/06/16 21:58:00 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="A toolkit for building modeling frameworks like Active Record and Active Resource"
+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"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}:*
+	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.2.0
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.14.0:0.14
+		>=dev-ruby/bcrypt-ruby-3.1.7
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+}
diff --git a/dev-ruby/activerecord/ChangeLog b/dev-ruby/activerecord/ChangeLog
index 132c4b797892..f90c0999f52e 100644
--- a/dev-ruby/activerecord/ChangeLog
+++ b/dev-ruby/activerecord/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/activerecord
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.295 2015/06/16 21:36:13 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.296 2015/06/16 21:59:35 graaff Exp $
+
+*activerecord-4.2.2 (16 Jun 2015)
+
+  16 Jun 2015; Hans de Graaff <graaff@gentoo.org> +activerecord-4.2.2.ebuild:
+  Version bump.
 
 *activerecord-4.1.11 (16 Jun 2015)
 
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 77d32cb7e1a9..629347fced68 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -7,18 +7,20 @@ DIST rails-4.0.13.tgz 3761572 SHA256 a693a8c5f767d153e765634cecb6356855ca51b6554
 DIST rails-4.1.10.tgz 3723355 SHA256 f8060783a25002bdd8120411f3ef7f5b696b5069477135ebf481501f4b69384c SHA512 9493d52ae6d417e11dc141c9e9fa0abf5b4d1ba355d89f5cabbcf774d54128c9e2815b60467bbc0ba275cde8f771b9845c9a4cb1ba775ac8228223a87a51f807 WHIRLPOOL 1a34cd978da13ec1804791cc31aba12de4e1be67787aeda23a50eb2cc54c568a613d89e0d7d61a2969bca1e551e12ba23f362cafedd0b0bc7b0c37e12ab02c05
 DIST rails-4.1.11.tgz 3723586 SHA256 3a59ba7a4020ba4dd54907a4927d1b9b9a60f5098ccd0bc3220b77ec6fca0bc1 SHA512 1df57853b3f80ec0fa1f7c08f3109ff64a42cfc7044ff229b9bde4b52025d21fee2d6631e86440adf12346a26cb67f8c812c869b64e1eec219bb9132610d62b9 WHIRLPOOL cdb08fb137a01f14dc32f268fbaa52667141bbe2384e2515256719eba27498aabb88572e693ab798e7821a1a8027074e7d67d6dab6cb01f2bd3e9138d3ec79d7
 DIST rails-4.2.1.tgz 4149447 SHA256 11237cc395c5d4a7f64636f2043cf8c248e862e1946f7491244f448e1c509af7 SHA512 00720fa889b7d0a25c4ef497a8dc95330393300ed05108c5de1413a8f2fa62babf9674b62a627adbd29f1f337395a7ec8c46985753dbed2550023f5159942d91 WHIRLPOOL d09243b37810d2288fe9ea64d82c15c5281b52847e7143a6b7076b5da103cbe02e705788cccdcaf366cced2e9fc6f14362da4b6ddb67df17281ac9a5d1cf5fa7
+DIST rails-4.2.2.tgz 4149494 SHA256 e8a0b1f96e2bf0bf24b2f28a5b5eabed7886b056119bd51c01ed451db4f35932 SHA512 707fddfcabf960ebccac9aa8c88067b1adedee341eed80a60c07044145f67047a91eb6d52b05c18d0693f0e575ec51b494b3095df755067f7cacd3a62275189f WHIRLPOOL 6b9296edbcaf95c20adf2981f877cf0b6febc4e2f33873826ab36ff0cdff68308c8e748bd9fdfb56f1d4e72c1588e25b826103ab7df9d74dd0e4e756d61d648a
 EBUILD activerecord-3.2.21.ebuild 2574 SHA256 3468a067ff034f5e957655c9c1cd2ec8fb1ac798e4177d9dcd46dc4cea417395 SHA512 c3c222bc69ba2e4a7bfc5b49fdce83cecead7336ceeedafecc26558b235e1a6aaca5914dbdfc4ade8568ca5d6ecccef56eba0725ba288d925125eee6998bc1c5 WHIRLPOOL c9c5c12e64e7e2192be8c48c43af034239ade8e29daf38ee12371dec40cd4d8d3903282eefcbeb774586ae36c4997a4c37dbde29f307a6539123f286f04ffceb
 EBUILD activerecord-3.2.22.ebuild 2582 SHA256 f1a1e309a01a69f38042700ceafddc540ccdc8303f7f8e683bbc2f6f37d9b9a5 SHA512 c8d6851ba3813114af1c0e115115623f5e7623364a2a410ed281d6d45137e679660e6d0f0201c57a694142d333820aaccb53d8ac38010c78e9b97343ccd6e598 WHIRLPOOL bcfa0ed88e71fa85f76501383390a3d592c0e9920fec1c98da86139641f923602776734dc6cbe8b9e61e390bf1677e0fb1504c29260e9ff73145b58fb36c79f6
 EBUILD activerecord-4.0.13.ebuild 2666 SHA256 8860a62c3da8ce666954304ec86d49844b0b0ecaa362b769bf413aef4e1cecab SHA512 3e7af2be06a092dc35bbb72c02471fde06e4d9d77de6fbf5459b7885f59f2f9a3d5d500762d3bc00a449a33c86ac2a4ec3d2fd41ffa1f090280481c90192b6f5 WHIRLPOOL ba114632b27abd095b5439da38c7c4f2a4d9d38a79be06ef86855d2be585d13fce36c751d0b2f347590b39e2b0e5d687ebbf55374292e5b0e08dc2fbaaae87c5
 EBUILD activerecord-4.1.10.ebuild 2438 SHA256 15bc30b55f4f216a73069d4d66b47daf936a18844c53829762495a7a90e24a3e SHA512 c3bf9668162ed257dfaa93b77280304540ece78c0df3b0b99071a912566954cd4ac80a497dc6348de04e1194acd17ca9d8c4ff01ca6553c3bdfeef24e4f6ffb4 WHIRLPOOL 5593fd469b3d6134825ef1ea7f43dbfea9c6c26199e410d1a3efb074b59c5e86d8e82e4eb802710589c69c03be377e23b91c7b009192db2589dbea1aedcae5a4
 EBUILD activerecord-4.1.11.ebuild 2439 SHA256 de4c71994d1f5b739963ab08ebb8c4eb6370362bc8050395bcf7268517493eb6 SHA512 eda014553ccda2d15eb77c1add7476957f310603572acd4fbda7b70807c868cc479c1200d79380e5d173837e9c90e9d4474d77a42c9292c872ddc2ebcca07a88 WHIRLPOOL 9e66b7f189da1580ce53d35c35623d908f9b1870c0982080291669d1e6353ab87ce0c436fc24eca151dbcfbd740e902effc4afb503ceea09664b1bf7c63ded90
 EBUILD activerecord-4.2.1.ebuild 2492 SHA256 d8bfd6abc3451bde0bcbea0fb75b7b217cc3d5748cb111a58792636fdcc063c1 SHA512 27533ed4b51b2b28d14be02680903e6e425ec255e8e7575353eca1e370f5d135889397b09b9fa2965562412a4842484e154a877074c9d005aca776b390de6045 WHIRLPOOL 39f9fd34cf885772c6f15113de7908a504a6890179fb354ea84871d78f09dff2826b98cadc6454de8bfe4f8de01d8427146c8cd8d5b4fcf725e67621bffbd735
-MISC ChangeLog 42168 SHA256 ee3a8f02ddbc7d47ad4463439e2bfdc79dc321e2fd40dc27818cd9378c9f237c SHA512 dac292df7e73f5505525255e6b3c7172c125946c62362e8a1dd3c271b8448f17e6aac43996ffdeef1fe3ed6120c0317e78572a6f1373c14262ca97c6e29623cf WHIRLPOOL 61eaf063d7936c7f16bbdb1caafb4c68d7945976d5c9ad7e54a6a55b90cbc571031e398641158575eac3ec76b3c430a7f33f3734b82f276a46971a1552ce571c
+EBUILD activerecord-4.2.2.ebuild 2493 SHA256 bbefa6e82708c242feca26338ee9ecbee8c72f4a895971976047f5f7e4231f96 SHA512 582a73c7a5d66c6ac52825a5f0eeb3cf16b672be0a62f5f8eb30ce394d58c8e604575b2a8f9de658de87b899c60831ecca6813e17380b82197d59333aef620d2 WHIRLPOOL 4c6899d33a0578ace571cb16b1666a8c1b801024ef36282e749a3e216553faf42d1d7f873ab63c8d93eb6309c1c6d6c4e5fd6135128ed0bd0c9cd2163187f796
+MISC ChangeLog 42298 SHA256 00c5f37c54f3ee439ac34bef8d0db7e3b42a15cec2749d701e0a9b20d7bac464 SHA512 637cd3af38031c27a571a180c2dc77737ba5beea7b8c520ebbb1e3238c760f1da2ec8b9ef59a03bda41b882991ab8eed0d8130d7c1984eb84127f8c575e24427 WHIRLPOOL 6c0afcdfd793445c02bc75ec46434c8bbbdb6a6b812dc47bdedee8347cf52e99af28792c8a7761999b95314c492bcf4b4d1645665d0c98c95b0c22e5b9a9671c
 MISC metadata.xml 239 SHA256 601a5b0fce4b301bb2c349bd1132c36c4a6504f8fadc36403aceb00d3fe45634 SHA512 56fb328eed48436d955df5dafd091e1be8345692fae2d30793166b6d5e2a70a4ba78ec0319601facd2e2c206d4c4089ff6392dd2c25efc26fa084b6b0d1663cb WHIRLPOOL 8a394bfb78d7fdca910776e32b6ca9c9e7c140173d73a2dbdceb03b6e101554650f025034ba2385a0dc1f8b7ce70914308fe15db0a2aa550baa365181f24f2c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlWAls4ACgkQiIP6VqMIqNchsQD/b4fFXgmFX70Deb5vGeadB98Y
-JbQpEdeov+vSWNqaG8UBAIsHNiZ+8oi+Lnl8RdI6txWVaRLoOluf6lMkABSlmTR+
-=kcjk
+iF4EAREIAAYFAlWAnE8ACgkQiIP6VqMIqNcqmwD/QWl+VhORc3i/hbBiaX544rtN
+l77d9vtiHHMGHtKcDiQA/166VznK2LXc0nEOJBxpA7avDOEejAb8uF90LJIPJqys
+=guIF
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/activerecord/activerecord-4.2.2.ebuild b/dev-ruby/activerecord/activerecord-4.2.2.ebuild
new file mode 100644
index 000000000000..2bd162335447
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-4.2.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-4.2.2.ebuild,v 1.1 2015/06/16 21:59:35 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+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"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	>=dev-ruby/arel-6.0:6.0
+	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
+	mysql? ( >=dev-ruby/mysql2-0.3.13:0.3 )
+	postgres? ( >=dev-ruby/pg-0.15.0 )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/actionmailer-${PV}
+		>=dev-ruby/sqlite3-1.3.5
+		dev-ruby/mocha:0.13
+		<dev-ruby/minitest-5.4:5
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	rm ../Gemfile.lock || die
+	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../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 test depending on mysql adapter which we don't support for
+	# this Rails version to simplify our dependencies.
+	rm test/cases/connection_specification/resolver_test.rb || die
+
+	# Avoid single test using mysql dependencies.
+	rm test/cases/invalid_connection_test.rb || die
+}
+
+each_ruby_test() {
+	if use sqlite; then
+		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+	fi
+}
diff --git a/dev-ruby/activesupport/ChangeLog b/dev-ruby/activesupport/ChangeLog
index 40c8c4f0ded5..30059d8d6d37 100644
--- a/dev-ruby/activesupport/ChangeLog
+++ b/dev-ruby/activesupport/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/activesupport
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.284 2015/06/16 21:34:10 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.285 2015/06/16 21:57:42 graaff Exp $
+
+*activesupport-4.2.2 (16 Jun 2015)
+
+  16 Jun 2015; Hans de Graaff <graaff@gentoo.org> +activesupport-4.2.2.ebuild:
+  Version bump.
 
 *activesupport-4.1.11 (16 Jun 2015)
 
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 5ed24f427401..9f403ba4ef44 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -7,18 +7,20 @@ DIST rails-4.0.13.tgz 3761572 SHA256 a693a8c5f767d153e765634cecb6356855ca51b6554
 DIST rails-4.1.10.tgz 3723355 SHA256 f8060783a25002bdd8120411f3ef7f5b696b5069477135ebf481501f4b69384c SHA512 9493d52ae6d417e11dc141c9e9fa0abf5b4d1ba355d89f5cabbcf774d54128c9e2815b60467bbc0ba275cde8f771b9845c9a4cb1ba775ac8228223a87a51f807 WHIRLPOOL 1a34cd978da13ec1804791cc31aba12de4e1be67787aeda23a50eb2cc54c568a613d89e0d7d61a2969bca1e551e12ba23f362cafedd0b0bc7b0c37e12ab02c05
 DIST rails-4.1.11.tgz 3723586 SHA256 3a59ba7a4020ba4dd54907a4927d1b9b9a60f5098ccd0bc3220b77ec6fca0bc1 SHA512 1df57853b3f80ec0fa1f7c08f3109ff64a42cfc7044ff229b9bde4b52025d21fee2d6631e86440adf12346a26cb67f8c812c869b64e1eec219bb9132610d62b9 WHIRLPOOL cdb08fb137a01f14dc32f268fbaa52667141bbe2384e2515256719eba27498aabb88572e693ab798e7821a1a8027074e7d67d6dab6cb01f2bd3e9138d3ec79d7
 DIST rails-4.2.1.tgz 4149447 SHA256 11237cc395c5d4a7f64636f2043cf8c248e862e1946f7491244f448e1c509af7 SHA512 00720fa889b7d0a25c4ef497a8dc95330393300ed05108c5de1413a8f2fa62babf9674b62a627adbd29f1f337395a7ec8c46985753dbed2550023f5159942d91 WHIRLPOOL d09243b37810d2288fe9ea64d82c15c5281b52847e7143a6b7076b5da103cbe02e705788cccdcaf366cced2e9fc6f14362da4b6ddb67df17281ac9a5d1cf5fa7
+DIST rails-4.2.2.tgz 4149494 SHA256 e8a0b1f96e2bf0bf24b2f28a5b5eabed7886b056119bd51c01ed451db4f35932 SHA512 707fddfcabf960ebccac9aa8c88067b1adedee341eed80a60c07044145f67047a91eb6d52b05c18d0693f0e575ec51b494b3095df755067f7cacd3a62275189f WHIRLPOOL 6b9296edbcaf95c20adf2981f877cf0b6febc4e2f33873826ab36ff0cdff68308c8e748bd9fdfb56f1d4e72c1588e25b826103ab7df9d74dd0e4e756d61d648a
 EBUILD activesupport-3.2.21.ebuild 1831 SHA256 91de72aae7a831c834da153924fd4cb65296d4b1b627eed7cb716cb3b2ca4405 SHA512 46a29b1a697630f3bb18f4cef9ecf19c1e3050818475c75b8ae8e383d372d6030006ebdb1c762a5072337133108edda1802dcdbd2f580158e880200444fb082c WHIRLPOOL ffd53172125dfc73d732dd68a0dd0902d868b8324bdf85422344dca28b2f0e9da4b71317fcb0beffdfee8b6a03632c2f087756460f0e5612c6232c2af13ff4b1
 EBUILD activesupport-3.2.22.ebuild 2013 SHA256 ea8b89b98f22fcbaaedf0d6092e80e97d0067c25137de4354a83ffe59b32f39c SHA512 603d17428a5f7c2e26eec085cda5cef261136332c61d6033308930999f5653b5c7bb5517b6425a3b1d0808c4aeafdcca45a94711da2e07b2ab73450d7fcb3e69 WHIRLPOOL 4a1a4731a271b271ad178c7705c712d727f5a18f3b845102f01c841ee215644f3fb721ce616339e654a24787b21c659db966db3b4657a59116407edede981e59
 EBUILD activesupport-4.0.13.ebuild 1896 SHA256 99bbd0543d756c792a172a871e64adb84c9cd8a989e39e67ac9a4588d883329e SHA512 74c5335003ceb368de71014d198e16354aebb0f2702bc65cd57a2d4f20395dfa85e551a07c8f520878a0e05ec27400afda4c12fd6193e72970d299ef7954b0fc WHIRLPOOL 84133b2ac6750299c1d3ff5f1d0c4fc98e2e5c73f2fd1aa004753b7d56746e72c3f6c841d16483c3cc3fe8cb5c43cb04bba86c00e15a7705959d55b9a70363ad
 EBUILD activesupport-4.1.10.ebuild 1878 SHA256 9166ad6a7f0cb38bde9bbcd9847f5d2e3f6abe58ea2deb02d589150796090802 SHA512 8f5bc1a1de7c7967ce1eea19f4d33dafd9ec3db71297fd6e1a11ca8d0c0fc7c9c26f66c2fa3dbb760f43a8c0cf7363bfb3fccb919cd91063bdbe5d9ee84c995d WHIRLPOOL ad1f2d2199481b88be03392208be54dca64db2b2c40134c93519dfbd054f435d1bcfb95ff1470d6415f725ae222558a9bd0711e745a53e6ce71550ec40834505
 EBUILD activesupport-4.1.11.ebuild 1878 SHA256 e36fa4a7cfdfc1b0740b13235e9fd608cedabcf388cf2f27c581d4e650464609 SHA512 8f416b9e070e0d7fb35a0c2101c7c5680a62a5ad1a227e1df753e77f291acbdc3623b5c256b159906d7d4d3482bfb6606196ee5b50a3c5d588ae5f29993d55b2 WHIRLPOOL 5aab477a5f1b79e051aa9946a07f73400243153e51546987ec3921676683082489b5552fd1fc314d49c5ad96fcc4557382741c31f204879a5fd4dff85e937855
 EBUILD activesupport-4.2.1.ebuild 1877 SHA256 6a2ecc6b25df84cebacc6e91fbcbbc80ca0d23d2b6158d01b27ffc288d87341e SHA512 f34884cdc8153877c9caa989c61272f5e9e240e72c0c4394ad98751734b4c0c077cb0517f30bbf445d19cd25d18974f5fc79ec965823d987b3eb5acee28a4995 WHIRLPOOL b08b3f85dcddd31ea6c4365aa4960b672148479b34722a4fd74cc8bf486deb0d03fe44ac477e045b98272acd7768b19d59c1d663f4a483d69715fa57bbae3a0f
-MISC ChangeLog 41525 SHA256 97d9961af981dda303c8c16746c151e03182f72493b523c8711091a90e931dc3 SHA512 9817b5d87e844ab9bbae2efd50d8a898336827fbd97dc319dbac38eeacc31bdfedfe2671d8ffe3c5291f5a027324e9f6236d0bbe450fc6e2f791a4992900cbb3 WHIRLPOOL 998a3ad56222de8f4ee181584da3d66f994a9fb148883aa522242c1ed2bf293b7cd3c980bc238f63e50e62b098abd13bd2c5ebac075332198f7dde570e39e3cb
+EBUILD activesupport-4.2.2.ebuild 1877 SHA256 eb8058812993dcc96b14bf973c6db6ccbccc198373d2c23ae4a2bcc3cb7d2183 SHA512 7c7d5d6da7ab4d111d598dbc6f40498631143bd957a3c6e43977c79647a12e40b1f336e4e360326988629ff8b3cfb5956dbade8acc290ebccaa87a20fc03311e WHIRLPOOL 9278f7badedea1274ff2695f0a45bbb6ab31ac720357b1c4b53a18088447a0cdb495dfc99e0d8073b11efa3e39ed6af216f31b13eee8edc049782651fe37d52e
+MISC ChangeLog 41657 SHA256 307a9482d44b9f6652c20f87eb756ccc60363b69378ffdc73f4bb4f65f75d6e2 SHA512 563d857e0fd9131e75ca42edc782dc761a0ec702e57d25e0f9c90c546b62b2ac5aa487257da314bcde430fdb222195404e409c3fc995fb2cfffbce66d752d837 WHIRLPOOL 736c808b3c3814995490cb5aeb3dfd6fe4fdbd15c014242d76e41e297a1c80c2f6762e652032ec8ec8aabbbf4b6c05f4c453722161ff559d4130fae8f1bac0c9
 MISC metadata.xml 239 SHA256 601a5b0fce4b301bb2c349bd1132c36c4a6504f8fadc36403aceb00d3fe45634 SHA512 56fb328eed48436d955df5dafd091e1be8345692fae2d30793166b6d5e2a70a4ba78ec0319601facd2e2c206d4c4089ff6392dd2c25efc26fa084b6b0d1663cb WHIRLPOOL 8a394bfb78d7fdca910776e32b6ca9c9e7c140173d73a2dbdceb03b6e101554650f025034ba2385a0dc1f8b7ce70914308fe15db0a2aa550baa365181f24f2c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlWAllMACgkQiIP6VqMIqNeIFgD+M7xpfV9vkScT+kxkR5MQkk8k
-1NWeF9N1Wbld1C/5bJIA/2/T9fUT37CeHDeipkc7Qjqtv0GfmLahXQ5EGS/Yl+m8
-=g6k5
+iF4EAREIAAYFAlWAm9cACgkQiIP6VqMIqNfdoQD9HkIvivjcsWd6pVpZ0MZegGF2
+foQaBroO0gr4oMuJ6q8A/ikzcMgZhQzFMRhQiNqZTR6K55ykj5g+Z8Ns6TNsY4eJ
+=ml0U
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/activesupport/activesupport-4.2.2.ebuild b/dev-ruby/activesupport/activesupport-4.2.2.ebuild
new file mode 100644
index 000000000000..3d3920f64cd0
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-4.2.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-4.2.2.ebuild,v 1.1 2015/06/16 21:57:42 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+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="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/i18n-0.7:0.7
+	>=dev-ruby/json-1.7.7:0
+	>=dev-ruby/tzinfo-1.1:1
+	>=dev-ruby/minitest-5.1:5
+	>=dev-ruby/thread_safe-0.3.4:0"
+
+# memcache-client, nokogiri, and builder are not strictly
+# needed, but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-2.2.1
+	>=dev-ruby/nokogiri-1.4.5
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/libxml-2.0.0
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Set test environment to our hand.
+#	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Avoid test that seems to be broken by lack of DST.
+	sed -i -e '369 s:^:#:' test/core_ext/string_ext_test.rb || die
+
+	# Avoid test that fails with Minitest 5.4 since that already defines
+	# a string E in its TestCase.
+	rm test/core_ext/marshal_test.rb || die
+	sed -i -e '/test_const_missing_in_anonymous_modules/askip "gentoo minitest"' test/dependencies_test.rb || die
+}
diff --git a/dev-ruby/rails/ChangeLog b/dev-ruby/rails/ChangeLog
index 44a590ebd74d..2e641508aef5 100644
--- a/dev-ruby/rails/ChangeLog
+++ b/dev-ruby/rails/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/rails
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/ChangeLog,v 1.315 2015/06/16 21:36:44 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/ChangeLog,v 1.316 2015/06/16 22:00:15 graaff Exp $
+
+*rails-4.2.2 (16 Jun 2015)
+
+  16 Jun 2015; Hans de Graaff <graaff@gentoo.org> +rails-4.2.2.ebuild:
+  Version bump.
 
 *rails-4.1.11 (16 Jun 2015)
 
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index c00165422cb5..64aff4e7ad7e 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -7,18 +7,20 @@ DIST rails-4.0.13.gem 1550848 SHA256 d4b3ca8517b394459fd31773c5c6877b4aded8f2c84
 DIST rails-4.1.10.gem 1438208 SHA256 9f81f8b716ba76ea768b1c0ed4a185a3f7647b384fc297c26c2b51be82856fd3 SHA512 431177f8b2303a01e273325d0d7cfa3f470c590be8cea8a1aa47d4fda9f052b90a1c4f6793ac7330e7be6058d05278a48cf93607bfd575416eef7ebdbedcc107 WHIRLPOOL bab9fad1d87d1df77cfa96b44deaa3e1b1bf0f1c0859b751635a04e48e15f1a81c8ba518eb84ce524247c3e5c8a4e6a7e4223e527349c13bcf30b68d2d4a4d2a
 DIST rails-4.1.11.gem 1438208 SHA256 eb7a9f8c5cb838e16f934e53f71f14e14ac2ef646939134a59eb65b3e209102b SHA512 5754abc6205ebe653df9103c278b90ca3a384c3d1ffbd4c91d9ebe18db9b2c25ed0e0ec4328ee8ef9e5a904ba1e9b163aacddc5d89568fbc49105012c536e552 WHIRLPOOL 002e2c6552306240b1bf9aa757229ea3f035eed5c668da55a30cbff7d93e04128acc3aa81104134cd5b9b1a1e760f7522a69dd92e3f23afe5f36a42f10f6c915
 DIST rails-4.2.1.gem 1475584 SHA256 6b5f7d3a4a9eb2f181bab4a657315dbe08d0be218eae6017bef8a45dede211cb SHA512 67f6e1704f590b672dfe4aa967d822b9ae4dc7fbd7894516fc32c1524e017d5bb54426ed2de5b2ea7e83b5281805e829abe1f12e375ce4a3cd1bd99210dbe442 WHIRLPOOL 06bfa668027280ba47bf87a86d53eeb64b2f0628d01eced3a81045234fd53af9a8a333f7660496d0f2c6224d67c004d62b0c222fe84f84d6f705438b70b80584
+DIST rails-4.2.2.gem 1475584 SHA256 60826c698420631bd4b623c8eb305510a428e507c202885b4cc52551293901c1 SHA512 f33c0a808e5fc4201d38b13b78f33be88771c5349cf0babde1c6241863734262a43a6e0557e50bfb2dacc0aa69e9b6d0ada5180a89e1f34021c7eee67dbd7de4 WHIRLPOOL 832d227dd49e652550d7fbf98ebf7b6b8d38487785a0e85ae7385d888caf47a78888d920891b420e03a1d2605bf60f852b03edf3c37e0af2a89195f45e6cc79e
 EBUILD rails-3.2.21.ebuild 1062 SHA256 d171d2a4d1c95c96ef9ecd31ece1dd4800d5740c4b2c2b1ae0d740c024df5d5f SHA512 9bf380d0bc4070941dab436c76f907f756f92e7e56444ce03cf9ebbde70bc614db5b0fad2a17601c29296c14039c57f65c05137cfeec1aea0e0bcc1092746039 WHIRLPOOL 129c5fae19083045d2668c624f7418c8caf9ee0e9f08d1098c5da367e236b11d36dca65dc991c9cc06208b20d3c881bf672a65d2d1456b9871e94ea4e79dd7ec
 EBUILD rails-3.2.22.ebuild 1069 SHA256 e9e8fd0d0a956c038c3312c877d6311cd9a3648408282212c9094a0ba2c32ab8 SHA512 a0fe1cab5ca29f80b01e6c3008d47c60a3d2757d0781c71ab44f1cc2d2ace5eafad1692fd31b3e03b2a80bafd4bce8111c056bbe7410627aedd8af32e4c9a7ad WHIRLPOOL 88818c7f04ba572cf5ca9ddbd5eb61100f59a3d42be6d36e3257aca3c191c9c86a64b39250a891a9fdf041786ed4a43d4c26ae0cc56b6fc9295bec351205352f
 EBUILD rails-4.0.13.ebuild 1131 SHA256 49c99a8fe12312b1e65282379555337eecfd837301211f42b7d64c2f0327b41d SHA512 4aa9e7240063c5e1fef98594df6311cdadf56ce3d96b9fa4a945c69784f700a377832d92df5c5f30e1ca9b4dbafd345c9cf1ac14dcf80558a2446f98467b0135 WHIRLPOOL e7ae81053c6e9511534a3b8b0dce4bc3c729b1ec0048ce363c4c18b554fe0a7d1391baec537075f55d62bc5ebeb76921e2f9249af1dd3e413347de48cdb90e87
 EBUILD rails-4.1.10.ebuild 1183 SHA256 f0026a2b9ffc4d3d8d5ff9950641ba08899c54c5857e61ca2c3bf3fac6c8313b SHA512 451f2da8ca8f656308e343d089e3d076b089faac9a0227870f36b62e8700a11c03d10de2c508881a8d4c2ab006f6972bca0b042bb9001ddf885888734c8d3e43 WHIRLPOOL 713cf25eead4c6bd92ffb249e94a026cca946d2a3fb26f1cd313bf21289a47a002783f17b2f0b8d8712481ea6e38846f1d42f09b3c1db980a0abf66682be9b84
 EBUILD rails-4.1.11.ebuild 1183 SHA256 09ea0e3ae90cb028d2356f234a99fab5c1728de1444cce8fc28b312147bdc786 SHA512 423cac13781fa50bc6c93ea46e2cdb358637a5dbf74dc678de0968f458c647dfc9195a8e7d5fabb0c264c8f232bea684481cb3a7b042b43ac48fbed255d05321 WHIRLPOOL a93bfbb9009ad8a55eb9da6acef1ef893923c4bc4e9ef013f094b9528a2228ce75cc2376591cede436688360b4efbff6ee529daa6a92215658ef79bd498e501b
 EBUILD rails-4.2.1.ebuild 1203 SHA256 4a7a938afb5f8f369b49b18d58ff3dc6c0b6c4df7da0843f5087e73d2189afeb SHA512 2a4a0ad9fd8a0407862082f67d69dae084ce20bf37915e5095bf111ec750a8698d01219d2eee3f6299fc3b354365df06b24dfd7285daaa45273b8ce98345fa25 WHIRLPOOL 4fc03c07c3ec97bcbcb02783d1e9a0a076597a739027f41826950101a09dad40eec21b78c72e69bc99725d557447c732b76329202de3d19304e9ab52906e1af8
-MISC ChangeLog 42088 SHA256 62572ad9662bc57a4af92270789aa8d1576e708cc884a319a837a27ad5d93beb SHA512 fde0a06ba3a9b69af3e1b062b3e82397f207aa012e62839540fc47b247e0b2f7424ced17170faf4b5b4ab888ca5c231ef39add148f57280ade1ae1cb708cd76b WHIRLPOOL f28920e6ed5703f712f6f66eaf04bd9e14916f9a959933ac418c85a459e810522de285a237d7098184d81421ceb2598710a31aefef2f8425d2ea7bfdcf44160f
+EBUILD rails-4.2.2.ebuild 1207 SHA256 2449e748aba10ecbb7faab646dcc0e84a4ebbd4c8e56948bbf41d2835d2736f3 SHA512 b4fbc201c6b19783ad13b3d974488f6dcee47f1b920bb2737afac55ae91feb794aacf7ffe4d689f8bc1e498fdccfe25c24c0ed44c81211a03385162edaf7d9b6 WHIRLPOOL 33c31807828c77a9f4c8714fc16efaf93ce0104eb3617b4b7267d4bc3a95459c681f418287c0e6a67260c77959abb4e5826c1a1a6a906a77fdb05c901c7bc920
+MISC ChangeLog 42204 SHA256 c71264f015632b66c974fa58d4d4ce7dd9b9b27d88a886987f7ad6b791c6ed9c SHA512 e9af9923d3a984544cf02ebc332f48cac78901da030f4d240539250b29b881194280f2af3826310f53b43c4c4bceab84a3d94161228ffd958837a9ff2d1932d7 WHIRLPOOL d362a7a1fc9f0f17d22df86d88d7ea53139f1e9b74fdc56d19d192f7eb6d28ef9dee33b2ee808890d118641585a1d8e2ab3c0b0979af3128752acc2522f762b9
 MISC metadata.xml 393 SHA256 ab0c7d6f591fe1803349f791b02e9be652e39232117c98f1b173c7ffb0854dee SHA512 dcdd257e9e5ad70fd720cd74ad12f3d292b98f72cc45c80ac02599fe46d16fbdfa84f78e6781756c59fdbc9a808c4734e491c07e320a54a1d2a51241658bb713 WHIRLPOOL 5317c82e4e1ac614e51dc74741272cf1b20fa0cd7b72c77559ecd1115d82dd7b9359bdcd80f1e08c358c096fe1f77e4d8d9e30e6ec70d6246a09613b92fef4b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlWAlu0ACgkQiIP6VqMIqNf4lQD/Ri7BlLwo0+87hFxt8L9hew1X
-1VaLUihF59TAv6wbdM8A+QGSRpX1PZFcZbDufEc/ub3/f+yStmeASbJFL7T92hpE
-=+Uqg
+iF4EAREIAAYFAlWAnHEACgkQiIP6VqMIqNeTZQD+J2aosUh5hAwobbKHg5PWleBT
+9Q/gZDaX5nm2szoQETQA/iXgxEN7isZ6zUJELGwvALTkIJ7hsDRGftZIgfWKdzpc
+=2oBe
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rails/rails-4.2.2.ebuild b/dev-ruby/rails/rails-4.2.2.ebuild
new file mode 100644
index 000000000000..a0f75792df61
--- /dev/null
+++ b/dev-ruby/rails/rails-4.2.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-4.2.2.ebuild,v 1.1 2015/06/16 22:00:15 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+# The guides are now here but we'd need to rebuilt them first.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md guides/CHANGELOG.md"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="ruby on rails is a web-application and persistance framework"
+HOMEPAGE="http://www.rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm"
+
+IUSE="+asset-pipeline"
+
+ruby_add_rdepend "
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/railties-${PV}
+	>=dev-ruby/bundler-1.3 =dev-ruby/bundler-1*
+	dev-ruby/sprockets-rails:*
+	asset-pipeline? (
+		dev-ruby/jquery-rails:*
+		>=dev-ruby/sass-rails-5.0:5.0
+		>=dev-ruby/uglifier-1.3.0
+		>=dev-ruby/coffee-rails-4.1.0:4.1
+	)"
+
+# also: turbolinks, >=jbuilder-1.2:1
diff --git a/dev-ruby/railties/ChangeLog b/dev-ruby/railties/ChangeLog
index d24c1ade5eaa..32186aebd955 100644
--- a/dev-ruby/railties/ChangeLog
+++ b/dev-ruby/railties/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/railties
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/ChangeLog,v 1.105 2015/06/16 21:36:31 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/ChangeLog,v 1.106 2015/06/16 22:00:01 graaff Exp $
+
+*railties-4.2.2 (16 Jun 2015)
+
+  16 Jun 2015; Hans de Graaff <graaff@gentoo.org> +railties-4.2.2.ebuild:
+  Version bump.
 
 *railties-4.1.11 (16 Jun 2015)
 
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index 00e18d06646b..bebdd8e8f66a 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -7,18 +7,20 @@ DIST rails-4.0.13.tgz 3761572 SHA256 a693a8c5f767d153e765634cecb6356855ca51b6554
 DIST rails-4.1.10.tgz 3723355 SHA256 f8060783a25002bdd8120411f3ef7f5b696b5069477135ebf481501f4b69384c SHA512 9493d52ae6d417e11dc141c9e9fa0abf5b4d1ba355d89f5cabbcf774d54128c9e2815b60467bbc0ba275cde8f771b9845c9a4cb1ba775ac8228223a87a51f807 WHIRLPOOL 1a34cd978da13ec1804791cc31aba12de4e1be67787aeda23a50eb2cc54c568a613d89e0d7d61a2969bca1e551e12ba23f362cafedd0b0bc7b0c37e12ab02c05
 DIST rails-4.1.11.tgz 3723586 SHA256 3a59ba7a4020ba4dd54907a4927d1b9b9a60f5098ccd0bc3220b77ec6fca0bc1 SHA512 1df57853b3f80ec0fa1f7c08f3109ff64a42cfc7044ff229b9bde4b52025d21fee2d6631e86440adf12346a26cb67f8c812c869b64e1eec219bb9132610d62b9 WHIRLPOOL cdb08fb137a01f14dc32f268fbaa52667141bbe2384e2515256719eba27498aabb88572e693ab798e7821a1a8027074e7d67d6dab6cb01f2bd3e9138d3ec79d7
 DIST rails-4.2.1.tgz 4149447 SHA256 11237cc395c5d4a7f64636f2043cf8c248e862e1946f7491244f448e1c509af7 SHA512 00720fa889b7d0a25c4ef497a8dc95330393300ed05108c5de1413a8f2fa62babf9674b62a627adbd29f1f337395a7ec8c46985753dbed2550023f5159942d91 WHIRLPOOL d09243b37810d2288fe9ea64d82c15c5281b52847e7143a6b7076b5da103cbe02e705788cccdcaf366cced2e9fc6f14362da4b6ddb67df17281ac9a5d1cf5fa7
+DIST rails-4.2.2.tgz 4149494 SHA256 e8a0b1f96e2bf0bf24b2f28a5b5eabed7886b056119bd51c01ed451db4f35932 SHA512 707fddfcabf960ebccac9aa8c88067b1adedee341eed80a60c07044145f67047a91eb6d52b05c18d0693f0e575ec51b494b3095df755067f7cacd3a62275189f WHIRLPOOL 6b9296edbcaf95c20adf2981f877cf0b6febc4e2f33873826ab36ff0cdff68308c8e748bd9fdfb56f1d4e72c1588e25b826103ab7df9d74dd0e4e756d61d648a
 EBUILD railties-3.2.21.ebuild 2101 SHA256 857f03d2e75943f658f76baa4a725f0fd0d70ba73b53df8c82fc993e55abf3c3 SHA512 9077a069992ba263fceb0df8b053623c69693d3745a9eb3aaf50d71e6e33bd49ef98176c73164203a7c190244384862d7249e7d3a91f1d415a5d0cb8e9e6dc72 WHIRLPOOL bfb05860568a7857af06d08a7d7101e35f8674533fe2c740b11e6d8a878eff7311577b5506b3a678227f31b7b34e37a4d735875e42efc5c2b73aa9a79fb6a641
 EBUILD railties-3.2.22.ebuild 2113 SHA256 eb748d8b63106f912ac9af6a842624cb4a1b662d2331264617b7e64b6fca3864 SHA512 ee60ee37de2476bad76b15f421bd16a1717376f1580de1f701be4a06fa7744dd7de2fe62100d10503bc2e61a8056b39f5e298b5283f3364d65c4b4a7e40161b2 WHIRLPOOL cce96dcc352ffe775c06607317f6eb7305f872194aebe199e0ca3b6b61a1d735ceb2c3599ea66e8964f176e5f3dcdd8cca4323a2b47d930e1dbd7dd0d002f4f3
 EBUILD railties-4.0.13.ebuild 1760 SHA256 e34259f2873b1757a3c1799aece310acbdf2d7ed6c71994eac266852d3d25c4d SHA512 802fdd7ae6c406692c18eb2e679b65ceadc105194a3dca3e8c5c90200b84bdd0c0103a492b17797cfc7380c165ff5382fb838b091c06247416a94942d2f2a65b WHIRLPOOL 71988ba963b411cf8dbd919fbd8113c3949d6da026d4dd25893b45f7ae5b1c2e649914bd9f5c77482bb81b72a9dcbf407dc1de62486d0af7c2b6476245df7074
 EBUILD railties-4.1.10.ebuild 1784 SHA256 c2675fc5863c7fc481efd23bc08295b91f4298fcf68801a919f6a202ee6dac5b SHA512 ec33261e41d52635086394f022557b3c66002a12566796404e15c979749d9b34de2de61483ab284e48430d09905da07af40f1d58ae27ad4800079b3356b305c0 WHIRLPOOL ade66a4a57877c5bfa28bb15572177644593882dfb5942c853cc73d0d6d74b888739dbe0860282ffac5470916721977af0a6f5bb9d115929799081d0b1034f58
 EBUILD railties-4.1.11.ebuild 1789 SHA256 5fea91f2aeb77f8381400da2ea651fa62ebaa3a27e902a01b1b3385b93677eb0 SHA512 ac02e5202a27e83db47f82ade734d8c88689b7d7c538998140c5ec637081f3c15a3820fb7f10d93a01c0762398ccce968d7b27385b2b4ee84a4eaa05705239ef WHIRLPOOL e294e0c41a3fd4b80d57cd395aecff76a2b2d80ce3906a666c3766d80848f8eef237e3dbd009c124a11a446775ea55680e95024b86c258d65ee4084c52dd5f0f
 EBUILD railties-4.2.1.ebuild 1783 SHA256 a0b79b54683e11b69b595a40ff5d6ee5d1ce24cef38b54ac55a61f897d08bef3 SHA512 4c0457606d58ec83f1ccc16242011838d4ade46677e658fbfcccad88ee54c55293d978107aade82dcf9fa48af5e4f7fe687bb8b5690b72e5e50cc8c4ad9dfdca WHIRLPOOL ff2b7a092b0c7ee8ee606a19dc9c0e7e6c01798c70a5650f5ac99f92aedd4676830d62e1d6cae35f55dd4ec00f62ff4d9c2a0e4f00d5d6b1922619cf691a8ef7
-MISC ChangeLog 15882 SHA256 65d8d917ba7e945f5fc15a19a3af092e28a60f13a7ea1a8e667fa4c00562f933 SHA512 aed996747f5a97d3800ade63f497b1621a5449abcbb7205acf31ab23e5404be2e6b3bbf0e1e73bb688dce7e269634d4490c01c6ebbfd21371abcd6db1400c7cc WHIRLPOOL 67fcefc44dabe4d03acdb6fbfa2fb61e5e07ea937b56c16cb99ac84527ba97155fd950407d3773a2134b92ab74ccace17a59b16af6fa4698a96796d0d4daf74f
+EBUILD railties-4.2.2.ebuild 1788 SHA256 729adb3d74b1044e36abe28f8ac388d24e0d2a0cfc48fef4ba7473241b6a9c77 SHA512 14c92721c6130f3088f99286a12879109c14f9c4d3d958cc70f071e928fb115d083888f8d17de6f4ac6b2707b238482822affbcf703672f3e4897a33cb9f04a3 WHIRLPOOL 131cde12505603fecadc1cc4ba7c255d5f65857ac243aa5e119aff35f95cf5887c747085bc9ccd52d7f4ac3bbbffd0d9d5cd101eec7442ff07eb91a3e19a661d
+MISC ChangeLog 16004 SHA256 5ed368abad1d71bcfe2673edbb6bfbdeb29378e78848f65bcecb5a0dbd0ee31d SHA512 5c65b42a2e07e43e77de78fb6ef3a2667fa414d9e63ba6f0f83d8c3460d1904d027db4b4ab6c70a3fcd1a0d6a09e189a9fd3927fbe8e2d3269d436c53c04ac9d WHIRLPOOL 0475b8babd4371c4bac3e21baf3fee0fda5de0adf658c1cb20b4fc20c1afd35712eb8f43dd491145b4de80694fabd3de2da6c8ca76060823207d90a05cde3713
 MISC metadata.xml 239 SHA256 601a5b0fce4b301bb2c349bd1132c36c4a6504f8fadc36403aceb00d3fe45634 SHA512 56fb328eed48436d955df5dafd091e1be8345692fae2d30793166b6d5e2a70a4ba78ec0319601facd2e2c206d4c4089ff6392dd2c25efc26fa084b6b0d1663cb WHIRLPOOL 8a394bfb78d7fdca910776e32b6ca9c9e7c140173d73a2dbdceb03b6e101554650f025034ba2385a0dc1f8b7ce70914308fe15db0a2aa550baa365181f24f2c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlWAluAACgkQiIP6VqMIqNdRogD/aIxjWcgzdKUX7zUUraTYs75b
-hglJLTIrJbzZnTigGxgBAJePTd1tJ2sYZPaJrKH1FLICQo4PSmIyJ91pg5BlytfQ
-=9Y52
+iF4EAREIAAYFAlWAnGIACgkQiIP6VqMIqNdiSgD/bGJXOqqNWN3EVPjA3OSdp4Yf
+gdKC/17e8pp8OlNnf48BAI1RIRnSFuasTHHEem6ZYhavNSxZ0r0CiMIVL01SjJ5D
+=rOzg
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/railties/railties-4.2.2.ebuild b/dev-ruby/railties/railties-4.2.2.ebuild
new file mode 100644
index 000000000000..43c876cfc64d
--- /dev/null
+++ b/dev-ruby/railties/railties-4.2.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-4.2.2.ebuild,v 1.1 2015/06/16 22:00:01 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications"
+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"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+RDEPEND+=">=app-eselect/eselect-rails-0.19"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionpack-${PV}
+	>=dev-ruby/thor-0.18.1
+	>=dev-ruby/rake-0.8.7"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/actionview-${PV}
+		dev-ruby/mocha:0.13
+	)"
+
+all_ruby_prepare() {
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
+
+	# Also allow rdoc 4.x
+	sed -i -e 's/~> 3.4/>= 3.4/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rails rails-${PV}
+}
+
+pkg_postinst() {
+	elog "To select between slots of rails, use:"
+	elog "\teselect rails"
+
+	eselect rails update
+}
+
+pkg_postrm() {
+	eselect rails update
+}