Cleanup unused patches.

Package-Manager: portage-2.2.14/cvs/Linux x86_64

4 files changed, 7 insertions, 37 deletions

diff --git a/dev-ruby/actionmailer/ChangeLog b/dev-ruby/actionmailer/ChangeLog
index 7e35f201f40c..702cd9785643 100644
--- a/dev-ruby/actionmailer/ChangeLog
+++ b/dev-ruby/actionmailer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/actionmailer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.276 2014/11/17 20:19:39 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.277 2014/11/18 13:46:38 mrueg Exp $
+
+  18 Nov 2014; Manuel Rüger <mrueg@gentoo.org>
+  -files/actionmailer-2.3.10-rails3.patch,
+  -files/actionmailer-2.3.9-require-uri.patch:
+  Cleanup unused patches.
 
 *actionmailer-4.1.8 (17 Nov 2014)
 *actionmailer-4.0.12 (17 Nov 2014)
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 75500554bd63..2094bf98926c 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,8 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX actionmailer-2.3.10-rails3.patch 431 SHA256 4eec1446601ffef54a0e8e210ed53b1d72676ab035cf0ab1d8844f11b5611cde SHA512 2421cb97ec78f6a4fe8a191e90cac51f05a4f0389aae574c3f89542feacf7d0d7c589165ec0fac2072704df00117a783d5e9e51cc706f50d5cb1809039a7288c WHIRLPOOL 016e524c2602413b013efda5288274a3b3cf53c101772af27fd03d368941b06b6dfee01ca73b12a0fea71b5ea2eb035f10a63138823483621eb26fda547f7577
-AUX actionmailer-2.3.9-require-uri.patch 507 SHA256 8aa2121eecea068632f38cc03cedf694e22896f1e57dd9bca912585c5fb14efe SHA512 c6236d36edbf711f6511d002d53b11aefc88efa5d72e8d44799286279f3af9ad7fee72d872df7d15c02d2a333230279cdebaa546c1d0d0860e2377243cb35bb9 WHIRLPOOL f43892b7a4bf9ea84c03e81dc902a29414777f951d4e0f8aec62c8886dcd76950ae64aff7b8239f1263e3b0e9dcbb55440cc059d9db0978dc79a4d8cba2e32e1
 DIST rails-3.2.20.tgz 3567367 SHA256 373e66ad1ea7af66504e676b0925806a20532673e2d9da7fa0131aa0559dad5c SHA512 2f39d14c1543e203a6e182528967bfa00d08a29872fd233022e2c3bd6e1a1d4cac754016258c1d7f5f821942e83d5c0f4df39a8c4fa4d5d7ba135f79bcda26a3 WHIRLPOOL e011cccc18a74ed924368077a90e43b14824e460f0d05fbe4c1a4a3092df2fb63808c148190b0f4920bf60ea94fd1be5f56f0d628e8afaf431fb9ba702fa6f71
 DIST rails-3.2.21.tgz 3568729 SHA256 95dcf2a848a7fd09acbb12c47e6901baeea08645c32c37e2ae04e2650cf01deb SHA512 952c799736dd2a48532a4340d97ffbbbdc2451fc509e7f86ca47c09f5c6a3f4e5cb9b87c3e803692bc8a810bc178513bbe74f3037fdf8f786c30f0c85dd26948 WHIRLPOOL a2c79df0091ea0ca6f3969a91b4d73c14f79cab9d31ec30591a640321487aedafd0318326080ad4d9be0523002eab2c3c5e9e49b2c6b0b5ef6f5dac8da0bfab5
 DIST rails-4.0.11.tgz 3759423 SHA256 cb44b605bc0e6477c9cf389f9c6a8274de10de6a98f979a53ef8505b7eed9e33 SHA512 a38eee261aa76070417ea248ac8f79536f19a75e5ee4bf16ae59f1eff5a9c751b033257a5cdbd1cfdcd80796142ef2ea1f8b2be5cc73604e96759fe2979f9b41 WHIRLPOOL e4b52b5f3d3ddae13ce4aefa1f5890813370de7874e8c5edce1e4f1df32704782babe52013dfa96cf4e60327429602f7b9534af2c19a9ef269d179186a8e1b62
