Cleanup for security bug 493284.

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

4 files changed, 9 insertions, 165 deletions

diff --git a/dev-ruby/activerecord/ChangeLog b/dev-ruby/activerecord/ChangeLog
index e3255fb06c2c..7595bc006c98 100644
--- a/dev-ruby/activerecord/ChangeLog
+++ b/dev-ruby/activerecord/ChangeLog
@@ -1,6 +1,10 @@
 # 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.250 2013/12/04 19:24:35 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.251 2013/12/16 20:09:58 graaff Exp $
+
+  16 Dec 2013; Hans de Graaff <graaff@gentoo.org> -activerecord-3.2.15.ebuild,
+  -activerecord-4.0.0.ebuild:
+  Cleanup for security bug 493284.
 
 *activerecord-4.0.2 (04 Dec 2013)
 
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index e04703743e8a..3ea94f43c4b5 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -6,21 +6,17 @@ AUX activerecord-2.3.14-dynamic-finder-injection.patch 2138 SHA256 d24dcb57517b5
 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.18.gem 541696 SHA256 09aec34a541e01c53b3e9bf0057a4306fa6ad394753cc21a7cbd3e8b8ab969bb SHA512 4446ff38d0dbbae4e01ca043f5fcf2facd7907946cfca17b2043557c9cb8cad7ca41c17f9b3de7e5a764315c6ab3a53a8c56781927a057e1ee69531574c34719 WHIRLPOOL ecb741c39efa23f1e0f29386471b81475e0581378e48bd70eb3ffd4a0ba9726358d6fc6cf11cb76057d9210e95654468a1cef40d4daf0900b11558aa06a25224
-DIST rails-3.2.15.tgz 3566493 SHA256 6fc98f28742e6423efd151d4a0005c10cdf83bf1cef3350042f305d15474b286 SHA512 c2fa25a81b5c77a9054fc8b42a9fdc0733ef175a981ccdbff77eb33a08aa299c3a3ca9469ab80234b01fbc4eef7ccf09c4b3f55dd04e81bf4f8cbfc7eaf58719 WHIRLPOOL 18e8f8b2b90886bca4572efe24508fb77f5a227fd3f3d4732da68f52baea9a2fdf7b620023c8cf229354e4fca85eb9f28886b7b27f862693dbd383a063e961cd
 DIST rails-3.2.16.tgz 3566631 SHA256 8fe61b98496e40d8aaef5f8db217f2aad56c9add1bf8417c37a0cbd24f74a57e SHA512 304ef964c33eccfdd4dc1a1c47d43b05e7498d869c64a2ba7a62e8356a07d03cd3f48e1edb9b80d2de1cafc8d91f6ac491df9b0abf3c30d6d22f34f39571965e WHIRLPOOL 5a6ba360c741a7aa3979722ae20790df65e05347a4bad77eea805a9601de2e4cc50a02b8f75d7b7e827da8bef62e8e4e72bb4d4c1de9e783f8f5b95d156bceac
-DIST rails-4.0.0.tgz 3705371 SHA256 644601ae66881313346ffeacd9ea372d249df55aa7abe853acdcb231fffe6bbf SHA512 3e03f25de83ff894a7affdebe948fd151cff81c8ec906692119036633d891c9ba5cbb312e3ab32f1e62f4a383fcfc2e878daeb62fc04336e932b2e2bda63f7cf WHIRLPOOL 792513f2fdfcbc2a57633e3ef344943948e5614c638b06cae1245fd84716d84b5391a7906123a94a1a325ad789bdc465a4f7e2b774924bd0f18d341c29109a82
 DIST rails-4.0.2.tgz 3720518 SHA256 cd973b85cfff735da80d8ed4e11421e2242be735d96cbe4d83ac0c4b6ca7c8d1 SHA512 67d7580c0081deeec4271f96caca6d6db8f65864c876a237e7e3f0e8c6e495d299f103dcbe7627385fa4fd3699dac5015e20be90187ef3b2af49352ad9c8d6af WHIRLPOOL 5b496df36ca4de6a4b55951fab2403bd8b31b3505d17d450bf2edf084429a7689c4fdeb8d19d0be40b2d4d0ada8cefd6c3fc104c2428769d2ca8e434d97c6465
 EBUILD activerecord-2.3.18.ebuild 1818 SHA256 88be14e5deb72df9236203ba3f56be2784062a063007435d91699e8d8282b48a SHA512 901d3dc0536753297838595c3cd4776dec7dca292342650c052293ed0e699915da675b0ca25865cfa3d5494a743a7dabd57d7dacdbe536d0e4e63783ec26ad4d WHIRLPOOL f5b39ab5258c36f8adc124354b630fa8d3e74aceaf50fc4265ea79d7506dbfce2699e1a0057530b252d1e6579facfeac46fbb71d5da19e51401d338dd46e4315
