Version bump for security bug 462452.

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

18 files changed, 426 insertions, 12 deletions

diff --git a/dev-ruby/actionmailer/ChangeLog b/dev-ruby/actionmailer/ChangeLog
index 62078e96326d..de77159f046d 100644
--- a/dev-ruby/actionmailer/ChangeLog
+++ b/dev-ruby/actionmailer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/actionmailer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.231 2013/03/27 13:35:31 moult Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.232 2013/03/30 09:32:51 graaff Exp $
+
+*actionmailer-2.3.18 (30 Mar 2013)
+
+  30 Mar 2013; Hans de Graaff <graaff@gentoo.org> +actionmailer-2.3.18.ebuild:
+  Version bump for security bug 462452.
 
   27 Mar 2013; Dion Moult <moult@gentoo.org> -actionmailer-3.0.20.ebuild:
   Remove dev-ruby/actionmailer:3.0 due to lack of upstream support
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index b46b19363087..6f04b2f3167b 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,16 +1,28 @@
+-----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 actionmailer-2.3.16.gem 272896 SHA256 5493fce4c6eb5c07f74312fb84af00b140d684c5b581ab4eaafb059a4a5f9ad3 SHA512 abe49066cace06b3afab0e0619561242057d86edcd15ca3431239dc93c80bf5f04777d68017c9b97824d1c8eb1faff76c68c12dce434831a9b8d26118ddaebae WHIRLPOOL f896c0cb1ae7859aa2cb68b962a286bf6048499c5a810e2261f0a9ff359e18ddda58f3b055ef1d09defae5bdeeae4f746bc953fd8e81ab9f4f05e8af75707483
 DIST actionmailer-2.3.17.gem 272896 SHA256 c79f074a3e35a146e4ce3a7acc64703d9d0d0452313a255722973e4f653c9105 SHA512 5e30edd3cfe12950ca12a960fe649ecb39bfa0a2dcb49a4f124047015c07f3182c3e516ce550fdeb5300b1bb19e595591ecbac1521c1aa55f5f65299ac2a17f4 WHIRLPOOL ea8e65c8428a00448069e24a1fadd17feac2bc9cec34912e406d2ad33e26cbf6871e9f9a1f9b44221f4f685c4acf2e377813661d9c380f49b3378b69c725070a
+DIST actionmailer-2.3.18.gem 273920 SHA256 cbb44db58ca8ef03d9758af5ea80229317db678bb4a6b8bfe65a7c6f32b563d9 SHA512 93ac7d613faa80d083e13094aa7a9e9abf2a89461964a3dabb9ac5ba828eb91458fc7d7056c928ed6fae2ee75c18f5078620e1e43e1300a264ab28b0e5bfb27a WHIRLPOOL 039eb1b19bb840c80b1da8aeb9d96de8b73edb12ed07c432f12d3112a422d34ff6ff802c6aa028e11d895eee2dc614ce8c073fbf5c76e44308f229ebb2380e7a
 DIST rails-3.1.10.tgz 3394031 SHA256 d0614db8c4011ed1fcb4bd0afeb8220634b1ec8b196ee40a956c77a76026ef65 SHA512 c6b3db4043345c81582ab22289c29630e3946dc1936adebff0af196f461236805ab146e74ed400fe045d980df562ae44479e36c2c8747ed8a6ba6807add23e6b WHIRLPOOL 5329cd31170ce2ee7c109c9c1152b5eed35c8ec1af48a84d03eff4bb4fe083a7a9840ceb076575961d84c6baeb725fe1c5eed1a4756d39a8bc52a26f23dc6123
 DIST rails-3.1.11.tgz 3393987 SHA256 763719d4bdb46b6b45594985439b1f063375f4da4f0af000414267e5d4633e57 SHA512 ddd3ef1ee9a9bcdc9048958adfb45fa60cf79e961b8fd728e55bb2281dcb51e8f010d2d14de97a60c4c3ff1480b419562d8281031c8ea1c02269263e52fb8918 WHIRLPOOL 76df2b987b2291b01a1d17bba54d3836c11523309b8e30be164ee901a2e4af8f2be943dfc928b64d2e8e2477472fb4a2632b4de30b933cb89d277e3cd3df0298
 DIST rails-3.2.11.tgz 3547068 SHA256 3f05603f84bfb7a99f999f878af247533706255e6b3baa4111439b6f5fd8ab70 SHA512 50644772186127887bd4d7537ad41cbe549c5c8496274cad2765f21859528a0f42f5b8dbe3a1627a08b1724b2e019c0ec6526cccfdff3da4ffcec285f9259558 WHIRLPOOL 70d5620fc611872b2af62351c81abbe43b3b1d41c92a1d1935cef704a4a655c9bb043599bc758c947c14378ef52e34b44c61536d5a048401cc6bfaef613eba23
 DIST rails-3.2.12.tgz 3547449 SHA256 b3371bd5706903f740cb091deb992758011ef2dc3e9c79c8fda64819f0251f0f SHA512 61c74648fd81758b561ec8102573bf0099d67dd4c43bd76e93d2409ac03002dc4062154159e904cf52543e931980c418ceec8a785a5d977967d27bc60cf06a13 WHIRLPOOL 995dea20c8bee1fa93352430600257a4d2cc50fa433a9d06bbbbaa0d5e36f96e0d56fc599dcc092791ec982c8aaba8bbd608eaf8c2db81abd2ad8147c8d73da9
 EBUILD actionmailer-2.3.16.ebuild 932 SHA256 fbcde46a4ba2a6021b88024c73fa973214504882f18e2b0618e4e0aff5e4532f SHA512 5800dc9816fd0e351688580e1d1d167d5356d077efcfc94581fa40873ddadf17a735d7861adfda6c3f86ee806c1e2aa169459da3d751e6e10ce1e07be6dd8d7a WHIRLPOOL bf97e58bd534e0717da238bb504368612994de887b7a16b947a1d12f3c4f5b0c68e673b4ba889de813bb13adcd54d8af16d19cd62ee86926357b8d5a5a766271
 EBUILD actionmailer-2.3.17.ebuild 932 SHA256 5b38b10c74b9cbb5e61e30d11d399772575df060c98234b91142bf862de8c21a SHA512 8b0be7311726bca7b1b1bbbe1da59a3c1bb9122a8eb3ecb18c3c78e38d0102df859dc8e017526af56c7d273a0eced7944216e74812d66769f83f8dab2f6f6f4f WHIRLPOOL 04d1e03449deea4d5a55bcf699b0110c000d692a09b169bef6afd61a5ee97bd06e32aa736503bbc2d8bf408c029e6463347f7321611c4b8ed3616a43a427e620
+EBUILD actionmailer-2.3.18.ebuild 933 SHA256 4ea6c7feddfbc476ecd643ad318065e6ae19ed0fc221926a10be873ae99fb657 SHA512 36188ee858184ad6372d25fc00f4c85bcb0d3a83dc8a1b12ab6ab44c04e5b4ae18a262b424e2ef4cba2a017fe827ac79ac10c3f5b6a66036b5e19bbe89e3d6f3 WHIRLPOOL 011c6a7d62a377537cb3bf545b4b72d052c505c946a9feb4aa1d034d3b8e6cf1dc01f2cf6beab518765955234270695cb08661a55742369d0d6c9a91673e11bc
 EBUILD actionmailer-3.1.10.ebuild 1254 SHA256 3396b7c35d20dfe8d8a39694bcf5bb873e82fef076c697489f94981e46e608ee SHA512 35ea6db1c016cf60a4791f102c908dc9fc0ccbd1f51c89aa1790c1cdc7103469497440570ab9a2beba2982d321ce7f4270d54215d2a5459667252102a14836f5 WHIRLPOOL 4b89287e5cc7f8dc7bb0b413f75a76a9e1e034299a289b5f5701d1ea45e9ee5a41bfc07e987b14a9f239f60b4f18d6f0dbe3c8afae1fb39658f03ee4fddde181
 EBUILD actionmailer-3.1.11.ebuild 1251 SHA256 5ae77df2df34cc21e766b3566928b8d22c492a8c6d7b1f868f2127cf00589a73 SHA512 ea7179e87b072f39394314a600516a1d0873fdc0354d9aecbaabb82638fa8f6b4f9775b37bd8c34df3131581e36c4ec3e79ae096e022ecd5195088e0432502f9 WHIRLPOOL 72bd60be8f523ddf595c8f4720d03d6a47ae69c45edab0eb34e875498becf1a92bfec31d9f4b359db4f20ca98cddbe67c56f0fb6ddae5d1057a6fa7142e0f0c6
 EBUILD actionmailer-3.2.11.ebuild 1211 SHA256 bf40debd671f798592e3affe89742ca52f918d422f417b017e0fc6610e6547b9 SHA512 76ded09a9e9caacee9d52d093891dea4cd666d44eae32150ac198716c7a2a6d7a3c52f76587e13277da84efa22a008f0059f9a3e5b73401f6e42d68fea565e6f WHIRLPOOL f266dcd84b6837595065c844f2489a0fe4728fa4c1bed5d2e61b62185c66e2484999be5b6d627b0e1a52b14ea3960f1413bba4e16025ad06fd342287fd6018c3
 EBUILD actionmailer-3.2.12.ebuild 1215 SHA256 6135a0b03def9d95a2cb9cbae19c48e51c854ffadf2d254233458c91c6f272e0 SHA512 d9cbf64dba0d29203b138bf5028df8a7f0518325cebaa5e137e1905c27f7476966a982a97e8780cb94ac5b541d5da95941fd14654667a8329f046517577b1df7 WHIRLPOOL fdc2abec4f0ba67afd67766d1667782c7caef167e4cb5e1c5245f998c95ec1d0d096cd9f8f24a07b59a9d280c0bdfab17fef16b6975f03299281282776ba52b7
