Version bump for security bug 453844.

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

24 files changed, 521 insertions, 44 deletions

diff --git a/dev-ruby/actionmailer/ChangeLog b/dev-ruby/actionmailer/ChangeLog
index 359bf236aa8c..c941cf851207 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.216 2013/01/28 21:39:32 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.217 2013/01/28 22:23:56 graaff Exp $
+
+*actionmailer-3.0.20 (28 Jan 2013)
+
+  28 Jan 2013; Hans de Graaff <graaff@gentoo.org> +actionmailer-3.0.20.ebuild:
+  Version bump for security bug 453844.
 
 *actionmailer-2.3.16 (28 Jan 2013)
 
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 337711da2738..ebc04cd82e4e 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -6,21 +6,23 @@ AUX actionmailer-2.3.9-require-uri.patch 507 SHA256 8aa2121eecea068632f38cc03ced
 DIST actionmailer-2.3.15.gem 273920 SHA256 9b635cfff21a47f69d4e2ed4080597a94a86a4d627734128e41c8ae9bcd4317a SHA512 cf25d00aafb50d485c17eff97214f71e4ff6909fbd89ffb18b3b50604a0e498fdf6a483e681f0e79dbfca33ecd8c44c1b9db6815f543dc2fc6a560d6eb618eb0 WHIRLPOOL ea01031e31305c1066906973561756f886069083649a9835ea1edc9f029f383fcb9f05011562877a12a5fb792389a5369ee936396e9d97665ade0bbf350004c4
 DIST actionmailer-2.3.16.gem 272896 SHA256 5493fce4c6eb5c07f74312fb84af00b140d684c5b581ab4eaafb059a4a5f9ad3 SHA512 abe49066cace06b3afab0e0619561242057d86edcd15ca3431239dc93c80bf5f04777d68017c9b97824d1c8eb1faff76c68c12dce434831a9b8d26118ddaebae WHIRLPOOL f896c0cb1ae7859aa2cb68b962a286bf6048499c5a810e2261f0a9ff359e18ddda58f3b055ef1d09defae5bdeeae4f746bc953fd8e81ab9f4f05e8af75707483
 DIST rails-3.0.19.tgz 3510042 SHA256 a8a9c7ce5aba53bc13d6621ddf2b55adf1f8ad18999217580af2171db30cec43 SHA512 98ccc8724767202999007592571e9aff85fe121616d4e31409cbdd0917e8419c858b4e9cb547721da0e5bd6e5c46f3c31344c91227abef97009ad96bfe31f952 WHIRLPOOL 2d8bf0941d8a6efc78a69601ea8c44f61026974aa3ff58ab076873388866dd3d05eb9a7ad0db4e6772e17cb2b4c4c2113b5bb506066d7dd9b508b44a2a52cf76
+DIST rails-3.0.20.tgz 3515055 SHA256 01e1364804bc329c8d6f3a93ed7dbc578e667c7138a5b6e3b0cd85cbc1fc4e6e SHA512 06e23aa7176640dac0f912a31177b067f0297ad2d2d3301bfe7c9a0dc6b140716fcc4b28daef75620376218e77aac3a387e5712d7cd9dab8ca8020216ed4ec89 WHIRLPOOL f5e66a55537f569d54a5ac81166be39104d209a832151c99af91ca5dd889ce12f2baaf80364f11909ac191c3fc058921d370464792db1c3e7f742f45c2a1b41c
 DIST rails-3.1.10.tgz 3394031 SHA256 d0614db8c4011ed1fcb4bd0afeb8220634b1ec8b196ee40a956c77a76026ef65 SHA512 c6b3db4043345c81582ab22289c29630e3946dc1936adebff0af196f461236805ab146e74ed400fe045d980df562ae44479e36c2c8747ed8a6ba6807add23e6b WHIRLPOOL 5329cd31170ce2ee7c109c9c1152b5eed35c8ec1af48a84d03eff4bb4fe083a7a9840ceb076575961d84c6baeb725fe1c5eed1a4756d39a8bc52a26f23dc6123
 DIST rails-3.1.3.tgz 3638313 SHA256 412c8a3ae4e0d5283ace45a2ee95127418d6b70fb1a954087b09755ab3a25e99 SHA512 286434f02c16f9cde51c160a5f84ac9b53d9d3aaf44c6c8018cef3250213cd39909013006223cceea8bd68ffe0bdc8ce50b0695e57756d8bb9ec44ab5986a711 WHIRLPOOL 710aa7c64c71b46741e19be41023aa6acf7dfeb25b94f8f14c10748f4a4a4cacd61ecf51a9db0b4eae1d0a1797f4287fd9b0f139a874f1659cab8fa5f252c200
 DIST rails-3.2.11.tgz 3547068 SHA256 3f05603f84bfb7a99f999f878af247533706255e6b3baa4111439b6f5fd8ab70 SHA512 50644772186127887bd4d7537ad41cbe549c5c8496274cad2765f21859528a0f42f5b8dbe3a1627a08b1724b2e019c0ec6526cccfdff3da4ffcec285f9259558 WHIRLPOOL 70d5620fc611872b2af62351c81abbe43b3b1d41c92a1d1935cef704a4a655c9bb043599bc758c947c14378ef52e34b44c61536d5a048401cc6bfaef613eba23
 EBUILD actionmailer-2.3.15.ebuild 932 SHA256 607ffd95942c242fd5bdefe6cc7cbc0272f7f956d9df612ddb18ad7f08ccbb40 SHA512 a4ef9043d5e239a979a4c3ad6e7f7830a7ff1fb198ff1e15764a1542c6058dc961a59c736069ce0aa1c53beb70f5441bbeb7b859938575571b7153b11e217a17 WHIRLPOOL 6aff084cd0ba19f720e1c64e0809fe12671d1fbcde898ecc322506abaaf228b36a93e5a049260729ca33b6eea1389650c40fc85393f99dcd01ad75a72f9efeef
 EBUILD actionmailer-2.3.16.ebuild 939 SHA256 27dbd2a89f9f3cc7585a07bc60409d1aae03d1b22cf2ce2dfb4af8798bb77127 SHA512 d6f7f3a255a2745a73401b09e6f8f8e4ec83daacb0306be25db18adfc40f1d5c0b4a41a0fa6830e11be14c485b40866793950f6a9dcb962d4517d944f7d6af50 WHIRLPOOL 2cc9e45c0c09a882222460d771d1f08d95b73628b6f791b1df54d300c9d622db4b365c0197514b6a006e17aaa2161371441e623d4b84073c440f6eb44653a9ca
 EBUILD actionmailer-3.0.19.ebuild 1384 SHA256 8616bcf9768a4c765468544ad70680025ae330b10119992bbca330ac9839bcdd SHA512 9c9d9c7c6cd237491d407acc2c7d5695a7871acedb90fb37b270e5b32c80837316ecaa858fbdfb8402c54c69aa09f1626a83c127ed289338c0114bc0c9a6d5a8 WHIRLPOOL 61da3003e1adf685abb8506b1dc74e98e4cd6a51f8688ab89e99a7bd076262af2198bc46220e798e0587f90e7e6e39475b4d5fc3bc196b001bb3008f473194fd
+EBUILD actionmailer-3.0.20.ebuild 1384 SHA256 9482d92e2d8d7b5dd91c07cd241e5098591d4da40f5cde63752546ea0ffdeb52 SHA512 99d0cccf1fb551821cffe79b37b86808fec80fe99af76894c4afd6f6a266d681a561766128d33027f23b6a3b019af65b98af70c8cda7d5af220fe26eef39adf9 WHIRLPOOL 3a3554a8f2e96d68928a810dea053c263e5a0b24ceff97db9a6b00e0a201a690359b88ad9cd93ab933fb0453fb89b25ae42c685934b08a856e2f2383201fe3d5
 EBUILD actionmailer-3.1.10.ebuild 1254 SHA256 3396b7c35d20dfe8d8a39694bcf5bb873e82fef076c697489f94981e46e608ee SHA512 35ea6db1c016cf60a4791f102c908dc9fc0ccbd1f51c89aa1790c1cdc7103469497440570ab9a2beba2982d321ce7f4270d54215d2a5459667252102a14836f5 WHIRLPOOL 4b89287e5cc7f8dc7bb0b413f75a76a9e1e034299a289b5f5701d1ea45e9ee5a41bfc07e987b14a9f239f60b4f18d6f0dbe3c8afae1fb39658f03ee4fddde181
 EBUILD actionmailer-3.1.3.ebuild 1170 SHA256 81ed0dd767be10bbd5431fd445c927cab1f7490147334b729f13b6cf01e96807 SHA512 c8c4052b1da15e26fe41ca3b5842d0b4ad0c0c643f8786d41590223810e2fd4b0e20d35ab43d252849a69c36288e3e18053306beb641bde7c9b6c94573bc5af0 WHIRLPOOL ed3c7ea4ef9535a7046abb6c4695f9235b13a9adcf6a37e6a5bfcbf5bba10c45a9619ecb452eeacb68ae5dcdd7f6e71adbdd448b69f8b82a5cf312f2c91b1dc9
 EBUILD actionmailer-3.2.11.ebuild 1211 SHA256 bf40debd671f798592e3affe89742ca52f918d422f417b017e0fc6610e6547b9 SHA512 76ded09a9e9caacee9d52d093891dea4cd666d44eae32150ac198716c7a2a6d7a3c52f76587e13277da84efa22a008f0059f9a3e5b73401f6e42d68fea565e6f WHIRLPOOL f266dcd84b6837595065c844f2489a0fe4728fa4c1bed5d2e61b62185c66e2484999be5b6d627b0e1a52b14ea3960f1413bba4e16025ad06fd342287fd6018c3