-EBUILD activerecord-3.2.15.ebuild 2497 SHA256 ef697bd8e356733a34cfb58d87e32f45f77f5a1ced763478ec8c8eaf85c54c60 SHA512 281f5e1a384ead5d156fbc50b59e5966556c458dcd7c397d9bff7adb3d35bfc9c90b0ee7d4a16dfc12c7f85f55cb1a934e104b0be9f296b64a49a52a48650b0c WHIRLPOOL cf2400a417e17efc9443053add3f7fb23e22b34382987de8a250fcca41150468d160b5f68e7e155d97264dd28855e1bed39e792d955d40da5123f10ab2a631e8
 EBUILD activerecord-3.2.16.ebuild 2497 SHA256 103bdacf0e9b3284ca4dc9f45a53ecba2ec3c80a159502a475e7063f7c0a43ce SHA512 5bf6347c83ec5f0d7149dfa73527630c170d124dba0fb918284a8efb00506950ddfa50c93fe89e1da6216d46e23adb8f26e5f5f149f493c91b0c8e26c6ca9a7b WHIRLPOOL e28372f7dc27dbed2c2ea7ec508eb01bec701533c421d074544f1cfc22e9d30ba532881650f711de565d067fc952e8a71992f087c4d2e2e09d01ecdd118f529e
-EBUILD activerecord-4.0.0.ebuild 2595 SHA256 534e87283d8b73b2a95b45f9aa480ff498f6b2c22621fd683ed5fb52b11e61cf SHA512 9e5bf755bf0cd2eca2d5ebaaf5a6188b482a3fb0260ba8e6df4320c493f5a0317697fcf6422ef6d857c42653b9fdbfb2ce26e808704bc8ec308d9bdfc5861fb1 WHIRLPOOL c6d846eefdaca1e3d1c5b4f0c7db5a1c43ad40967338071f4367ed99c23a06ca887d3dd46d4b4c41e6a363385596076031162aae2a90e39ac09802fa6f73e0e6
 EBUILD activerecord-4.0.2.ebuild 2692 SHA256 4a1e727b7eaa014e2a4b57081c05770d5fad0173838edad60db6c79a8cfa4f97 SHA512 c2f0b987639d2320ebb8eab737ab984a8dc3360a696214e1d1bdc0670bce55d189ac85c4235c1795015f6c31d70c6ba9e323243f60f651744039b012e3f145af WHIRLPOOL 554675d1ded2a18b0375f916e79b9545d90955405fc17f03ca341a3774280f95195815ce2995a640a34e6ffe81a9ccb25f04328bee413fcef7841a5e3ba1911f