-MISC ChangeLog 31358 SHA256 dca2bf8f446624b73a089fa623e92c85b0858fe8e1b350e8e47577aeabedeb6f SHA512 572ed23ddc94590b7ccddf3e64b0804987fb43c8b9f616d3a06f2740b0a0cd984de662b9d3a245cf6e83c868436e461042bdc46b516d2cc6357c5b21b3262b3f WHIRLPOOL 7b9960f3f049ff9cab1dad3a4cd6af48d914215b83266044a6e042feac892df0fff0259ea7c1f32c015cf959219ea936b9983929a08610c5524d560f8b571102
+MISC ChangeLog 31515 SHA256 a128f74367ad1d432fcf9dc6fb2436d2355ee4560e0ad14e3bbe32ca67f1944a SHA512 6f424e4edaf80c2bfb7e8d5d6042ad0f38df19135fe7de498e8ccf21248a7f2ce139dd9a00eb37b970d47f272b3610c85562cb0451c0f156fa507a3d26e1c2cf WHIRLPOOL f784c9d27d8a9f83fb5cc68843b284ce9745e4596294bd5557cb720485249ec4d54a97fe3197af091c16fb5b47b3ea87646d18aaa1ddb96638f9bef11ea4a44c
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlFWsUQACgkQiIP6VqMIqNcR1wD/WrjJxgzMumldyEfQ6/JFPxbY
+0/ZIDPwlq5YDdh7LgcgA/jonaqgC/E2COqXGpWFavPq1wVwFTU5IRVBcbavYZOOw
+=LO81
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionmailer/actionmailer-2.3.18.ebuild b/dev-ruby/actionmailer/actionmailer-2.3.18.ebuild
new file mode 100644
index 000000000000..3609c9f997ff
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-2.3.18.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/actionmailer-2.3.18.ebuild,v 1.1 2013/03/30 09:32:51 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18 jruby"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="http://rubyforge.org/projects/actionmailer/"
+
+LICENSE="MIT"
+SLOT="2.3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_PATCHES=( "${PN}-2.3.10-rails3.patch" )
+
+ruby_add_rdepend "~dev-ruby/actionpack-${PV}
+	>=dev-ruby/text-format-0.6.3
+	>=dev-ruby/tmail-1.2.3"
+ruby_add_bdepend "test? (
+	>=dev-ruby/mocha-0.9.5
+	virtual/ruby-test-unit
+)"
+
+all_ruby_prepare() {
+	# Custom template not found in package
+	sed -i -e '/horo/d' Rakefile || die
+}
diff --git a/dev-ruby/actionpack/ChangeLog b/dev-ruby/actionpack/ChangeLog
index 6c066094aec4..0fe72edafd6b 100644
--- a/dev-ruby/actionpack/ChangeLog
+++ b/dev-ruby/actionpack/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/actionpack
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.247 2013/03/27 13:37:32 moult Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.248 2013/03/30 09:32:29 graaff Exp $
+
+*actionpack-2.3.18 (30 Mar 2013)
+
+  30 Mar 2013; Hans de Graaff <graaff@gentoo.org> +actionpack-2.3.18.ebuild:
+  Version bump for security bug 462452.
 
   27 Mar 2013; Dion Moult <moult@gentoo.org> -actionpack-3.0.20.ebuild:
   Remove dev-ruby/actionpack:3.0 due to lack of upstream support.
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 5b26c66439f5..74ef487c8cc5 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,17 +1,29 @@
+-----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 actionpack-2.3.16.gem 744448 SHA256 ea7b7f9e544b574ee393799e161a7b0b3e1d4dad3d5051b1055a8b95bdaeca68 SHA512 d2d3f8d90512014004c1fa3cf584c224a54e9d3ea80832a9e22c69ca3d305ef1364371a53dfcca6398ba6d0548f6993db6165c1a85d65e411246e3c3b35246c5 WHIRLPOOL 4f2675edf03e3e279d8776d89befffb388f200de516c7c2f13efc5aa4b20ac655daa2946f23f926462e3999193a6e9e97f3a930c1b7f23a30a37ec3d74fd0dc8
 DIST actionpack-2.3.17.gem 744448 SHA256 f97f0e9804a0b3e8969b2ddd096d05bb6766d4cd5070b33a32fe5c7ecf701954 SHA512 43bf3104a99d0e3d95abb113ebf0f3844083efc5e77f0dd282eb7b97921f7de050f1efbe612d199558e39dac8b5245449d6470664cb2edb4d9f00144de30c942 WHIRLPOOL 4fc7e052bebc66b3437db51de9e7a0a12d84ad26ee7513ed0f3359121f8cf1e777c64520eca3bd4d8f970ce40a324090e3ae9abcd2598b413d8fa2f7569d570b
+DIST actionpack-2.3.18.gem 749568 SHA256 304a9759801fe00928c14991e6ab252dbbbfa560e41ff9e5fdc66a65a2cf2ebd SHA512 d08af1e8a15b4b16f2160fe431b41b081f9442d0680bd30af20075186cec07febff85ac467924fd65cf8ed4f2fb808c5dd2e8f7d50c9e24d12e177659f30c3ce WHIRLPOOL 8d8aade452b5e715060ef327f41f78677624134ec0a9953a61dbf26ed0ab54bfdc7ed4f43e19f5ea190038c997cf25146912349bd35a1840c635d7713bfdfd1e
 DIST rails-3.1.10.tgz 3394031 SHA256 d0614db8c4011ed1fcb4bd0afeb8220634b1ec8b196ee40a956c77a76026ef65 SHA512 c6b3db4043345c81582ab22289c29630e3946dc1936adebff0af196f461236805ab146e74ed400fe045d980df562ae44479e36c2c8747ed8a6ba6807add23e6b WHIRLPOOL 5329cd31170ce2ee7c109c9c1152b5eed35c8ec1af48a84d03eff4bb4fe083a7a9840ceb076575961d84c6baeb725fe1c5eed1a4756d39a8bc52a26f23dc6123
 DIST rails-3.1.11.tgz 3393987 SHA256 763719d4bdb46b6b45594985439b1f063375f4da4f0af000414267e5d4633e57 SHA512 ddd3ef1ee9a9bcdc9048958adfb45fa60cf79e961b8fd728e55bb2281dcb51e8f010d2d14de97a60c4c3ff1480b419562d8281031c8ea1c02269263e52fb8918 WHIRLPOOL 76df2b987b2291b01a1d17bba54d3836c11523309b8e30be164ee901a2e4af8f2be943dfc928b64d2e8e2477472fb4a2632b4de30b933cb89d277e3cd3df0298
 DIST rails-3.2.11.tgz 3547068 SHA256 3f05603f84bfb7a99f999f878af247533706255e6b3baa4111439b6f5fd8ab70 SHA512 50644772186127887bd4d7537ad41cbe549c5c8496274cad2765f21859528a0f42f5b8dbe3a1627a08b1724b2e019c0ec6526cccfdff3da4ffcec285f9259558 WHIRLPOOL 70d5620fc611872b2af62351c81abbe43b3b1d41c92a1d1935cef704a4a655c9bb043599bc758c947c14378ef52e34b44c61536d5a048401cc6bfaef613eba23
 DIST rails-3.2.12.tgz 3547449 SHA256 b3371bd5706903f740cb091deb992758011ef2dc3e9c79c8fda64819f0251f0f SHA512 61c74648fd81758b561ec8102573bf0099d67dd4c43bd76e93d2409ac03002dc4062154159e904cf52543e931980c418ceec8a785a5d977967d27bc60cf06a13 WHIRLPOOL 995dea20c8bee1fa93352430600257a4d2cc50fa433a9d06bbbbaa0d5e36f96e0d56fc599dcc092791ec982c8aaba8bbd608eaf8c2db81abd2ad8147c8d73da9
 EBUILD actionpack-2.3.16.ebuild 2231 SHA256 13447a302e027a5b3fcf1f2560a175bb14411d99d845517420fba426afe9dca5 SHA512 9cf59fc53595548e45022900c85f3e2cea869640537826077521a9e0046c85a8483cea2209f24af149b763f11819c3a00b9b917058152d2795d36a500d2da6c3 WHIRLPOOL e5956ec960137f064ba2fe50840d8100dc952bbefc82f70db7f76580f6684a5a847a3988120e8367c30c6d1d904c191124f90356515820916316e179dcdb1c14
 EBUILD actionpack-2.3.17.ebuild 2319 SHA256 8f4cabeee6a449be0f65c53808ce24aac5d72aa81bb2e775dc5f90452adee3e5 SHA512 910c9ebc06aa00526e9bd5ee93ebc214f4917a2a692caec8b8ee677be4b50bf176f104f7d64c965cbcd37766581844cd0c1ab6da4e27bf402d6305e1e1f477b1 WHIRLPOOL 8be3459a0b1dd0eccc436889ed50f18298de113a3b84428a7874ada0c433d6ca6985f63647de75cb7b9955c7761a82f907dd7e445e1a9e6e241dd9ae26c7880c
