Version bump for Rails 3.2.18, security bug 509706.

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

24 files changed, 607 insertions, 25 deletions

diff --git a/dev-ruby/actionmailer/ChangeLog b/dev-ruby/actionmailer/ChangeLog
index ba3ce506793e..4b380c7ce220 100644
--- a/dev-ruby/actionmailer/ChangeLog
+++ b/dev-ruby/actionmailer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/actionmailer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.257 2014/05/04 18:04:14 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.258 2014/05/06 18:52:09 graaff Exp $
+
+*actionmailer-3.2.18 (06 May 2014)
+
+  06 May 2014; Hans de Graaff <graaff@gentoo.org> +actionmailer-3.2.18.ebuild:
+  Version bump for Rails 3.2.18, security bug 509706.
 
   04 May 2014; Manuel Rüger <mrueg@gentoo.org> actionmailer-3.2.17.ebuild:
   Add ruby20 support.
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index b50302ccde59..e5d2e22710de 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,12 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX actionmailer-2.3.10-rails3.patch 431 SHA256 4eec1446601ffef54a0e8e210ed53b1d72676ab035cf0ab1d8844f11b5611cde SHA512 2421cb97ec78f6a4fe8a191e90cac51f05a4f0389aae574c3f89542feacf7d0d7c589165ec0fac2072704df00117a783d5e9e51cc706f50d5cb1809039a7288c WHIRLPOOL 016e524c2602413b013efda5288274a3b3cf53c101772af27fd03d368941b06b6dfee01ca73b12a0fea71b5ea2eb035f10a63138823483621eb26fda547f7577
 AUX actionmailer-2.3.9-require-uri.patch 507 SHA256 8aa2121eecea068632f38cc03cedf694e22896f1e57dd9bca912585c5fb14efe SHA512 c6236d36edbf711f6511d002d53b11aefc88efa5d72e8d44799286279f3af9ad7fee72d872df7d15c02d2a333230279cdebaa546c1d0d0860e2377243cb35bb9 WHIRLPOOL f43892b7a4bf9ea84c03e81dc902a29414777f951d4e0f8aec62c8886dcd76950ae64aff7b8239f1263e3b0e9dcbb55440cc059d9db0978dc79a4d8cba2e32e1
 DIST rails-3.2.17.tgz 3566537 SHA256 f94972ed71c005ae1f7520d8840852872fbdf6c834bb2eaf1516fe63e406d609 SHA512 4ad32d71108d444bd791ffb2fded25deed69a304a4d6497fb12a586e07348bf4cd1a453614eb932a907063ad6166b89f4778742cb5c2c420f17a116e11b964f6 WHIRLPOOL 0b0911120202e3152a74d31f3b7f8a24261f8e163577ad88c12fd85be088871a0f8ed46b305325250bb830f786231ff349e847b2f642cba02905a95a9a022d68
+DIST rails-3.2.18.tgz 3566632 SHA256 25f5c98c965a222b001ee07eefa7e2c3719bfd8f6a9b44eedd4759c646b05895 SHA512 31e219eb038bffe395d2dddd59d5b861001f5ffe88bb1fa33e87e584d70f0d0a8143b905cf736dd328dcea1934ff662e59ab20e3e9593d919b1110bb1f92a3f1 WHIRLPOOL 3188b58902092c5f2a4c6ea905698200b65e9158c0bac41374187bccea9fc68bfc05631060b2ef6506cb69d13fcf38ee7c8a5aec9e3166a9914c59110b4e3592
 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
 DIST rails-4.1.0.tgz 3678238 SHA256 0f2cff305d20d374a7326fbaaae991ac380676b1a4a710f36ac99b410902cabd SHA512 16a6ff43f19cb1bdbe0cdd4729bf9d198ec38ef258362832e6f1d2a065569a133527c7bb4f3394d8544cb012e9af41a643122600b8a196f9d75ab541a32034f5 WHIRLPOOL fb365255d0752104815f0d143f45c696b50863b83af0634a26c407d01d3d1f402b516aac3de425e696cb62e33ccb0395884e0ae68b9eb90608bb203bb1d2ee2c
 EBUILD actionmailer-3.2.17.ebuild 1366 SHA256 59d5acd8ed318fb9508e1d1f8bd3dd8fa7fc923f912a3ea3a88227dcac7d13fc SHA512 0aa432f1e50686f6ef71f2bfa6cd32ba88ab8c03f54d30a71d3ac5f5a5c6f99d168fc2a4a5699b872da6c0d1f749f932d842386edf08fa7803e84c1882227cc9 WHIRLPOOL d25fd4b889781365646f694cbb1ed03603ab23a3d3fc5a5dd5e0133d7801aafd37e79467bab122570b06a8aca2a07867eb2ada38fa1cabe984d8fa15e1772fe7
+EBUILD actionmailer-3.2.18.ebuild 1386 SHA256 1c597f2f477bf07362210b646a41c58c6000c26591055e6862e2cab5e2a9dbe9 SHA512 af902bb8656ad4edd0e94228bccd22e5038fe7ff1eb7ac031026450b50137eb43b2aabe3b9fa8e9c0f90f1f506224d77cafa5636bc5fef2fdc3ae09f05606fe5 WHIRLPOOL 682c13da8938950eb9ac763ab039721e5d9c19775d485c4b28e661971912614b62d8ba109b7845057a9e194b371fe117941e80f4cc56f91cdc74cc5ee9a4b796
 EBUILD actionmailer-4.0.3.ebuild 1242 SHA256 8575e906f989cab0caaa5aa31f9b94b29fa7a9ff8eed462fb4b78265bfa4512a SHA512 9976d8a1ffa5acf99ce22b49b9983634dac874469c27adf979b49dfb43c52e9fa5d6c68a2cfe7d7a503b804bf3c5aba89a3ca84a4385a5a142086ae7d3c8c7f4 WHIRLPOOL 3e421a9e26d55c9d75518ec91b4d1ef02899ac488c117bd5105d953497dcf73e58e2f6fceef8ae4090493d45b7213c0d19a11e4b0ee60afa1ed17e97aa5980dd
 EBUILD actionmailer-4.0.4.ebuild 1258 SHA256 a7af79aee42334737bfbf0bd1be8ccb2974582d4966f84dce2993c1b3849baed SHA512 44cd4f7c1805e3ab47a72d306b6f569ae2061884562a262912c766a5c059482dfbcb08547c7c198a1c40db12951e4750c3905ef9259b908fc33a5f3de01b94e4 WHIRLPOOL e475f026bf8e071b82c770a249338ab6f65d3033ace3d28ee9397a9b0c2432ab7fbc6581bbfa050457fa6620ee1afb95fd05633b32706563104968afd698ff74
 EBUILD actionmailer-4.1.0.ebuild 1253 SHA256 76d2c9a3dc6d2f1b227c91feafede7d959bf0a0162302fe99d1ff77ca3845c94 SHA512 e2511a2f3bf7002cb889b5496becea45c13f2530f0046c148119a89f37b7308bfea72765d1daaed2efc3c4edd597e6d65e5c00659de2a8a585ab537bce081ebf WHIRLPOOL 4de9d5a38fbb0ea04293f85bfedfff28ed20157b588ef33d10285e42cf76da164ba1e98caa594cde4a08df9e22953929800fc4bde503184a0467d72d3c0cb7b3