@@ -15,12 +10,5 @@ EBUILD actionmailer-4.0.11.ebuild 1424 SHA256 eec545e7294bc68f6ab0dd20c67e9c2315
 EBUILD actionmailer-4.0.12.ebuild 1424 SHA256 48bc11b8f98fb01a5851d2da6d564c31d2b65b2ab840551c81d5e3f376e55121 SHA512 a9da6c3d13367988976d55a0eb7fc6c5a7f0d96b198393be08c8dfdb9ffe453dbf116136d8ec71a8a588c27e73ad44dab632e55419ff2d4670a9b93312933773 WHIRLPOOL 06b29e90d4b049dde22ee8c2d19728376be5d478498c0d23263270da5c05da5fdee9e5c1462bf6ad5b745a45fa92bb8da82ef848685c50494bf44ca7c7573c15
 EBUILD actionmailer-4.1.7.ebuild 1252 SHA256 a84f535ccc8929c6f6210b8f224fa2c99299a02cc6f2aeab98948b3e38f0b51d SHA512 daae68c0358a175cb952c61d7ad635d4db20ca4e0db45266102576658e4e467278a24619a5fc5dd09f47baa0bf589b5525de075e3e6f9d90c4423dfbf25c0949 WHIRLPOOL 55323bf72ec314db4319f1bc96e4e3027b927d908393eba783251f5b2c9e4e39f383dd0faeb802706c5b5fc3cb19118c12ba4e8a33fc2798e13ca87ce9456c77
 EBUILD actionmailer-4.1.8.ebuild 1469 SHA256 6679289105b18e8906d96ba048f5144b5a9a89d8755543300b7598bab36e320e SHA512 059d93cb3cf1bf4b40f0933b6d53d919868510b8949e8cc7c046b0f622069e73eace8b6642553d6335312212531c17a361692ec9cfe911a76bb9b137ace61507 WHIRLPOOL 3ca4b30eedf202c6f16306c957b2f35bd0b4f28757243fc3c3b3ce68fabac685c84a8c56ae6b002873db3e1c70d393f93b848828393ac81cf4693566ff7393a8
-MISC ChangeLog 38437 SHA256 99afd4fc7ebd2e8c56cb5fd5c68b11ff4e275fe4e2fbeeadd02a713b2c661554 SHA512 9042bb4d87631621ce03a78b405a77ae3b4e91aac110b99c5b1928e39ef3bef820257a377d425697b37649c446a8bff835795517797fb5a063b8a8ed92d48f13 WHIRLPOOL 7291f390d4a33ac36aedd0d239f14f97bda82b54d4c701bad88f5453e5eda556cac15c121fe5f83272fb763a4ad777ce0fda85396f5df52e006383b24444d24d
+MISC ChangeLog 38601 SHA256 95bce2191a72424310f9514a6f7013bd66b2d464eeb030a0f4f5bb3eeb66b89a SHA512 1e12eee72e15d7568ba8caa88db5002a3106b3593dd82e684ae53a893fdd4cc5a885f8a448a124d69412696e2fe3c175efb25bba40aa04e4d7839eb56515ce79 WHIRLPOOL affcdfef071d5b6d68fd1e5bbb54b897a9e86c1d1815c7cfd510a00f8ff232f3ee6c535e417b05a554cd0e28a1204aa189832b0825155fbbb245770d36216a10
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iF4EAREIAAYFAlRqWFwACgkQiIP6VqMIqNdgzgEAlSCTuQ62oj8oX+4ujNQnCoBH
-lud2GRV9lJQUHnco7dAA/0EAq6zBpU4tIyGc+x+5ghUHHb2YP/LEuubm16j5QwIr
-=xqPa
------END PGP SIGNATURE-----
diff --git a/dev-ruby/actionmailer/files/actionmailer-2.3.10-rails3.patch b/dev-ruby/actionmailer/files/actionmailer-2.3.10-rails3.patch
deleted file mode 100644
index 8e0bf276f5b3..000000000000
--- a/dev-ruby/actionmailer/files/actionmailer-2.3.10-rails3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/abstract_unit.rb.~1~	2011-02-21 20:35:21.775255045 +0100
-+++ test/abstract_unit.rb	2011-02-21 20:39:26.051025768 +0100
-@@ -1,6 +1,8 @@
- require 'rubygems'
- require 'test/unit'
- 
-+gem 'activesupport', '~>2.3'
-+gem 'actionpack', '~>2.3'
- $:.unshift File.expand_path('../../lib', __FILE__)
- $:.unshift File.expand_path('../../../activesupport/lib', __FILE__)
- $:.unshift File.expand_path('../../../actionpack/lib', __FILE__)
diff --git a/dev-ruby/actionmailer/files/actionmailer-2.3.9-require-uri.patch b/dev-ruby/actionmailer/files/actionmailer-2.3.9-require-uri.patch
deleted file mode 100644
index ddf9cd537522..000000000000
--- a/dev-ruby/actionmailer/files/actionmailer-2.3.9-require-uri.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/5555-actionmailer-239-should-now-require-uri
-
---- lib/action_mailer/base.rb.orig	2010-09-05 10:56:52.424972729 +0200
-+++ lib/action_mailer/base.rb	2010-09-05 10:56:59.760472595 +0200
-@@ -247,6 +247,7 @@
-   class Base
-     include AdvAttrAccessor, PartContainer, Quoting, Utils
-     if Object.const_defined?(:ActionController)
-+      require 'uri'
-       include ActionController::UrlWriter
-       include ActionController::Layout
-     end