Cleanup for security bug 493284.

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

4 files changed, 9 insertions, 91 deletions

diff --git a/dev-ruby/actionmailer/ChangeLog b/dev-ruby/actionmailer/ChangeLog
index 2363a9c540c9..c9f62b6270db 100644
--- a/dev-ruby/actionmailer/ChangeLog
+++ b/dev-ruby/actionmailer/ChangeLog
@@ -1,6 +1,10 @@
 # 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.247 2013/12/04 19:24:16 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.248 2013/12/16 20:10:16 graaff Exp $
+
+  16 Dec 2013; Hans de Graaff <graaff@gentoo.org> -actionmailer-3.2.15.ebuild,
+  -actionmailer-4.0.0.ebuild:
+  Cleanup for security bug 493284.
 
 *actionmailer-4.0.2 (04 Dec 2013)
 
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index c7dde9fa4071..4a5d9b008e32 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -4,21 +4,17 @@ 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.18.gem 273920 SHA256 cbb44db58ca8ef03d9758af5ea80229317db678bb4a6b8bfe65a7c6f32b563d9 SHA512 93ac7d613faa80d083e13094aa7a9e9abf2a89461964a3dabb9ac5ba828eb91458fc7d7056c928ed6fae2ee75c18f5078620e1e43e1300a264ab28b0e5bfb27a WHIRLPOOL 039eb1b19bb840c80b1da8aeb9d96de8b73edb12ed07c432f12d3112a422d34ff6ff802c6aa028e11d895eee2dc614ce8c073fbf5c76e44308f229ebb2380e7a
-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 actionmailer-2.3.18.ebuild 926 SHA256 4a4896ff70d033a6a86433546da2d2e6eb09f9498f769ed7f7d18c994bffaef6 SHA512 cde1e7bc4bc03a8a501e2bc214142de2de12e84345a951955607992fee15c05e2c65413e8708cd5cf27496c3cea99642f553e70d641c949e3054aa12438633ee WHIRLPOOL 7c0f750293acd6f85e03e595d58fbe31a31336e2ff99f827ed956635fb5e02ffbacdd2967c6f73c00872db0d3272859a49f5b0ff1deed0d04f0fc5ab4fa03bc6
-EBUILD actionmailer-3.2.15.ebuild 1367 SHA256 c7f6bd2d0b1996e5dfd5e7b6fa190db7fc076e9aed98ea11aa6e17e7a7d30b73 SHA512 2fb248f2a28fad1e59728f640cc9abf23858b1e847c09629527fd67c08f03b0bc223e2d32ac6432f5a19cdad3d50f2dd3ca80891394ef0dfebf42c4361997706 WHIRLPOOL dac1e3d4057351a121e82a8b2dd5ab89494a954468df3ff689b26605368e6f300e7dc6ffd492c909600fcbe126899abc77d70d04ce345d32d6d7f6b4458e8e70
 EBUILD actionmailer-3.2.16.ebuild 1367 SHA256 4d72da68a76fbe149229c9db44644d2bbb1fb17f6f09d9781d25eff3e07fd8fb SHA512 53a732694f93c92f7aee2d205c42ed3118bf11718e0d86e0ac67de698dccefb3a00a76701ebaccaf5b044424771b1b0aade236a6465c06e14bce3b66230f0b26 WHIRLPOOL cf2fbafec05381c64a7012ab7599887699d8ff8cba91f4353bd865464b80af9e45d05bb4fc6c6e12ee82a286a8b606d7a0d71bad1a21efe2f864fb2b6f2e1518
-EBUILD actionmailer-4.0.0.ebuild 1239 SHA256 75ff64c54fad692009049dc82c6b2e50f0d95c3943edb3f9535a3bca627612c9 SHA512 4e0735a28a6a7b700b42a4a496a9a3390487746378a6701046b626d4f8a2d8d493cfa68b7f05fce86b35007c6385407ff582ce97acbc71e3c4972e06a7483dc5 WHIRLPOOL f5b1b7f8f5939b6a271149c2c1bd3732483bc7460e1a3942295e3004c79970f3265170a2bbe5d77aa8550e3f53007c1b62a2e503b83862ec2c723569264dc4de
 EBUILD actionmailer-4.0.2.ebuild 1239 SHA256 b1ec92cbf87ac9328fc3bc5c8251476667ecd3ee5dcda8ff6fcfe87f4ccc7c7b SHA512 4d404a88553105e1695a4df060cbd064b5929a32f36874bb411f200eacaffa2f5d63867f73557db0b9775d39583fcf926386eb1b4c0b33f2c43cec5756a91110 WHIRLPOOL 72a33e71204894eb9f4c4a4a779235f341427a905bb671da12c366c543c7dc5aad8e3898d3b19b87db668e80ff0f14906850373aef98add6b924e6c49a8f3cf2