-MISC ChangeLog 34974 SHA256 a558760f941cc09fe959b3a4bf7bf79394f4a8773897aaf02aa3c5b396f27d34 SHA512 a4a3c91992b3cadada82a76f2398c69a4c69f8601223738b975cdf214db2bab2a8d1905d2cc23471499dda1648d2da11972f4e3f9784977d39fcd4da6af4bfb8 WHIRLPOOL cda4036bd18ba365fb41602b862903517d237b56942825ae8078fc3d01751721fb57592a516f48f5c35996888c6dc687e3e94298b51b0ea90e35c3cf2c92e7bb
+MISC ChangeLog 35145 SHA256 963b24fbe00d7a20793380233e515b07c4765c67446671c4a7b16e4dd8073e17 SHA512 056d8cfd8947068968e1efcc4a11159e6c5267e340bc9abf8d37b0c44df8353adfcd0db361c519959b2b440a33a495ff2c9cf99a32f80e3db8988d401c30058b WHIRLPOOL 7151fecb419b5c4ec7c5c0efffaf1e5a65f3cca8575446077a9b5642dea83577a44e6dd47aa1178f68768664b28cb01bc0bf501a11d3d012b94f704ddb0df1d1
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlNpL1oACgkQiIP6VqMIqNcE9AD/ezysPakvwfXimUNafCP5qt+J
+MIjx6cxGDnzs5R3ZvU8A/2ljeFVzEBFFgglepPkyd692tp/C01rXRS0gCQ/W5hRa
+=/+nD
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionmailer/actionmailer-3.2.18.ebuild b/dev-ruby/actionmailer/actionmailer-3.2.18.ebuild
new file mode 100644
index 000000000000..9f2c9fd58ee7
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-3.2.18.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/actionmailer-3.2.18.ebuild,v 1.1 2014/05/06 18:52:09 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+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="http://rubyforge.org/projects/actionmailer/"
+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 ~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/actionpack-${PV}
+	>=dev-ruby/mail-2.5.4:2.5"
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/mocha:0.13
+)"
+
+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\|bcrypt-ruby\|rdoc\)/d" ../Gemfile || die
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+}
diff --git a/dev-ruby/actionpack/ChangeLog b/dev-ruby/actionpack/ChangeLog
index 04d92010322e..dc0ca442f72e 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.275 2014/05/04 18:05:34 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.276 2014/05/06 18:52:29 graaff Exp $
+
+*actionpack-3.2.18 (06 May 2014)
+
+  06 May 2014; Hans de Graaff <graaff@gentoo.org> +actionpack-3.2.18.ebuild:
+  Version bump for Rails 3.2.18, security bug 509706.
 
   04 May 2014; Manuel Rüger <mrueg@gentoo.org> actionpack-3.2.17.ebuild:
   Add ruby20 support.
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index e0b70c1156cb..921d6b8a371c 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,13 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX actionpack-2.3.10-i18n-0.4.2.patch 2671 SHA256 7060319a5037c3623e8c5beb36133dde6d3e358746fecfc0ee072edbec5b33e5 SHA512 d9e258d26b60166987649b52e7edccc22c37f8e915688a2ceee7088b853a1ca262cf34630b5712c7a02f027984b4eb37296d1274475a16317cbb5778777cd173 WHIRLPOOL cfaa63240a403b09b23893f76205aacc317e010936cca8cd46b7603eab4aacf7c2b09974ff3d5533524f40eb4318db30c0bab3403a688588da194ee2c6df17c7
 AUX actionpack-2.3.11-rails3.patch 416 SHA256 8b2dc793f9e8b996c57dc77b3898a54757f330b8c95ee94c9bdf3b0013350093 SHA512 3e9540bb1777b29736285561ce1d7466f0497150927d40169fd5ce222f803df595105c9f222ff223e923b8b5411d90a92d265b727104f1f494693a7bb100b3d2 WHIRLPOOL 3000e6b584ff572e246d2b281cda1075449af85f905dff6bf591f75de60145868e81af7753882b29af48d45e69f79db3898610646ac5af7862e13f0e24dfbdfe
 AUX actionpack-2.3.8-custom-cookie-fix.patch 3009 SHA256 9368cd7b35fbc0b5d4161e121aa9ced113ea831b738a47b6c59828bb17f24c04 SHA512 4e8a1ed63446c946722922b2cd5901b27df4ddcd7125b0c1777148e675117537e9394ba998093667f79e1349ec79a61b7e2e9c6d704327a3e000992f7ae3deb9 WHIRLPOOL e7a716f7b45b8f20eeb0be4faacdb973b172a7f44168862a228ce242afd88db512c73b64cf9bb8faab1e5ca698e65dad8746ca1fbf7cbdf9273819d722c3d32e
 DIST rails-3.2.17.tgz 3566537 SHA256 f94972ed71c005ae1f7520d8840852872fbdf6c834bb2eaf1516fe63e406d609 SHA512 4ad32d71108d444bd791ffb2fded25deed69a304a4d6497fb12a586e07348bf4cd1a453614eb932a907063ad6166b89f4778742cb5c2c420f17a116e11b964f6 WHIRLPOOL 0b0911120202e3152a74d31f3b7f8a24261f8e163577ad88c12fd85be088871a0f8ed46b305325250bb830f786231ff349e847b2f642cba02905a95a9a022d68
+DIST rails-3.2.18.tgz 3566632 SHA256 25f5c98c965a222b001ee07eefa7e2c3719bfd8f6a9b44eedd4759c646b05895 SHA512 31e219eb038bffe395d2dddd59d5b861001f5ffe88bb1fa33e87e584d70f0d0a8143b905cf736dd328dcea1934ff662e59ab20e3e9593d919b1110bb1f92a3f1 WHIRLPOOL 3188b58902092c5f2a4c6ea905698200b65e9158c0bac41374187bccea9fc68bfc05631060b2ef6506cb69d13fcf38ee7c8a5aec9e3166a9914c59110b4e3592
 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
 DIST rails-4.1.0.tgz 3678238 SHA256 0f2cff305d20d374a7326fbaaae991ac380676b1a4a710f36ac99b410902cabd SHA512 16a6ff43f19cb1bdbe0cdd4729bf9d198ec38ef258362832e6f1d2a065569a133527c7bb4f3394d8544cb012e9af41a643122600b8a196f9d75ab541a32034f5 WHIRLPOOL fb365255d0752104815f0d143f45c696b50863b83af0634a26c407d01d3d1f402b516aac3de425e696cb62e33ccb0395884e0ae68b9eb90608bb203bb1d2ee2c
 EBUILD actionpack-3.2.17.ebuild 2867 SHA256 747b932a47d677b9f4eefe0e41639b549b60d21f974a6430a9d013fe9e0ff988 SHA512 03beab9a3c2ddf5a6725f48ce6ae65655ba8455a6be603e60afddc6d15283547a9e8c6d6b357b76b5525679b0f758c3d5547e9259db02524cde73eb99f07b79c WHIRLPOOL d32c2923d961a2d7bfd77525862587da1703881e53378c56aaba37fd6584bfeb945a9c4939af8f79548d8156745d3ebc0170f93246ef54709692ea12a94ee051
+EBUILD actionpack-3.2.18.ebuild 2868 SHA256 564c8b8afd05ba7b7a185b44ab3cc7cdd50f383b08952d2f401344fb3bded5ae SHA512 0e8a673a8504f2660f53ddccba1c99895360bd8a26293f90ef7bb512d33edeebd93e6b08b98b13b2ff1c68973cdae34dc9e2a65cf2afd00afffe36c11bafe81f WHIRLPOOL d20d6e3a77e51a122c133f87ff66cae96e1b1d3b7c6763a8d09ffb01bd4bd8264052b2f5e965f6c519d04413eab00e3f3c10b3a78713259ad8609ccfd621348a
 EBUILD actionpack-4.0.3.ebuild 2771 SHA256 ebeec611db2676836b269a492cef7bd0d11f02f5ecdc972e0941e03741470bab SHA512 a7f7de5cf3e9b1a24e79fceea840f8d6dbb6487a7ed69e3c29e27cd198a182631bf918706b5ab3bbdb0accda8007c5d4e0929d45a3ec546136ba3690c0830a72 WHIRLPOOL 9f58a9541a1830ce5a4cafd9781117ec0e51859e259e327d5d6b07ff63db26f4d4bb3daf31a7043c7902bebb9373a39908615c6a860773672378dc666ea3bd38
 EBUILD actionpack-4.0.4.ebuild 2755 SHA256 9541b5f7af43b8f18ccea9b4040fe4672a657fd8af892bd35c08826c2a0d19cb SHA512 e218731065f29b08a9464e610f1b9c3a6fceb3a648891045e401928153be31db81a427a7486cea35b92ff4b273bb617bac2faffa5ca37e922209015ac0e85995 WHIRLPOOL d01cc8b9b33d13088c9e310f026d39fa1b61b41b240c8edfe2eef77f7ab8141c7c342bafb9d123a86d323a3de3381dd7ae0d8f108389da2402198791a5780895
 EBUILD actionpack-4.1.0.ebuild 1416 SHA256 a6e0d72ef2c6f2f4efe932b294ce9b43abc5ac0f47ea32eaf746f1491eec5bf9 SHA512 0dfa0e07e9dd801327d8662dce5bc65c8e0bfc0368fa12b75572adc97c1733c3fb8386207d3d94f50ca827ee27e27f408d4aab6f26a1f31f77bd3a5ea311f388 WHIRLPOOL 80b870ffd5fe373cb3efc842cf4843ed8e6c6087fc7e16308f5905838eddb48c091e43db65bd4331aadf23b36a71c3ff33302d833e7fd205c542b639fd14f539