-MISC ChangeLog 29393 SHA256 6b6df358aa845e0776322153cd83786bcbb33adfcaa71620679664c659740c64 SHA512 bee976aa7efa5eb102b8b7bde8feef982d0cb9a73a7834a4761303ce159ed077675593a9936f27ec203b355fb7f96f344c4686a9570bbfac17931e18e0dbb2f2 WHIRLPOOL 0db1665f6423dd4fbee27ff5250d29f3b748e734ea8231ece6e38c9d06248d77a0311a4171a991b94afff29cfd2499c2821f02655383af9b2a9f4113e6704d17
+MISC ChangeLog 29549 SHA256 dca71695b599e920306a50fb4ff78f9145ea82a1a0f3e6b4ba259a2ae76371d5 SHA512 8bbe268b624f289cc189312c9a56a3066b91851a37bc73137ba53302ef2b7412c770e76ba18fcaca16dde365c6ff2671e25cec1875747790102ec757e13eb9a2 WHIRLPOOL 197f7cfaf2f2b602c0d9cf6a9ba2c7b71441d9584f969c3d83e99e6a52e7ebcf7fa82c933e64165650e53e3ec1e7f5674bf848354d08586060da6a99292455a2
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlEG8BUACgkQiIP6VqMIqNdkxQD/da3NvOT5uUc/Q1Haq3nq4fEk
-uR95t77JIP5ZekGmASIA/2Xm1Q7tV7m3THWH1RFMQ/SOaBW2MqItwiJtv7TxwiDd
-=aX6/
+iF4EAREIAAYFAlEG+n0ACgkQiIP6VqMIqNePDgEAiRTqC1yuUvSP/SFHwpl4ba/o
+Bw1B6oYzZdCGrcGrhPsA/i+AeuBHwfUfJP7L1UQ88Sy42TLRri882VJV55gK9Yrk
+=osLN
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionmailer/actionmailer-3.0.20.ebuild b/dev-ruby/actionmailer/actionmailer-3.0.20.ebuild
new file mode 100644
index 000000000000..8995fcd23274
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-3.0.20.ebuild
@@ -0,0 +1,42 @@
+# 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-3.0.20.ebuild,v 1.1 2013/01/28 22:23:56 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ree18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="http://rubyforge.org/projects/actionmailer/"
+SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-rails-*/actionmailer"
+
+ruby_add_rdepend "~dev-ruby/actionpack-${PV}
+	>=dev-ruby/mail-2.2.19"
+ruby_add_bdepend "test? (
+	>=dev-ruby/mocha-0.13.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"
+
+	sed -i -e '/dependency.*mail/s:~>:>=:' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Rename private method to avoid conflict with the simple_format
+	# TextHelper. Already fixed in Rails 3.1.
+	sed -i -e 's/simple_format/format_paragraph/' lib/action_mailer/mail_helper.rb || die
+}
diff --git a/dev-ruby/actionpack/ChangeLog b/dev-ruby/actionpack/ChangeLog
index f8ad66d0da45..5e80c6483480 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.233 2013/01/28 21:39:10 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.234 2013/01/28 22:23:33 graaff Exp $
+
+*actionpack-3.0.20 (28 Jan 2013)
+
+  28 Jan 2013; Hans de Graaff <graaff@gentoo.org> +actionpack-3.0.20.ebuild:
+  Version bump for security bug 453844.
 
 *actionpack-2.3.16 (28 Jan 2013)
 
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 051b3a14fc20..98622fab5e48 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -7,21 +7,23 @@ AUX actionpack-2.3.8-custom-cookie-fix.patch 3009 SHA256 9368cd7b35fbc0b5d4161e1
 DIST actionpack-2.3.15.gem 749056 SHA256 7fe685d93655ded1b5f2a63617c0bc1fa9b7a0a755680771fca44bc60dca0ffd SHA512 08a8288b96a89e1587fddd5cecb665b084a5798391fc314aa9475499807d710e3912176b4087385065ae0d3a60075576d4d02019cecec3b8b8f05b735c16743c WHIRLPOOL d5a3195d2079387791cd4eef66c9225382b1791b7582aa150e42a63aa0659b493ca58bce5af4b53f30d94279d599ef38098044b019e2085b1a805e1d7a3a1d78
 DIST actionpack-2.3.16.gem 744448 SHA256 ea7b7f9e544b574ee393799e161a7b0b3e1d4dad3d5051b1055a8b95bdaeca68 SHA512 d2d3f8d90512014004c1fa3cf584c224a54e9d3ea80832a9e22c69ca3d305ef1364371a53dfcca6398ba6d0548f6993db6165c1a85d65e411246e3c3b35246c5 WHIRLPOOL 4f2675edf03e3e279d8776d89befffb388f200de516c7c2f13efc5aa4b20ac655daa2946f23f926462e3999193a6e9e97f3a930c1b7f23a30a37ec3d74fd0dc8
 DIST rails-3.0.19.tgz 3510042 SHA256 a8a9c7ce5aba53bc13d6621ddf2b55adf1f8ad18999217580af2171db30cec43 SHA512 98ccc8724767202999007592571e9aff85fe121616d4e31409cbdd0917e8419c858b4e9cb547721da0e5bd6e5c46f3c31344c91227abef97009ad96bfe31f952 WHIRLPOOL 2d8bf0941d8a6efc78a69601ea8c44f61026974aa3ff58ab076873388866dd3d05eb9a7ad0db4e6772e17cb2b4c4c2113b5bb506066d7dd9b508b44a2a52cf76
+DIST rails-3.0.20.tgz 3515055 SHA256 01e1364804bc329c8d6f3a93ed7dbc578e667c7138a5b6e3b0cd85cbc1fc4e6e SHA512 06e23aa7176640dac0f912a31177b067f0297ad2d2d3301bfe7c9a0dc6b140716fcc4b28daef75620376218e77aac3a387e5712d7cd9dab8ca8020216ed4ec89 WHIRLPOOL f5e66a55537f569d54a5ac81166be39104d209a832151c99af91ca5dd889ce12f2baaf80364f11909ac191c3fc058921d370464792db1c3e7f742f45c2a1b41c
 DIST rails-3.1.10.tgz 3394031 SHA256 d0614db8c4011ed1fcb4bd0afeb8220634b1ec8b196ee40a956c77a76026ef65 SHA512 c6b3db4043345c81582ab22289c29630e3946dc1936adebff0af196f461236805ab146e74ed400fe045d980df562ae44479e36c2c8747ed8a6ba6807add23e6b WHIRLPOOL 5329cd31170ce2ee7c109c9c1152b5eed35c8ec1af48a84d03eff4bb4fe083a7a9840ceb076575961d84c6baeb725fe1c5eed1a4756d39a8bc52a26f23dc6123
 DIST rails-3.1.3.tgz 3638313 SHA256 412c8a3ae4e0d5283ace45a2ee95127418d6b70fb1a954087b09755ab3a25e99 SHA512 286434f02c16f9cde51c160a5f84ac9b53d9d3aaf44c6c8018cef3250213cd39909013006223cceea8bd68ffe0bdc8ce50b0695e57756d8bb9ec44ab5986a711 WHIRLPOOL 710aa7c64c71b46741e19be41023aa6acf7dfeb25b94f8f14c10748f4a4a4cacd61ecf51a9db0b4eae1d0a1797f4287fd9b0f139a874f1659cab8fa5f252c200
 DIST rails-3.2.11.tgz 3547068 SHA256 3f05603f84bfb7a99f999f878af247533706255e6b3baa4111439b6f5fd8ab70 SHA512 50644772186127887bd4d7537ad41cbe549c5c8496274cad2765f21859528a0f42f5b8dbe3a1627a08b1724b2e019c0ec6526cccfdff3da4ffcec285f9259558 WHIRLPOOL 70d5620fc611872b2af62351c81abbe43b3b1d41c92a1d1935cef704a4a655c9bb043599bc758c947c14378ef52e34b44c61536d5a048401cc6bfaef613eba23
 EBUILD actionpack-2.3.15.ebuild 2231 SHA256 30bd9606593cfbf5af04523ec272636d4d486b831060bc93247a7513e063d64a SHA512 dfa647759cb16c6087de87beb127767fc6dbc8a0608760c6774f54b42510d279f8023f5f9b1cb3e7fdf24a158f586afbffe1989c71e3981749e122ba687aed39 WHIRLPOOL dc990036210a646f7b274c82db36fc3520d94dc728be24107ff840c07d75b4d9f4dd8e24193c7b4a9c3a528a022f5650eb77ee497fd6e783e93891e774c67402
 EBUILD actionpack-2.3.16.ebuild 2238 SHA256 bed690ebc00223f1ad9d0f623ca90be7418215c158bc403f23813480ca268f81 SHA512 8572468a57b077c500bbcfb16c8ad29e68c634805bb986ffc21777182712397129188d1421602072f0916418df4a610478eaebc12731d6ed4810f415da55536a WHIRLPOOL 31aeb2237c85c1882c2336fa5a8336e75419bea5ab4c0a26c482793d104a9d99b7ae4113c18ac6a469f4b423a8f6f21c64ac8e19a28fac92194bc5f28ea5f2fb
 EBUILD actionpack-3.0.19.ebuild 2077 SHA256 fce82cb31595da23a26c597e0d6e3767545d415282222ae51af9546ac8b4977d SHA512 52900c968560cf6cd04b94175e6d336b8365ec657611962fc010c17934524e03531039a7cbcf855a41a0abc2cac80f3616868b5aea8796a0c40ccdcb5063db64 WHIRLPOOL 324c4c5dccf0990b4b45c8dd91db5f5146afb30838b6617224076b154dc652b11bf40489da172bb91a8e6846367580c4d3cc2aa698ef73d8ae98b5e942cf216d
+EBUILD actionpack-3.0.20.ebuild 2077 SHA256 9489895376421fca5f842dafe36f930efdf51c81bfbe8059112a3d8727492408 SHA512 5ac34546f0190cc2901119de086a15eb5218d727838e8d83daf2d8b10ad770974afa8c2c9fe0a5084ebcbc3eb595fe33e4f392c001b9edee8a165139c6bd5c45 WHIRLPOOL 83fc186390abbbb9a417a37dbff973e738cd64e98aae841a52c0e462269d3ff34465718b48be0e17e7dceddec2d4b4d7135ccb277084de97c3903d7ddadefbdb
 EBUILD actionpack-3.1.10.ebuild 2580 SHA256 54abcad05f2efcfe8941ed77c982a5dfc1efb3775808aacf9b2ed822635324ce SHA512 1e0be27e84c67c85fc4ba264d3d4a0233ca4970e5e9eeacfd757e7b5ad802f0e35ec0de930ee5e3d1105b11bd247c37c604f1ec91f4da8d71b549a254bb0df37 WHIRLPOOL d6527bc2235b3a15c7924c0b63f21fea587900d11c606aa65d84ac0201f3b66b1d884c33c91e613438cdce082a8ef07446973a947b04383ea56d8e351c70c53a
 EBUILD actionpack-3.1.3.ebuild 2098 SHA256 39c689e1b3250e1bad2686463bbc08c6610ca89056de9737b23742a2f9421ffc SHA512 916fa25972bfe90d60607d6142c448c4bf6610d517943f367e81468454393b977bd32d269cbdd27e38ddd68e2aa967d8f343f66276480694ac4a49af9c8d34bc WHIRLPOOL cde148eea4d530126c10910f4d36abd431c061c2979b0cefc5ebc80450020e3e5495732f4291dcdf278c88c550835da696423b997bfb54938191e90a369d0725
 EBUILD actionpack-3.2.11.ebuild 2478 SHA256 2fd15e02d9d11c1663fb09439a26ea6b97a6f7565c7e88df0aeb40a39a3f8afc SHA512 d81bbddccb05fa5aa648fc87308a271e2a8b6d5f37da1605233ea41f32a275817b70b64f2ca0a199dc4dedaebcad0ceb18bf647d4c5825087dfc86ecdbde07be WHIRLPOOL 2a85b232d0ef81284fbe8b47b198040649d430e3a7d0b57e6daab2f26bf493693b109750f9e129c1482dcc72fd4661241c237ead18fdbae8fd36abad9e219c86