+EBUILD actionpack-2.3.18.ebuild 2340 SHA256 abe08633783be80fa41fc0cd3630c2b685f2e68a0862d51a6976f87e7f5d9180 SHA512 aefeb72839b7712f483892e2efc8885905a5270ce2eb5940725d18b12cbc45b4247d98dc521397df363feab46b7c75ccca38207233b543306a76ff899eb21899 WHIRLPOOL 1584c0c361239e7c5075a9bb889753c04ee230df42d3867caf48fa349e85f374eee16e207fe17c973bb1fa1a3eb853c006d5120b21f81d468c71f008e0c6b9bf
 EBUILD actionpack-3.1.10.ebuild 2580 SHA256 54abcad05f2efcfe8941ed77c982a5dfc1efb3775808aacf9b2ed822635324ce SHA512 1e0be27e84c67c85fc4ba264d3d4a0233ca4970e5e9eeacfd757e7b5ad802f0e35ec0de930ee5e3d1105b11bd247c37c604f1ec91f4da8d71b549a254bb0df37 WHIRLPOOL d6527bc2235b3a15c7924c0b63f21fea587900d11c606aa65d84ac0201f3b66b1d884c33c91e613438cdce082a8ef07446973a947b04383ea56d8e351c70c53a
 EBUILD actionpack-3.1.11.ebuild 2577 SHA256 cdcb2121887693fce6222bdc1effdc992900c86b1a77f054ef7fb498b6d052c0 SHA512 e7d4567a2d3d1576ed08cac7184e463c65b068123999a34a28898f3d2114aaba3d587e806a425ea783344f5dfb14798d67d1ba9c8031de08498518fdd676d68c WHIRLPOOL 43cadc657d5bf1fd9c52e8cb784d264eca62c9ea28b28ee9c8f9b3762c35a764f75407c1f486a24ba1fc0a0ce82a818eeade24fe4b8cc301c0467bbf2e46e0ea
 EBUILD actionpack-3.2.11.ebuild 2478 SHA256 2fd15e02d9d11c1663fb09439a26ea6b97a6f7565c7e88df0aeb40a39a3f8afc SHA512 d81bbddccb05fa5aa648fc87308a271e2a8b6d5f37da1605233ea41f32a275817b70b64f2ca0a199dc4dedaebcad0ceb18bf647d4c5825087dfc86ecdbde07be WHIRLPOOL 2a85b232d0ef81284fbe8b47b198040649d430e3a7d0b57e6daab2f26bf493693b109750f9e129c1482dcc72fd4661241c237ead18fdbae8fd36abad9e219c86
 EBUILD actionpack-3.2.12.ebuild 2659 SHA256 c38763624080b5490cd90c64055ea1020e3ef6ae58fc9799fb7630311196eb95 SHA512 b2283a6378203e274ce2779997c7bdceb787c5eec4d2e47cbecae48194dea14cc3495a2b98a98f47acc116202a43b6482a3ea6f2279d6fa26ae8e4bce450011d WHIRLPOOL 4dc0b69311d3adb022a1b9269cf2e141acbab2a667537d91d79e95f441731a9715c7884bd8951aadc17833d3ab32b91b2d38fee45cbb557f07a35198a5898118
-MISC ChangeLog 33181 SHA256 1296908fd0f9bf479103d72d52858adadf86366d5c80d6130da05f5171ccbea0 SHA512 a55123e868bda905d79f4b516a449651e46951c0b3bbccfc72f5e94bbb7a126d8a4647f1e486f4812a15307bc41c79d4f245fd70cbb7e75da32616115b2e3d7d WHIRLPOOL a0e6f2b3d770225b218c5e2ed5cc687ca68239845b680b3da02c7b9fea5d22ff513128261170a4bec0fd527684070a6345bda2b3eeea57c0cba0a0e90d5d2fd0
+MISC ChangeLog 33334 SHA256 498b93993d40c78a834e91dfe21a8cc50585a270013dbb64e25ef55b6551b84f SHA512 5d5eca2d53d9f0efec8abaedd31eef551fdd56956ea1302dd5a46c0b35cf47a33d22d9148b04da4cafa0119142c02406dd7166e1312af85d61eaa35c9bcad659 WHIRLPOOL 172069ad70437abdee800eb9c140ae7175b4529f6734db3bee8ef49aad838b3fd09f34ba7802d8de7f28d9de5fbe8c85ee3fa2b04c988b4bb86b1237d085b58c
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlFWsS4ACgkQiIP6VqMIqNd1DQD9HcAsB9gtYzsasGrluN6OkuBX
+ibeYQpCRErDuXBroXiMA/03Mvm6DRr9UXK9VbBwINuALe1l5vjrOT6woMI95GyId
+=PW3v
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionpack/actionpack-2.3.18.ebuild b/dev-ruby/actionpack/actionpack-2.3.18.ebuild
new file mode 100644
index 000000000000..9891b1c36a9a
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-2.3.18.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/actionpack-2.3.18.ebuild,v 1.1 2013/03/30 09:32:29 graaff Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 jruby"
+
+# The default test task tries to test activerecord with SQLite as well.
+RUBY_FAKEGEM_TASK_TEST="test_action_pack"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Eases web-request routing, handling, and response."
+HOMEPAGE="http://rubyforge.org/projects/actionpack/"
+
+LICENSE="MIT"
+SLOT="2.3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_PATCHES=( "${PN}-2.3.11-rails3.patch" "${PN}-2.3.10-i18n-0.4.2.patch" )
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	>=dev-ruby/rack-1.1.0:0"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/mocha-0.9.7
+		dev-ruby/activerecord:${SLOT}
+		~dev-ruby/actionmailer-${PV}
+	)"
+
+all_ruby_prepare() {
+	# Custom template not found in package
+	sed -i -e '/horo/d' Rakefile || die
+
+	# This tries to load a “vendorized” copy of activerecord that we
+	# will never have. It can now also use a normally installed
+	# version but these tests fail.
+	sed -i -e '/PATH_TO_AR/s:^:#:' -e 's/self.able_to_connect = true/self.able_to_connect = false/' test/active_record_unit.rb || die
+
+	# Fix the testsuite, the symlink is not present in the gem for
+	# some reason
+	ln -s ../../symlink_parent test/fixtures/layout_tests/layouts/symlinked
+
+	# MemCacheStore tests no longer fail gracefully, and it's unlikely for
+	# someone to have them running anyway, so remove them for now.
+	rm test/controller/session/mem_cache_store_test.rb || die
+
+	# Fix tests when run against i18n 0.4.2 which ignores locale
+	# definitions with an empty data section.
+	sed -i -e 's/, {}/, {:test => "test"}/' test/template/render_test.rb || die
+
+	# Test now broken on a whitespace difference.
+	sed -i -e '/test_multiple_cookies/,/end/ s:^:#:' test/controller/cookie_test.rb
+
+	# Skip failing tests in the interest of security updates.
+	sed -i -e '/test_rescue_action_locally/,/^  end/ s:^:#:' test/controller/rescue_test.rb || die
+	sed -i -e '/test_should_sanitize_neverending_attribute/,/^  end/ s:^:#:' test/controller/html-scanner/sanitizer_test.rb || die
+}
diff --git a/dev-ruby/activerecord/ChangeLog b/dev-ruby/activerecord/ChangeLog
index 2354e5230cc8..ffb939fb3c74 100644
--- a/dev-ruby/activerecord/ChangeLog
+++ b/dev-ruby/activerecord/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/activerecord
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.233 2013/03/27 13:33:45 moult Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.234 2013/03/30 09:33:18 graaff Exp $
+
+*activerecord-2.3.18 (30 Mar 2013)
+
+  30 Mar 2013; Hans de Graaff <graaff@gentoo.org> +activerecord-2.3.18.ebuild:
+  Version bump for security bug 462452.
 
   27 Mar 2013; Dion Moult <moult@gentoo.org> -activerecord-3.0.20.ebuild:
   Remove dev-ruby/activerecord:3.0 due to lack of upstream support
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index fadc41dbe071..1775b7718e82 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,18 +1,30 @@
+-----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 activerecord-2.3.16.gem 537600 SHA256 dcc29890142c59de02ee08641a3c0b94d074844d16e056e0318fcab52c8164d0 SHA512 7c44ea8b314a2acd6fd66309502cb6d232e7e57daf670347ef9e78e01c7a7798d0bc902fe6dc3a3a45be10fbc02015e01bf4dd5c675d547fb518d2877ee55172 WHIRLPOOL 9876259d63928eb13dd161a01479987906c61d3f71a75fde17cfe5f38c7663f344cd7ce13b9d0ecdbd0e33535c7ba213407b46f5f3ee62bf189430ed3f35d8a0
 DIST activerecord-2.3.17.gem 538112 SHA256 e9ba440fe799511acba102736ed30694a7633afeac06870b15a996f502432872 SHA512 7b6f0203870f347b3ba8b67404f96c6f1047cb38f6161c263a7ac19f5c0008f3dc59b4713d2cf7fb5531eebe192bd53aeefcef58376e277d8e5c975575f4dec3 WHIRLPOOL 8687336b4e9b83a160209303829f913c148ad46275a50408788ea92129f64411d59795ac2f02b29bdfb4c050bc1d7e8b5d9a22c899ed582457cdd2d09a4659d1