-MISC ChangeLog 37049 SHA256 70a7a34441d58651a9e521a0b21466f17d8115672a46b712ac5f7934b1fc0601 SHA512 0e80688cddd40eedc756f2f1b6c9f215b96f7828efd76f60fce2fa4b12a4fd619496aa41daad8d6db48034ffc35889e785fdbe418f4da559b36f2f69319b401a WHIRLPOOL 0d6b6d60d6f55c58029159f4a84af052dac6630d530d2aa36df89161a6919a3d1ed7524aac01485dd40e7627c7d17fb11da79fee25adfd60c3ecc828780624e3
+MISC ChangeLog 37216 SHA256 fe55d91185fbca4ecd3d90445ab629b6599f4b712ab92fafcd1631f494215d4d SHA512 18171690661d52437203ab75b4cf23d9649b665ee7c0526370111f46d7bfb51f57460a4280aa55414316d1628e60496a7b432026b1a2546dbb3f449e80f4bc75 WHIRLPOOL 5abb6dec85386cee15d2fe04096fe3b4215665129ae2d1309e640464c5c58b59b7ab45b9fd24bb899be6f172f5d2a710c500efb775c3f4645574bdc4678eba02
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlNpL24ACgkQiIP6VqMIqNfu7gEAiNkHeHtLJ89UYNqd+HZYHFHs
+Gi4HhgEDJmL8wP5vi9IA/RZaTCpJRFQcSeag73Id+wVTt+lCyeUWoaB1fot1iGO5
+=+CDY
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionpack/actionpack-3.2.18.ebuild b/dev-ruby/actionpack/actionpack-3.2.18.ebuild
new file mode 100644
index 000000000000..bbf6e9ae5efd
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-3.2.18.ebuild
@@ -0,0 +1,74 @@
+# 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-3.2.18.ebuild,v 1.1 2014/05/06 18:52:29 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20"
+
+# 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 ~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" ../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
+}
diff --git a/dev-ruby/activemodel/ChangeLog b/dev-ruby/activemodel/ChangeLog
index 6df3bc208f3a..6f1f0845c6e9 100644
--- a/dev-ruby/activemodel/ChangeLog
+++ b/dev-ruby/activemodel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/activemodel
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/ChangeLog,v 1.75 2014/05/04 11:30:08 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/ChangeLog,v 1.76 2014/05/06 18:51:15 graaff Exp $
+
+*activemodel-3.2.18 (06 May 2014)
+
+  06 May 2014; Hans de Graaff <graaff@gentoo.org> +activemodel-3.2.18.ebuild:
+  Version bump for Rails 3.2.18, security bug 509706.
 
   04 May 2014; Manuel Rüger <mrueg@gentoo.org> activemodel-3.2.17.ebuild:
   Add ruby20 support to slot 3.2.
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 5739668aab06..c2d80877325f 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,10 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST rails-3.2.17.tgz 3566537 SHA256 f94972ed71c005ae1f7520d8840852872fbdf6c834bb2eaf1516fe63e406d609 SHA512 4ad32d71108d444bd791ffb2fded25deed69a304a4d6497fb12a586e07348bf4cd1a453614eb932a907063ad6166b89f4778742cb5c2c420f17a116e11b964f6 WHIRLPOOL 0b0911120202e3152a74d31f3b7f8a24261f8e163577ad88c12fd85be088871a0f8ed46b305325250bb830f786231ff349e847b2f642cba02905a95a9a022d68
+DIST rails-3.2.18.tgz 3566632 SHA256 25f5c98c965a222b001ee07eefa7e2c3719bfd8f6a9b44eedd4759c646b05895 SHA512 31e219eb038bffe395d2dddd59d5b861001f5ffe88bb1fa33e87e584d70f0d0a8143b905cf736dd328dcea1934ff662e59ab20e3e9593d919b1110bb1f92a3f1 WHIRLPOOL 3188b58902092c5f2a4c6ea905698200b65e9158c0bac41374187bccea9fc68bfc05631060b2ef6506cb69d13fcf38ee7c8a5aec9e3166a9914c59110b4e3592
 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
 DIST rails-4.1.0.tgz 3678238 SHA256 0f2cff305d20d374a7326fbaaae991ac380676b1a4a710f36ac99b410902cabd SHA512 16a6ff43f19cb1bdbe0cdd4729bf9d198ec38ef258362832e6f1d2a065569a133527c7bb4f3394d8544cb012e9af41a643122600b8a196f9d75ab541a32034f5 WHIRLPOOL fb365255d0752104815f0d143f45c696b50863b83af0634a26c407d01d3d1f402b516aac3de425e696cb62e33ccb0395884e0ae68b9eb90608bb203bb1d2ee2c
 EBUILD activemodel-3.2.17.ebuild 1618 SHA256 f1a3a30e63880c91f0b2afdf4b00eb1beb68b4c0fa38c664e522000815335b6b SHA512 d0d498c284712f8412181cca4f81e5924e53e85ba668df5814402c5d653d12af8072d3405c4e0d376eb4008b415fdc6806d30a9041a73232aa4773fd60efae79 WHIRLPOOL 012a3ef92a7bbd3e88de174b9aa9741ec148a78b943c5649c3a922d70c3d952b755de1d8803d71b48b89657f3726b7b724ca141fc9f3a48451d9384dc0bceb4a
+EBUILD activemodel-3.2.18.ebuild 1619 SHA256 f95d0bac3e83f0c70f2c2ee99e6ce2f3f2ce007f62fb0bbea9236e3162c0173f SHA512 5fcde3a17ad1c5dc041da45f3a9f9a1a75efe0e290ca83ba61018538c32d99067c087fe2653853b696db379d9cc4a09d6d043ac3dc36645c88150cfebec26332 WHIRLPOOL 0c2eda6f48e69554f6750c968cefef7e47c91a7c292c1f1810d40e618898576ec264984be338940143e3840befcf16eacd001839cd2ba6950848001fe716640d
 EBUILD activemodel-4.0.3.ebuild 1290 SHA256 0166f84217882049578144eab0dabc7e00effdfa1ba6ee788f3c089b8302c343 SHA512 41a76c2e4071d0d1098dcf035fbc5785e932c7996caaf2d251fe70b0722832804bc6233a7b20e486c636e84a2913adb71871b97438401c5a73a1a0bda8c7df0b WHIRLPOOL 63306649343554ad5ea1aa26c6813b0dc7b84c00729d1ba6d9feeecf3594f7ade91a7aa0aada392e24dfcc840b10065315c0cef80b7e65844e28a850446480f1
 EBUILD activemodel-4.0.4.ebuild 1306 SHA256 3b11feb2404c7478aec9dbd1731121a6c14b4984ed2596c5ebb91e59de9cb903 SHA512 fcfda04326555070f966ce492b9d05ae1359ce68e439c03676b16df0139ad88da5797a049f015bfca4425dac2912b759366b40857e88a724672b41c1d800f096 WHIRLPOOL b56e2121733765018e2ea28f85a9006f3794617172a5dd061eb9d6cdd2141af9b1c29d9fce8aae645dab9f2dcf104e8d4aff1bd78a54038812368def959839df
 EBUILD activemodel-4.1.0.ebuild 1155 SHA256 41116a5a99e9019153b7f4b94488f4aa127f6e18d75e81ddb15de43986703dd3 SHA512 ea2910734f97b82a2a7a22e78c542e168aa81c28f46531895dc9d35409585ab1ed1b44761719e0e146575918634c580bdc3521c768f071c0e4ec9ce8e726c5e1 WHIRLPOOL 01c975bbaf6a554783531a24fe6bc736215156bed1ecbd109e26131c5f9aea422ddd9989937c765319457f718ebaa854e844cc86e127c9e216cf61c212055230
-MISC ChangeLog 11105 SHA256 81a954e01ead55ccb4f2225ddfac49d5405aa3c187ae9bf5818898d6013ad8b2 SHA512 fb875439f653c179b0d2c65be6e781a4e4045eea6394de235d27430c1f064d15ae0894a1d41b52130bd272be04b70e65f082c5c278c384537a212d2c7925e52b WHIRLPOOL a9836c45e7faa088e0074829c0b36f90b5651b28d374ae5c9eea46967300478f812cdbe6575826a3ac3ee4e9bf7d23b2110f3881e0208c130f395ff73847e2be
+MISC ChangeLog 11274 SHA256 9c9bc575419ebecadae512b34393eb79aeb6a081849b97f5a28ee9f0fdacf17b SHA512 1be0effa03872cd051159ef498f2ea0d53c793c2bbbe0b3c67f8c770067a944d4036c9129f67d2b83a4deda9e570e56a8c7c85b788b30ddd257cf24e830611d4 WHIRLPOOL eafaff4644b8e33c2eb51d8de2fe4fe55174c23320eb713ef1e1ca4e70f45ddfc92eee8209bb1a15fb917a35d161d8c7e563c08a3df3a0b973dd322fc3624e88
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlNpLyQACgkQiIP6VqMIqNfRawEAgfg5ps9EJA/MxawIUjVNjgUy
+xZThAS1nWP65/jTQiPQA/iy/YIGppeOBrisr0QExPbiJ1YlUbNdxhfUIrzHCdH2k
+=/P8g
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/activemodel/activemodel-3.2.18.ebuild b/dev-ruby/activemodel/activemodel-3.2.18.ebuild
new file mode 100644
index 000000000000..664a6d658741
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-3.2.18.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/activemodel-3.2.18.ebuild,v 1.1 2014/05/06 18:51:15 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20"
+
+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="http://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 ~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/activesupport-${PV}
+	>=dev-ruby/builder-3.0.0:3
+	>=dev-ruby/bcrypt-ruby-3.0.0"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.13.0:0.13
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/cases/helper.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/cases/helper.rb || die
+
+	# Fix bcrypt dependency since bcrypt uses semantic versioning.
+	sed -i -e '/bcrypt-ruby/ s/3.0.0/3.0/' lib/active_model/secure_password.rb || die
+}
diff --git a/dev-ruby/activerecord/ChangeLog b/dev-ruby/activerecord/ChangeLog
index 5e827fc3d55b..d41ba678f412 100644
--- a/dev-ruby/activerecord/ChangeLog
+++ b/dev-ruby/activerecord/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/activerecord
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.263 2014/05/04 18:04:20 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.264 2014/05/06 18:52:44 graaff Exp $
+
+*activerecord-3.2.18 (06 May 2014)
+
+  06 May 2014; Hans de Graaff <graaff@gentoo.org> +activerecord-3.2.18.ebuild:
+  Version bump for Rails 3.2.18, security bug 509706.
 
   04 May 2014; Manuel Rüger <mrueg@gentoo.org> activerecord-3.2.17.ebuild:
   Add ruby20 support.
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index f0b6560108e0..24a3190c7538 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,14 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX activerecord-2.3.10-rails3.patch 295 SHA256 96422289122ca769d24f488bc9ab9af9cdda4162ad83a3fe27894b04106d8567 SHA512 0aea58d477b1be3b664e12895316fb8b39c4e6770107a96cef1331cc483f19126709b99d2b4c257c4b10c03ad4d355e57af8ea82df25740851ab6037e745826c WHIRLPOOL 278f8d6457834fb449f725445bb399321e3040913b74594b990929383cbe51d28bdfd127154e089aa5ae18ec144f5561a18f1635c443b0965c326c64916eddbe
 AUX activerecord-2.3.14-dynamic-finder-injection.patch 2138 SHA256 d24dcb57517b5dc5056a91bea1dd7ac63a587dd6a7fba7bc9e621fbe18fbe26e SHA512 23d12fbd4ff6ba51f3f17bd35c79e71b5304926780626898fcfb0709a12d8403421d939fff615673963f40afc663b62935701eec4a2c0184c943c6345c17bc61 WHIRLPOOL 753facd9e94cb474f09803b8ee19b1afccf4661e7a1eb7a3c20ff66c2355fdf37a772124f2b8b355ea123f2effd615b1eb16d38a74d99f3f855686aeb0291753
 AUX activerecord-2.3.15-null-array-param.patch 907 SHA256 eaac6a89147c2f4ff0cf75301ac199adcdb18bec3b856af005805aac41677651 SHA512 d18ef97cd98b25055a3865789452f32e15e08718c2288f741e6f33c9a5441ca47f4030ef4e4a6d305b59bf68030686cfa637458f75abd6cf84120a6cefae6de0 WHIRLPOOL 155df14956562306f55f5512c3da0fd19f5010c3c908db953d13b446491b8297a02ca3c743c5476c8d53d5505b077908620f72eea28f879709737ec9877db264
 AUX activerecord-2.3.8-add-index-with-symbol.patch 2588 SHA256 792750e8a065d78235d72d6549694bef3f2b3ffb537c699cd598d19d436a70cd SHA512 c03c3123a2ad65a121f682436f831b249f478a691f66baf2360588f7f9141d6cba992c107440d5095cc44311ea28268a5dd7a3bc3727c3f9d98fb0a771142bfc WHIRLPOOL 16e1f4357fd07446ffa1863c95512f9a371f8f96226f9c77a905971fe16d3213ba602665078f3e12c5b66ab765a6e5cee1d90fedd610691408ec0988024dbe25
 DIST rails-3.2.17.tgz 3566537 SHA256 f94972ed71c005ae1f7520d8840852872fbdf6c834bb2eaf1516fe63e406d609 SHA512 4ad32d71108d444bd791ffb2fded25deed69a304a4d6497fb12a586e07348bf4cd1a453614eb932a907063ad6166b89f4778742cb5c2c420f17a116e11b964f6 WHIRLPOOL 0b0911120202e3152a74d31f3b7f8a24261f8e163577ad88c12fd85be088871a0f8ed46b305325250bb830f786231ff349e847b2f642cba02905a95a9a022d68