-MISC ChangeLog 31384 SHA256 cafdebd99fb6c9e561e733f8f2b9e8d6f3d953f8f3c261ba46b046129e511ab2 SHA512 a36770edbca30d58ec6e780df01cc85c605c712e52557c7d55080fa8c669d37b13b6aa1629cf63a0c7d2772e235a3a3e3e96717883b6f0b452ead9690690ab20 WHIRLPOOL a37c31538875705d9cf7e3ee4315d60a357fc549f4c439debaa1c531bce3b03e3f3e47f1a9d87a7cadf4106b1018679fb1fe5f6d4ffeafea93dd4b56dbe8829a
+MISC ChangeLog 31536 SHA256 db296e084f77a28ebef6a755315904ddd17d359c5ba343f1d0094c5cfb99d52a SHA512 ab6888230db4f61a16e6b2c394e3f6e70de832eebb57caa973604ebb86834915d2b296f5bf419610debbb9f33ae158d6c77a4c1a15fafca0eb1e875e9cefb5da WHIRLPOOL c07b28d4d25f9b2c899b44e12bc1cee21c7260baf7422f6772325f48c78adbc38c7fb0c6894a4b072d94d5c69e7cc92556bd60c0f24b8dbc5ae0c949d91cd2bb
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlEG7/8ACgkQiIP6VqMIqNfUTgD/SLqV3kEmxNM4h3A0WTAiTbzl
-3uRBXlEshvAdAHGm6vEA/24V0DRBMBUaQkAKSTsphktR4rSnjMt0jGWi8l2zLF4R
-=SDIl
+iF4EAREIAAYFAlEG+mYACgkQiIP6VqMIqNdNDwD/ejdx1cOxZuxDyFxHbUQhP0gl
+dR/dRvtRfMsjNvPgbeAA/0t4xTtOggP+yb20Z6gUwVkZQ4Y6Ren5WsuqFTJirmvE
+=TMbf
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionpack/actionpack-3.0.20.ebuild b/dev-ruby/actionpack/actionpack-3.0.20.ebuild
new file mode 100644
index 000000000000..9d5382473e34
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-3.0.20.ebuild
@@ -0,0 +1,65 @@
+# 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-3.0.20.ebuild,v 1.1 2013/01/28 22:23:33 graaff Exp $
+
+EAPI=4
+
+USE_RUBY="ruby18 ree18"
+
+# 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 README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Eases web-request routing, handling, and response."
+HOMEPAGE="http://rubyforge.org/projects/actionpack/"
+SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-rails-*/actionpack"
+
+ruby_add_rdepend "
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-2.1.2:0
+	>=dev-ruby/erubis-2.6.6
+	>=dev-ruby/i18n-0.5.0:0.5
+	>=dev-ruby/rack-1.2.5:1.2
+	>=dev-ruby/rack-mount-0.6.14:0.6
+	>=dev-ruby/rack-test-0.5.7:0.5
+	>=dev-ruby/tzinfo-0.3.23"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		>=dev-ruby/mocha-0.13.0
+		~dev-ruby/activerecord-${PV}
+		~dev-ruby/actionmailer-${PV}
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e '/\(system_timer\|horo\|faker\|rbench\|ruby-debug\|pg\|mysql2\)/d' ../Gemfile || die
+	sed -i -e '/thor/d' ../railties/railties.gemspec || die
+	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
+
+	# Loosen erubis dependency since this is not slotted.
+	sed -i -e 's/~> 2.6.6/>= 2.6.6/' actionpack.gemspec || die
+
+	# Loosen mocha version restriction
+	sed -i -e 's/0.10.5/>= 0.10.5/' ../Gemfile || die
+
+	# Ignore failure introduced by security measures in 3.0.17.
+	sed -i -e '/test_select_tag_escapes_prompt/,/end/ s:^:#:' test/template/form_tag_helper_test.rb || die
+}
diff --git a/dev-ruby/activemodel/ChangeLog b/dev-ruby/activemodel/ChangeLog
index 21467c8fab55..784b53a9ad8d 100644
--- a/dev-ruby/activemodel/ChangeLog
+++ b/dev-ruby/activemodel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/activemodel
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/ChangeLog,v 1.50 2013/01/23 20:32:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/ChangeLog,v 1.51 2013/01/28 22:22:52 graaff Exp $
+
+*activemodel-3.0.20 (28 Jan 2013)
+
+  28 Jan 2013; Hans de Graaff <graaff@gentoo.org> +activemodel-3.0.20.ebuild:
+  Version bump for security bug 453844.
 
   23 Jan 2013; Diego E. Pettenò <flameeyes@gentoo.org>
   activemodel-3.2.11.ebuild:
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 887d79c60d52..d60448558a26 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -2,23 +2,21 @@
 Hash: SHA256
 
 DIST rails-3.0.19.tgz 3510042 SHA256 a8a9c7ce5aba53bc13d6621ddf2b55adf1f8ad18999217580af2171db30cec43 SHA512 98ccc8724767202999007592571e9aff85fe121616d4e31409cbdd0917e8419c858b4e9cb547721da0e5bd6e5c46f3c31344c91227abef97009ad96bfe31f952 WHIRLPOOL 2d8bf0941d8a6efc78a69601ea8c44f61026974aa3ff58ab076873388866dd3d05eb9a7ad0db4e6772e17cb2b4c4c2113b5bb506066d7dd9b508b44a2a52cf76
+DIST rails-3.0.20.tgz 3515055 SHA256 01e1364804bc329c8d6f3a93ed7dbc578e667c7138a5b6e3b0cd85cbc1fc4e6e SHA512 06e23aa7176640dac0f912a31177b067f0297ad2d2d3301bfe7c9a0dc6b140716fcc4b28daef75620376218e77aac3a387e5712d7cd9dab8ca8020216ed4ec89 WHIRLPOOL f5e66a55537f569d54a5ac81166be39104d209a832151c99af91ca5dd889ce12f2baaf80364f11909ac191c3fc058921d370464792db1c3e7f742f45c2a1b41c
 DIST rails-3.1.10.tgz 3394031 SHA256 d0614db8c4011ed1fcb4bd0afeb8220634b1ec8b196ee40a956c77a76026ef65 SHA512 c6b3db4043345c81582ab22289c29630e3946dc1936adebff0af196f461236805ab146e74ed400fe045d980df562ae44479e36c2c8747ed8a6ba6807add23e6b WHIRLPOOL 5329cd31170ce2ee7c109c9c1152b5eed35c8ec1af48a84d03eff4bb4fe083a7a9840ceb076575961d84c6baeb725fe1c5eed1a4756d39a8bc52a26f23dc6123
 DIST rails-3.1.3.tgz 3638313 SHA256 412c8a3ae4e0d5283ace45a2ee95127418d6b70fb1a954087b09755ab3a25e99 SHA512 286434f02c16f9cde51c160a5f84ac9b53d9d3aaf44c6c8018cef3250213cd39909013006223cceea8bd68ffe0bdc8ce50b0695e57756d8bb9ec44ab5986a711 WHIRLPOOL 710aa7c64c71b46741e19be41023aa6acf7dfeb25b94f8f14c10748f4a4a4cacd61ecf51a9db0b4eae1d0a1797f4287fd9b0f139a874f1659cab8fa5f252c200
 DIST rails-3.2.11.tgz 3547068 SHA256 3f05603f84bfb7a99f999f878af247533706255e6b3baa4111439b6f5fd8ab70 SHA512 50644772186127887bd4d7537ad41cbe549c5c8496274cad2765f21859528a0f42f5b8dbe3a1627a08b1724b2e019c0ec6526cccfdff3da4ffcec285f9259558 WHIRLPOOL 70d5620fc611872b2af62351c81abbe43b3b1d41c92a1d1935cef704a4a655c9bb043599bc758c947c14378ef52e34b44c61536d5a048401cc6bfaef613eba23
 EBUILD activemodel-3.0.19.ebuild 1239 SHA256 c078e2e1cb9f3ecfffcfb5e55bfdbba8caee95205eee53622a28f334c771d394 SHA512 a9c77811f95c9468f51f49fafe302992081052b252bdadec0dc1f544198901e5b2e7596f4bdd2097a306629ac68a4f89e0b593377e70ef2e5f1b5ab801766ef5 WHIRLPOOL 88dcb3c947747b272de6566fd76d6e2e69a145a995c54c242ca4b388d500cfadf0505f7211f59586fe3ba036243ff958e710b101e0a1b3bfe049563f71f47ad2
+EBUILD activemodel-3.0.20.ebuild 1391 SHA256 2d9c7a5747869ecb871bbe1ab6f38f13787163a44b012508947618f59dda323e SHA512 c60946f755b62a507dc2fc715f1a30c4484f1c7e3b7d8ec26406dbc7eed553100625376a5d12608c3cba99bc46b7d6f5f0c836e963dd573baac53976998955ea WHIRLPOOL 2b16c1016e73f71d0e7e5a7032f833bb18942bd0516ddc5e1db90e0b9ae37450fd4677c32cf814f8b41e867ab7f63788a9b0b7512f708525000213a2c55f3cf1
 EBUILD activemodel-3.1.10.ebuild 1268 SHA256 ee3926dfc1d80028dc75864e4808be129276283294468372b3b063a47638aebf SHA512 c5b83401433fb3b7d91185b95e3855fd9821d18821f8d6ae784c49b643ed23d2f540b9b3c77a0e65e88b5ee0fa470b91ba7e789afe6247d234b780712a343fb5 WHIRLPOOL 731fca21780655b43c5a78169e475a3286e7d91a8179904610b67e69fc948d2aab705626e6e739248c0d62ad92f0a98fd553b2a4d68092193ff0eadbab6653dd
 EBUILD activemodel-3.1.3.ebuild 1267 SHA256 96ebe47343111239b925a0504440a1605951fb56b6a7de9c3bf159a5e586c0f0 SHA512 4d7e2343b64a948f318b0beeb50ef628037accc95909cbae578ad17ec6e3280b1c4ea1b9b45ba6934bec3813768e728e6bad884684943c48cf8c932bdced675d WHIRLPOOL c1de198b93cc502cf52210d69d9d4926658ad77193caeb2dd20e408af4f0e7fed3a3ef8a586e84bc3016eec65d72df0a5a7b025a05060775ead721636acf262c
 EBUILD activemodel-3.2.11.ebuild 1286 SHA256 492edcc96143c1b770b2b9ecaf6e35fe4d7ece17a0a4bf46f864653d2f2b3d03 SHA512 f4a93d08d689c96c497f9ae128ffdf20b75ea8e39a779ca141d0601e63d38473bc94c1298720b5ccbb2be49fb51d0030e5de7ca05ef515696a7e984cf8420f8b WHIRLPOOL faf3f6be4355386c16a1f4079de451fec2bb0013cd8ee219e902a10c8ce31594db086e763105a3050ed289e5e90bd29d6677f59a280b3bdacebd90880560d9e9
-MISC ChangeLog 7552 SHA256 78c74333524675178da0f3891e8c07f92c7e6455d07a3368a8fd6630fe0eb2b2 SHA512 6905d21c412a279e030bc83f3a8c8144af989918cd939a355864b82d79969e3538a568390566509012fc79953ab5397089a2274da5c0c9351e20b071d3526f18 WHIRLPOOL 7a70998dccb0c5609a2fc57f47d1f3e6b02dd3050262509b302e3ad7a342312a29829fefa8556d6c669ce8f8b7f76c0f0812333028ff8af338b3799aff64c8cd
+MISC ChangeLog 7703 SHA256 623358a507f5c5d0e836c68250e066b56e4a7bd86da64362a679e532372c80cc SHA512 6b4c22d8532edecb83048f83516401008e06b8345353c803273e4e1ee3ea3055ee95d528ce387c384566878066ad8649545b1d42da779b7cc8053c434f54310d WHIRLPOOL 4e0ee232b9aaba2567f7bdd158e7f460ce2c127d9d5f48a47056d483bb50f6df15ddadf6d9ce3cd5c9b00fbc0a6997458da474727b52197d8d724752c0de7390
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRAEj7AAoJEBzRPIrUMBNC244IAIa5o2xuQnQoEkuUU/y5ukDd
-ZzizkWMJPkDfcoFFp6ugIklRruGPLy5m1VP6hqkth2ncbiKvxIAdT/NS+YqU7n+n
-Ua1JcuJ+7hb+KwONMlUo6axYIGMFZaeAp8KCa6ikC9k0rD0MxMZHaYZLD2mIwRZb
-qM5uPfSj/YjZJ1Mg8/OanRQpJZ58Hxya1cy6mhx4oJwtGV5rNtVG5aUHnNI8+VtP
-n+L50Uv7P0TGj86YMVk39eS6YyNroDPTkkV+zeIFaCDmPGoSQRw2C8CPl6kSNytr
-PruJ3I+j7jJfFg/Z1iQxPkHPSjv+OhRqnOxBK4tunxXibdYz1q+L/EkA+jE8Cw4=
-=Mc7J
+iF4EAREIAAYFAlEG+j0ACgkQiIP6VqMIqNfzngEAg6DM6uqW4sthapHw2RpmwX8O
+qvg8L5yO/koCpUbGdgwA/0O7tmqe3cYLUM5KiZmwowLGlFmOEwISlKPufjW4BKnc
+=MSDd
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/activemodel/activemodel-3.0.20.ebuild b/dev-ruby/activemodel/activemodel-3.0.20.ebuild
new file mode 100644
index 000000000000..e1b2053a6e14
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-3.0.20.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/activemodel-3.0.20.ebuild,v 1.1 2013/01/28 22:22:52 graaff Exp $
+
+EAPI=4
+
+USE_RUBY="ruby18 ree18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+inherit ruby-fakegem
+
+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/tarball/v${PV} -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-rails-*/activemodel"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-2.1.2
+	>=dev-ruby/i18n-0.5.0:0.5"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/ruby-debug
+		>=dev-ruby/mocha-0.13.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/cases/helper.rb || die "Unable to remove load paths"
+
+	# Avoid a test failing on different-but-equal HTML semantics.
+	sed -i -e '/should serialize nil/,/^  end/ s:^:#:' test/cases/serializeration/xml_serialization_test.rb || die
+}
diff --git a/dev-ruby/activerecord/ChangeLog b/dev-ruby/activerecord/ChangeLog
index 8503f515d5e2..34081a988d87 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.219 2013/01/28 21:40:20 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.220 2013/01/28 22:24:17 graaff Exp $
+
+*activerecord-3.0.20 (28 Jan 2013)
+
+  28 Jan 2013; Hans de Graaff <graaff@gentoo.org> +activerecord-3.0.20.ebuild:
+  Version bump for security bug 453844.
 
 *activerecord-2.3.16 (28 Jan 2013)
 
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 5d28e7b1b6eb..d9842c685089 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -8,6 +8,7 @@ AUX activerecord-2.3.8-add-index-with-symbol.patch 2588 SHA256 792750e8a065d7823
 DIST activerecord-2.3.15.gem 541184 SHA256 2f97c0f8346466f5125f8181f00cd2162e915b5205162abb8ae2f5d72c7406e8 SHA512 6699656491355f236fc733dc924c134c0cb4ac83523c3adc5717d2af438fcbf8172668f85b8636cec745e8113877128941001417e18ca7efd92d99f57b15d449 WHIRLPOOL 54c907a48854ece97830b4903c8c1a1c4171477d76b9d650a61a07c7a9520ea940ac4ac18868038c18f443bb9bc2cc8f1bca612b4cf68321fe3db54155483a2b
 DIST activerecord-2.3.16.gem 537600 SHA256 dcc29890142c59de02ee08641a3c0b94d074844d16e056e0318fcab52c8164d0 SHA512 7c44ea8b314a2acd6fd66309502cb6d232e7e57daf670347ef9e78e01c7a7798d0bc902fe6dc3a3a45be10fbc02015e01bf4dd5c675d547fb518d2877ee55172 WHIRLPOOL 9876259d63928eb13dd161a01479987906c61d3f71a75fde17cfe5f38c7663f344cd7ce13b9d0ecdbd0e33535c7ba213407b46f5f3ee62bf189430ed3f35d8a0
 DIST rails-3.0.19.tgz 3510042 SHA256 a8a9c7ce5aba53bc13d6621ddf2b55adf1f8ad18999217580af2171db30cec43 SHA512 98ccc8724767202999007592571e9aff85fe121616d4e31409cbdd0917e8419c858b4e9cb547721da0e5bd6e5c46f3c31344c91227abef97009ad96bfe31f952 WHIRLPOOL 2d8bf0941d8a6efc78a69601ea8c44f61026974aa3ff58ab076873388866dd3d05eb9a7ad0db4e6772e17cb2b4c4c2113b5bb506066d7dd9b508b44a2a52cf76