+DIST activerecord-2.3.18.gem 541696 SHA256 09aec34a541e01c53b3e9bf0057a4306fa6ad394753cc21a7cbd3e8b8ab969bb SHA512 4446ff38d0dbbae4e01ca043f5fcf2facd7907946cfca17b2043557c9cb8cad7ca41c17f9b3de7e5a764315c6ab3a53a8c56781927a057e1ee69531574c34719 WHIRLPOOL ecb741c39efa23f1e0f29386471b81475e0581378e48bd70eb3ffd4a0ba9726358d6fc6cf11cb76057d9210e95654468a1cef40d4daf0900b11558aa06a25224
 DIST rails-3.1.10.tgz 3394031 SHA256 d0614db8c4011ed1fcb4bd0afeb8220634b1ec8b196ee40a956c77a76026ef65 SHA512 c6b3db4043345c81582ab22289c29630e3946dc1936adebff0af196f461236805ab146e74ed400fe045d980df562ae44479e36c2c8747ed8a6ba6807add23e6b WHIRLPOOL 5329cd31170ce2ee7c109c9c1152b5eed35c8ec1af48a84d03eff4bb4fe083a7a9840ceb076575961d84c6baeb725fe1c5eed1a4756d39a8bc52a26f23dc6123
 DIST rails-3.1.11.tgz 3393987 SHA256 763719d4bdb46b6b45594985439b1f063375f4da4f0af000414267e5d4633e57 SHA512 ddd3ef1ee9a9bcdc9048958adfb45fa60cf79e961b8fd728e55bb2281dcb51e8f010d2d14de97a60c4c3ff1480b419562d8281031c8ea1c02269263e52fb8918 WHIRLPOOL 76df2b987b2291b01a1d17bba54d3836c11523309b8e30be164ee901a2e4af8f2be943dfc928b64d2e8e2477472fb4a2632b4de30b933cb89d277e3cd3df0298
 DIST rails-3.2.11.tgz 3547068 SHA256 3f05603f84bfb7a99f999f878af247533706255e6b3baa4111439b6f5fd8ab70 SHA512 50644772186127887bd4d7537ad41cbe549c5c8496274cad2765f21859528a0f42f5b8dbe3a1627a08b1724b2e019c0ec6526cccfdff3da4ffcec285f9259558 WHIRLPOOL 70d5620fc611872b2af62351c81abbe43b3b1d41c92a1d1935cef704a4a655c9bb043599bc758c947c14378ef52e34b44c61536d5a048401cc6bfaef613eba23
 DIST rails-3.2.12.tgz 3547449 SHA256 b3371bd5706903f740cb091deb992758011ef2dc3e9c79c8fda64819f0251f0f SHA512 61c74648fd81758b561ec8102573bf0099d67dd4c43bd76e93d2409ac03002dc4062154159e904cf52543e931980c418ceec8a785a5d977967d27bc60cf06a13 WHIRLPOOL 995dea20c8bee1fa93352430600257a4d2cc50fa433a9d06bbbbaa0d5e36f96e0d56fc599dcc092791ec982c8aaba8bbd608eaf8c2db81abd2ad8147c8d73da9
 EBUILD activerecord-2.3.16.ebuild 1824 SHA256 680f5b522657f7d1fb57dbe2bd8c2654a6ef1e21998d91776ff0d9be300d45e7 SHA512 78e088322d4aecbcb3822269d626caedfe5b68a21582ba4d90a13dcb5bfda92f5a8372fe59901a749a4936446393198ad2612aeb36ce4a71cc69d491f8d27734 WHIRLPOOL b1a76c25ccfd646c8f116a3457cdf3fb7e40d4c92df610494251b365f7348c27d7579e9f455b3e0ac2a0d27bb9f7bc4e388f0f9a156166941b4613a046bc71ad
 EBUILD activerecord-2.3.17.ebuild 1824 SHA256 7c8df8cb6a50be6d3d498c1cfb695917c805726421789a6e55af53e29a56f811 SHA512 0e18d1c96b6de0fd983a3fc12515e6437346e7b9fa0d867178687be0ffd943e002defdf65533ec231f2a8ebcd977201c576d54db9759537a4d79555d6c750b2d WHIRLPOOL 9c0542da62597601ba2b0b5bf4c88c7d0860a514e1f569450c0b773e511f3604b5ea74f1d15720ad1a386a37fac766ad7a95e81bd32a536d5ec3f6be6062ce83
+EBUILD activerecord-2.3.18.ebuild 1825 SHA256 492904e83aa586fe004b832b82ae90db18f3ff06a888018b26b09e19b7b08608 SHA512 779ab043674666c6ac800cab8f568fe780b804193264835bf416b36ddfab9c3d05eef98199b8f76728b1a478b8a3ebef03d1a5d06fc14956aa21a0903083fee7 WHIRLPOOL b958c79fb2c73eb10820eb97a51d358a1df3f865108621dc4e24f0baf892a7749707b64e3a3149500fe5ee657256cc20faf2a20861796cab6f93a4402fd29848
 EBUILD activerecord-3.1.10.ebuild 2428 SHA256 fbeafdacc1e7e0b3d2295b72ccb73546ce555c8ee7373c03ccac3ffa2a2d4cfb SHA512 4c19f7f225b9110cfb5244c5eb3298a49923fd4a266f75c2d60fbc821b74dd2eb3317938f7ddf13de380ce582e1a69372cdb2871480756d222992facf94b3d63 WHIRLPOOL 3d9934a027d132d789dc57767f9c82c1aba0e9e08a08074713cc4d898c62ac5283a25b35fe7bd06ffd9820f8cc244ac94603ee8ef902cf6e74bc7b7ace62b389
 EBUILD activerecord-3.1.11.ebuild 2033 SHA256 cdd8abae3d0279786bf8bba4f294771e3c83686e12d5920b63a42aae0663a67b SHA512 bf557fd2fa814942221f11d881f085fc628b96d00e8952fa1402d27536a4620030b4079c326d9f9936917691f864c2ad22576d765164bb364b812b9738bf6326 WHIRLPOOL 0e722a99b097ec86ac79cb93a4e044a24f79f923aa9529a44d2bd3bfc0df06fc3edb70992fd5c89c3b9ab975acffbe9cdd3505d2e9f28614a60392f466795753
 EBUILD activerecord-3.2.11.ebuild 2434 SHA256 6468398a914ab121eb70ebfa9537444f9d2148a607a81fbc577c4ca5b28255a0 SHA512 c1cc0eb39383d940148355067be265f437623ae5cf2e63319593d7624b79a44cbcc2efd9d41c7eeba3a5c7b2870e51444fef7027c8f496eec7b2909725b08712 WHIRLPOOL 989fa0e10e58f5c38f41411c246f4ef6e63d63cba3025cd0ff7f2903d8018b08c394ad14391d6429e478b773b24a678934fd51e0d65182529a999f67aacf2c72
 EBUILD activerecord-3.2.12.ebuild 2431 SHA256 4cce7e0a620a2b4a0b689750f7e396a9c242c49847bb51d1ac3fd54df777e202 SHA512 6aa66a6b2bcba4eed54cbaab92b7dd665225d3ab6c2f0e4b953159a5f28ab60060b0535d6c9bf10846f77f7a2d10896469d75b5f476a1fa9cd6b97a0bf490247 WHIRLPOOL a1614d4530a79d3f973816b81197cb5f7ab405ec72ba32cbf56208e517182e1960ff98f93b8aa9f94294b7f756864d31a1f2a1a40b1be34a041a4b2781b71932
-MISC ChangeLog 32273 SHA256 78256c7029acc86768f65309a9c59b988c3336ccf5acd9ac8359bfd438072ace SHA512 4acfc5eb2dd533d477a42648ff31427e3d4c36e9ed314f42727c1fab5f1312e4851e298c1cbbe8f2196bc0859297fa1f6f9282f5ab39c43bca26c25e3e53ae23 WHIRLPOOL 8a3c87b58a5cbee64000176d5f76f4263186b5dafe0b5a421ec656a0961f893456deaa30f976ee859e091c3f321e8d764f238c53dc2892d7606262d60515b457
+MISC ChangeLog 32430 SHA256 e48c102426aa11623728290eaf4bac4d9d2ece1af3f252b3ceb763b995d427d3 SHA512 45c8ed96ad569ed78b28bca2efc21163506c1026c1ce4aa9c7b084909e2b06125cc19bb56be08e893cde9f5c4db66b6ba83612f8a27c4775bad9a6ac41d919d1 WHIRLPOOL 77c2dcfba2d3c5a940fb37a6beab11777549dddfce88840ea121f54617de51fd38c4fdc9ee2955909ea6a611026f647e9d4b837dd92920a39cb5584ff3b54741
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlFWsV8ACgkQiIP6VqMIqNdtYwD/cBaU5ZGrs5bNiwXgA2ycL+DF
+V/CT2Cpq5qojQi+XqRkBAJdY4y5go4JG5pEhEHWq44X84hjxwAYyPdZNUA6GYt2F
+=k8AS
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/activerecord/activerecord-2.3.18.ebuild b/dev-ruby/activerecord/activerecord-2.3.18.ebuild
new file mode 100644
index 000000000000..86e7766fe752
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-2.3.18.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-2.3.18.ebuild,v 1.1 2013/03/30 09:33:18 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18 jruby"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="http://rubyforge.org/projects/activerecord/"
+
+LICENSE="MIT"
+SLOT="2.3"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="mysql postgres sqlite3" #sqlite
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}"
+
+#ruby_add_rdepend sqlite ">=dev-ruby/sqlite-ruby-2.2.2"
+USE_RUBY=ruby18 \
+	ruby_add_rdepend "
+		sqlite3? ( dev-ruby/sqlite3 )
+		mysql? ( >=dev-ruby/mysql-ruby-2.7 )
+		postgres? ( dev-ruby/pg )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/rdoc
+		=dev-ruby/mocha-0.10*
+	)"
+
+all_ruby_prepare() {
+	# Custom template not found in package
+	sed -i -e '/horo/d' Rakefile || die
+
+	# Remove test cases with hash ordering failures.
+	sed -i -e '/test_bind_enumerable/,/end/ s:^:#:' test/cases/finder_test.rb || die
+	sed -i -e '/test_should_automatically_build_new_associated/,/^  end/ s:^:#:' test/cases/nested_attributes_test.rb || die
+
+	# Make sure we load a compatible version of activesupport for tests.
+	sed -i -e '10igem "activesupport", "~>2.3.15"' test/cases/helper.rb || die
+
+	# Drop test now broken by security fixes.
+	rm test/cases/serialization_test.rb
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*jruby)
+			;;
+		*)
+			if use sqlite3; then
+				${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+			fi
+			;;
+	esac
+}
diff --git a/dev-ruby/activeresource/ChangeLog b/dev-ruby/activeresource/ChangeLog
index 016a3b1999c9..7641453e952b 100644
--- a/dev-ruby/activeresource/ChangeLog
+++ b/dev-ruby/activeresource/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/activeresource
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activeresource/ChangeLog,v 1.151 2013/03/27 13:39:12 moult Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activeresource/ChangeLog,v 1.152 2013/03/30 09:32:05 graaff Exp $
+
+*activeresource-2.3.18 (30 Mar 2013)
+
+  30 Mar 2013; Hans de Graaff <graaff@gentoo.org> +activeresource-2.3.18.ebuild:
+  Version bump for security bug 462452.
 
   27 Mar 2013; Dion Moult <moult@gentoo.org> -activeresource-3.0.20.ebuild:
   Remove dev-ruby/activeresource:3.0 due to lack of upstream support.