+DIST rails-3.2.18.tgz 3566632 SHA256 25f5c98c965a222b001ee07eefa7e2c3719bfd8f6a9b44eedd4759c646b05895 SHA512 31e219eb038bffe395d2dddd59d5b861001f5ffe88bb1fa33e87e584d70f0d0a8143b905cf736dd328dcea1934ff662e59ab20e3e9593d919b1110bb1f92a3f1 WHIRLPOOL 3188b58902092c5f2a4c6ea905698200b65e9158c0bac41374187bccea9fc68bfc05631060b2ef6506cb69d13fcf38ee7c8a5aec9e3166a9914c59110b4e3592
 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
 DIST rails-4.1.0.tgz 3678238 SHA256 0f2cff305d20d374a7326fbaaae991ac380676b1a4a710f36ac99b410902cabd SHA512 16a6ff43f19cb1bdbe0cdd4729bf9d198ec38ef258362832e6f1d2a065569a133527c7bb4f3394d8544cb012e9af41a643122600b8a196f9d75ab541a32034f5 WHIRLPOOL fb365255d0752104815f0d143f45c696b50863b83af0634a26c407d01d3d1f402b516aac3de425e696cb62e33ccb0395884e0ae68b9eb90608bb203bb1d2ee2c
 EBUILD activerecord-3.2.17.ebuild 2620 SHA256 a3a33b084e912787531f78cf1f4e4d6991de34ff690bfba3820133b29c52af21 SHA512 6455ee0e300c724764fcdc2a483691259725bc013e9d07acd8cbe24787a4e1d93a4387258cbedbcf4fd3e0c427f245a940cab5106e2dd1b0d262bbe256661dd6 WHIRLPOOL 111ebf68dc01512dabde86cff3acbabb17e3047e63592b66988ea3266464bcfe0a9fe56cba2a67b67bf36211a16db8020c961833049f679991ac31a1e96f493e
+EBUILD activerecord-3.2.18.ebuild 2622 SHA256 5e2764a71be330405c8bc1717d5bb11a7099ba51f5a865bf4fea5571d13c3223 SHA512 562ec280bf13ba91a99708bbe7f6d5d8d938d96c621178c6be0dd1d12e34a81b36b0e22f2ea55499b5c79c6f76fbd5dfbefc48c8b19360ca5765aae2400b413d WHIRLPOOL 7974aa37afd3ebbd3db477414dcd3166cfa2a937ab886584de1e607158f6d2f3e33c050c80d7d4de178605c8ba43e9cca5954186571295cb9248e6a82897c692
 EBUILD activerecord-4.0.3.ebuild 2878 SHA256 35e5a8497cbe43e04427384724aaf0415482077f1c355430522341d06bd69ec2 SHA512 eec4beac85a8e89a057e3a24d5b5e11da9924a2dbd5947964ac9ff2b72939cd9acfc76c1136e5f20713e8f0345b9ebcdcdd09e0930aeb10a4b7385343abe8a26 WHIRLPOOL 8bc704f88a26b59e41ed8bc05e74521e565ce60cdaf0884efbe99998d9c0d6d51230337c11603322cd0588506bc26408acc04c702d3a8a403dd0b7a4eb26478b
 EBUILD activerecord-4.0.4.ebuild 2894 SHA256 05c491e5a9fa822d3015e427c311c6351b609038ffd833934ec090d4c8e44663 SHA512 73773c3d2f3ed69446aa44e318d57414d45fa47496a13b6fd6048d7882e5e9c35dd3bb5c72ab7914074f13a5579a02067e8bce28015086c7362991e7d863ee25 WHIRLPOOL 0285f15f78bb3a18793622a59bec90bcc7ecdaff35073e6fceb7cbb18a8bf11cd11c087b1a53429f171daee9525099954c88128297ebd382c12fcade706db90b
 EBUILD activerecord-4.1.0.ebuild 2846 SHA256 1765fd93913fe88d225af19996230f255fb3329d87a91307231bbf7288be643e SHA512 e16c904c4ad7f92f21a7bd54ba7c2ffc0df68d2e02019837201679dd6e49f9c42c9f0223763c1b53dbc8a8738f6a3976ec5f39e7982340dabcee24c2e8c8187f WHIRLPOOL 5370012335d07ea8a835498fbeb9ee694af75a56520d506ccf6f843e6912e0fd73a1418e35497ea2e17654c948e9602c3724784f4b7c0ccd563002f2a34fb6a3
-MISC ChangeLog 36514 SHA256 d15ff510208af185f588d70d545dc82dddf18e5bf5ee489ba5a2f4658dab766c SHA512 4bcc5f9ca5c9da8f61c0e10fdf22eb8c524c054c8001e6aef0ad3de4fb7ef5aa92f3dcfe174fa15e8f46878a68573c24ee630ae134f6a0f8a141d56203f8fc65 WHIRLPOOL 26faee2fc41051796c7a54c28d8f347511b24abeabf366950080a134df1c5cc9124af801e62d9209b9184d68361b493db4857452b873b91b1955e44c71f21459
+MISC ChangeLog 36685 SHA256 e1e84d86b63ce588656635b68b0fcea2a32b6561a0a152152d71a74c8d2f38ee SHA512 da3c09163d50ebdff1dbc981d72c5e82a9eaa65bf2f1899d9ef4a096555b4f7fe3f177f765e2c95c089248a4eb84053a822f336322a0077b4a07213c8cc1f31b WHIRLPOOL d572ea714f8fe7ea6f4174d8b3195da125dd1a3f85b11ead5dcd36261ab401300b1fb076c73e96cd928f6219ac115a7171d4e830f469c064636377b7a80e9529
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlNpL30ACgkQiIP6VqMIqNex0QD/TV7W8EiKi7uGPL0bXelvBtIQ
+EqgfXmhRunFiCynJvQQA/3fD+iXqMhTSOlSIapzy+cLZ2+/nKKkgaFbFwhNK2d+9
+=xmbb
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/activerecord/activerecord-3.2.18.ebuild b/dev-ruby/activerecord/activerecord-3.2.18.ebuild
new file mode 100644
index 000000000000..9dbd5ebbedd7
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-3.2.18.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.2.18.ebuild,v 1.1 2014/05/06 18:52:44 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+# 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="http://rubyforge.org/projects/activerecord/"
+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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="mysql postgres sqlite3"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	>=dev-ruby/arel-3.0.2:3.0
+	>=dev-ruby/tzinfo-0.3.29:0
+	sqlite3? ( >=dev-ruby/sqlite3-1.3.5 )
+	mysql? ( >=dev-ruby/mysql2-0.3.10:0.3 )
+	postgres? ( >=dev-ruby/pg-0.11.0 )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		>=dev-ruby/sqlite3-1.3.5
+		dev-ruby/mocha:0.13
+	)"
+
+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 "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|nokogiri\)/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 '/[Bb]undler/d' ../load_paths.rb || die
+	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
+
+	# Avoid tests depending on hash ordering
+	sed -i -e '/test_should_automatically_build_new_associated/,/ end/ s:^:#:' test/cases/nested_attributes_test.rb || 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 test depending on specific sqlite3 binding or database version.
+	sed -i -e '/test_uniqueness_violations_are_translated/,/^    end/ s:^:#:' test/cases/adapter_test.rb || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*jruby)
+			;;
+		*)
+			if use sqlite3; then
+				${RUBY} -I. -S rake  test_sqlite3 || die "sqlite3 tests failed"
+			fi
+			;;
+	esac
+}
diff --git a/dev-ruby/activeresource/ChangeLog b/dev-ruby/activeresource/ChangeLog
index abd772a70052..1fd25cc7f275 100644
--- a/dev-ruby/activeresource/ChangeLog
+++ b/dev-ruby/activeresource/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/activeresource
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activeresource/ChangeLog,v 1.170 2014/05/04 13:09:14 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activeresource/ChangeLog,v 1.171 2014/05/06 18:51:29 graaff Exp $
+
+*activeresource-3.2.18 (06 May 2014)
+
+  06 May 2014; Hans de Graaff <graaff@gentoo.org>
+  +activeresource-3.2.18.ebuild:
+  Version bump for Rails 3.2.18, security bug 509706.
 
   04 May 2014; Manuel Rüger <mrueg@gentoo.org> activeresource-3.2.17.ebuild:
   Add ruby20 support to slot 3.2