+DIST rails-3.0.20.tgz 3515055 SHA256 01e1364804bc329c8d6f3a93ed7dbc578e667c7138a5b6e3b0cd85cbc1fc4e6e SHA512 06e23aa7176640dac0f912a31177b067f0297ad2d2d3301bfe7c9a0dc6b140716fcc4b28daef75620376218e77aac3a387e5712d7cd9dab8ca8020216ed4ec89 WHIRLPOOL f5e66a55537f569d54a5ac81166be39104d209a832151c99af91ca5dd889ce12f2baaf80364f11909ac191c3fc058921d370464792db1c3e7f742f45c2a1b41c
 DIST rails-3.1.10.tgz 3394031 SHA256 d0614db8c4011ed1fcb4bd0afeb8220634b1ec8b196ee40a956c77a76026ef65 SHA512 c6b3db4043345c81582ab22289c29630e3946dc1936adebff0af196f461236805ab146e74ed400fe045d980df562ae44479e36c2c8747ed8a6ba6807add23e6b WHIRLPOOL 5329cd31170ce2ee7c109c9c1152b5eed35c8ec1af48a84d03eff4bb4fe083a7a9840ceb076575961d84c6baeb725fe1c5eed1a4756d39a8bc52a26f23dc6123
 DIST rails-3.1.3.tgz 3638313 SHA256 412c8a3ae4e0d5283ace45a2ee95127418d6b70fb1a954087b09755ab3a25e99 SHA512 286434f02c16f9cde51c160a5f84ac9b53d9d3aaf44c6c8018cef3250213cd39909013006223cceea8bd68ffe0bdc8ce50b0695e57756d8bb9ec44ab5986a711 WHIRLPOOL 710aa7c64c71b46741e19be41023aa6acf7dfeb25b94f8f14c10748f4a4a4cacd61ecf51a9db0b4eae1d0a1797f4287fd9b0f139a874f1659cab8fa5f252c200
 DIST rails-3.2.11.tgz 3547068 SHA256 3f05603f84bfb7a99f999f878af247533706255e6b3baa4111439b6f5fd8ab70 SHA512 50644772186127887bd4d7537ad41cbe549c5c8496274cad2765f21859528a0f42f5b8dbe3a1627a08b1724b2e019c0ec6526cccfdff3da4ffcec285f9259558 WHIRLPOOL 70d5620fc611872b2af62351c81abbe43b3b1d41c92a1d1935cef704a4a655c9bb043599bc758c947c14378ef52e34b44c61536d5a048401cc6bfaef613eba23
@@ -15,15 +16,16 @@ EBUILD activerecord-2.3.15-r1.ebuild 1885 SHA256 d44e29cf93181669c3d3eabb777e4a9
 EBUILD activerecord-2.3.15.ebuild 1824 SHA256 1b887d2a539ae69f0457c3ed961ba5a4d3bf46c2fb238ecb58ad1e9b95e01031 SHA512 c43531eec80e14ad681b350b68d719a131a612460cd82603d88d39bc8ee6fefd6e95246b8a1affaebcefba4f8d2016a3424f5d13de1d632c121a95101f5da9b5 WHIRLPOOL bad80f54bba7f9bba2e5275b1c10493aa4074c9af971ac5311b9704cbd35eeb481197fe28793ab9ff4b188cac8973b13053eba3c0b7709d89d6d5b20d9e24674
 EBUILD activerecord-2.3.16.ebuild 1831 SHA256 f9a9b837c85a80c15cf794791c395a42e09127aaf2e3ecdd227f711c98ab40a7 SHA512 2fba42ca19176a70ad11cee1078cf31a18d49ccf97dfd72821d9c44d593e50abe5c5db97c10bcc83ba2541cab4e1c80aa18c1dc49122ab91b880545822e87627 WHIRLPOOL 5d5cdd6b5475fdce10e6ff5ab16fd2dda9d3bf6fce1044297ac2323e5a083a2e092090ad06b3372ad0b498c94bca63c782b2a23ddde2fa94f8495009f2043db8
 EBUILD activerecord-3.0.19.ebuild 2375 SHA256 5c0919060328e14a8e383eb04beb5912b441a10db37beed5d779747a8ffc5366 SHA512 1e4561bf0c05bcde960ce0a80f0b4a189a40a4716c0fa0a7f59c417d2c727f050005e522e539d913647c3ad60dacb0b6004d3cf80be5998ea9b0d54ff1d2e4f6 WHIRLPOOL 076dbd57fe9bb44bd4ac126e0b1f2434c6ca2384ba38f8327515690e3fa41663ffc79ceba8a820b430038393d21d61278a87876b30e8a03469891acf128b62e9
+EBUILD activerecord-3.0.20.ebuild 2375 SHA256 c4721d41ea62e594abb91a92511057108540ffcc50784ad2cd377f90988b3e28 SHA512 af7f9900f36d4514c446aad3cfc76a15105bf0652686bb7eb10a8e322f32cddcc001e10154054b899a3291ddbfcf1142db4105e5ea9a442ad814a003b73bfa10 WHIRLPOOL 6d4f80a9f860e3367f5a26d07ec38af9f6290f6c023308afa808d9894d8e21c60d5a977ab929dccc70f5c9eb885bd3c0c6870a437b393714ca3bd937d8cab7df
 EBUILD activerecord-3.1.10.ebuild 2428 SHA256 fbeafdacc1e7e0b3d2295b72ccb73546ce555c8ee7373c03ccac3ffa2a2d4cfb SHA512 4c19f7f225b9110cfb5244c5eb3298a49923fd4a266f75c2d60fbc821b74dd2eb3317938f7ddf13de380ce582e1a69372cdb2871480756d222992facf94b3d63 WHIRLPOOL 3d9934a027d132d789dc57767f9c82c1aba0e9e08a08074713cc4d898c62ac5283a25b35fe7bd06ffd9820f8cc244ac94603ee8ef902cf6e74bc7b7ace62b389
 EBUILD activerecord-3.1.3.ebuild 2071 SHA256 b74884d978e21aa6190c879f970608a20d6d9b8c59bd0fdf8b52f3bd8bf5e6f9 SHA512 582ad3c3454a86401263f73c31ea9686af60e2fa7898de1297d84e0d72cafed2e0ee626ea3e0293e346917a02a9cab35589662b15ee9e92ca7a5e167d57673c1 WHIRLPOOL 5e442d36192ec685809d1337a02ca26dab39bf4ae3d1b66f16f62ed3c70f3a9e1b0af20d8aecb79924c392825ab590866deaed88c7784c289aab69afabb64dce
 EBUILD activerecord-3.2.11.ebuild 2434 SHA256 6468398a914ab121eb70ebfa9537444f9d2148a607a81fbc577c4ca5b28255a0 SHA512 c1cc0eb39383d940148355067be265f437623ae5cf2e63319593d7624b79a44cbcc2efd9d41c7eeba3a5c7b2870e51444fef7027c8f496eec7b2909725b08712 WHIRLPOOL 989fa0e10e58f5c38f41411c246f4ef6e63d63cba3025cd0ff7f2903d8018b08c394ad14391d6429e478b773b24a678934fd51e0d65182529a999f67aacf2c72
-MISC ChangeLog 30401 SHA256 fc2dc2453d09fd84434c29938d77308c40ea001723b57f60fa33b6d41aee2d75 SHA512 5a4cd013382351cc360ada39660ccf0f4d8539c2f0b68a34571d81d1e42951d154cd99409d87ac8962b779005cbe7db2df1fb04be24d3e5ded0bc50394bdf897 WHIRLPOOL d71b91f1999d93e43b7ab943b9ac7b07a3a3440bcf39cbe3cc0e587665983519e3de7e15630f3fee6c94eb14af1176d103ca3c79b474b8aab159386db051d9bd
+MISC ChangeLog 30557 SHA256 8de9135be9affb0f8115fc7220346d9568b2dea3371bb68b281a95833f9a4ca0 SHA512 bb8fd438ce93dcef16954fc3bbdba30ee1505214a4ad76786c2d2903edfd033590a383a48a06b9a8c0ce15520b8df51aa307ff72fd75abd6ddd66d9e0d85d725 WHIRLPOOL 65bebeb8e72798f093be3c05fda6ccc6379fac4d0541865cd6a20800737e49ed24c6c46d37d66ebfd6bd8c0f8bf026f9c3f57a0c50e38dc04c926854f2ea4446
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlEG8EUACgkQiIP6VqMIqNfe7AD/VUSLQi1CxQJCOTmfo256VXWT
-72jKWieRxDAfOUvOuHoA/0Fq3VlwQ1c+Mi6lh0DVFYhCDO9bJef7RR+9JAwlqonI
-=1hzG
+iF4EAREIAAYFAlEG+pIACgkQiIP6VqMIqNdB+wD/RzMg80bMkFNC6sZqnOfVf+I+
+hZalAUbVC4jEEr1wDAAA/AzQO/JPc07+Foi794x6EUp/OMiGNzMK12UiRqJ027oZ
+=xzIZ
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/activerecord/activerecord-3.0.20.ebuild b/dev-ruby/activerecord/activerecord-3.0.20.ebuild
new file mode 100644
index 000000000000..a69a41867703
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-3.0.20.ebuild
@@ -0,0 +1,74 @@
+# 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-3.0.20.ebuild,v 1.1 2013/01/28 22:24:17 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ree18"
+
+# 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 README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="http://rubyforge.org/projects/activerecord/"
+SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="mysql postgres sqlite3"
+
+RUBY_S="rails-rails-*/activerecord"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	>=dev-ruby/arel-2.0.10-r1:2.0
+	>=dev-ruby/tzinfo-0.3.23
+	sqlite3? ( >=dev-ruby/sqlite3-1.3.3 )
+	mysql? ( dev-ruby/mysql2:0.2 )
+	postgres? ( dev-ruby/pg )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		>=dev-ruby/sqlite3-1.3.3
+		>=dev-ruby/mocha-0.13.0
+	)"
+
+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"\|mysql2\)/d' ../Gemfile || die
+	sed -i -e '/thor/d' ../railties/railties.gemspec || die
+	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
+	sed -i -e '/\(system_timer\|horo\|faker\|rbench\|ruby-debug\|pg\)/d' ../Gemfile || die
+
+	# Loosen erubis dependency since this is not slotted.
+	sed -i -e 's/~> 2.6.6/>= 2.6.6/' ../actionpack/actionpack.gemspec || die
+
+	# Loosen mocha version restriction and skip incompatible tests
+	sed -i -e 's/0.10.5/>= 0.10.5/' ../Gemfile || die
+	rm test/cases/autosave_association_test.rb || die
+
+	# Avoid test broken by security updates.
+	sed -i -e '/test_serialize_should_be_reversible/,/^  end/ s:^:#:' test/cases/serialization_test.rb || die
+}
+
+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 c694c2df252e..2260b4a436c9 100644
--- a/dev-ruby/activeresource/ChangeLog
+++ b/dev-ruby/activeresource/ChangeLog
@@ -1,6 +1,12 @@
 # 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.137 2013/01/28 21:37:54 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activeresource/ChangeLog,v 1.138 2013/01/28 22:23:11 graaff Exp $