diff --git a/dev-ruby/activeresource/Manifest b/dev-ruby/activeresource/Manifest
index 43a3a50f4d15..d3b64f192150 100644
--- a/dev-ruby/activeresource/Manifest
+++ b/dev-ruby/activeresource/Manifest
@@ -1,15 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX activeresource-2.3.10-rails3.patch 309 SHA256 b217130a77128bfe5d8e5e1a6d056308d116404e721b5bd67e7bdb30326115d1 SHA512 b337154cb1d8452e9768f794607a7ccd6ee2ac19bca3d378ccd62044099b02c8ad337ce891a07b789b521dbb2f4d1168cb830dff326ff65efa87836a0c9129c7 WHIRLPOOL 6a2789db7537d8bc0d2e5a73c70ce6db64fb12898b1dd693c7acbe7d07bece2e35f0771fa6260616fa90c2405071fed115043d55b315241a548f81013cd6c4bb
 DIST activeresource-2.3.16.gem 47616 SHA256 f04030ab7350634639022f127c4a30413b3a1113eeabef777e08a71954449d0e SHA512 55228c838c229624ef3f74ae8efc2e86e24f087a0ba27fc0489021802fb777e3a68cf797155c3b22f17d7006371abf0aa077a49df65e3f31194652eaa6df4df4 WHIRLPOOL 43ae524f2fbba0b38e94a90faf6855ed5375a801bd6c36a5e2b2a4c908737cc283092d2fe4f6ca4adbb3d2b2ab764ba09052005d76bfb0490f078c4edecd191c
 DIST activeresource-2.3.17.gem 47616 SHA256 da48a4d2c91c6bf70f852e0269adfb492699fef1c0defa68000fe4c2f185aa8c SHA512 1b9df21461ce102ba93fe25110515bf5e8bbd7feddbec44f968426baffd73566218ff048a4a621e89fe608ede0a054e61aade956701cbf338ed4526b68867312 WHIRLPOOL 2fe0b2760e9b6b6abece22a43a248cd33aba20f44f6e7a5648a8672b654fa80eb6f118667d1ec830dd7c78ba57c0e8cf5a2ae1bc0ce9b092e8bf228cd2829ea0
+DIST activeresource-2.3.18.gem 47104 SHA256 f0a7db71e592f721dd33867b104a5f6e60f11671ac8c7dafa9786b5256514812 SHA512 aae382f2057c4491fe1ba229fa7a9470c8fe36374cb83741aae2e2f4a86149937b046e620f8d901d4f3b2db80db024137e32587d984fa91a6626048bb390d8de WHIRLPOOL 58d675e0883d4ff91e5b603a6f1e8f62919fe899bf0d70715c126876d6576d7518972d9ecc62eaed0c536ef213d8dd76b9ecb7caec909af98a648973d1cfb1cc
 DIST rails-3.1.10.tgz 3394031 SHA256 d0614db8c4011ed1fcb4bd0afeb8220634b1ec8b196ee40a956c77a76026ef65 SHA512 c6b3db4043345c81582ab22289c29630e3946dc1936adebff0af196f461236805ab146e74ed400fe045d980df562ae44479e36c2c8747ed8a6ba6807add23e6b WHIRLPOOL 5329cd31170ce2ee7c109c9c1152b5eed35c8ec1af48a84d03eff4bb4fe083a7a9840ceb076575961d84c6baeb725fe1c5eed1a4756d39a8bc52a26f23dc6123
 DIST rails-3.1.11.tgz 3393987 SHA256 763719d4bdb46b6b45594985439b1f063375f4da4f0af000414267e5d4633e57 SHA512 ddd3ef1ee9a9bcdc9048958adfb45fa60cf79e961b8fd728e55bb2281dcb51e8f010d2d14de97a60c4c3ff1480b419562d8281031c8ea1c02269263e52fb8918 WHIRLPOOL 76df2b987b2291b01a1d17bba54d3836c11523309b8e30be164ee901a2e4af8f2be943dfc928b64d2e8e2477472fb4a2632b4de30b933cb89d277e3cd3df0298
 DIST rails-3.2.11.tgz 3547068 SHA256 3f05603f84bfb7a99f999f878af247533706255e6b3baa4111439b6f5fd8ab70 SHA512 50644772186127887bd4d7537ad41cbe549c5c8496274cad2765f21859528a0f42f5b8dbe3a1627a08b1724b2e019c0ec6526cccfdff3da4ffcec285f9259558 WHIRLPOOL 70d5620fc611872b2af62351c81abbe43b3b1d41c92a1d1935cef704a4a655c9bb043599bc758c947c14378ef52e34b44c61536d5a048401cc6bfaef613eba23
 DIST rails-3.2.12.tgz 3547449 SHA256 b3371bd5706903f740cb091deb992758011ef2dc3e9c79c8fda64819f0251f0f SHA512 61c74648fd81758b561ec8102573bf0099d67dd4c43bd76e93d2409ac03002dc4062154159e904cf52543e931980c418ceec8a785a5d977967d27bc60cf06a13 WHIRLPOOL 995dea20c8bee1fa93352430600257a4d2cc50fa433a9d06bbbbaa0d5e36f96e0d56fc599dcc092791ec982c8aaba8bbd608eaf8c2db81abd2ad8147c8d73da9
 EBUILD activeresource-2.3.16.ebuild 1006 SHA256 9b2168c239e9efe89c39eb4f2c997e31590494d68d78d69c2b58f8387e1816d8 SHA512 9f0218763f07709a838c15b90de6ad68d583e9fb40be6bcd9c795de765397a13fdf8060a02fc03585179b73cabe3a3c3ded197b1eca2687d24e9464913aae010 WHIRLPOOL 0b1d5bfc33372c71435cbe4a4636e995297196c06082b56b97318e9f5ff037c5190e982395f0ebb3da55cff438013b56754cfceab836a961f6677a888ab2d427
 EBUILD activeresource-2.3.17.ebuild 1006 SHA256 4d7272127ea7d5cee06108918f3811c33a22a0d5c85f9fc6df240e64fea42539 SHA512 dee07371bf855b4f5181e3e140273fdfa7340ebed614118bfcf82736e198cfe951afaf1b1e8da27ce415b0571df062d61a6b51b64c8b2c1ac7925d58cdfe9664 WHIRLPOOL 754b8fb71704ce609ff51e3fac0411e07e4f87040c7d5218ae2635731ae51b09f9669d1d5fc69dda448474afc7dd373f23772a4df9743e3d6318b64e503639a7
+EBUILD activeresource-2.3.18.ebuild 1007 SHA256 76e68937859bf9d7f81cbbc506bc80962f445372e9259f68148afe5fc4c74759 SHA512 e2789aeef22c5a86a938621d9d3081d7f07850249620c9ea5f6a2f74bb69bb149a2b6439ef979afe3b1a87ac728c07036be26d16d98f780444f1914d327b9890 WHIRLPOOL ae2dba56b7000c900740c3ecc16ea7d887c019f3d8f489aec98fe735d747f7529a05339c4970750684043590bfb2797af9154496c7edbccea26e4a6d87c861f6
 EBUILD activeresource-3.1.10.ebuild 1341 SHA256 74eba772264fe0c82a640b2373f581da70259cad26dcf5c0f4751181634850d8 SHA512 213ddeae99a1f294f58b46c85a2e0e25bfd743acca9ed895f5f5fa9585a3bf35227af51da277f7b14f1355a7adac321927ffa5ee687eb16d65da0aafb789ee3a WHIRLPOOL 5904a0be9151f765ff94ede1101c7128f327dfb87a6c2496f02ad7ffca064ab916981197843ada1691e280185db9ebe4ef5aeb5491e4c9112cee69f97518bbbf
 EBUILD activeresource-3.1.11.ebuild 1341 SHA256 20b71a635c84a83638635305bcf52849cc7e551a5d0603b32c74ec19ba017b22 SHA512 004b183ac4c3907603f66d5c485b3c2ae2aba98bfce1dd1755d66d12203e96fb512725ca455a46057af9134dc3bce4c678521db54ab9f17eeefcd6d3be5c217d WHIRLPOOL 389fef0806901b6b016f5ed1332db252e1e879a1dd4dedd5c41f37c9364948a3ba37a3c327ed5c781d70d9b9055bb0112a480879f43040051f4db22b5b6114c7
 EBUILD activeresource-3.2.11.ebuild 1367 SHA256 2b353473248d59aced54ea6a9aa6605e0390bf989f024bc6d1863c07c421247d SHA512 4c773de2266913615c30af1a8e249076043eccf6285d32b49ada5906fbfc5329f341b2070d368029f3607669aeae8fe9969dff051af6b89b408a0ab878bcc8da WHIRLPOOL 79aede93e6631c896f987eb55347034cc0c5c39901bfe95cfbb208680b5ce9a3abddf7979ce4b4dc6e9dcbf92b1930cf0e2e1c1b0a3c5fce1178c342857eabc4
 EBUILD activeresource-3.2.12.ebuild 1364 SHA256 f8b0c1a2239f64e5cc67200c6c65a7a4dca460bccf8a2e533cb8f189988cf6b1 SHA512 572aa2b1223aca6892d897651a0bdbd0071a583e5df47f747ab43bbaca83ed7b38250d2ab525245c007b24bda3b7aa30ceba39bfbe13da4ddc76d6bc35bf1f0d WHIRLPOOL a2475f6dbcd7aefa7836453e182bdb45f2547664fd1bd7a47c8d89801553a62f572107b7291aeab4619edd3bcda590a5ea42fda30228c6b3395c08d7403a7061