-MISC ChangeLog 33622 SHA256 338840b9ac305321b4b80df8e5ce6ac94d97d1368d72128a607e7b5655d52251 SHA512 2be364cbc74b7605f258561238e96d7a39e928968637a1fff0c82c943428b70447ef48ec0c1923515d25270d2053bd6ab484a7c67e5a8b375104e10d7611f16a WHIRLPOOL fa92c5367e652b1c3ad88096bf69f72535f619b18d1d3b185222ff33c403e93bcf74573802711c6c827c5b6203ffe2b323b97e1183585a4b3d2abea4d316f7b8
+MISC ChangeLog 33767 SHA256 ed63096248e40533408fa5846c71e3486759ac0a91a3e331dec8ce001c34f3fa SHA512 08da9c8fd355192bf1ee6cfdaab63f812bc452a5a8ae739be735685371bd4b2aeabe54616553a21fbc92bb83077b283fe1b29a458aa0ea35fe3067c6cf7f50c2 WHIRLPOOL 35401bbc8cf63032f3a000c361f6a0593da52e2b012788e1933571fe4d33cbe86b063935d8feb71d881f25306c44f5d6720ef1dec85b475bddcc217a05d67278
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlKfgWIACgkQiIP6VqMIqNcPIwD/XafDCVhOD2PNR/ew9KZMwPBj
-vU9rPu0zrjrWl7wBySoA/A4OwMl0Q4xk/tzXYa0DtPt+1Bxlux5UF95SKl6vECrA
-=wbla
+iF4EAREIAAYFAlKvXikACgkQiIP6VqMIqNdnFAD7BQ/2gL8m78WjHMLwt2bO26e2
+um+3U6ahkw885x7IDZgA+wYdk2g8AJIu1XHrHG2s4xKmkb6s+E3YgxHXZ/MHx3b6
+=zbEv
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionmailer/actionmailer-3.2.15.ebuild b/dev-ruby/actionmailer/actionmailer-3.2.15.ebuild
deleted file mode 100644
index a0acf651878a..000000000000
--- a/dev-ruby/actionmailer/actionmailer-3.2.15.ebuild
+++ /dev/null
@@ -1,41 +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/actionmailer/actionmailer-3.2.15.ebuild,v 1.1 2013/10/17 06:36:47 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="http://rubyforge.org/projects/actionmailer/"
-SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/actionpack-${PV}
-	>=dev-ruby/mail-2.5.4:2.5"
-ruby_add_bdepend "test? (
-	dev-ruby/test-unit:2
-	dev-ruby/mocha:0.13
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Make sure we use the test-unit gem since ruby18 does not provide
-	# all the test-unit features needed.
-	sed -i -e '1igem "test-unit"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-4.0.0.ebuild b/dev-ruby/actionmailer/actionmailer-4.0.0.ebuild
deleted file mode 100644
index 3e391ab56e93..000000000000
--- a/dev-ruby/actionmailer/actionmailer-4.0.0.ebuild
+++ /dev/null
@@ -1,41 +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/actionmailer/actionmailer-4.0.0.ebuild,v 1.2 2013/10/13 22:10:12 maekke Exp $
-
-EAPI=5
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="http://rubyforge.org/projects/actionmailer/"
-SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/actionpack-${PV}
-	>=dev-ruby/mail-2.5.3:2.5"
-ruby_add_bdepend "test? (
-	dev-ruby/test-unit:2
-	dev-ruby/mocha:0.13
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Make sure we use the test-unit gem since ruby18 does not provide
-	# all the test-unit features needed.
-	sed -i -e '1igem "test-unit"' test/abstract_unit.rb || die
-}