+
+*activeresource-3.0.20 (28 Jan 2013)
+
+  28 Jan 2013; Hans de Graaff <graaff@gentoo.org>
+  +activeresource-3.0.20.ebuild:
+  Version bump for security bug 453844.
 
 *activeresource-2.3.16 (28 Jan 2013)
 
diff --git a/dev-ruby/activeresource/Manifest b/dev-ruby/activeresource/Manifest
index 0adafc533b38..1aa739b6c9b3 100644
--- a/dev-ruby/activeresource/Manifest
+++ b/dev-ruby/activeresource/Manifest
@@ -5,21 +5,23 @@ AUX activeresource-2.3.10-rails3.patch 309 SHA256 b217130a77128bfe5d8e5e1a6d0563
 DIST activeresource-2.3.15.gem 47104 SHA256 95999b7b46290d8c62d39d573a30bb223af851e528746fe1438bcc98704ad9fa SHA512 d7b0910d44b2ae28e98f1b0ffaa3ad575350eb1d982188dadd2c71e8f81bca0df8496c81a27d55fffcd076cc6d708566ed87a59d976b03ca10fa0d913b0bbd66 WHIRLPOOL 6b66d81c93bcb4b11882a7f45827688c2eab1b88e290418d24f969c7698e757194c9ee18bddcdc344b629f0f948473933ade9c49f0a17a8c4e627cba7605ddd5
 DIST activeresource-2.3.16.gem 47616 SHA256 f04030ab7350634639022f127c4a30413b3a1113eeabef777e08a71954449d0e SHA512 55228c838c229624ef3f74ae8efc2e86e24f087a0ba27fc0489021802fb777e3a68cf797155c3b22f17d7006371abf0aa077a49df65e3f31194652eaa6df4df4 WHIRLPOOL 43ae524f2fbba0b38e94a90faf6855ed5375a801bd6c36a5e2b2a4c908737cc283092d2fe4f6ca4adbb3d2b2ab764ba09052005d76bfb0490f078c4edecd191c
 DIST rails-3.0.19.tgz 3510042 SHA256 a8a9c7ce5aba53bc13d6621ddf2b55adf1f8ad18999217580af2171db30cec43 SHA512 98ccc8724767202999007592571e9aff85fe121616d4e31409cbdd0917e8419c858b4e9cb547721da0e5bd6e5c46f3c31344c91227abef97009ad96bfe31f952 WHIRLPOOL 2d8bf0941d8a6efc78a69601ea8c44f61026974aa3ff58ab076873388866dd3d05eb9a7ad0db4e6772e17cb2b4c4c2113b5bb506066d7dd9b508b44a2a52cf76
+DIST rails-3.0.20.tgz 3515055 SHA256 01e1364804bc329c8d6f3a93ed7dbc578e667c7138a5b6e3b0cd85cbc1fc4e6e SHA512 06e23aa7176640dac0f912a31177b067f0297ad2d2d3301bfe7c9a0dc6b140716fcc4b28daef75620376218e77aac3a387e5712d7cd9dab8ca8020216ed4ec89 WHIRLPOOL f5e66a55537f569d54a5ac81166be39104d209a832151c99af91ca5dd889ce12f2baaf80364f11909ac191c3fc058921d370464792db1c3e7f742f45c2a1b41c
 DIST rails-3.1.10.tgz 3394031 SHA256 d0614db8c4011ed1fcb4bd0afeb8220634b1ec8b196ee40a956c77a76026ef65 SHA512 c6b3db4043345c81582ab22289c29630e3946dc1936adebff0af196f461236805ab146e74ed400fe045d980df562ae44479e36c2c8747ed8a6ba6807add23e6b WHIRLPOOL 5329cd31170ce2ee7c109c9c1152b5eed35c8ec1af48a84d03eff4bb4fe083a7a9840ceb076575961d84c6baeb725fe1c5eed1a4756d39a8bc52a26f23dc6123
 DIST rails-3.1.3.tgz 3638313 SHA256 412c8a3ae4e0d5283ace45a2ee95127418d6b70fb1a954087b09755ab3a25e99 SHA512 286434f02c16f9cde51c160a5f84ac9b53d9d3aaf44c6c8018cef3250213cd39909013006223cceea8bd68ffe0bdc8ce50b0695e57756d8bb9ec44ab5986a711 WHIRLPOOL 710aa7c64c71b46741e19be41023aa6acf7dfeb25b94f8f14c10748f4a4a4cacd61ecf51a9db0b4eae1d0a1797f4287fd9b0f139a874f1659cab8fa5f252c200
 DIST rails-3.2.11.tgz 3547068 SHA256 3f05603f84bfb7a99f999f878af247533706255e6b3baa4111439b6f5fd8ab70 SHA512 50644772186127887bd4d7537ad41cbe549c5c8496274cad2765f21859528a0f42f5b8dbe3a1627a08b1724b2e019c0ec6526cccfdff3da4ffcec285f9259558 WHIRLPOOL 70d5620fc611872b2af62351c81abbe43b3b1d41c92a1d1935cef704a4a655c9bb043599bc758c947c14378ef52e34b44c61536d5a048401cc6bfaef613eba23
 EBUILD activeresource-2.3.15.ebuild 914 SHA256 a69a49f983f7d74c5f9f8323e26d1eea6781e19c20a613de5e2c15fc4630eb91 SHA512 0e928e9b6c976693d9cc95470ec570a911ae210abc25f8af8661bff13d23ba48bb1d0ab0647215e158b16b93b4a2a1f53c1e25a996b9ead98a3c5c0b0e8c0d2a WHIRLPOOL 23241adaa6270208bed6a3ad548d542b6d9e7cdd73767004b46d9a0d35436c02825e4b693a8d861cf49a3276eef20eacb375fa9575e69fc59d25f82eb6742f77
 EBUILD activeresource-2.3.16.ebuild 1013 SHA256 75e41a6d29f74093d3bc69c13d4ddef3b5fe1c6699145dd0e47c53846f557024 SHA512 2234ba00729481e95721d1a8aa3e73d82298fa76601ec1ff25348c85543200c84f3bfff7b706c300b1bcdb44b1b8ad2f49236841209c4057db0d5541926deea5 WHIRLPOOL 3164988c455dedf3cd7b40106e036037b23cd5c3ae4d4d9e6ce366290a803d41c00aabd6f7ec5dc8460abce9c697a6e36a1ba809545b48480356ebd096ac9a2c
 EBUILD activeresource-3.0.19.ebuild 1316 SHA256 4d85eba94cc6721cc7f17e5883cbb4eb6776d6a203ed7ac4c882a5c6d62046ab SHA512 033a6ed1c3e9a4138e0f385e5976ada803dd932b293005e1054c8416055e1d214152bd0315e38e25e0a5ae4a1c78d45760ee03645204bfa08c0c40097b033fc8 WHIRLPOOL 7f3af994dcd8d1723de032341b89b3ccbc0f8ba7a7e946b264b881ea96f1b3836bf4321cdfdff0e5f26d1b4ba9636bf9bfc4009c3791d5ec11d87d06258c58da
+EBUILD activeresource-3.0.20.ebuild 1292 SHA256 2e877354b93862e66afd8336cd13384a35975f26ae8ed18a45edefc1385a3ee3 SHA512 ec95dc39e3ace953bc5dacf6a33ce8014607b326a2aaa3515b0aa256440c734984eb606c380b717f8ad7aa61817f0d66dfcce80f6aeb3b9173ac445ad7a27085 WHIRLPOOL 02b9d66ca556931cc71cb69827548b58c0f3f5feea318e7f8a5de236838e8cda7e1a760bb554e9c63264a69b9b3a5cc06b1e414534ff6165f1369e6157d2553f
 EBUILD activeresource-3.1.10.ebuild 1341 SHA256 74eba772264fe0c82a640b2373f581da70259cad26dcf5c0f4751181634850d8 SHA512 213ddeae99a1f294f58b46c85a2e0e25bfd743acca9ed895f5f5fa9585a3bf35227af51da277f7b14f1355a7adac321927ffa5ee687eb16d65da0aafb789ee3a WHIRLPOOL 5904a0be9151f765ff94ede1101c7128f327dfb87a6c2496f02ad7ffca064ab916981197843ada1691e280185db9ebe4ef5aeb5491e4c9112cee69f97518bbbf
 EBUILD activeresource-3.1.3.ebuild 1217 SHA256 573d345997d0741f76d9c79b86bd2f607b8dae325cd078021258ee0009798991 SHA512 1c1bd20379646895647493e5d8376f95c0b5252c3d6d041b93bcd0ee597a5bdd73cdc971281f8368c1db13ef7e877474ed177f5a4b3a6f2eb25ece0f90b3786d WHIRLPOOL 1159e076a4b47aa98e690484a031f0c2a254afd34cbcb33df4a59b4fb82f0feca30cee527a0f6811f724bfcde666639a257af1c8b1b17f5825fbff0e8b4adde8
 EBUILD activeresource-3.2.11.ebuild 1367 SHA256 2b353473248d59aced54ea6a9aa6605e0390bf989f024bc6d1863c07c421247d SHA512 4c773de2266913615c30af1a8e249076043eccf6285d32b49ada5906fbfc5329f341b2070d368029f3607669aeae8fe9969dff051af6b89b408a0ab878bcc8da WHIRLPOOL 79aede93e6631c896f987eb55347034cc0c5c39901bfe95cfbb208680b5ce9a3abddf7979ce4b4dc6e9dcbf92b1930cf0e2e1c1b0a3c5fce1178c342857eabc4