-MISC ChangeLog 34721 SHA256 915023fe668cec0f0fe5e04951f4af1b5548ed7d1d8c2212a6d55b3e3fe98b63 SHA512 c955bf70e9dde54dfac4a50fb81d128ea6160263c320f473c75241006091f21021dc8711f4037c505ae710a38ddaaaa412463628a217532da637cc129d4ba5e3 WHIRLPOOL 9d10f272272740f144a58b6de5e6dfc932df36ca2e892533a7cc9af9118744e61eb8a642975c000610375e1df6594539bef008b8edc654d325c9d03692b145df
+MISC ChangeLog 34866 SHA256 e52ac2dd24947e424f0494bd3d6f2a023613b79502adae2d4043effa85b2ba59 SHA512 5c5fbf30e8274ecbe7fa3ef0cfa0dddbc94f29492b34b8e406e1225eedbd83131f1e90f6d7f066f39a32942c4a6b64170ecb333c22e197b0984bf287cf2a7b87 WHIRLPOOL 802fcacab192cd0133daccff3c873e2193f28dc4d428452047ae8716ca28601e3fdfee26011b15a9fe4c66bdd8374d2382936e1fbe80110773bb8c368551391f
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlKfgXQACgkQiIP6VqMIqNePaQEAgAcX9QJsdwPXhc2YwQqr0Oi1
-upLdohSEqYu4mRL2hasA/AilzaKVwz/YwC/UX98U5OUuMuqY2JapimkcLlCmxH20
-=4DMK
+iF4EAREIAAYFAlKvXhcACgkQiIP6VqMIqNd3MAD/S/bMilKI1qLdaZSnOtwRKvGM
+9RvtQFSGfoVUN0NqWRUA+wdyMA9NEJLsoYIazcTy0wEdATDNoewMTwHQP+LQtDXh
+=J1iv
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/activerecord/activerecord-3.2.15.ebuild b/dev-ruby/activerecord/activerecord-3.2.15.ebuild
deleted file mode 100644
index e17f303cf899..000000000000
--- a/dev-ruby/activerecord/activerecord-3.2.15.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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.2.15.ebuild,v 1.1 2013/10/17 06:37:26 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ruby19"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="http://rubyforge.org/projects/activerecord/"
-SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="mysql postgres sqlite3"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	>=dev-ruby/arel-3.0.2:3.0
-	>=dev-ruby/tzinfo-0.3.29:0
-	sqlite3? ( >=dev-ruby/sqlite3-1.3.5 )
-	mysql? ( >=dev-ruby/mysql2-0.3.10:0.3 )
-	postgres? ( >=dev-ruby/pg-0.11.0 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.3.5
-		dev-ruby/mocha:0.13
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\)/d" ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
-
-	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
-
-	# Avoid tests depending on hash ordering
-	sed -i -e '/test_should_automatically_build_new_associated/,/ end/ s:^:#:' test/cases/nested_attributes_test.rb || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*jruby)
-			;;
-		*rubyee18)
-			# Turn on travis support to avoid tripping bugs in ree18.
-			TRAVIS=true ${RUBY} -S rake test_sqlite3
-			;;
-		*)
-			if use sqlite3; then
-				${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-			fi
-			;;
-	esac
-}
diff --git a/dev-ruby/activerecord/activerecord-4.0.0.ebuild b/dev-ruby/activerecord/activerecord-4.0.0.ebuild
deleted file mode 100644
index f0da8b80bafa..000000000000
--- a/dev-ruby/activerecord/activerecord-4.0.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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-4.0.0.ebuild,v 1.2 2013/10/13 22:09:02 maekke Exp $
-
-EAPI=5
-USE_RUBY="ruby19"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="http://rubyforge.org/projects/activerecord/"
-SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm"
-IUSE="mysql postgres sqlite3"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	>=dev-ruby/activerecord-deprecated_finders-1.0.2:1.0
-	>=dev-ruby/arel-4.0.0:4.0
-	sqlite3? ( >=dev-ruby/sqlite3-1.3.5 )
-	mysql? ( >=dev-ruby/mysql2-0.3.10:0.3 )
-	postgres? ( >=dev-ruby/pg-0.11.0 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.3.5
-		dev-ruby/mocha:0.13
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\)/d" ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
-
-	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	# Avoid tests depending on hash ordering
-	sed -i -e '/test_should_automatically_build_new_associated/,/ end/ s:^:#:' test/cases/nested_attributes_test.rb || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*jruby)
-			;;
-		*rubyee18)
-			# Turn on travis support to avoid tripping bugs in ree18.
-			TRAVIS=true ${RUBY} -S rake test_sqlite3
-			;;
-		*)
-			if use sqlite3; then
-				${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-			fi
-			;;
-	esac
-}