-MISC ChangeLog 21491 SHA256 540bef940cea66ba4ede10558f65612302351131284c939fc24a7a151145a159 SHA512 b6fab997aa227e520e1bcd043ebf91bb4c095c752f2483c2d972828bf22a7237954bf3e5314acabc9afd2edf99cd2f7202b6b5ba017ebae3c0b1a7b093f4ba1b WHIRLPOOL 104a53c31bcb06654a0be1e0a011d44ff67c1aaac5a1070b06dd3fddf7af91817e0324c31a3ebf64e88f08df3cb96ca0e1109a0a3129ed89b4ddfff6eae0101c
+MISC ChangeLog 21652 SHA256 717a2d28a0393b60ba2b40ad4079532b50bad169e3aa527756ccb5fba5d2b1c0 SHA512 4208ce2835b3342567c9a991a5a4ec3ed8bc0edb04c70b99a1329f453429536ff3f7b4a0a0c44077e66f8b9bb0f1eacfced7ffe791ceaa70b5a3a3505e2357e6 WHIRLPOOL 7d965bb69bc46b0cbc96f0927a980d4c10627a4f21c2d2936028fb7d8bd63cf7683d8f9e87e1cd198b381a6156ebeb8d42cab0d1b4cad67be54dcbb27f4a1255
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlFWsRYACgkQiIP6VqMIqNeREgD/R6FQC29PguMLwoMXdlJM7pix
+6dEZlt6DL4ZsXqsRBzoA/i/qZWBsoU29MtpqSylcQHGSaD11RNG6j45HqT2Fjjun
+=2C+0
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/activeresource/activeresource-2.3.18.ebuild b/dev-ruby/activeresource/activeresource-2.3.18.ebuild
new file mode 100644
index 000000000000..1067b6660b15
--- /dev/null
+++ b/dev-ruby/activeresource/activeresource-2.3.18.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activeresource/activeresource-2.3.18.ebuild,v 1.1 2013/03/30 09:32:05 graaff Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 jruby"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Think Active Record for web resources.."
+HOMEPAGE="http://rubyforge.org/projects/activeresource/"
+
+LICENSE="MIT"
+SLOT="2.3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 -x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}"
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/mocha-0.9.5
+	)"
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}/${PN}-2.3.10-rails3.patch"
+
+	# Custom template not found in package
+	sed -i -e '/horo/d' Rakefile || die
+
+	# Avoid test broken by security fixes
+	sed -i -e '/test_load_yaml_array/,/^  end/ s:^:#:' test/base_test.rb || die
+}
diff --git a/dev-ruby/activesupport/ChangeLog b/dev-ruby/activesupport/ChangeLog
index 51376b4412a3..54233fe93832 100644
--- a/dev-ruby/activesupport/ChangeLog
+++ b/dev-ruby/activesupport/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/activesupport
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.220 2013/03/27 13:42:49 moult Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.221 2013/03/30 09:31:34 graaff Exp $
+
+*activesupport-2.3.18 (30 Mar 2013)
+
+  30 Mar 2013; Hans de Graaff <graaff@gentoo.org> +activesupport-2.3.18.ebuild:
+  Version bump for security bug 462452.
 
   27 Mar 2013; Dion Moult <moult@gentoo.org> -activesupport-3.0.20.ebuild:
   Remove dev-ruby/activesupport:3.0 due to lack of upstream support.
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 8af61ca73838..1cbf742c14ce 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX activesupport-2.3.14-unvendorize.patch 2382 SHA256 e9c8c27437a24ec765df9dce35caaa353661bfe51dd50c71007e5be12b092ad1 SHA512 270a110323ad44f52488b17e0fe0a1a98f1367b313532fadddcc72e1e3967f7d0abb16b9f47306c6d7bdadf41cc92f768d945b3bc4f43e0c95d7fb050c75c530 WHIRLPOOL 0ef42aa0427914d01bd4ca1469b59879d1cc21d2997944456ed347702f8bca3897bdbd0886698328ac70044c34c56d548c7e74f37b30b76f97af77bb9b199742
 AUX activesupport-2.3.15-unvendorize.patch 2403 SHA256 67b1e963a7a824733b99c98aaa9479b1117490392393a781c13efbbfd7478ff8 SHA512 f481f103e870f56dba1422eaf6fff95cc4ffa271ab1f2b37530ba665d030f18865d2a3d1daf0a1a36d5e7560a63cc69f94f3eaa5b20c74a872d0a1c5f8a36b82 WHIRLPOOL a3d70a3fc9007dadd97b0ac90aa1dcb62939c63cf56455ec9e818f247c597e3213b3b844fccb0f60a47352b9c7dccd15119a425eb9451ddbd9243bc685f3ebe2
 AUX activesupport-2.3.16-unvendorize.patch 2382 SHA256 fda4f0aecd104d7516b8c6b0d3860b8ac257bc5898eebbb9e3761c1f8ab56c25 SHA512 6d53b4b33c04d8fe337687afd4285b72cf68b98a940f2d314cd03cb015d0b13c9fc01904b5a0036ce8a4cf627379a149655d40d0ffbc022dda8226c0504f60e3 WHIRLPOOL a3bcc1e10cd3f70deb353df130b382d43916f1d0a7d16202bd4b9012e3901d574a3476bf6b62a82d08bffd22c0795d3d07b1307ae0eff3da294dab9f1725032d
@@ -5,15 +8,24 @@ AUX activesupport-2.3.5-mocha-0.9.5.patch 1031 SHA256 238be71abfb03ca232d5c80c48
 AUX activesupport-3.0.3-mocha-0.9.5.patch 666 SHA256 61e62f5794f9291f3ad8315d5ce0379c25d491311fd30fb06d35f618ece61a5f SHA512 a2d986bdfd7f4376264af1995626d46abf4331fcd64d081bc6c9480e9dae8f4700a2ca6a995a922846c20bf64660fed2e39a7df537240701d0324be4faeaec32 WHIRLPOOL 5ed28791b7dec003a53e6a5a6454d86196b2201b7b3caa32b9971bf05dca59d8ab36b48cf0be604801d1bbc29f204e90b5d77f026aef9c412ad980ce257867db
 DIST activesupport-2.3.16.gem 429056 SHA256 9f79ec4160f24f875357632a71efdd0257ae5dcca31f3aef99e0d470ce0ec5af SHA512 cb469637b7897f8e4be600829ae54cf939b4d9c567e6480f21716151ad6c485eda786941170da95300c6e4495a8794a1b908348a9765fa999d2bdb61ecc265b8 WHIRLPOOL 9b5bca12b5cfe3c6835253cc87018edcf90e7ac229208410592ce3ece80e318be6d00ea32c207511d82094584dc971b7b26d2113914272b1f85025ac84899137
 DIST activesupport-2.3.17.gem 429056 SHA256 8ea5d5ead4684f12e2ee35ed2b59c1b37739ea7b0e344f9d9b238801e807cb33 SHA512 0fdf4ce3e724100272fbe028b4cd0defb07ea6ce1fdf46664785f7e081f316e3412a4161cd313427dab676e833f4ce0b860b56eb7682a5df4dd6ae56007169b7 WHIRLPOOL 4a81fd493905a506531698094c0e2e9dc0fc7cb4f89cef952080d1f1e05d2a218f4f33da381ff14f83ad15a59fd3ec2277667d78e0640b657527b7e7c24cd686
+DIST activesupport-2.3.18.gem 434688 SHA256 65b009c10c9c1fe298b04dfc428db7311f1dfbdcafc6c9429517651a679dd36b SHA512 47fa41bb13b8c1bc34133c0adcce5275f977a2148964f3c81da83dc69fea8cd81f3af181606a2a9c047107f2ce7cc6dd6290efa66acf68f6573d482bc6359fa4 WHIRLPOOL 34317e22696d29fe2389a66161dcb7348ea1528f82f120b39a1a7ce1f5d6135c50c0a7ea82ce90c9fd4bc8a8ed3e257efd7ed31fb7b5afce94d0323f28509eea
 DIST rails-3.1.10.tgz 3394031 SHA256 d0614db8c4011ed1fcb4bd0afeb8220634b1ec8b196ee40a956c77a76026ef65 SHA512 c6b3db4043345c81582ab22289c29630e3946dc1936adebff0af196f461236805ab146e74ed400fe045d980df562ae44479e36c2c8747ed8a6ba6807add23e6b WHIRLPOOL 5329cd31170ce2ee7c109c9c1152b5eed35c8ec1af48a84d03eff4bb4fe083a7a9840ceb076575961d84c6baeb725fe1c5eed1a4756d39a8bc52a26f23dc6123
 DIST rails-3.1.11.tgz 3393987 SHA256 763719d4bdb46b6b45594985439b1f063375f4da4f0af000414267e5d4633e57 SHA512 ddd3ef1ee9a9bcdc9048958adfb45fa60cf79e961b8fd728e55bb2281dcb51e8f010d2d14de97a60c4c3ff1480b419562d8281031c8ea1c02269263e52fb8918 WHIRLPOOL 76df2b987b2291b01a1d17bba54d3836c11523309b8e30be164ee901a2e4af8f2be943dfc928b64d2e8e2477472fb4a2632b4de30b933cb89d277e3cd3df0298
 DIST rails-3.2.11.tgz 3547068 SHA256 3f05603f84bfb7a99f999f878af247533706255e6b3baa4111439b6f5fd8ab70 SHA512 50644772186127887bd4d7537ad41cbe549c5c8496274cad2765f21859528a0f42f5b8dbe3a1627a08b1724b2e019c0ec6526cccfdff3da4ffcec285f9259558 WHIRLPOOL 70d5620fc611872b2af62351c81abbe43b3b1d41c92a1d1935cef704a4a655c9bb043599bc758c947c14378ef52e34b44c61536d5a048401cc6bfaef613eba23
 DIST rails-3.2.12.tgz 3547449 SHA256 b3371bd5706903f740cb091deb992758011ef2dc3e9c79c8fda64819f0251f0f SHA512 61c74648fd81758b561ec8102573bf0099d67dd4c43bd76e93d2409ac03002dc4062154159e904cf52543e931980c418ceec8a785a5d977967d27bc60cf06a13 WHIRLPOOL 995dea20c8bee1fa93352430600257a4d2cc50fa433a9d06bbbbaa0d5e36f96e0d56fc599dcc092791ec982c8aaba8bbd608eaf8c2db81abd2ad8147c8d73da9
 EBUILD activesupport-2.3.16.ebuild 1616 SHA256 a3ae9608a43b1109ddc216f5278fd55538988104d9c26c9b86a6974e0c11914b SHA512 1641891a2a5c63989351688df0ba752051d7bd3dc8d28c4cdca1780ed55f755fe2b77f2f7fea0efd23c713923df9d5957d425f5000291b59fc77b71d902a9f1e WHIRLPOOL b49a37daae8562ef258a4a092bb2028fe6d7c10f7cc72dd8926eea41eaa2b93115916a77c51a30b8ccc30bf2198604633505120ee2e0f196c8395685e8f62464
 EBUILD activesupport-2.3.17.ebuild 1616 SHA256 0ba172041f4f901a538e25e0cab691778410536dbd5a6100fe990737909eb75f SHA512 e175fbdac713c66b4736548e5c1effd35a701159532f6e40e4763817ec3b6d95cd990bd0c018c57c33530e9df88ce832a71cb4dae8f76823d2a90f02a71373f4 WHIRLPOOL bc5c14f6be15ceff8789e3187cd87e8cd04b8c2984b1342469873b26b72146d625e11e705783711d8bb9baabcac8e1d1b66ab7cdad1708d77495ceb09b6f235b