-MISC ChangeLog 19600 SHA256 be91b2410d805971c966238bcc83fa011d64dd151baceb2ec1d46935402e6da7 SHA512 9387aa1fb3520dfd86891d85ad69e27e3df426b085617f6d3cf28d2e40e4238d5300a8c761e51c78ef0966bf77a38e02bf1013bce8e73cdd9528a48b02fd4a17 WHIRLPOOL da618a2c8a6de4b489adeab223187a3705184110e6abf90e745965f432d01e4d64d8c4f1ed555501eb9cb6aa604c7cb71aeedfcc6f56aa38f8e94db2614bdc9a
+MISC ChangeLog 19762 SHA256 0b07125e128bcb34f5033c0893fa10edd401e58e583429c423b8dd0bf879734c SHA512 55d09d2d3202efabd3811defa32388bbf1d8d9c5aa0f2e8657ecb7fcf01e35ac76af3e2905942681e9985203997f937616f8dead1eda1fb0c7af28d7438fbffd WHIRLPOOL fda3650cfd08059f3f653cde8b15474dd603be37ebf38cc0f22e6cdc636ad4691be325dc116e54c38306d3b63457f1e4b40f69e24bac4385e117159ce6ad1977
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlEG77MACgkQiIP6VqMIqNcnQgD+IQQjqXKokQCuHR9m2ytxeGAS
-RFBwZOrNZNzx3PlTlHoA+gMgxND3Fu2ISV2lCMisJhBDRv7oO5+TaDiSLB4YCZeZ
-=jTcM
+iF4EAREIAAYFAlEG+lEACgkQiIP6VqMIqNfNagD/QKbXuEV0uBUSPf31qKA7gdnz
+6/UuJXcfeSaAdDT5AyMA/RHXBVykxXkBZ/bj0jrryO+MemZEu1MICP+G6jAg3Og2
+=XGKN
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/activeresource/activeresource-3.0.20.ebuild b/dev-ruby/activeresource/activeresource-3.0.20.ebuild
new file mode 100644
index 000000000000..03afd89733cb
--- /dev/null
+++ b/dev-ruby/activeresource/activeresource-3.0.20.ebuild
@@ -0,0 +1,42 @@
+# 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-3.0.20.ebuild,v 1.1 2013/01/28 22:23:11 graaff Exp $
+
+EAPI=4
+
+USE_RUBY="ruby18 ree18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activeresource.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Think Active Record for web resources.."
+HOMEPAGE="http://rubyforge.org/projects/activeresource/"
+SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-rails-*/activeresource"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}"
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/mocha-0.13.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"
+
+	# Avoid test broken by security fixes.
+	sed -i -e '/test_load_yaml_array/,/^  end/ s:^:#:' test/cases/base_test.rb || die
+}
diff --git a/dev-ruby/activesupport/ChangeLog b/dev-ruby/activesupport/ChangeLog
index 27a27891b745..87a82d6ee172 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.205 2013/01/28 21:36:58 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.206 2013/01/28 22:22:34 graaff Exp $
+
+*activesupport-3.0.20 (28 Jan 2013)
+
+  28 Jan 2013; Hans de Graaff <graaff@gentoo.org> +activesupport-3.0.20.ebuild:
+  Version bump for security bug 453844.
 
 *activesupport-2.3.16 (28 Jan 2013)
 
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 909a7f95aa24..4a0a05d87a1b 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -9,21 +9,23 @@ AUX activesupport-3.0.3-mocha-0.9.5.patch 666 SHA256 61e62f5794f9291f3ad8315d5ce
 DIST activesupport-2.3.15.gem 431104 SHA256 2528988dba42992c61f0c55935a840bee782418adc18f8ce67d0a80cf1f437bc SHA512 9e27f083950d4cd26abba5e2f5351879e95e1935c2283682c1d0a7d30a16f5f8955e753bfa79e67d14e051a048c363f2916eb09848a58c89ee7a9a65c73c58e0 WHIRLPOOL 9463e148d3c9626293727142f422f5e4ab3f745da24af3fe81892dbd2a196bd057bd5bb8d56ca0ff644bca6c2fe51330ebf88a98cbd924935f3ab549b72ac90e
 DIST activesupport-2.3.16.gem 429056 SHA256 9f79ec4160f24f875357632a71efdd0257ae5dcca31f3aef99e0d470ce0ec5af SHA512 cb469637b7897f8e4be600829ae54cf939b4d9c567e6480f21716151ad6c485eda786941170da95300c6e4495a8794a1b908348a9765fa999d2bdb61ecc265b8 WHIRLPOOL 9b5bca12b5cfe3c6835253cc87018edcf90e7ac229208410592ce3ece80e318be6d00ea32c207511d82094584dc971b7b26d2113914272b1f85025ac84899137
 DIST rails-3.0.19.tgz 3510042 SHA256 a8a9c7ce5aba53bc13d6621ddf2b55adf1f8ad18999217580af2171db30cec43 SHA512 98ccc8724767202999007592571e9aff85fe121616d4e31409cbdd0917e8419c858b4e9cb547721da0e5bd6e5c46f3c31344c91227abef97009ad96bfe31f952 WHIRLPOOL 2d8bf0941d8a6efc78a69601ea8c44f61026974aa3ff58ab076873388866dd3d05eb9a7ad0db4e6772e17cb2b4c4c2113b5bb506066d7dd9b508b44a2a52cf76
+DIST rails-3.0.20.tgz 3515055 SHA256 01e1364804bc329c8d6f3a93ed7dbc578e667c7138a5b6e3b0cd85cbc1fc4e6e SHA512 06e23aa7176640dac0f912a31177b067f0297ad2d2d3301bfe7c9a0dc6b140716fcc4b28daef75620376218e77aac3a387e5712d7cd9dab8ca8020216ed4ec89 WHIRLPOOL f5e66a55537f569d54a5ac81166be39104d209a832151c99af91ca5dd889ce12f2baaf80364f11909ac191c3fc058921d370464792db1c3e7f742f45c2a1b41c
 DIST rails-3.1.10.tgz 3394031 SHA256 d0614db8c4011ed1fcb4bd0afeb8220634b1ec8b196ee40a956c77a76026ef65 SHA512 c6b3db4043345c81582ab22289c29630e3946dc1936adebff0af196f461236805ab146e74ed400fe045d980df562ae44479e36c2c8747ed8a6ba6807add23e6b WHIRLPOOL 5329cd31170ce2ee7c109c9c1152b5eed35c8ec1af48a84d03eff4bb4fe083a7a9840ceb076575961d84c6baeb725fe1c5eed1a4756d39a8bc52a26f23dc6123
 DIST rails-3.1.3.tgz 3638313 SHA256 412c8a3ae4e0d5283ace45a2ee95127418d6b70fb1a954087b09755ab3a25e99 SHA512 286434f02c16f9cde51c160a5f84ac9b53d9d3aaf44c6c8018cef3250213cd39909013006223cceea8bd68ffe0bdc8ce50b0695e57756d8bb9ec44ab5986a711 WHIRLPOOL 710aa7c64c71b46741e19be41023aa6acf7dfeb25b94f8f14c10748f4a4a4cacd61ecf51a9db0b4eae1d0a1797f4287fd9b0f139a874f1659cab8fa5f252c200
 DIST rails-3.2.11.tgz 3547068 SHA256 3f05603f84bfb7a99f999f878af247533706255e6b3baa4111439b6f5fd8ab70 SHA512 50644772186127887bd4d7537ad41cbe549c5c8496274cad2765f21859528a0f42f5b8dbe3a1627a08b1724b2e019c0ec6526cccfdff3da4ffcec285f9259558 WHIRLPOOL 70d5620fc611872b2af62351c81abbe43b3b1d41c92a1d1935cef704a4a655c9bb043599bc758c947c14378ef52e34b44c61536d5a048401cc6bfaef613eba23
 EBUILD activesupport-2.3.15.ebuild 1616 SHA256 9a09b4da856d8c9c5df65b635eec98b393572f0089e49572ad5d3fa04c39e901 SHA512 3405bffa4b4fd5bd04c3b594ce40837dffdedaa22f882de0625afef75b8134932d87df1083742259c41a46658f3dbef1c1600ca595b8d711fd2d6250ba42619f WHIRLPOOL 449d3dbd5556a39b734c3175a7ca06faa70e79b1e823abba3287fbf77077d9f89b7866a7a8ba705bddbb4c6df31e62780b8a366fed4bcb3b0e55de666df89bfa
 EBUILD activesupport-2.3.16.ebuild 1623 SHA256 adb8f7389bb3d5656a9204a287e1060d2dd42eb8ddc23d19c814d9d48fd061e9 SHA512 23258f991a6e34e6ded9b5e8428f65be68e12a4993c88c769f97294528ee3961035e992fc50932abb757fc2c892752b779109d9a8cbf5765f4c51de21b301336 WHIRLPOOL d398909320fdb2af81532348fc9a52ea290384bc0011bc22b0a3890f1c56b326150db0825b38b51c0d63e2e6efcedb1d3d65c5dbd22c33cad641f3c3c617ec63
 EBUILD activesupport-3.0.19.ebuild 1744 SHA256 5e4b2d63d3a157b9b627180b464848f1046b6376d0f9e34f8ed29a84560b6a69 SHA512 4a7824c7b03a3185c180b49ca44ea201031d0b888bb94223e5043cbd2d795903dc044ad1b2bc3e0cfacdf0624d3d52b6fe627c3468669429fb31978db77ee77d WHIRLPOOL 5d293838f8c99579a26ac6ba14986fb7472c56a95b6eaa818b5d9cc16187dabc541a591527a23cd2dfd6caa5c7b979d867c68509d1773f09e82dec1c9734ab15
+EBUILD activesupport-3.0.20.ebuild 1746 SHA256 b9d87a0353da69f7fbbbaaad507e0b0142f3ab315897135880d18a2096389c86 SHA512 0bcfe61400ca329927f65e19481cf6ff9a767b7f1558760eaa5ba5a25f9ab6d422f6574a31035332801b29388f57d2db63633dfaa93148d270b9ea9470dfb75f WHIRLPOOL a650d7d689024b8e54bb7dacdc26817a723fe4e6f5cfa5e6a7ea854209d48f496d75931cfbf92e515416922860a62900f39e8e5a011a857c07f600c15fdd9238
 EBUILD activesupport-3.1.10.ebuild 2059 SHA256 fb26161f068163d63fba2f2ffe8c7200855102cf8cac5550303063ce2fc2e225 SHA512 c9225f02e0eaa448e03a8e263862b3f1f13d38ad8ac05216cfb70917875b8cb4e47522a9069f91470494671cff5d6007b4e478a0a2985f5afa34a063ef188339 WHIRLPOOL d6d7ea96219391780e67b4a72f34cf4969cf02aa8ea77f6546f717d6a47c28bdb72aebb85ccd2c1c4418adaf18ad0332357afb4e22210a8a0fdcc2dc98055e43
 EBUILD activesupport-3.1.3.ebuild 1560 SHA256 bf4f55f2ce93838f14f5f2832cfa111e250522b5e2b74f4ff345f84e7ecec35c SHA512 74291076ae5e64357b1d8754af54e80d5cdf0908ea6e9a9933da78258fda27629fe3f7658ae1ddd60fa903baafbd647a595a9ecdd3666f60ef29e9deb093502b WHIRLPOOL 5c176b91e9ff1b3fbaea95b652a090d8348ccba8829bdf49b542fdd8bca6aae85367c668b949e6d85514d10a0592b9aa57e4e35e931af3ae38f2825844d27366
 EBUILD activesupport-3.2.11.ebuild 1640 SHA256 1853f8a5d6835e49bd59ff8b10ab5879418859d4e5647caf84e1e71efdd8ccb3 SHA512 ee90de5d52bbbcd2a246b453656b400ce3e1a51c1c214f88d38cf9456e5764c6e7848853a162f798895964f2ec968a40f15ee48859025d4af23a8b4e8dd94b75 WHIRLPOOL 677883bebe832b326df53a52935f322a42eab549ee99cc65a5ebf951348da0245a2be2b5879bf5548779da4c67dba531241f3d4d77849674460534353c00305f