diff --git a/dev-ruby/activeresource/Manifest b/dev-ruby/activeresource/Manifest
index b5b91a2c7a7f..5b6554e1a747 100644
--- a/dev-ruby/activeresource/Manifest
+++ b/dev-ruby/activeresource/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX activeresource-2.3.10-rails3.patch 309 SHA256 b217130a77128bfe5d8e5e1a6d056308d116404e721b5bd67e7bdb30326115d1 SHA512 b337154cb1d8452e9768f794607a7ccd6ee2ac19bca3d378ccd62044099b02c8ad337ce891a07b789b521dbb2f4d1168cb830dff326ff65efa87836a0c9129c7 WHIRLPOOL 6a2789db7537d8bc0d2e5a73c70ce6db64fb12898b1dd693c7acbe7d07bece2e35f0771fa6260616fa90c2405071fed115043d55b315241a548f81013cd6c4bb
 DIST activeresource-4.0.0.tgz 69142 SHA256 b2f8094b56c589193fa9c275e4a970fdcd4eb7e7885c8a7a12c86eda6c8d2f37 SHA512 bad94922b7125f79988fb8c6694d6a0370ff1271b47d031e1c249441079e98f75a8069602c1eebf2ec8d7e28aab21b0ca42502c79fe06f46dfa5d42659ff79ab WHIRLPOOL 04120c0a81e140435194ae28a98b4c2ba69e3ef663b7fbf02783839b842c92db70742e4c5d204168dfe4a28caac8d3a8d4c2aea81842959819590544b648d867
 DIST rails-3.2.17.tgz 3566537 SHA256 f94972ed71c005ae1f7520d8840852872fbdf6c834bb2eaf1516fe63e406d609 SHA512 4ad32d71108d444bd791ffb2fded25deed69a304a4d6497fb12a586e07348bf4cd1a453614eb932a907063ad6166b89f4778742cb5c2c420f17a116e11b964f6 WHIRLPOOL 0b0911120202e3152a74d31f3b7f8a24261f8e163577ad88c12fd85be088871a0f8ed46b305325250bb830f786231ff349e847b2f642cba02905a95a9a022d68
+DIST rails-3.2.18.tgz 3566632 SHA256 25f5c98c965a222b001ee07eefa7e2c3719bfd8f6a9b44eedd4759c646b05895 SHA512 31e219eb038bffe395d2dddd59d5b861001f5ffe88bb1fa33e87e584d70f0d0a8143b905cf736dd328dcea1934ff662e59ab20e3e9593d919b1110bb1f92a3f1 WHIRLPOOL 3188b58902092c5f2a4c6ea905698200b65e9158c0bac41374187bccea9fc68bfc05631060b2ef6506cb69d13fcf38ee7c8a5aec9e3166a9914c59110b4e3592
 EBUILD activeresource-3.2.17.ebuild 1416 SHA256 9a19aca62c5ee26c94b8cba7807f60810adb806cce1d87929fa2e1f7d2a2d4b0 SHA512 e01191f7d51b7bc1f40fac045e4394517d0eb462c92ed41882244f697b10de3115e544fb6ff0116f97785165bc95cd78d40507803778fd02b782fc1e464c8f6f WHIRLPOOL c73cd40b150e58291876403576690746d98a358d846989732806d2691cf9246ae67e2dd106348fa5e25aa2ea7e4a44b44d31cd1e65156b01a55f0cb1b6d18264
+EBUILD activeresource-3.2.18.ebuild 1417 SHA256 786b6228c64b97b788ed6ef06e712cadf74e1e07fde2088ec29d5739ee5f6ce0 SHA512 69b6632bd4c66237558da12b4e926617794b2aa5554fe3af197ee229ad7f43829eaa6fbb316bd8479145fc2d59f77a6b25762e20b4fb5c977b6972385fdbb38a WHIRLPOOL 0c069a6759a54f1f47d06f38fffc3c90c5fbd55a7014e0748786a135f942c3234ba2e8a497c78bc213514b3c2ed5cf981ad53f983914585c17dad255a9cf47f3
 EBUILD activeresource-4.0.0.ebuild 1186 SHA256 f1d63fa0d4eadbd540206cf7d8b196667c1c995d4e2e035e51cf8d435ff5bbd1 SHA512 fad10236c85f3f897c41728b52fa9a95a6bd7d824972675971f88f751431d6830daff4ddd2fd6e6a2f982760c900f31a76c8e846d0abd06b23ca9e2f8e9c8ce1 WHIRLPOOL ac00ca00cba17b5a0614441f937e0fbd9b243426da60a85aa75c1073d35064d20063e7f84ebc800fdf9051e031560f24e07e935f7af7cbf25e2c33c65b42a52f
-MISC ChangeLog 24189 SHA256 e940bb466890c279feeeca96c1b48d6129c760c39ed92c5879a4cda0b86ce739 SHA512 04427c04f51b031690a499375c6d7e58a0422b5b01f858c651f9c84e09ba157d9fe3e8ffb12df28e9a05aaf9212227014c303a0d8ac029a597398aace3fc2147 WHIRLPOOL a2a847178a95c2b6d54556d0e9d411d08b04dc36ed9b19b5ff54c5cc2fdf69f904173befff305a4562b43ef6a17df1f2f1430c511d4dd666b18b4a03f9e6003b
+MISC ChangeLog 24366 SHA256 7c398374e5674e502ec093250c692f98e903f0b687afaf7a32a10ff234762cf1 SHA512 7e1c1644678476068848af982cc7ac41424bb2a1780e4e9e11bc1229cb6d7971b5950f5894a7c3eb391c2d79dd25168c50e3a8329894d00aa75c8f5d76926594 WHIRLPOOL 8666bbd0613734b184773819888a036b8e7eca6e59530a82d94d9e4d4fed3b43d0c7a0b35058af9860a45329aa34400dde62135e99c40d526f80c4b6e5240042
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlNpLzIACgkQiIP6VqMIqNfKGwEAlxrzvKZ2OQ7gM7nSUgoL1XQZ
+syH9z8iMPVDSpW42ZisBAI0ae4AipmfgZ6rh5rQ5hFdvdGUSCTkqsz6hkPpbhbnm
+=Zg59
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/activeresource/activeresource-3.2.18.ebuild b/dev-ruby/activeresource/activeresource-3.2.18.ebuild
new file mode 100644
index 000000000000..a2d26eef9e5d
--- /dev/null
+++ b/dev-ruby/activeresource/activeresource-3.2.18.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activeresource/activeresource-3.2.18.ebuild,v 1.1 2014/05/06 18:51:29 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activeresource.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Think Active Record for web resources.."
+HOMEPAGE="http://rubyforge.org/projects/activeresource/"
+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 ~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/activesupport-${PV}
+	dev-ruby/builder:3"
+ruby_add_bdepend "
+	test? (
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.13.0:0.13
+	)"
+
+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
+}
diff --git a/dev-ruby/activesupport/ChangeLog b/dev-ruby/activesupport/ChangeLog
index 93d25126f26e..9f083acd584c 100644
--- a/dev-ruby/activesupport/ChangeLog
+++ b/dev-ruby/activesupport/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/activesupport
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.253 2014/05/04 13:49:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.254 2014/05/06 18:50:41 graaff Exp $
+
+*activesupport-3.2.18 (06 May 2014)
+
+  06 May 2014; Hans de Graaff <graaff@gentoo.org> +activesupport-3.2.18.ebuild:
+  Version bump for Rails 3.2.18, security bug 509706.
 
   04 May 2014; Jeroen Roovers <jer@gentoo.org> activesupport-4.0.3.ebuild,
   activesupport-4.0.4.ebuild, activesupport-4.1.0.ebuild:
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 091221e0d214..cfc4049b4d57 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -7,19 +7,21 @@ AUX activesupport-2.3.16-unvendorize.patch 2382 SHA256 fda4f0aecd104d7516b8c6b0d
 AUX activesupport-2.3.5-mocha-0.9.5.patch 1031 SHA256 238be71abfb03ca232d5c80c480da4e8f1ed8f8da6cfd89f7a64513b82cfd811 SHA512 3f98d2c18b7b2cf4cc03c425191201d6e59d83537bf01fbc09c35bfadaf45f05a24f694033edc3a30dab9b02eb865c3ba26f7e376e80d6ed1cbe14fc3c73f8a0 WHIRLPOOL 97e2622840b264bdda41c4ccc50315ff4dafafdaa422acf86e77f02bf5589155b2a7bd55a0a9886b0a8671932fa230d6bb76da07709e02509ce37b3c108964fa
 AUX activesupport-3.0.3-mocha-0.9.5.patch 666 SHA256 61e62f5794f9291f3ad8315d5ce0379c25d491311fd30fb06d35f618ece61a5f SHA512 a2d986bdfd7f4376264af1995626d46abf4331fcd64d081bc6c9480e9dae8f4700a2ca6a995a922846c20bf64660fed2e39a7df537240701d0324be4faeaec32 WHIRLPOOL 5ed28791b7dec003a53e6a5a6454d86196b2201b7b3caa32b9971bf05dca59d8ab36b48cf0be604801d1bbc29f204e90b5d77f026aef9c412ad980ce257867db
 DIST rails-3.2.17.tgz 3566537 SHA256 f94972ed71c005ae1f7520d8840852872fbdf6c834bb2eaf1516fe63e406d609 SHA512 4ad32d71108d444bd791ffb2fded25deed69a304a4d6497fb12a586e07348bf4cd1a453614eb932a907063ad6166b89f4778742cb5c2c420f17a116e11b964f6 WHIRLPOOL 0b0911120202e3152a74d31f3b7f8a24261f8e163577ad88c12fd85be088871a0f8ed46b305325250bb830f786231ff349e847b2f642cba02905a95a9a022d68