+EBUILD activesupport-2.3.18.ebuild 1617 SHA256 cc04180b7b6abea4cc96fea163f198af1295050721209526cb49c75c830d07e2 SHA512 1cc24203b1aa907b61960933853673b0e32bfecb39b9185ced83859d88833f854d45a2eda43da8d0246af76e9e390f6ed30742ab161b21c6ddf2925496dae496 WHIRLPOOL 5e2581c75f52c301f80211dbae6bc7143fc3c18914f286e0f3755c35cf0b9c711570b5731775bb70908db3f2acecc64b9577aeb0fb8f14983cb8e4d6fa110900
 EBUILD activesupport-3.1.10.ebuild 2059 SHA256 fb26161f068163d63fba2f2ffe8c7200855102cf8cac5550303063ce2fc2e225 SHA512 c9225f02e0eaa448e03a8e263862b3f1f13d38ad8ac05216cfb70917875b8cb4e47522a9069f91470494671cff5d6007b4e478a0a2985f5afa34a063ef188339 WHIRLPOOL d6d7ea96219391780e67b4a72f34cf4969cf02aa8ea77f6546f717d6a47c28bdb72aebb85ccd2c1c4418adaf18ad0332357afb4e22210a8a0fdcc2dc98055e43
 EBUILD activesupport-3.1.11.ebuild 1402 SHA256 8342a7f1af22f65a0a582ab243e2cd7d6de7508a0ef6a1c5ebd7f1f2edb258f0 SHA512 40136f9b3c65bbfaf20a43ff59ad21d4dff2ad4a3f6d30ef738d399bfad2ac556b206ac36c15aa9c114025e7e8d46e4df6329912c11e6a490336247d94c0ea1e WHIRLPOOL 3b555946b590eedf2db14b469c00881f9b6b9f0e06f6ba8ccb1804042a52eb7692ca47df7882ba2dfedcec52d0673a1aadf09e95a0d35b271500c595a29a1258
 EBUILD activesupport-3.2.11.ebuild 1663 SHA256 f6ebfea65cdad564e1d7224594b2e48aeb114b5c00b460df1c6ca29df5fd4ea1 SHA512 ec3e113c3d4e2122dfda6cad8d29de9a21b4685edd1f6b6bf126c76ee8f5ec1d3042c54c6c59f7f000dabab76bd80f012dc3bb4bac1de99bd43a4824fa05afce WHIRLPOOL 273706c50a7ded44c5ce467b65206255f5555f21fadff50c380b264e8c0f0b687e20ca06d83efca55a38ba7bf911b6767a9f4635e14dcd3aeda98b3dcfcee19a
 EBUILD activesupport-3.2.12.ebuild 1663 SHA256 b83f1541ddab0a4e34f9eb439712ee96a7f6607451348654ca7acaee6ab1b565 SHA512 3072d355541faa1ab2b9a251a0d480f4c75535b9b0d41a557aae5fd18d617090398d7318d4a4d7aafb7b5b12af0fb29ae4b9770368b6d54e2d21f1ce41087aa4 WHIRLPOOL 72c65bac85b91b2ab5b1b30166c07f1c562667638ee24a40712776ea2259ce15502baa0c557e8685ef26fadcc499cc2cbef6794e56891c738c0064ea9f903e5f
-MISC ChangeLog 31482 SHA256 85a14a8126ad7fbe75dfc2eb2a49f19a1c3cf9b1d0a94a87f32e5a2d4aa74fd9 SHA512 31a8afc85e32c8724e6911922b66d9f9f95c004b72f9388d57ba95e79f7c34f047b9dd9fe4cf3a0adbf293038e0a2739cd5a7a107a61b4f2cd1bc45825a63ab0 WHIRLPOOL fe1c9f5e73e130809194d179b34be42c9157ea6e120c3913d181874c0586ea3bfd4af1d7d9a402ae93c26484589f87fffba91e0f54209b6810b64f76a062d90c
+MISC ChangeLog 31641 SHA256 880b3116c263af99aa7e5fa305e2416901ef4278ecf6eb15ca57abafb83b1a1c SHA512 66a3e91f11f8079eb75a16c0830b841b406913b9f2286494202c4dd6a41a1a958129c6853e2b5d207e73406203db5f00ce5d57809a681a6a9a134ab8ee03a069 WHIRLPOOL a4561454e721aa56ce5da3a584722875b990b84f8b3e0fbcde2f4e52fbe8595be13552c1fa8585fb5234a8f36b2b2459eac34379e3af2d3cae0880b89df44579
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlFWsP8ACgkQiIP6VqMIqNfOUwD/X242Hcm73GTdzClBy6tNlkcq
+INpiFl1iP/BgTgS3OAsBAJNR34nMUH3CZLGdipZLi9aTjXbGkS95zsIefon54L7z
+=4FEV
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/activesupport/activesupport-2.3.18.ebuild b/dev-ruby/activesupport/activesupport-2.3.18.ebuild
new file mode 100644
index 000000000000..a03860c05f50
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-2.3.18.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-2.3.18.ebuild,v 1.1 2013/03/30 09:31:34 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18 jruby"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="http://rubyforge.org/projects/activesupport/"
+
+LICENSE="MIT"
+SLOT="2.3"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/builder-2.1.2:0 >=dev-ruby/tzinfo-0.3.16 >=dev-ruby/i18n-0.4.1:0.4"
+
+all_ruby_prepare() {
+	# Remove the bundled packages!
+	rm -r lib/active_support/vendor/{tzinfo,builder,i18n}-* \
+		|| die "failed to remove vendor packages"
+
+	# This patch removes the fallback to local vendorized gems, as well
+	# as fixing the dependencies for i18n to use the correct slot. It
+	# also edits the metadata file so that the dependencies are added to
+	# the specification, which is required for bundler to pick them up
+	# (which in turn is required by radiant 1.0.0rc3 to
+	# work). Furthermore remove the references to the vendorized copies
+	# from the specification, to be safe.
+	mv ../metadata . || die
+	epatch "${FILESDIR}"/${PN}-2.3.16-unvendorize.patch
+	mv metadata .. || die
+	sed -i -e '/\/vendor\//d' ../metadata
+
+	# don't support older mocha versions as the optional codepath
+	# breaks JRuby
+	epatch "${FILESDIR}"/${PN}-2.3.5-mocha-0.9.5.patch
+}
diff --git a/dev-ruby/rails/ChangeLog b/dev-ruby/rails/ChangeLog
index 2585d5befeea..3256dabf064a 100644
--- a/dev-ruby/rails/ChangeLog
+++ b/dev-ruby/rails/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/rails
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/ChangeLog,v 1.262 2013/03/27 13:28:39 moult Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/ChangeLog,v 1.263 2013/03/30 09:33:45 graaff Exp $
+
+*rails-2.3.18 (30 Mar 2013)
+
+  30 Mar 2013; Hans de Graaff <graaff@gentoo.org> +rails-2.3.18.ebuild:
+  Version bump for security bug 462452.
 
   27 Mar 2013; Dion Moult <moult@gentoo.org> -rails-3.0.20.ebuild:
   Remove dev-ruby/rails:3.0 due to lack of upstream support
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index e94202122b13..5b25f182acda 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,14 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST rails-2.3.16.gem 211456 SHA256 8228c5404bddc2dd7b99495f348b40302709da577a096619f90e8c37e824060a SHA512 55a5ab85634c4e86efac070fbc807499ae9b68adbf4a7c230479e21ff6ccb8e17b23fd79e0f8ea0990967780ed168661f7c4c605629253ff65dd8ff2a40f26f7 WHIRLPOOL 21368929faee01d2148d2523713fdfa0d1a42ddcdefb81524924283cab6ebd8d8986f0c291d1374ce1b4a4fd5200e38c34d06fe24fede2f812ffb5fc5adb9eed
 DIST rails-2.3.17.gem 211456 SHA256 644c7b054638c0b7e92c12dfe0574c63c5929abfb42a1cc6b9196bfdd9e5b017 SHA512 3780c6148b87f66d7174bd41b27e6963f462cfd753760f544fabb9111d5ca794360c80ba432b06c81abf726d10900f4ded1e5d85073f5b45b37c26200c6c9bd8 WHIRLPOOL 951a79159e5303c9dd36863d3597942fca617bddc74af87456242e4e39db788220af8cb0955fc424aaeeb6fc1553730ea8eaa2fa27356e2baf59483ac7d76777