-MISC ChangeLog 29483 SHA256 6fd7ef848475031632ada5106e9c3ee60de398f23efe6a7a5568dfc43bcd2bb5 SHA512 28c73c1b3369950a58f244ee2e7d41798d5752936279725cae9dfa72941fe6cabe463d66faa625851b31335ffdcff4ca7a3cb04fe55d36d656e8ee7dd02121b1 WHIRLPOOL 650f8b139030b6f98554cb6d95dfcb327045d91f465a0d853c6c10778da330ca0dda9e3dde9537fe5f418bcd831881b9a51a2b546e9cfc060c669e19a67b0094
+MISC ChangeLog 29641 SHA256 9bce4455f9149a16fc592a308d2dad52412d3b396d5762702f5686d8ac474138 SHA512 2157473ec8d9845092dab2fb709fb8782117bbf2d3e188dec4f07b03865fac94ba60d283e7496f071f974e193660afea116f65d86ef7aa03fa1aa8ed83e1e77a WHIRLPOOL 836867cdb4bca4baef2ba31ebb9827d6b4bc171ff05a764593e112c5418c814558bfd8ca1c7ea5c9e7fdc0ec493e8d4ed0a4c465a969365156632698b9a5f82a
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlEG74AACgkQiIP6VqMIqNdg+wD/Qve9coEWhp+/kSXeJAGaX6dw
-xYpg7bH7G3YEtlDw/fkA/1McfR6QTLlqxaSQitjo/e5lVGSYH6NVDykQyLr1lez/
-=VyoH
+iF4EAREIAAYFAlEG+isACgkQiIP6VqMIqNdoNwD/fhgU6NCoV6dgQVgGiANOqlNg
+cH5iquJeoQXydGdtUtIA/jqIcY/UW8Mz263thpwYhIzpSOxtRIrkGaRvM9ffPFHx
+=0xw8
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/activesupport/activesupport-3.0.20.ebuild b/dev-ruby/activesupport/activesupport-3.0.20.ebuild
new file mode 100644
index 000000000000..1faccd8b58aa
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-3.0.20.ebuild
@@ -0,0 +1,53 @@
+# 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-3.0.20.ebuild,v 1.1 2013/01/28 22:22:34 graaff Exp $
+
+EAPI=4
+
+# jruby fails tests.
+USE_RUBY="ruby18 ree18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="http://rubyforge.org/projects/activesupport/"
+SRC_URI="https://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-rails-*/${PN}"
+
+ruby_add_rdepend ">=dev-ruby/memcache-client-1.5.8"
+
+# libxml-ruby and nokogiri are not strictly needed, but there are tests
+# using this code.
+ruby_add_bdepend "test? ( >=dev-ruby/libxml-2.0.0 dev-ruby/nokogiri >=dev-ruby/mocha-0.13.0 )"
+
+all_ruby_prepare() {
+	# don't support older mocha versions as the optional codepath
+	# breaks JRuby
+#	epatch "${FILESDIR}"/${PN}-3.0.20-mocha-0.9.5.patch
+
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Avoid tests that do not work with newer versions of mocha.
+	rm test/whiny_nil_test.rb || die
+
+	# Avoid tests failing due to slightly different builder semantics.
+	sed -i -e '/test_one_level_with_nils/,/end/ s:^:#:' \
+		-e '/test_one_level_with_skipping_types/,/end/ s:^:#:' \
+		test/core_ext/hash_ext_test.rb || die
+}
diff --git a/dev-ruby/rails/ChangeLog b/dev-ruby/rails/ChangeLog
index 7f8c0fa7cf0b..691b21e6771e 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.248 2013/01/28 21:40:46 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/ChangeLog,v 1.249 2013/01/28 22:24:53 graaff Exp $
+
+*rails-3.0.20 (28 Jan 2013)
+
+  28 Jan 2013; Hans de Graaff <graaff@gentoo.org> +rails-3.0.20.ebuild:
+  Version bump for security bug 453844.
 
 *rails-2.3.16 (28 Jan 2013)
 
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index ac95cc173e5b..094a02883d42 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -4,21 +4,23 @@ Hash: SHA256
 DIST rails-2.3.15.gem 211968 SHA256 21c177e2577faa9d09319a965870ee5f03d944d2e558573df852659cd729a79e SHA512 eef8b60224b82393e2a3387e45bae37d7d500e831baf20c54923a98fd106c981bded8da8f9907b935222951fc446d5bfab5b77ec55e5d40e182c7955cbee5c98 WHIRLPOOL b72eebe369f55a0081adab489d0f0612f00ae7174d2514d793c3fa4235b5636334b03e5317b497ba4c7a53170fecb0c9e6c369234619ad1781d131db972c6304
 DIST rails-2.3.16.gem 211456 SHA256 8228c5404bddc2dd7b99495f348b40302709da577a096619f90e8c37e824060a SHA512 55a5ab85634c4e86efac070fbc807499ae9b68adbf4a7c230479e21ff6ccb8e17b23fd79e0f8ea0990967780ed168661f7c4c605629253ff65dd8ff2a40f26f7 WHIRLPOOL 21368929faee01d2148d2523713fdfa0d1a42ddcdefb81524924283cab6ebd8d8986f0c291d1374ce1b4a4fd5200e38c34d06fe24fede2f812ffb5fc5adb9eed
 DIST rails-3.0.19.gem 4608 SHA256 da9e6e21a032770f56c0e92f7099897a3638392f8d4a37cd572641915056c7ca SHA512 173c6484f12032504dad828d996e76315eb95d8d5455ed74d73588a7fadcb7af26f24d820e16807f6f10d349e06f8a7fbb364828890a3e5f3fd83d1090c4fb50 WHIRLPOOL c7ac3beabd88969e68fa7ffe1dde38cad0cabedcf3581ac903f2c35b83fa3759af521f2335c968e16ba9fc1ff119bb4ab074171aa99865a931d518fcc3d2c898
+DIST rails-3.0.20.gem 4608 SHA256 e22944d88c22d206e719bee3757fbbc0d025d00419421e5609a9a52136be3190 SHA512 690bf3e4fbebb4bccd24c27e36ce3e7853e595d42278d4e3ced834c898b3e56aeca6f39e207d1f4e6ee92d105e2710b5f455338f4b82cbbf4d39fd95d1fd618e WHIRLPOOL 6ee13ca79d7708d1617bc3eae7f382a2affe1ad4e5e25bc7e4921c8dced2294fe89e11c4e2f36f1a731e7e38b8a0371a09a8eb2c5759d4f2dfecb45bbfa9e026
 DIST rails-3.1.10.gem 4608 SHA256 1bdd1d8597d50e2b3bcea99491541855774182dbe0b39d07ed75c321c1e6b621 SHA512 ef2082e4951a99a8fac9f5a2690b6885fe4ee5931839f194eb4dcc005d891bf8b9840d828844cadf7b1aa08aa60b0715ae13701ff61d83af981642dc53cb8fd1 WHIRLPOOL 1d71183802182ebf91f3c21dc51f83bff7d2202e2265bea3034f10735499ba23de89e3eb0dcd7a536084511900ec8585fd8a99b61a82a5bde7ccc65cfe2cd343
 DIST rails-3.1.3.gem 3584 SHA256 e817252efd196b32a16b0af6a92eecd8b2e0b1cbe1511b36fab6c8acdc53e81e SHA512 f3217a24d0f91a298a0aa43f08a3c346e3c71622fcd6dfa66191b483cb848517efd61bdcd1f6ca94cda421c5cc0434df2516929a922dacb7ae2efe7280b53942 WHIRLPOOL 2283a34cfecff079a761366fbf7f06b48a0c4343cd8c8fff6c792c167f0deaeb4b6d6612f4f051be2a242a5e21deb9b4019a11d5c9f83e9dfece004dccf64ab7
 DIST rails-3.2.11.gem 4608 SHA256 f5e02999889aa39af2c7d2c882d9e3b5c71e8adfc98236a69dadacdfbce5603e SHA512 3c0d8d88611ded1e48d76470eea91ab7f36541ed774595e102af7bac2dd2e97bba26f39838a7a8bc1e91ea5f272116073bb961a0fb9d1a310ee3c42e933871e2 WHIRLPOOL 13b4d80adc84616e39120b58ab2b612d67bff8ff63d473406aae8888166eedaa703bde48462c77c9598506dea5dd009ebe488586689fd4a2e313ba0fa1d85d81
 EBUILD rails-2.3.15.ebuild 1696 SHA256 e7df959411deb877de28e0a1860b0115958d3bdcc98b260f8abab01d49df0eea SHA512 5cbe450cefe8eb28e9e8c47784c29e8ede4f503ad1b5e7dc7fcc9dd8b5906662764c6325afc438001aa2b3039db87c058b929bfffdca598d9794c9754277d7b9 WHIRLPOOL a708049588cc92c18b0ae3c858f81dfa93fdcc9bdf4117841a8bb0d60bb2ddd0f2b69c3247202692f87afc5f82b0fb09a9b59a0b2b39a4cd6de6b05e9914601c
 EBUILD rails-2.3.16.ebuild 1702 SHA256 30760aa2ec7ace99ba4a5483de2701304373ab386cf03fc9bf675437f11416ca SHA512 cee3ea78adf3fc93980068ff50c9a23f9860b60010081b9cbfcbd433f7bc35e81ae2b948524c4086e02b3fc227e829f1e180e0268c9264868b4d36fa5a55f4d2 WHIRLPOOL 19ee7231d1e1dded2e2e69787b566c5b8cef1946a2b9ce49f0008df81dc9cdd9519e64a2358d20ba05d435688a9c4450a8966d8f3aed15e7c6eac2efd56b2cbe
 EBUILD rails-3.0.19.ebuild 1125 SHA256 c8aa38295f2c808ddba2b95f79a95ef6cd745a94c61eff3f7c13644f9cb32c17 SHA512 46d1f89796c5bece1a2f9afeaa96c27d99077bfd9acf4f7209bcc45b129f73938606bdde14596a66b863a69897963a98528a08af9092fbb6cd8f05a09481be20 WHIRLPOOL 22e4e8e7c274460121a7168d49e07565c2e406fcdb6c7849dce884f7bbbf8673d404fc461dd0b93db7a531c6dd1df28e1247060d63f5ae2aaa20f19a9a0033e8
+EBUILD rails-3.0.20.ebuild 1125 SHA256 7719293c35fdb6b5cced89ce093330fd2ab4c58d5bd7c7d0b446e2398aa92164 SHA512 0aa3b296d06400f776e55d4eea92d113de29e2447961fffd77ad1cdebe1e749d4e7cdc0c57c9cf50b87461db19b1a2a2ec7ab7d21378aa5f9e25d31dde9d65fa WHIRLPOOL 36a245b359441beaacdeb64f7de8c23c416236e3ccbac5161798e7ae0a2f18e99789c89cd7e870de0fba5047b3449d1776881b8e6be6b156ff145b067dc245f1
 EBUILD rails-3.1.10.ebuild 1275 SHA256 23d26971bd6b5b0c77f90557d05781f12c4b6fdc2010717d370284158bb518d2 SHA512 815e92a53f7af15882ff2953a4b0cbad5c661133d7804c83977e73757f484be5c19507f01bc4371c0932801074f8c3d2b3bc9850cfacbaa1fac67594953f78a2 WHIRLPOOL 98622679148c02b34a69c7c05d22b64c1ae8d7d5d482c61f9c2753fb9186155419adc642e25fa40829225c1b9b4c8d3da53c10dc9b234aadfc8a58d6f38618f3
 EBUILD rails-3.1.3.ebuild 1147 SHA256 7b6080bd46e2d4947618f58be883b6bbeaa9f09c7d1cd0cfe265db91780e7ebd SHA512 e18a9fd37f27f55b2946733eb881351c07662aab94d1d5a552c1e45ec27f688dd3f62542a983afe904b3583673f42f70494256af567b3625f19472f1b2061152 WHIRLPOOL 8c7ffc83d31fb5593e66f70064a47c3cc8349b2dc39da724e36ce62e48f9fe652ce25b13b7017fea6744c01da66b43f88b995f58c3a3d36214b275e4bef77f8f
 EBUILD rails-3.2.11.ebuild 1071 SHA256 bd14ef861c812888f4a65d7ef2a18a9d93aa59f0d0f2ffce51257d23d6731b65 SHA512 25b380eb20bbac987e6befd0249d7497be6edaf29e0f822337eaef000ac0c00875f6df5a1070e2b0a1b1c65bf5b19a958602aae3ec7bd342de09b9b8c0df71f9 WHIRLPOOL 92de40213f5dc797207af70ee8d34ec5d303a993cf4ad259533bed6f08617136db4f335d4fa23570152c228c33ed0f9e4b545bb89827daf66f44f48b49cc4378