+DIST rails-3.2.18.tgz 3566632 SHA256 25f5c98c965a222b001ee07eefa7e2c3719bfd8f6a9b44eedd4759c646b05895 SHA512 31e219eb038bffe395d2dddd59d5b861001f5ffe88bb1fa33e87e584d70f0d0a8143b905cf736dd328dcea1934ff662e59ab20e3e9593d919b1110bb1f92a3f1 WHIRLPOOL 3188b58902092c5f2a4c6ea905698200b65e9158c0bac41374187bccea9fc68bfc05631060b2ef6506cb69d13fcf38ee7c8a5aec9e3166a9914c59110b4e3592
 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
 DIST rails-4.1.0.tgz 3678238 SHA256 0f2cff305d20d374a7326fbaaae991ac380676b1a4a710f36ac99b410902cabd SHA512 16a6ff43f19cb1bdbe0cdd4729bf9d198ec38ef258362832e6f1d2a065569a133527c7bb4f3394d8544cb012e9af41a643122600b8a196f9d75ab541a32034f5 WHIRLPOOL fb365255d0752104815f0d143f45c696b50863b83af0634a26c407d01d3d1f402b516aac3de425e696cb62e33ccb0395884e0ae68b9eb90608bb203bb1d2ee2c
 EBUILD activesupport-3.2.17.ebuild 2496 SHA256 60211d3859706c8fcde46424660965da6226fa974825781933fea98b06261f7f SHA512 cb3d162f854a23715a810834452dfdc2eb72b9a6d1bd9dd4648486c6202818c05690c02311f04956e01a3ffd1a70ba5562a0626f5ea620cb47ecf6a36d062d95 WHIRLPOOL b422696827664e8acb88e5a513ede94b1c9d9ad50a266fa61fe61d0e0a21aaa4852ed457de345211becb1042e9cd0e6a690e47e389e9ee6a5227de0679f7fa8d
+EBUILD activesupport-3.2.18.ebuild 2496 SHA256 5c8043f6ad66e093fa727253cdc60beb734605b39c1de0231a888f68fb66c2f0 SHA512 4801e819659b51e5fc1a80f8e6041bd473048f85ca6cfb80f21a92293e86602512aba95c6da0dd0023cc72933164539369c936517cc44961a7b0e717c8ff004f WHIRLPOOL bf709f65238c4459c4b0d3fa0fa73a18a24402c571ad88276b6cac2ad1a8dc6fd3c0c3243fcb66a98c03d3d4c94e970cf5043ea210220dac39acf46c7847f1f7
 EBUILD activesupport-4.0.3.ebuild 1768 SHA256 cb15db6963219d7e03eadf47710a0606679105570fcafa3c102a4a6e8fef2764 SHA512 e64f1f84d8d257584c97cd1c65f29b618070ed4a8f75ecb6581e988b6398af399777e7dfdaf5aa89fabc191e0bcbb6079a01f0d5773ba5345853e37f01825194 WHIRLPOOL 59b019021bf29161588b52601be7fdf3bd0fb2318ddcdeab8f1a5d81619c86ceb02101eb2a20194dc565d0f5844abc2275e0ff65b3538826205b1abce2dd33c0
 EBUILD activesupport-4.0.4.ebuild 1775 SHA256 c5aad3231251322c6e872b40f1b8b19b1f8d67ebcc2ffe1c14fb73d0a65c08ae SHA512 805dbe4a17c9faec86a9bccdf578924c8929d95f2a7e016e92e9a302a8ff42ebaf3bc780ac683caf495c45d2d28681b4aba6aa86cdc1c1beff8d389e981d2c7b WHIRLPOOL 0ef688a45eebca5cf1514ed3e7090f03c0c160dace37bfe5152bf679e64682a207c38c2bba2194a5f4909de68b5c48c6abe31ca4ed4e195b30822347af7206ea
 EBUILD activesupport-4.1.0.ebuild 1496 SHA256 fb58063320485f50f0cf7d172414bb93fc93cf0cee620ab4546294cef6176a8d SHA512 2d0cde541cadcd4cae231272f59c9e9eb702ced81a0a92cd4bee96e68ee248eeb6fa1f9a0ae6bd7c21fe0d79b7dc5b504ce97d51df46ee712ed5c175b7f6f469 WHIRLPOOL 28ca7f3a6f426c48927f54098542c831cb31af6e25c7e4efac7ea512bd717ff85a2c9b23719a815c6fc96425968d25fbe0ee1bccb92ef1964d699bd7346e840a
-MISC ChangeLog 36057 SHA256 c993375d2b8eb10a441af629131bb456c005910a6857023745120fe2349d6204 SHA512 7d20c0c47cc0b75971b4bcc930e566210da6a00d8c61c3117277e524c793c1b280ed06c8ef091f84c6914185b5fa622ae90fdb4db291eb790a061e12555f1a0c WHIRLPOOL a1c2bdc73daa8df11b9b14c57da2096f51c73aca759b8421830fa374c849af4a4a72e0d1ff8da110a51dc91e3d21cb0a191b48ba4c424a046b1340aef1c25482
+MISC ChangeLog 36232 SHA256 b1d3a422fbca4e69a7596b299311f650aa84b7d7a349b3103e91c3976e0d74a4 SHA512 6ad0a582d34fc5050283a1b71bc92cdd27b4c3e62cf400aff3eb611a5fa2a66b665f4d33162e4c6d0525c67f8a36429314ada3581ac9f35c0f3b85d716103418 WHIRLPOOL c8a1a8dcb90d58fd54dd94601dfbc4d93624874aa701353956f6517191cbb7039b900300cf6a270e05a6446f55dc5245869da050348ca9cfd13313c7bd7f130c
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNmRXcACgkQVWmRsqeSphPk2ACfaq+hFP5qwqDClW3YXU52vf+C
-BywAn3D0S/ngXZlPNy/Ai6IOLaCDpMza
-=xiaM
+iF4EAREIAAYFAlNpLwwACgkQiIP6VqMIqNd1xgD9HgyPqE/swdTUrGVtZtf/Fg/k
+giQ0xe3vO2RX83w8d1oA/iFMvH6iiIdD/32yw80JkamQBPL9I9fJRsV7deS0uwOx
+=5F+x
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/activesupport/activesupport-3.2.18.ebuild b/dev-ruby/activesupport/activesupport-3.2.18.ebuild
new file mode 100644
index 000000000000..da92e5e48ab4
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-3.2.18.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-3.2.18.ebuild,v 1.1 2014/05/06 18:50:41 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
+
+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="http://rubyforge.org/projects/activesupport/"
+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 ~hppa ~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/multi_json-1.0
+	>=dev-ruby/i18n-0.6.4:0.6
+	!!<dev-ruby/activesupport-3.0.11-r1:3.0"
+
+# memcache-client, nokogiri, and builder are not strictly
+# needed, but there are tests using this code.
+ruby_add_bdepend "test? (
+	dev-ruby/test-unit:2
+	>=dev-ruby/memcache-client-1.5.8
+	dev-ruby/nokogiri
+	>=dev-ruby/builder-3.0.3:3
+	>=dev-ruby/tzinfo-0.3.29
+	)"
+
+# libxml is not strictly needed, there are tests using this code. jruby
+# uses a different xml implementation.
+USE_RUBY=${USE_RUBY/jruby/} ruby_add_bdepend "test? ( >=dev-ruby/libxml-2.0.0 )"
+
+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
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby18)
+			# Skip failing ruby18 tests related to JSON serialization
+			rm test/message_encryptor_test.rb test/message_verifier_test.rb || die
+			;;
+		*jruby)
+			# Ignore failing tests on jruby in the interest of a security update
+			sed -i -e '/test_not_allowed_to_expand_parameter_entities_to_files/,/^    end/ s:^:#:' \
+				-e '/test_exception_thrown_on_expansion_attack/,/^    end/ s:^:#:' \
+				test/xml_mini/jdom_engine_test.rb || die
+			sed -i \
+				-e '/test_exception_thrown_on_expansion_attack/,/^  end/ s:^:#:' \
+				test/xml_mini/nokogiri_engine_test.rb || die
+			;;
+	esac
+}
diff --git a/dev-ruby/rails/ChangeLog b/dev-ruby/rails/ChangeLog
index a9a6f80d1417..cdd566d3f98f 100644
--- a/dev-ruby/rails/ChangeLog
+++ b/dev-ruby/rails/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/rails
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/ChangeLog,v 1.287 2014/04/26 15:10:25 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/ChangeLog,v 1.288 2014/05/06 18:53:31 graaff Exp $
+
+*rails-3.2.18 (06 May 2014)
+
+  06 May 2014; Hans de Graaff <graaff@gentoo.org> +rails-3.2.18.ebuild:
+  Version bump for Rails 3.2.18, security bug 509706.
 
 *rails-4.1.0 (26 Apr 2014)
 
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index 6d46b758bee6..2bf1d43e3e66 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -2,19 +2,21 @@
 Hash: SHA256
 
 DIST rails-3.2.17.gem 3584 SHA256 8eff1bbf9f22fa943e58e9b71c6bdbe5d5d95caf022bec38ce083599961cb984 SHA512 cd8ebfbd78f4ee415121d24f490024bcbab0e1b18f4ed5572ba7be7c27409055e3d233e26aa7e10cdc919b310be5ac85409d3f0371144b21913a772c958543e3 WHIRLPOOL 92ebf09cb682185e5bbec7af6d2da6c6397a1f31d94b41c9482b0ad060b4dbef5f1d5dcb74d181be7befd72bbb5536faccc5491cbed94c59aebc20b22e55bdce