+DIST rails-2.3.18.gem 211968 SHA256 f92ee63fdb481d5d0758db6a955f850d44f525558ccc5ad7ce4367220a72314d SHA512 c7eeeeba60473cae3cf06410745ca5f24758bb4b0bf449a8fc80310299957af572cce4e781390aa92953169f907c0fafe8b2a31c83d6494d3a98c35eb5654365 WHIRLPOOL 31d89ff9a115355f1d3fc55183228dafccf2afe95a62478392e57adb2f50c52465439a95433f167459474319f8ed5a636defdad2820fc24c2d50c12d6455e071
 DIST rails-3.1.10.gem 4608 SHA256 1bdd1d8597d50e2b3bcea99491541855774182dbe0b39d07ed75c321c1e6b621 SHA512 ef2082e4951a99a8fac9f5a2690b6885fe4ee5931839f194eb4dcc005d891bf8b9840d828844cadf7b1aa08aa60b0715ae13701ff61d83af981642dc53cb8fd1 WHIRLPOOL 1d71183802182ebf91f3c21dc51f83bff7d2202e2265bea3034f10735499ba23de89e3eb0dcd7a536084511900ec8585fd8a99b61a82a5bde7ccc65cfe2cd343
 DIST rails-3.1.11.gem 4608 SHA256 45f4a20aaff2ca71b6096e3a0ab6c770ccabae17203510b43bb26f862d9a35fa SHA512 155f33c1d60403f8f4852d7b1da38fc4124d35aadf88de01098bc117749a24795d7c7a2e8833042b4d185748bf28f601659030e695b81e29d218fe5bc3ed0fbb WHIRLPOOL e8c254e59ed39c4539b2ffed98d9a4f353f7a3e2cb8e597d00bc3415e97d03fab34fee8b9c0c11d18569b2ca0e250426c589739f8d90bd70ce9047cb26089641
 DIST rails-3.2.11.gem 4608 SHA256 f5e02999889aa39af2c7d2c882d9e3b5c71e8adfc98236a69dadacdfbce5603e SHA512 3c0d8d88611ded1e48d76470eea91ab7f36541ed774595e102af7bac2dd2e97bba26f39838a7a8bc1e91ea5f272116073bb961a0fb9d1a310ee3c42e933871e2 WHIRLPOOL 13b4d80adc84616e39120b58ab2b612d67bff8ff63d473406aae8888166eedaa703bde48462c77c9598506dea5dd009ebe488586689fd4a2e313ba0fa1d85d81
 DIST rails-3.2.12.gem 4608 SHA256 bff3605849350b46cceab64e0b9136cd8743d45db902160c19bbd06fc9a956ca SHA512 9735135bb517d86898ef2fa36d5c9069d13efe8cba2b22dde744949984f1e2c143933640114d0ebeaf5a25af037b8393fddc595fde1b9d8bb9a0da55ce348f13 WHIRLPOOL 68af91385c4d8e9e682a620bff44de0dce808794001d7ede0adbf29e003d2cb5d13c2b4c97666d060ff41d0d65e22869873fb8cddfce03e0ec8823e922f8e2d4
 EBUILD rails-2.3.16.ebuild 1695 SHA256 b140841a4cbf27733a65fbf1711eaffdc1b7f765b19986c6e00a36fc5d870608 SHA512 2e1ccbb6a5d9f53e849908f3444048c3aab6fcc7935b5bbbf8fe787ef465a5b9a7efeb2443b9b06b4ce92f502b7288aa4a876fa2f95f8d8f01acc3563a202916 WHIRLPOOL f5bd90152b9a1e60caeb8e758285012d121e06851c4aa9e0c73340c0b6fe4482da1127b8879c97c30046ea0c043f3f46e03ebcd19adb5c9314ef506ae8e83dcf
 EBUILD rails-2.3.17.ebuild 1695 SHA256 16ae3303b75bdfcd9005fe64891c2d496a7caefd47634761cf545566546df0ad SHA512 5db39f19639859c1fda98382ec48d1bfa6d3825df9bfcc5159c73cff834c447d746470795ef39ef2be6bdc0351edc24a7c7e874249240ffc0ec780cf85a74c6c WHIRLPOOL 0baca053b1a526b9ede985bc5f5ee32b5715eec6a9723b803692dee1b37b9458a218c7376a4a70be478830efc221d4071ebf90697f4faa5264be10a643448a1f
+EBUILD rails-2.3.18.ebuild 1696 SHA256 401636fe9f694d012d7e748eb4446b154649d9f581da585883b1a4dac461cd45 SHA512 feb778c81e0ef194750f490b454154aa4c5b096ca900b90a2e52e9d6e445284d8fa9b810b8f74cb117a6c1f314b8922da7635c586f9201f03a7b672f02168e88 WHIRLPOOL 8a18c34c35657adc87bb26541729080a0a3dda9a1157a37b23cbcfd982a01405551a5778de7183faaf8f6896ea49ae4bf72b6ba08b121defc71d10a64969071e
 EBUILD rails-3.1.10.ebuild 1275 SHA256 23d26971bd6b5b0c77f90557d05781f12c4b6fdc2010717d370284158bb518d2 SHA512 815e92a53f7af15882ff2953a4b0cbad5c661133d7804c83977e73757f484be5c19507f01bc4371c0932801074f8c3d2b3bc9850cfacbaa1fac67594953f78a2 WHIRLPOOL 98622679148c02b34a69c7c05d22b64c1ae8d7d5d482c61f9c2753fb9186155419adc642e25fa40829225c1b9b4c8d3da53c10dc9b234aadfc8a58d6f38618f3
 EBUILD rails-3.1.11.ebuild 1275 SHA256 fcb20227c61db4ca856736909482b65064eb7297bc41887d566daf72786207c0 SHA512 53d231a6b2873fbee852ddd140468f17ad2f5add5442d8dfdeaf5189ed472f62eb2086b3adb1b335bc78809a2e8c7eeac7721bacea0d60106c34f51db6dc728d WHIRLPOOL f6d9ebc2368f5b4f3ea60094abb1864ddc3129a017342f0eb308f86690bdfae87bc6ab7fcfafe171983d5468c229670059dc1c7a2ba213a4d89b61a3f560d4df
 EBUILD rails-3.2.11.ebuild 1071 SHA256 bd14ef861c812888f4a65d7ef2a18a9d93aa59f0d0f2ffce51257d23d6731b65 SHA512 25b380eb20bbac987e6befd0249d7497be6edaf29e0f822337eaef000ac0c00875f6df5a1070e2b0a1b1c65bf5b19a958602aae3ec7bd342de09b9b8c0df71f9 WHIRLPOOL 92de40213f5dc797207af70ee8d34ec5d303a993cf4ad259533bed6f08617136db4f335d4fa23570152c228c33ed0f9e4b545bb89827daf66f44f48b49cc4378
 EBUILD rails-3.2.12.ebuild 1068 SHA256 b07207ba26c5410f6e493d13844c75e7e403b8e58af8cd716ca20c1e115c166b SHA512 fd2929f16e953490f44ee9018c3d0be3d66b945afba5f404ede5650fbe29f97df4f27fd187c83e6c1336df3ce14a07317619c008dea52ad37e635b53f1e7b937 WHIRLPOOL 1588fbcd9c9dcd313cceb596d503bb3ad5ed272c4ded39652ef1c43738e9b3154c2aea8d9d3b2faf875837fa89de4a1407a5c3d74f8faf25497b4aef08e5f446
-MISC ChangeLog 34707 SHA256 b26413ba5cbf219b9254f375299cfa6fcd44a027e04fe866c49a61761f491840 SHA512 b6782aaf663548f2e29e257f022457b38146948a19e757888800041f15cdde163ed86bd78fee7c3feefb4740d6de45fcfa1a8cbfbc456723264f5cd734da0359 WHIRLPOOL ce84f5c2e002ba778b0ce44311c545c5f4810f42c32c8962ef8cbf2e0559d6cff3a5a8c11fcf7d22acbf9c56559941924ea5f5629e80c4eeeb8691da75811de9
+MISC ChangeLog 34850 SHA256 5517dac26f7b25ebc5b07493a0383af90357945af51239e487cd6d24cd250d3e SHA512 ac0951084382e67f0a4644461a475de979513e75ed341adcb4a0c3e7a536f06c0d69a041c10499ec6f2f2d31360dac7da0be2458304fe8c8c54a386e88bf8cec WHIRLPOOL f47c819260871791c6f2b041ced901100dfd1cc9e0c6973b1cf313a96c32fde7e63e13688626831f19d2f67015bf2e42b6063683e9f73811ec4ff9fa9e0e917d
 MISC metadata.xml 393 SHA256 ab0c7d6f591fe1803349f791b02e9be652e39232117c98f1b173c7ffb0854dee SHA512 dcdd257e9e5ad70fd720cd74ad12f3d292b98f72cc45c80ac02599fe46d16fbdfa84f78e6781756c59fdbc9a808c4734e491c07e320a54a1d2a51241658bb713 WHIRLPOOL 5317c82e4e1ac614e51dc74741272cf1b20fa0cd7b72c77559ecd1115d82dd7b9359bdcd80f1e08c358c096fe1f77e4d8d9e30e6ec70d6246a09613b92fef4b8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlFWsXoACgkQiIP6VqMIqNdCLQD+LK2RTC8d0+zrwdO1owXqZJ52
+qOwGN6kkGoKfhOBlEcwA/RxcbySE6mOg8ymVndcTePdR6xZJMP6gJe8/ddlEuCPq
+=1lRC
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/rails/rails-2.3.18.ebuild b/dev-ruby/rails/rails-2.3.18.ebuild
new file mode 100644
index 000000000000..fffbfb9f75e1
--- /dev/null
+++ b/dev-ruby/rails/rails-2.3.18.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-2.3.18.ebuild,v 1.1 2013/03/30 09:33:45 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_EXTRAINSTALL="builtin configs doc dispatches environments fresh_rakefile helpers html README"
+RUBY_FAKEGEM_EXTRADOC="README CHANGELOG"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+# gem lacks tests
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="ruby on rails is a web-application and persistance framework"
+HOMEPAGE="http://www.rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="2.3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-rails-0.15"
+
+ruby_add_rdepend ">=dev-ruby/rake-0.8.3
+	dev-ruby/rdoc
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activeresource-${PV}
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}"
+ruby_add_bdepend "doc? ( dev-ruby/redcloth )"
+
+all_ruby_prepare() {
+	sed -i -e '/horo/d' Rakefile || die "Could not remove reference to unavailable documentation template."
+
+	# Create the documentation that we create on the fly in a separate
+	# directory, since we need to install the doc directory for the
+	# rails script.
+	sed -i -e "s/rdoc_dir = 'doc'/rdoc_dir = 'rdoc'/" Rakefile || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rails rails-${PV}
+
+	if use doc; then
+		pushd rdoc
+		docinto api
+		dohtml -r *
+		popd
+	fi
+}
+
+pkg_postinst() {
+	elog "To select between slots of rails, use:"
+	elog "\teselect rails"
+
+	eselect rails update
+}
+
+pkg_postrm() {
+	eselect rails update
+}