-MISC ChangeLog 33016 SHA256 a78eac58a7239dbd8ca88267f8603f59be6848e9c8681a283d99abc000f397d7 SHA512 524f529fd4b1bcb2023ca16c6faba9311ca37506e7921d943d38bc0b82aaa2bd738822ce78f774208c15a9a57d7c24b1bba562d72a9508fdb1a1d828220de90e WHIRLPOOL 22be7fd748e9799e6aa67045d852dfa4b7f269a4db39eb6a56f2ed6d39263fd5be306e7217ffb0f83b320ec304de8968b230265fbf5b21764dffd24671e58252
+MISC ChangeLog 33158 SHA256 394c72f3916f4e859779290f6c1a33289b23ee099ce96b8f8c3fc2cf466c03b6 SHA512 1475a0f1e0645a2c06d340e53dccf2a3ac21da3434c0048d58c5c1766e451b3e71385565ef50ef38cbe98e5a22808045fa88f22ed3ff075650222da78d795671 WHIRLPOOL 027f9adfdaf2950335fcc3e4e495d18b1aac530a2b418b47ad33f3f653a6f382503e495fc967b96a9758b0e6a35199237055f79d9550054c97eb42788864a161
 MISC metadata.xml 393 SHA256 ab0c7d6f591fe1803349f791b02e9be652e39232117c98f1b173c7ffb0854dee SHA512 dcdd257e9e5ad70fd720cd74ad12f3d292b98f72cc45c80ac02599fe46d16fbdfa84f78e6781756c59fdbc9a808c4734e491c07e320a54a1d2a51241658bb713 WHIRLPOOL 5317c82e4e1ac614e51dc74741272cf1b20fa0cd7b72c77559ecd1115d82dd7b9359bdcd80f1e08c358c096fe1f77e4d8d9e30e6ec70d6246a09613b92fef4b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlEG8F8ACgkQiIP6VqMIqNdj2QD/cwlu+QttdpdKbgSwyiKCkxtT
-Q6GjhWsyvV498ECtllQBAIjxodVXFS0nHVw0LorBvhYuamGDwBOr18/1N//XlS+z
-=Ud7H
+iF4EAREIAAYFAlEG+rYACgkQiIP6VqMIqNc2LwEAgFA5wSvC/nOg+L54jeLx97hh
+b18NijDifFqFTlzJKmIA/0Ym6nO9xU2yl0LvmNS1yh69O3+/m/9GEqprxYgKm/de
+=W/Eg
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rails/rails-3.0.20.ebuild b/dev-ruby/rails/rails-3.0.20.ebuild
new file mode 100644
index 000000000000..c060f44c9d12
--- /dev/null
+++ b/dev-ruby/rails/rails-3.0.20.ebuild
@@ -0,0 +1,50 @@
+# 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-3.0.20.ebuild,v 1.1 2013/01/28 22:24:53 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18 ree18"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+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="3.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-rails-0.16"
+
+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.0*
+	~dev-ruby/railties-${PV}"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rails rails-${PV}
+}
+
+pkg_postinst() {
+	elog "To select between slots of rails, use:"
+	elog "\teselect rails"
+
+	eselect rails update
+}
+
+pkg_postrm() {
+	eselect rails update
+}
diff --git a/dev-ruby/railties/ChangeLog b/dev-ruby/railties/ChangeLog
index 5c3fdd01f285..b10dae566737 100644
--- a/dev-ruby/railties/ChangeLog
+++ b/dev-ruby/railties/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/railties
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/ChangeLog,v 1.47 2013/01/20 15:02:59 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/ChangeLog,v 1.48 2013/01/28 22:24:35 graaff Exp $
+
+*railties-3.0.20 (28 Jan 2013)
+
+  28 Jan 2013; Hans de Graaff <graaff@gentoo.org> +railties-3.0.20.ebuild:
+  Version bump for security bug 453844.
 
   20 Jan 2013; Hans de Graaff <graaff@gentoo.org> -railties-3.0.18.ebuild,
   -railties-3.1.9.ebuild, -railties-3.2.10.ebuild:
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index 8704cc8c26c0..c55db492f4ea 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -2,19 +2,21 @@
 Hash: SHA256
 
 DIST rails-3.0.19.tgz 3510042 SHA256 a8a9c7ce5aba53bc13d6621ddf2b55adf1f8ad18999217580af2171db30cec43 SHA512 98ccc8724767202999007592571e9aff85fe121616d4e31409cbdd0917e8419c858b4e9cb547721da0e5bd6e5c46f3c31344c91227abef97009ad96bfe31f952 WHIRLPOOL 2d8bf0941d8a6efc78a69601ea8c44f61026974aa3ff58ab076873388866dd3d05eb9a7ad0db4e6772e17cb2b4c4c2113b5bb506066d7dd9b508b44a2a52cf76
+DIST rails-3.0.20.tgz 3515055 SHA256 01e1364804bc329c8d6f3a93ed7dbc578e667c7138a5b6e3b0cd85cbc1fc4e6e SHA512 06e23aa7176640dac0f912a31177b067f0297ad2d2d3301bfe7c9a0dc6b140716fcc4b28daef75620376218e77aac3a387e5712d7cd9dab8ca8020216ed4ec89 WHIRLPOOL f5e66a55537f569d54a5ac81166be39104d209a832151c99af91ca5dd889ce12f2baaf80364f11909ac191c3fc058921d370464792db1c3e7f742f45c2a1b41c
 DIST rails-3.1.10.tgz 3394031 SHA256 d0614db8c4011ed1fcb4bd0afeb8220634b1ec8b196ee40a956c77a76026ef65 SHA512 c6b3db4043345c81582ab22289c29630e3946dc1936adebff0af196f461236805ab146e74ed400fe045d980df562ae44479e36c2c8747ed8a6ba6807add23e6b WHIRLPOOL 5329cd31170ce2ee7c109c9c1152b5eed35c8ec1af48a84d03eff4bb4fe083a7a9840ceb076575961d84c6baeb725fe1c5eed1a4756d39a8bc52a26f23dc6123
 DIST rails-3.1.3.tgz 3638313 SHA256 412c8a3ae4e0d5283ace45a2ee95127418d6b70fb1a954087b09755ab3a25e99 SHA512 286434f02c16f9cde51c160a5f84ac9b53d9d3aaf44c6c8018cef3250213cd39909013006223cceea8bd68ffe0bdc8ce50b0695e57756d8bb9ec44ab5986a711 WHIRLPOOL 710aa7c64c71b46741e19be41023aa6acf7dfeb25b94f8f14c10748f4a4a4cacd61ecf51a9db0b4eae1d0a1797f4287fd9b0f139a874f1659cab8fa5f252c200
 DIST rails-3.2.11.tgz 3547068 SHA256 3f05603f84bfb7a99f999f878af247533706255e6b3baa4111439b6f5fd8ab70 SHA512 50644772186127887bd4d7537ad41cbe549c5c8496274cad2765f21859528a0f42f5b8dbe3a1627a08b1724b2e019c0ec6526cccfdff3da4ffcec285f9259558 WHIRLPOOL 70d5620fc611872b2af62351c81abbe43b3b1d41c92a1d1935cef704a4a655c9bb043599bc758c947c14378ef52e34b44c61536d5a048401cc6bfaef613eba23
 EBUILD railties-3.0.19.ebuild 1412 SHA256 ce3c1511b6dba6599b2ac25f39a3a6d626394b2e3627529320b5f16f4ebf8b2b SHA512 b7eee5e2bb7c07708816cd69d51db81564e7a59b88e30690aee37944f484ed2a42c119cac923bda5e91b74c48cef8535a2fe121fd65f464cf7f963183e36c542 WHIRLPOOL bebe062697b004c62ebe3b258aa94bcdd1039949a1724aadcf3657cea2c3400fc7604e440d31bbaae97f403b2849f9915df0fab7cb2bfc105312748777e5ddca
+EBUILD railties-3.0.20.ebuild 1412 SHA256 d37935e8869efea5fba520d5cf217db8a494d6cfdc52b31dfa9fc3c8d88aa22c SHA512 10dcac948d64567455fb0ca20a12331f4b263b60c3301822447106bb917bae88704bac0959e0a7792448cea10228269d9096d5b1b6ed82151ea62235d7e91f4b WHIRLPOOL a82312d71449d960cc0f4ae794c154550d430c455d6a5af20cd74e381fb4b90fd51626a99c25c7d5aafa19a9460a32f5d37ab7de36a80bca1839aba348557e44
 EBUILD railties-3.1.10.ebuild 1696 SHA256 953e449efa52f155526ee3b767e66e5ff5e0121b29f2f33e4c02b4eccab15489 SHA512 718f98fca832338c9e2677f5ad0f1fb11d5d2b5d3df41564001961956cd8da3c7b183c8bd018053be7321d373a8e4d10127f38d4c91f225f5b9e1dd9947f8532 WHIRLPOOL 36c26862c3576246e8689727373677a23535f1fa4570a83c14a4b4fe3509f75e3722334fe75a40e652015d10ec941f47a7a9577f37b2f6c3bc09831d314ce47e
 EBUILD railties-3.1.3.ebuild 1598 SHA256 059cf9305534db0da74585d932751310b866bb8a67d9a91ebecad7d60937d7d2 SHA512 7c450ec7c5d86e0184a358d4539eccfc706c02deeeb95a0101289170901de683263bd421ce40f18455fbcb0fe0814247338800a3fadae47fa6c2becb4ed6c318 WHIRLPOOL e92563541039ee22d475b07a2e8c715a845c883a7e7a7793a032c636937a7b2a8b98f0e65761646f5dce3c5946ba28d7b261fce1836caca003aede07d7c53bbc
 EBUILD railties-3.2.11.ebuild 1951 SHA256 0b6cd1bc69338b5d93eebd022d6f693ee79ddce5f86f56feccb97b8f133e9d97 SHA512 f9369687368da43e49271ac33c6c342e97b27579314c4c758739450f0c9ab98a256ca83eaade6c2a0eab7cf8c05d8b68092898996b84db2f74eec784b0baff72 WHIRLPOOL 39b6ea150d10cd13756fe5f6e04c8646446145bc631eea263b4a5f6dd3fc93fc94c40f1a729882602e0e5b4422ab2c6b44fc4a0247ab041acfd740e02472de33
-MISC ChangeLog 7032 SHA256 523462939555253b0409f60a011e5a3648b7a5419d1e629232defa785efe8848 SHA512 582166abfd7e74904e1323f4f0184fe6fe38dcd6c6157aa90550710992138161a73efd1f0a2b63ca95c5a973beb1cf2e0d367cf24a8535490f0a566df3d118b2 WHIRLPOOL f9f6e770ffe1bc6d487e0fdf62bfc6e5fcf0111a8a7b93a5beb78e701fc8015efb804ddcaf11b429bc947ea534b52d94760429bf78052f9d554066c8d86763ab
+MISC ChangeLog 7180 SHA256 e6712958ca79e9b0f6bdb48bbb8629633ce143091491fb3489e0c2372efdb176 SHA512 3d6e709aae4520d7e078f0030f43590f0befb15b497a5ca3fdbca7d3401bb0c937af0e73273a4019d69e1e6b0b2fcfaed725cdc526176f9d55264c63dd2d0d06 WHIRLPOOL c2e01411b25a728d17a60983dce0f86fd97e55810c9b67cd97ff4078f1f9c29fdd28cc5fc28fa0f519c24d6ecb6e429203d951e8ff89d7ffe08c05495ec4c1ab
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlD8ByUACgkQiIP6VqMIqNft6AD/Q3Q7jkU2r+abXueifB7Ej+t1
-JYoIx6SVQUISqrpA0BcA/1o8p0AZq6niuNjKvvvwFE2SZGdsoC2MWecTZ8p5/OaH
-=fInH
+iF4EAREIAAYFAlEG+qQACgkQiIP6VqMIqNerXgD/ZreI5np/oZbOHNZh6k+I3ukw
+SmgabRoKz+5OooCqzc8A/RJPUYada0V7Lk6CAc4u5U1biiELvXZVL6HBltBkrZfy
+=ibJo
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/railties/railties-3.0.20.ebuild b/dev-ruby/railties/railties-3.0.20.ebuild
new file mode 100644
index 000000000000..04c5aa3bdcd2
--- /dev/null
+++ b/dev-ruby/railties/railties-3.0.20.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.0.20.ebuild,v 1.1 2013/01/28 22:24:35 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ree18"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_TASK_DOC="generate_guides"
+RUBY_FAKEGEM_DOCDIR="guides/output"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications."
+HOMEPAGE="http://github.com/rails/rails"
+SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-rails-*/railties"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionpack-${PV}
+	>=dev-ruby/rdoc-3.4
+	>=dev-ruby/thor-0.14.4
+	>=dev-ruby/rake-0.8.7"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/mocha-0.9.5
+		virtual/ruby-test-unit
+	)
+	doc? (
+		>=dev-ruby/redcloth-4.1.1
+	)"
+
+all_ruby_prepare() {
+	# allow newer thor
+	sed -i -e '/dependency.*thor/s:~>:>=:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}