+DIST rails-3.2.18.gem 3584 SHA256 b087466024542c7abebc85cb5638ba8bed302616a914996cad454bf8d6e54198 SHA512 4b31a35a89d4fc9108c08d06700172ab45575acbb4f5a642b90f231713303bf7adf299978a2704a6f0581d473f69dd0bcb1c6287832d2be89016753c03bde6d8 WHIRLPOOL 50948b7e540cd4df641537f08ae3d3b90842dbf643ec2e040d3ca9b58d3d9253f60d7575e1f6bbb2fcd8166bf8465520466f1cd97ef86f1ec62b053ac9664d07
 DIST rails-4.0.3.gem 1549824 SHA256 649f8ca0cdc10d47e6bef73e098937a2a61f5aabbcf2fde930d28675021e81be SHA512 5c5addf2cc136300befee1e021f71936e3719f88047d390ec6e338efe0aa475bc4f18a0a1de1f5f2ed6c7fe49d9e0b4eacff154054210a77239784e6a49a994e WHIRLPOOL 312d934851c83f6181c45301af21a4d17287252def045fdeddd32b970199db06e3673defe203e12e1df3f9c6206ba687953b0169239357206a991aaf3bf3d2e5
 DIST rails-4.0.4.gem 1550336 SHA256 ead3f37942b32496cd07837a01c40acc4f8c8df72e839f3d087a2c3543d760bc SHA512 18aacdd84093a06a8cae6ad22f48620b742922a6ce0f6b1bd45887acdcb8d46b21dad7100d0aa5a4134d5ab6e81e19bfd894df75b190b9a59ef557030f4716d8 WHIRLPOOL 1e53c83d3740632eb60bc0600f5403c377744562b0dd982a36c92aa728357e0d1877d872e4489a574802a284989581f2300d8aff72e273c36e778faf0fa4287e
 DIST rails-4.1.0.gem 1435648 SHA256 d2ce7d3965f8c5d4b9076012d52512022dc0b0a0e4a427d801e84db449e140bf SHA512 9db57307fce170bdd300b89fad6e87630f2aa37855fbfa2f62be8d682a3371bb98abc347ff24b5e5c4741ceb2a9b1f4bf432ef33a0860a9dd8b14440223d0a6c WHIRLPOOL 2b502bb5fca1a9bed3feafc10dcee69315eb904a7b541abaaf3e3d237684d4d957a41abbde72a8f050ea6ad36acfbae33070f4fe735f9e11cb7d67736093ffee
 EBUILD rails-3.2.17.ebuild 1062 SHA256 b7db60e5a6145c30fd902ed3b00bbc31e0a404f1b238af9a8d99f6dfe9e7156e SHA512 e90df9df7763d14a2b0687f63bf39e742a1e6591c008a2e41c7762017f720a54293822fd2b4a33af126e68dedcbde22e9d0a3d0b8190258cdf115e3337341f0f WHIRLPOOL e366a66d7932a0b1d534c0a8931f8fb6a701a04c4ca4ae6f0b853789f11d1b37aa309a8676073683a089de6b62fb6935047c2247491ca1758e0731965f4c992d
+EBUILD rails-3.2.18.ebuild 1062 SHA256 d3b788817f3fbec255d016f8c09d53f448f494f645e731b9769f3b5bea55e919 SHA512 cd05a19e912c595bc918043e01fc1fb91fd2901efb19a32831e8582a6c077830e505e5fcba054a3a1d57170a3d297a1319125c21bbe8b0040c28b395646cf2a9 WHIRLPOOL 0b6db84b2ff1bb7520898e75c09157da84792595c6e434a16a51eff0ab7387f0243ab96c17293b5457a64c3f0b428510526a1702ffb28ba493fbbdca3e9b0762
 EBUILD rails-4.0.3.ebuild 1122 SHA256 afbe29210f1ae9e9fc7cda9953ad6993141f937c77747196f36fb8d1f582931a SHA512 312e37abee9f680f626aadef738471d04ad9bfe58feca87e7d436dda6151618f939acada088d8b19c2e7142b93bd42f4ebbfd7fcc2fc11921a7d5970749865fb WHIRLPOOL 0044a31d1124e41a68dd69952b00b2a7a60861c4d33dc5228d92417960f76781e428e431e0c7c418d8a9cd8fa3eaf76b65f1120f283087194e75a0ffe5d99221
 EBUILD rails-4.0.4.ebuild 1138 SHA256 fa9ac4094bedfe60dea541fe06dc2d828f46064c22ca63ec004df4d1945b3b4a SHA512 35b25d3e29e17202353f718e6bf7af10f23e6d62239df549a0da72329b4abfa35a89ed7414dc1ae80c526b2f7175943b822888e5ced7d8b117f59315bc926d17 WHIRLPOOL 266a06c2cb9f865862ed24cde9a382abbf5f5e81b7713f4b1273d7875e7a2ed3dbb88a4d38fce636cf5ed5853cc0d01bf9b4edb532096c9f4cc1ca60bf612734
 EBUILD rails-4.1.0.ebuild 1182 SHA256 ebf12d970357cd6e8bd10aa2686e5805a2105df309806b8607fe1e9b85f4cbc4 SHA512 1f636bfb26dab8f9a6a61ada7d23cbe652200f0de89b8643567c841a9fbdc83a2bcf128bdd1717a1ebd96281aabbc32a6c9e9fa558c5f52e68c4764bed166b30 WHIRLPOOL 678f8a3fb6ed611ac053751f2b6272bef22b292747c7ba3627456039adc9227db62845df0fe8138d7694c7e71c7c3be32b2c6d6bcfa6c915a7bdbf19f4769ffa
-MISC ChangeLog 37901 SHA256 1229c8642368d1c058cb021156608aa9716b150c749fa162283cfe832222f81c SHA512 5bae937f037297c82ae38f0550a14fc4b1c5f2adf51e157744181e79f44ce03605673d6d3f5fe4ba61659c56c20c72b1a9963ccf4fbbca5c4fafcf5ad3f0cc3b WHIRLPOOL 3c63e0f292f78fc3c1b801b30bd6e3be63aa7f566708782211ac79e4d159afd0ec5b6e0e128800499ac668c910c58d98bcf22f570845578c52f393317fa09776
+MISC ChangeLog 38057 SHA256 a88546f6b641c9103a0edbc0272ade5fcb4c331350d2472d7da44c8e803ce9e2 SHA512 bd9ad186710dae987cdee5669ab3ad0e4619b48d23815e7eaf1a07e2143f1d944508198ab33d62ef4c1fa717f66a979dc20639268d0ebdf0bd1634a014a44954 WHIRLPOOL dddbdbcff80ae8d116d013d6d6d4c8b65002187c4667fc1a88586928f7d0599ce91bc8aaddc1551642444a71bb31698e524d78c87286803d86d6c1418e0fb102
 MISC metadata.xml 393 SHA256 ab0c7d6f591fe1803349f791b02e9be652e39232117c98f1b173c7ffb0854dee SHA512 dcdd257e9e5ad70fd720cd74ad12f3d292b98f72cc45c80ac02599fe46d16fbdfa84f78e6781756c59fdbc9a808c4734e491c07e320a54a1d2a51241658bb713 WHIRLPOOL 5317c82e4e1ac614e51dc74741272cf1b20fa0cd7b72c77559ecd1115d82dd7b9359bdcd80f1e08c358c096fe1f77e4d8d9e30e6ec70d6246a09613b92fef4b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlNbzGIACgkQiIP6VqMIqNdqyQD/f775oaP8UEaz5CYmkvl4DRCV
-bgp+yhjPjA9SynP1ub4BAJCrVWvQ8nKhF3b3Le6Zm6w5rDG28WuQBH8r4JJOZelc
-=Oaji
+iF4EAREIAAYFAlNpL6wACgkQiIP6VqMIqNftmwD+KIiuGM/bNH2uzn6bko03gULi
+yp7854o6j9VSCzl/M08A/iTzM5WLe2E8yZB4+d4B3ENYNZ5Y94dtwC5oAAoglqbU
+=MB2t
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rails/rails-3.2.18.ebuild b/dev-ruby/rails/rails-3.2.18.ebuild
new file mode 100644
index 000000000000..57012119e6a3
--- /dev/null
+++ b/dev-ruby/rails/rails-3.2.18.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-3.2.18.ebuild,v 1.1 2014/05/06 18:53:31 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+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 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="+asset-pipeline"
+
+ruby_add_rdepend "
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activeresource-${PV}
+	~dev-ruby/activesupport-${PV}
+	=dev-ruby/bundler-1*
+	~dev-ruby/railties-${PV}
+	asset-pipeline? (
+		dev-ruby/jquery-rails
+		>=dev-ruby/sass-rails-3.2.3:3.2
+		>=dev-ruby/uglifier-1.0.3
+		>=dev-ruby/coffee-rails-3.2.1:3.2
+	)"
diff --git a/dev-ruby/railties/ChangeLog b/dev-ruby/railties/ChangeLog
index 4b2f7f165603..aa130f9f2e73 100644
--- a/dev-ruby/railties/ChangeLog
+++ b/dev-ruby/railties/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/railties
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/ChangeLog,v 1.73 2014/04/26 15:10:15 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/ChangeLog,v 1.74 2014/05/06 18:52:54 graaff Exp $
+
+*railties-3.2.18 (06 May 2014)
+
+  06 May 2014; Hans de Graaff <graaff@gentoo.org> +railties-3.2.18.ebuild:
+  Version bump for Rails 3.2.18, security bug 509706.
 
 *railties-4.1.0 (26 Apr 2014)
 
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index 619cdb6b206c..52f4d3116094 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -2,19 +2,21 @@
 Hash: SHA256
 
 DIST rails-3.2.17.tgz 3566537 SHA256 f94972ed71c005ae1f7520d8840852872fbdf6c834bb2eaf1516fe63e406d609 SHA512 4ad32d71108d444bd791ffb2fded25deed69a304a4d6497fb12a586e07348bf4cd1a453614eb932a907063ad6166b89f4778742cb5c2c420f17a116e11b964f6 WHIRLPOOL 0b0911120202e3152a74d31f3b7f8a24261f8e163577ad88c12fd85be088871a0f8ed46b305325250bb830f786231ff349e847b2f642cba02905a95a9a022d68
+DIST rails-3.2.18.tgz 3566632 SHA256 25f5c98c965a222b001ee07eefa7e2c3719bfd8f6a9b44eedd4759c646b05895 SHA512 31e219eb038bffe395d2dddd59d5b861001f5ffe88bb1fa33e87e584d70f0d0a8143b905cf736dd328dcea1934ff662e59ab20e3e9593d919b1110bb1f92a3f1 WHIRLPOOL 3188b58902092c5f2a4c6ea905698200b65e9158c0bac41374187bccea9fc68bfc05631060b2ef6506cb69d13fcf38ee7c8a5aec9e3166a9914c59110b4e3592
 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
 DIST rails-4.1.0.tgz 3678238 SHA256 0f2cff305d20d374a7326fbaaae991ac380676b1a4a710f36ac99b410902cabd SHA512 16a6ff43f19cb1bdbe0cdd4729bf9d198ec38ef258362832e6f1d2a065569a133527c7bb4f3394d8544cb012e9af41a643122600b8a196f9d75ab541a32034f5 WHIRLPOOL fb365255d0752104815f0d143f45c696b50863b83af0634a26c407d01d3d1f402b516aac3de425e696cb62e33ccb0395884e0ae68b9eb90608bb203bb1d2ee2c
 EBUILD railties-3.2.17.ebuild 2091 SHA256 9da8e23f10049aacba6a89072c5ae61ae13a826f459446a09cca0415ce4107af SHA512 1ff7c358d448b5f3c922abcfb2d2584339f228a647442a2c70f5db7cf7fa39a8dad80243c7b0024a74c3a876055ef3a7a8ee6a2aef189f0be428b3ef05d30429 WHIRLPOOL bd18a850bf4e9b3fbdce55ed6e079f1526d339dde0e0643315fabccd9baa29ce597b5d29d840dd1aa19eaee7c5dd81035ee7f73906b5ab9381d48f8ef3e80fba
+EBUILD railties-3.2.18.ebuild 2091 SHA256 0b98b112f3173044cafbe61988499a71130352dd996164386d3d26ffdb3cf31e SHA512 ca286a17e0b837bc3c84511e7edb207d3186c61eb9c2058e5b1c820ea95de2f2dfe70a2a179ea89833d180f4346bf81a479a061f444b2e28a86bcb14e24717d6 WHIRLPOOL 901861ad62ca136da25bbf5faae9e45b35e6d482efaf65d120a6325b9b96894608bf8cf9fc2f332a4246e9ddc890302b4af279c24879744b821e6c7caa811031
 EBUILD railties-4.0.3.ebuild 1733 SHA256 b41a56cf6df1317fcfd2ceec13ad1a8f39f92887ed86adbb951456c6e84bf29a SHA512 fc766432af7340e68559ddb7d4f8fa8532e9432a572db6924b518b6e76fb798d51011c1ed6a9ceb3494450261719196a9e8c2d2a33ab5855edac2d5dc07927d7 WHIRLPOOL 9fe9c7c32e03907253baa321b197ea1fd70261803e5684a82d269ab4a561fea48e52fdc00dfb774ea61ffb9b56aac47f6b641f252f419d3356737ebfe1d8fee7
 EBUILD railties-4.0.4.ebuild 1749 SHA256 ef95aea2c736abb37512cb94a8401d35c6f0e782e7aa3293526b60196a6739ca SHA512 42f2bbf366d73747eda86873f4d17de8b67cb1aa7c100214bd975a4cd8f80864f778106351cfb1eddf619298efcfed3baa1e0cfc2cc842432bf9440ae1a55d54 WHIRLPOOL f5ccd22802cde40e0f0b730057dcf8615b4d17844c8990a597c45b3055a7d6d2a305ee1eb6920615155401e21ddf3fd4f1f661bce1ae77913cec9eb2f076ece8
 EBUILD railties-4.1.0.ebuild 1773 SHA256 82e574024db0de01f543eaf097ee833ce1445ed84a6262362a6758e1bbe3bec7 SHA512 8745efbfec2cb9e484cbbe11c8acbfc72b4d84e05c0b61fae85da4bd98b7b8e93d63449481d3b88f2cfbdcbbf5c53ff45120e864d5f9c5dee0d8abd7708e073c WHIRLPOOL 29a0e5a56c9791b9c102945700f064eeb387ea3d081a47d12e609b3953e23e0739400b34922718a1c14f523addf95ef6b96b33afea7684b59f59d7e6601a74dc
-MISC ChangeLog 10661 SHA256 8c0149c7adb9616636408d4ae7ad8063edad5d1de155bc380aa6bc7bf3ad9ffd SHA512 f74521234016a45a17b07d29b83d4d9d4e3a24fda1ff514e5afd0642374efb50c8fbf2b5c18a8b6bc86891299d3b309d43bcb6fdedfb444cc6b16a376ce41063 WHIRLPOOL 9e05d8e7238c6889f06c70551878d69cdcdf97a51cabaf89a72643c72136654c50f76a1513bcb6526651abbfc360999b80fb9994e8a5d9a6cca0a82fbb324e95
+MISC ChangeLog 10823 SHA256 c2c04046d8834bb90faaa4192f2dd75bbce1d153b9db0daf0cfe6ab41ebfc1bc SHA512 f1b9c0f8193e9c01d817561cdd634ca131d5c7a906fe22aacc71a3d7a5a28e0fa0ea836d7d5fbaa1aa831aac6a9b90e68728e6ac574897d884d238a2aeedb6cf WHIRLPOOL 41f622a3de89302724a41014487c4da57cec3af4943a53358c8be580fd96ff1df7199c3475c3901e78e25a8c004462a1dce8e7912c23465e4ae975ed7ec41777
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlNbzFgACgkQiIP6VqMIqNc0yAD/cjnA441Lt89n2FviNTDf6zil
-F6wNopKaF2XbG8oc55MA/0t9ZfcS1Dkid0MrJNcYnjNihUolrL2XiYpQlxVUs9dA
-=mh7g
+iF4EAREIAAYFAlNpL4cACgkQiIP6VqMIqNeeygD/RGt0gtD1mSB0leW5x8IMLAfB
+sDGFp7DMKSmFKqPTmr0A/A7ezrd4WC03VWAuprtUi0maqfA9zLbj+h0coEpfr5Zc
+=KnxZ
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/railties/railties-3.2.18.ebuild b/dev-ruby/railties/railties-3.2.18.ebuild
new file mode 100644
index 000000000000..822a7acc5a45
--- /dev/null
+++ b/dev-ruby/railties/railties-3.2.18.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.2.18.ebuild,v 1.1 2014/05/06 18:52:54 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_TASK_DOC="generate_guides"
+RUBY_FAKEGEM_DOCDIR="guides/output"
+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="http://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 ~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}"
+
+# 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-admin/eselect-rails-0.18"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionpack-${PV}
+	>=dev-ruby/rdoc-3.4
+	>=dev-ruby/thor-0.14.6
+	>=dev-ruby/rack-ssl-1.3.2:1.3
+	>=dev-ruby/rake-0.8.7"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.13
+	)
+	doc? (
+		>=dev-ruby/redcloth-4.1.1
+	)"
+
+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 '/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\)/d' ../Gemfile || die
+
+	# Also allow rdoc 4.x
+	sed -i -e 's/~> 3.4/>= 3.4/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	if use doc ; then
+		mv guides/output guides/guides || die
+		dohtml -r guides/guides
+	fi
+
+	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
+}