Cleanup patches.

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

18 files changed, 35 insertions, 508 deletions

diff --git a/dev-ruby/locale/ChangeLog b/dev-ruby/locale/ChangeLog
index dd16a9cb253b..889c3c316183 100644
--- a/dev-ruby/locale/ChangeLog
+++ b/dev-ruby/locale/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/locale
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/locale/ChangeLog,v 1.76 2014/11/18 11:51:30 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/locale/ChangeLog,v 1.77 2014/11/18 12:00:52 mrueg Exp $
+
+  18 Nov 2014; Manuel Rüger <mrueg@gentoo.org>
+  -files/locale-language-fixes.patch:
+  Cleanup patches.
 
   18 Nov 2014; Manuel Rüger <mrueg@gentoo.org> -locale-2.0.5-r3.ebuild:
   Cleanup old.
diff --git a/dev-ruby/locale/Manifest b/dev-ruby/locale/Manifest
index 1fc3bbe93a2c..27c5b5ed9687 100644
--- a/dev-ruby/locale/Manifest
+++ b/dev-ruby/locale/Manifest
@@ -1,6 +1,5 @@
-AUX locale-language-fixes.patch 8049 SHA256 7ad3a4143f5994090cd0d4b4fe5acee1117c1d318ddf1a5c9960338a7b8d1308 SHA512 f626ec846d1d3edb3124ee0e5526f6d4d29e646a3c513fe2dbf89b7aa877bc4b83c4a5bf4242d1062ae49af4896f8f1e2ef2e224d742285eee00ed3a4db12259 WHIRLPOOL 8f0cb39137ef5dccac975c2375a01d08413dd88b0d1c1715b527f84c1618de1c199877fdffb1e336b80d0f5cdfa201f51a942aaf67c1667b42235feff09ade13
 DIST locale-2.1.0-git.tgz 99139 SHA256 0773283ff0db2a6574ba5ea05132598ea0bad1f88cd0bb037be7e461ed6aa565 SHA512 6f87730f8e6b128a6647bc0c7d223d5e90e85d5bcec884c0680963b09a221882a6dcadb088a27aeb8cc96652582278a5ce24302125902b2c97ca8b00c701abeb WHIRLPOOL 1cf895045c9fd5e273289082e7a1c357a0bf43e2c01a4b8e1567e27fcc71c5a01dbfdd0c7ccb2b08980b01abf00863c59bdd883820466ab36a776a1263245d70
 EBUILD locale-2.1.0-r1.ebuild 1526 SHA256 e49c57532188933b2d86af33141977b2deb9220737b69fe043a74d10998e4449 SHA512 a1fce20a4a3bf459afea8ead506f9d111dae9afcbd5776bc16a080ec7dc34e921f51e4ea08be45070aa7cb91447734a2e6ab921a9ad99f9ccead62a0069b9df3 WHIRLPOOL 089b34ce0bded910f13e17ab3ff8c675d386acf1995c9b59d34ac4640a8fcced7a9b550aad616fea08e6b62200bb968f7a62453036aebe199c0d7e1044f72d36
 EBUILD locale-2.1.0-r2.ebuild 1545 SHA256 4850ac4a5c968cab95f05942a93d44007c905cc4d66a9a3afdc6f9c7817b0323 SHA512 f0b09f5a0d0665996a774fbebaece366f4c09ad40b4e256355e74d4b153a3edda017d4442816dfcb32d3aebd41fa4c9be679f077b46805ec9e71e79f4bf6bcbf WHIRLPOOL 217feb001dabf544abb13afa3b93d4ef2b1542ac380355eaff2594a754395083a5b14b694c756abec8c0d895b525754f690a38761e0aa1f3bb47522ca2a6e700
-MISC ChangeLog 9700 SHA256 c391a03accf9e0e19740f286decbd3eefed402e3f32fdf0933862e20a314905a SHA512 8fbbe710c1ddf9e63e6295a0bc830445b1087b20a34435ddceb8c1c9b4720b923eb3c81dde3b1a7288f1fa984a22da1ccab1d57cdde2dc95265765cdc7510879 WHIRLPOOL 7ccabbc01d700aa43f67d0a3ee2d7fdd837f07592902973fecadd70d408b2fb26b9f5afdd790a8b1fa07e2d8054426c8f380401bb3069d0e456609e4a1287091
+MISC ChangeLog 9806 SHA256 f831e7dabd512435b89a514da4b75b120801e07dd26f8c3d87748333f47cb018 SHA512 361b3efe0dd6832c9f7df0c71cfd68c7ae2f1dfd6c5e9e4a6240a9bfcac4917c3377ba04f0cb6f7c080953879b20f6f215d7b9973b52e4cd697ec9c10d8d7c46 WHIRLPOOL 1d24bd7e3aaee312c12c5ba412e37becb0096e793c64f0e8d5c17270c6c948bf9a8f8312a41c0dc6a69bf75838d70a7c2980706818771c21c857096c2d3abe1f
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/locale/files/locale-language-fixes.patch b/dev-ruby/locale/files/locale-language-fixes.patch
deleted file mode 100644
index e4398808bb65..000000000000
--- a/dev-ruby/locale/files/locale-language-fixes.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-Combined patch of upstream commits 4cbfbbc2..c6c01691,
-fixes multiple issues with an empty/unset/malformatted LANGUAGE env variable.
-
-Bugs 327677 and 330227 for instance are caused by this.
-Upstream: yes
-
-diff --git a/README.rdoc b/README.rdoc
-index 381032f..5705872 100644
---- a/README.rdoc
-+++ b/README.rdoc
-@@ -11,7 +11,7 @@ handle major locale ID standards.
-   * POSIX, CLDR, IETF(RFC4646, 3066(BCP47)), Win32 and Java language tags 
-     and convert the tag string to each other.
-   * Auto detect Locale ID.
--    POSIX(Unix/Linux/*BSD), Win32, JRuby, CGI.
-+    POSIX(Unix/Linux/*BSD), Win32, JRuby, CGI(CGI, Rack, others).
- 
- * Resources
-   * ISO 639-3 languages
-diff --git a/lib/locale.rb b/lib/locale.rb
-index f56de37..95b965a 100644
---- a/lib/locale.rb
-+++ b/lib/locale.rb
-@@ -236,9 +236,11 @@ module Locale
-     end
- 
-     tags = []
--    (0...candidate_tags[0].size).each {|i|
--      tags += candidate_tags.collect{|v| v[i]}
--    }
-+    unless candidate_tags.empty?
-+      (0...candidate_tags[0].size).each {|i|
-+        tags += candidate_tags.collect{|v| v[i]}
-+      }
-+    end
-     tags += default_tags
-     tags.uniq!
- 
-diff --git a/lib/locale/driver/cgi.rb b/lib/locale/driver/cgi.rb
-index c1d1126..4035c78 100644
---- a/lib/locale/driver/cgi.rb
-+++ b/lib/locale/driver/cgi.rb
-@@ -50,7 +50,9 @@ module Locale
-         unless locales.size > 0
-           # HTTP_ACCEPT_LANGUAGE
-           if lang = req[:accept_language] and lang.size > 0
--            locales += lang.gsub(/\s/, "").split(/,/).map{|v| v.split(";q=")}.map{|j| [j[0], j[1] ? j[1].to_f : 1.0]}.sort{|a,b| -(a[1] <=> b[1])}.map{|v| Locale::Tag.parse(v[0])}
-+            # 10.0 is for ruby-1.8.6 which have the bug of str.to_f. 
-+            # Normally, this should be 1.0.
-+            locales += lang.gsub(/\s/, "").split(/,/).map{|v| v.split(";q=")}.map{|j| [j[0], j[1] ? j[1].to_f : 10.0]}.sort{|a,b| -(a[1] <=> b[1])}.map{|v| Locale::Tag.parse(v[0])}
-           end
-         end
- 
-@@ -81,6 +83,7 @@ module Locale
-      # * accept_language: The value of HTTP_ACCEPT_LANGUAGE
-      # * accept_charset: The value of HTTP_ACCEPT_CHARSET
-      def set_request(query_langs, cookie_langs, accept_language, accept_charset)
-+       Locale.clear
-        Thread.current[:current_request] = {
-          :query_langs => query_langs, 
-          :cookie_langs => cookie_langs, 
-diff --git a/lib/locale/driver/env.rb b/lib/locale/driver/env.rb
-index 9d0995f..a3e1b34 100644
---- a/lib/locale/driver/env.rb
-+++ b/lib/locale/driver/env.rb
-@@ -39,13 +39,16 @@ module Locale
-       # Gets the locales from environment variables. (LANGUAGE > LC_ALL > LC_MESSAGES > LANG)
-       # * Returns: an Array of the locale as Locale::Tag::Posix or nil.
-       def locales
--        if (locales = ENV["LANGUAGE"])
--          Locale::TagList.new(locales.split(/:/).collect{|v| Locale::Tag::Posix.parse(v)})
-+        locales = ENV["LANGUAGE"]
-+        if (locales != nil and locales.size > 0)
-+          locs = locales.split(/:/).collect{|v| Locale::Tag::Posix.parse(v)}.compact
-+          if locs.size > 0
-+            return Locale::TagList.new(locs)
-+          end
-         elsif (loc = locale)
--          Locale::TagList.new([loc])
--        else
--          nil
-+          return Locale::TagList.new([loc])
-         end
-+        nil
-       end
- 
-       # Gets the charset from environment variable or return nil.
-diff --git a/lib/locale/driver/win32.rb b/lib/locale/driver/win32.rb
-index 2bb6fbc..2ac09f8 100644
---- a/lib/locale/driver/win32.rb
-+++ b/lib/locale/driver/win32.rb
-@@ -1,7 +1,7 @@
- =begin
-   locale/win32.rb
- 
--  Copyright (C) 2002-2008  Masao Mutoh
-+  Copyright (C) 2002-2010  Masao Mutoh
- 
-   You may redistribute it and/or modify it under the same
-   license terms as Ruby.
-@@ -13,8 +13,10 @@
- 
- require File.join(File.dirname(__FILE__), 'env')
- require File.join(File.dirname(__FILE__), 'win32_table')
--require 'dl/win32'
- 
-+unless Win32API
-+  require 'dl/win32'
-+end
- 
- module Locale
-   # Locale::Driver::Win32 module for win32.
-diff --git a/samples/rack/hello_rack.rb b/samples/rack/hello_rack.rb
-index d6cb160..0f458aa 100644
---- a/samples/rack/hello_rack.rb
-+++ b/samples/rack/hello_rack.rb
-@@ -1,14 +1,13 @@
- require 'rubygems'
- require 'rack'
--require 'locale'
-+require 'locale_rack'
-  
--Locale.init(:driver => :cgi)
--
- class HelloRackApp
-+  include Locale::Rack
-+
-   def call(env)
-     req = Rack::Request.new(env)
--    Locale.set_request(req["lang"], req.cookies["lang"],
--                       env["HTTP_ACCEPT_LANGUAGE"], env["HTTP_ACCEPT_CHARSET"])
-+    init_locale(env, req)
-     str = "Language tag candidates of your request order by the priority:\n\n"
-     str += Locale.candidates(:type => :rfc).map{|v| v.inspect + "\n"}.join
-     [200, {"Content-Type" => "text/plain", "Content-Length" => str.length.to_s}, [str]]
-diff --git a/samples/rack/locale_rack.rb b/samples/rack/locale_rack.rb
-new file mode 100644
-index 0000000..2b53a8a
---- /dev/null
-+++ b/samples/rack/locale_rack.rb
-@@ -0,0 +1,11 @@
-+ require 'locale'
-+ Locale.init(:driver => :cgi)
-+ 
-+ module Locale::Rack 
-+    def init_locale(env, req)
-+      Locale.set_request([req["lang"]], [req.cookies["lang"]],
-+                         env["HTTP_ACCEPT_LANGUAGE"], 
-+                         env["HTTP_ACCEPT_CHARSET"])     
-+    end
-+ end
-+
-diff --git a/test/test_detect_cgi.rb b/test/test_detect_cgi.rb
-index e2adbfc..ef5a090 100644
---- a/test/test_detect_cgi.rb
-+++ b/test/test_detect_cgi.rb
-@@ -213,4 +213,12 @@ class TestDetectCGI < Test::Unit::TestCase
-     Locale.default = "en"
-     Locale.set_app_language_tags(nil)
-   end
-+
-+  def test_request
-+    Locale.set_request(["ja"], [""], "", "")
-+    assert_equal common("ja", "en"), Locale.candidates
-+
-+    Locale.set_request(["en"], [""], "", "")
-+    assert_equal common("en"), Locale.candidates #Cache should be cleared.
-+  end
- end
-diff --git a/test/test_detect_general.rb b/test/test_detect_general.rb
-index 08b912d..2367354 100644
---- a/test/test_detect_general.rb
-+++ b/test/test_detect_general.rb
-@@ -102,6 +102,35 @@ class TestDetectGeneral < Test::Unit::TestCase
-     assert_equal "Shift_JIS", Locale.charset
-   end
- 
-+  def test_language_strip
-+    ENV["LC_ALL"] = "ja_JP.Shift_JIS"
-+    ENV["LANGUAGE"] = nil
-+
-+    tags = Locale.current
-+    assert_equal 1, tags.size
-+    assert_equal Locale::Tag::Posix, tags[0].class
-+    assert_equal "ja", tags.language
-+    assert_equal "ja", tags[0].language
-+    Locale.clear
-+    ENV["LANGUAGE"] = ""
-+
-+    tags = Locale.current
-+    assert_equal 1, tags.size
-+    assert_equal Locale::Tag::Posix, tags[0].class
-+    assert_equal "ja", tags.language
-+    assert_equal "ja", tags[0].language
-+    Locale.clear
-+    ENV["LANGUAGE"] = "zh_CN.UTF-8:ja_JP"
-+
-+    tags = Locale.current
-+    assert_equal 2, tags.size
-+    assert_equal Locale::Tag::Posix, tags[0].class
-+    assert_equal Locale::Tag::Posix, tags[1].class
-+    assert_equal "zh", tags.language
-+    assert_equal "zh", tags[0].language
-+    assert_equal "ja", tags[1].language
-+  end
-+
-   def test_no_charset
-     ENV["LC_ALL"] = "cs_CZ"
- 
-@@ -149,6 +178,24 @@ class TestDetectGeneral < Test::Unit::TestCase
-     Locale.set_default(nil)
-   end
- 
-+  def test_wrong_envs
-+    ENV["LC_ALL"] = nil
-+    ENV["LANGUAGE"] = "g"
-+    Locale.default = "de"
-+    assert_equal Locale::Tag.parse("de"), Locale.current[0]
-+
-+    ENV["LC_ALL"] = "f"
-+    ENV["LANGUAGE"] = nil
-+    Locale.default = "fr"
-+    assert_equal Locale::Tag.parse("fr"), Locale.current[0]
-+
-+    ENV["LC_ALL"] = "j"
-+    ENV["LANGUAGE"] = nil
-+    Locale.default = nil
-+    assert_equal Locale::Tag.parse("en"), Locale.current[0]
-+
-+  end
-+
-   def test_clear
-     ENV["LC_ALL"] = "ja_JP.Shift_JIS"
-     ENV["LANGUAGE"] = nil
-diff --git a/test/test_driver_win32.rb b/test/test_driver_win32.rb
-index 604cd6e..35199e6 100644
---- a/test/test_driver_win32.rb
-+++ b/test/test_driver_win32.rb
-@@ -60,6 +60,6 @@ begin
-       assert_equal "CP1252", Locale::Driver::Win32.charset

-     end

-   end

--rescue LoadError

-+rescue LoadError, NameError

-   puts "win32 test was skipped."

- end

diff --git a/dev-ruby/nokogiri/ChangeLog b/dev-ruby/nokogiri/ChangeLog
index 3fc3efb76197..f818535a341c 100644
--- a/dev-ruby/nokogiri/ChangeLog
+++ b/dev-ruby/nokogiri/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/nokogiri
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.110 2014/11/18 11:53:47 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.111 2014/11/18 11:58:16 mrueg Exp $
+
+  18 Nov 2014; Manuel Rüger <mrueg@gentoo.org>
+  -files/nokogiri-1.4.4-libxml-2.7.8.patch:
+  Cleanup patches.
 
   18 Nov 2014; Manuel Rüger <mrueg@gentoo.org> -nokogiri-1.5.5.ebuild:
   Cleanup old.
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 6b6410c36bba..a9a7f59d4513 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,4 +1,3 @@
-AUX nokogiri-1.4.4-libxml-2.7.8.patch 729 SHA256 56fbfb502adbb04dc77373a2d7c3708cf7b7cf21f0419f2fc6ff40dc6fa56321 SHA512 a61e9af8a4f94fa90fe07fc1b7348e85baa9da0922e3b55aea33b4c5940fa29cfab0f1e906c382989e23080269bf993771f444074014024cb9414fd166885ebb WHIRLPOOL 375d3fa74410cd783a15e6b7e399822733c14bbe8601e0a79e90aaedf40964700934293ea04b2eb69b81671a44f89368ccaa2b191505ecfad3043eaa8cbc82c5
 DIST nokogiri-1.5.10-git.tgz 2027539 SHA256 d52f63518be0fcaa4a618308847e57261f1007627ff89d2d02fca1a3f8061ee6 SHA512 3a7523fdaf13a0364fe073d957e887bd82b15556ea4059e7a6820ab7d1fd40f7f5f652f7838707953b4fd25d411ca8c76a378aa92c1eeba9a7035d7fbe21bb43 WHIRLPOOL 4e7bfab43d9b9c3203afe85d791e7b06e87e7406ee9147a2d043f508c9d34774900c88b2070be0c8ad9d4bd1ad0c352255db19ab70928c23ffbf4410989b13d5
 DIST nokogiri-1.6.0-git.tgz 2030137 SHA256 ec1f11c2206167dbbf8556802f070a6fedecf71c4f552bf2db1be7b960ce7fbc SHA512 916247f2a84763c1b402c1c868000ce2d310deb708cdb42beab928edbcd7ab3bb55a641f7bf1ff958046bcdd6b1e6cbef06f9a0a6b90c24bdd2c51649f5ef0f0 WHIRLPOOL 54a8a04ce87c4015642b9e4e7bc7853b46aa679c320db5d5b7cc2c0b20451545162905e21793944f5dc81bc1284572c5db86a3806c983b5e62e67d01003fccfb
 DIST nokogiri-1.6.3.1-git.tgz 2289208 SHA256 a7aac3b6e7781ceaa53497aef429278831f505ca6bc98e0b64958be4c2597bd4 SHA512 e56b2c470343ba829f71f93cf69c99797e16b8d6ea509e4035ac2cdb3d5b6bbfd9abd6bebf7de18152a14250ea5d74725467522ecd45f4a44d98db858ddf7279 WHIRLPOOL bc8a8b04c1fcd6fe57e87a445836ab61696845c2eb2cbeeea556ad49edf9c2cf01123e4dbeb9adf0d14afd79e539961b397ba396227a43302f1a1aaf5da0d2ec
@@ -9,5 +8,5 @@ EBUILD nokogiri-1.6.0.ebuild 3446 SHA256 62e816a2bc5030510e13268177f366f6ec24b2e
 EBUILD nokogiri-1.6.3.1.ebuild 3467 SHA256 025a2a1849446b7ca55ad81f65c3d30dee010d718cb8e283cdfd9b437e0b202d SHA512 c924f7d4fa3af4ab5d1e7b55aea47db3053a767dc43be06f88eb0cc6d396a771509aab0ec83a51981924fe15f2822e93699175465421701517094119963435be WHIRLPOOL 2433a1e32d7ceaad4540c126b10645dd45a7852b1cba3c81436d106c9137aeaea929a4468eed2f9097a5842f66120cb556940eedebf9d05649ee264bf9e6dd81
 EBUILD nokogiri-1.6.4.1.ebuild 2552 SHA256 aa588233076d4f65c8c1959b1fbcc6e0107d0c7808718ec98c48df107548d905 SHA512 56909d9d34e31aea79ef695f50468e3bcb351f7019bd52b922e917a5f11d3972defdc0b826d91527fa22f687db60f2c6aab2d171399cec02c524239b152f58ed WHIRLPOOL c82c9265e39c6f444ab14b00918b1136d1db0180de5b6d1334871cb3dbf9a141e163494664b5e7be7d1ef2fba6ae1de8016b92fe65989cca11df09bcf293a8e4
 EBUILD nokogiri-1.6.4.ebuild 2550 SHA256 009cac9fefdb3766186327f1c243f6a7eb9df4a4527d6b599b61acc28acd0bf4 SHA512 b6ce8f7f1edf6dba02758c414d810b912a394d3296dd9add699db02033e8af001d66c4adc22d515c9ee7fc269dd31cc38c3631b8e6a42cb1e9f02c5d52c65a72 WHIRLPOOL c1b94be37af0f3fcc6b1d665d872ce593a3db6da691da97736f229be34466a65870be660cbf7b81dacf19747bee69634383efaa9537d153ddb993edf702ed0d8
-MISC ChangeLog 15596 SHA256 d091bbc83e5101e2517fa0117f411c22d62daf044aa66c1d932206b6e49dece3 SHA512 f06d2edff0f85df7dd539ed1c9808f5557c70c2701c8aa421c83ad50967ebf47dbcaabb56b7df9807bcd2c9ef892c2aefdac45841cfe8bc27944125a929326ff WHIRLPOOL 9a49a986303a345e8e4aa58f09931e10c4bab21aaa2e6e6945e149bb733e9c413c8f94660436e423508b9885bb810fa9d285056b9a4c5338ffd4b63d59fa02c9
+MISC ChangeLog 15708 SHA256 885f8b2ef1e492f56fb5339cdeb19833c865c1227eb43417535d79decb1019b9 SHA512 fd60d2e0a9322c5b22422e22cc298c75b11b109c646d75c51ce486043e09841950aa3da937d4b9043b36e9a93174d98c6f6ef44f0fb327df3fd8de8e3ade4d91 WHIRLPOOL 88a0ffd677833dd7950f4638aeadd351fca14e6dfb7729baf08fe7118d97dbda4ae890e0b17595a7bedf37c7172028a4a5c4ad61b966e1add06732fc29a6f0ab
 MISC metadata.xml 159 SHA256 abab7965b1f41e0acf6b54c554945c1c9fa35b5afab848d784dc58c298bc4679 SHA512 39d857a527ff3a066b0fa7a6e57f789e60178ca13c5ddaa93802b58ec8d45f47418c2ce85c389e2eed619216aca72d761651efa5a401d84357df9b24b478b3fb WHIRLPOOL ddb2c776f81935d41c9e81592c1ddbabc4f94422f44bab6e312730aa541994234a2405ea5ba2782818404a730be20dc53c9cc205efbf8f0843bd21cf839b0980
diff --git a/dev-ruby/nokogiri/files/nokogiri-1.4.4-libxml-2.7.8.patch b/dev-ruby/nokogiri/files/nokogiri-1.4.4-libxml-2.7.8.patch
deleted file mode 100644
index ba472d30a376..000000000000
--- a/dev-ruby/nokogiri/files/nokogiri-1.4.4-libxml-2.7.8.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit abe249425bef0356f54408b89c9f376c62862e87
-Author: Mike Dalessio <mike@csa.net>
-Date:   Wed Dec 8 10:23:52 2010 -0500
-
-    hey now. this test was failing for LIBXML > 2.7.7. sigh.
-
-diff --git a/test/html/test_element_description.rb b/test/html/test_element_description.rb
-index 2111cde..cfa9ca6 100644
---- a/test/html/test_element_description.rb
-+++ b/test/html/test_element_description.rb
-@@ -56,7 +56,7 @@ module Nokogiri
- 
-       def test_subelements
-         sub_elements = ElementDescription['body'].sub_elements
--        if Nokogiri::LIBXML_VERSION == '2.7.7'
-+        if Nokogiri::LIBXML_VERSION >= '2.7.7'
-           assert_equal 65, sub_elements.length
-         else
-           assert_equal 61, sub_elements.length
diff --git a/dev-ruby/rspec-core/ChangeLog b/dev-ruby/rspec-core/ChangeLog
index 08f164ff8a59..b91b0ea014b5 100644
--- a/dev-ruby/rspec-core/ChangeLog
+++ b/dev-ruby/rspec-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/rspec-core
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/ChangeLog,v 1.81 2014/11/18 11:55:15 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/ChangeLog,v 1.82 2014/11/18 11:57:47 mrueg Exp $
+
+  18 Nov 2014; Manuel Rüger <mrueg@gentoo.org>
+  -files/rspec-core-2.4.0-tests.patch:
+  Cleanup patches.
 
   18 Nov 2014; Manuel Rüger <mrueg@gentoo.org> -rspec-core-2.12.2.ebuild:
   Cleanup old.
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 9c60f4a99fea..e8b22022f981 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,4 +1,3 @@
-AUX rspec-core-2.4.0-tests.patch 1723 SHA256 05accc191c798941e4918701b22ed5defce97460f32da96141ecb67486aee99f SHA512 7974409e1c82d7b94082a0b5cc51cac392c2b465da414efd11b38ab5c85e845d8cb655ca993e4f6f3aae941bdc2ff5ba483742d0c84fe99e72f8a5440cdbd6ee WHIRLPOOL 08d43ae4d917d3166341c6f68909b65a7181c870b13c24a129971a46c91487a9bdc162a5698771ff0e545a24177fa9566e1a0d2110650be79430291d84bdc366
 DIST rspec-core-2.14.8-git.tgz 195949 SHA256 757febdcc4465b62fb41572e1fb7e0deb86f903127cb2941ea65d2c1d4ac29db SHA512 2be487f0a820cb959771b0c2a725aa7a43cd80a76f85ed42f3341420cefa4ba6413b5dbd86e8fba9f5515afef3e895e0f1f2f8239d50f0b764f037d5f0791095 WHIRLPOOL 5b2422d7f1d087caf654ea04d81f269ae90be63eb73135d34691839c27e6dfa152aac425f64a860b3af50ef0bf513ac7f4a68c979c254083f187e57a96c20fe3
 DIST rspec-core-2.99.1-git.tgz 212855 SHA256 998725627c1047010e43bc99863859fcc37c71b832264fa8aa1cfb45f18149c2 SHA512 218dfb42ddb425f49b3f46f892bed0ddf4d873b3e4919348d1f6f0a9fa93e1440ac9505e8b943f43c1a7d83430471ba7a0c5534dca5e22971b510cf4ab5f8292 WHIRLPOOL a23641c73536ad8ea1084d0a41cb3046cdf0df339f2a31ca9140891e074c51b6371e41560e132dd5ba409e325d9810ba09692ed4c7c08724ca1858b52e314881
 DIST rspec-core-2.99.2-git.tgz 212935 SHA256 75794e3f94f3323b1212b93e827d37d6ab2813dea2f5f927929b40e9ee170c43 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44 WHIRLPOOL 5584be2da2310688155c4fe600a4a36f68434440ebc00b063e9fcdcb3188138831a210f482ac86a469984fcf9838d795511ea02433020ecc6bc1d6aacc8c72bd
@@ -6,5 +5,5 @@ EBUILD rspec-core-2.14.8-r1.ebuild 2876 SHA256 dbdb1f3268ce4cf524c2c60199ad99260
 EBUILD rspec-core-2.14.8.ebuild 2546 SHA256 93c37ba4215d2012e2b3713236210db8d651760b8372ed332f2d6217ab930b01 SHA512 c0bc2f59dc7003bfa9457654f9374398add77ba7e9808b1485591bd80a941791cac0fedf640c61bea1db2454b548f90191e1b7793a30af94db0dbf269069446e WHIRLPOOL 96332ae0d915b5460ff37079ba746f1a8aaafc7f76a626fca4072aed67ac5a7993d9555d8d5f14558adfadf0de8cf9f6cc5b2e470321cb8f6bcdac0682addd2d
 EBUILD rspec-core-2.99.1.ebuild 2537 SHA256 e7e5674297d5802e1ea360a585e76ed03f85dadf5a3c864e976d74d3ba0c13cc SHA512 b601813ed1d56534d9ee0a424afc5a79d9cfaa8cde32149b343f27bc00503b694ee0d063ac5b91fed49361abe918db12f12aeb6469bda21a5582aff458e43a74 WHIRLPOOL c06ea5b9185df18fe1e5222ec8a0212b112f8cc9acb445ab9bb730cdc16d6d66f4f345b43957694c929db45ea1bb100a47fede9d19d8b5c8f5cc5db892cf1859
 EBUILD rspec-core-2.99.2.ebuild 2536 SHA256 43fecdf3408db43893701609bcbe1dc8adbb8bd3cee41d4d9115fd5212d9982d SHA512 f5c6276cc84612f32a14b23afc3bf88dd6d0bc26a692de1859c69eebcb4285cf8a296e80cb5d0d30b8d9f58498f861c6dc718e6c814e2f5179c1cbf98257867c WHIRLPOOL f28744a2df69c3a02bbafdb485859c1754e4c9e6f57bc53f1e7937a248ef2e18c44f68e05226f4335823e3023b3cfcc5df662b17d69b70391158223b0b67136a
-MISC ChangeLog 10355 SHA256 e25bf5a2dd5f9def03dd1b41f7b02f84015a4ebee2840f17122e20e6985fc1de SHA512 5cbdd14b68039446c9872c3399098d27ece0a4a3ca8313b5204b5454ed31e7be38ce7267d323e788f0f18ae0e0f4e7d617d11c62d69d2e3214bbf7e0594c4562 WHIRLPOOL 53afd82c40bfe6302abcda9de5fc45f2b828509b5b4cb3edbf2a70cfbda7d647212abd68980f59a2fee828a65d8ecdc5ce9db752cddb8cee263af135169928a1
+MISC ChangeLog 10462 SHA256 cf6dd9a1f59f88f53fafae0a967689bd450dee0fa8f2c8d17095eff7bc501d99 SHA512 ab03861a23a28e3534c5ee234b2659c4ce94f864a77d13fa347372d16b42ed17372eb2e94394b8131d4dbb5377e64e1d972beafd4bfb518338a0b5c6efae104f WHIRLPOOL 1aafd8b39103022921d300103ae6ee91718c5117704ce34e2cadb3495d9368c6706eb6312d75da533350f96013efca6a2f1d1cb3543bdf2bf65e7065b22e2da9
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/rspec-core/files/rspec-core-2.4.0-tests.patch b/dev-ruby/rspec-core/files/rspec-core-2.4.0-tests.patch
deleted file mode 100644
index 157f1f054889..000000000000
--- a/dev-ruby/rspec-core/files/rspec-core-2.4.0-tests.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 22bd1e10147d43c4055cbb1b1f95872b84d88fdf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Wed, 2 Feb 2011 14:53:16 +0100
-Subject: [PATCH] Squashed commit of the following:
-
-commit 23727ceecc0ac619acb31bf5a0c850eb60a443b7
-Author: David Chelimsky <dchelimsky@gmail.com>
-Date:   Sun Jan 16 16:42:48 2011 -0600
-
-    sort rather than match on unsorted content
-
-commit cdb8e160f1659dd148f56e12b5acc174444dda3c
-Author: David Chelimsky <dchelimsky@gmail.com>
-Date:   Sun Jan 16 10:34:01 2011 -0600
-
-    loosen constraint on outcome in example that returns an array
-
-    - Closes #278.
----
- spec/rspec/core/rake_task_spec.rb |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/spec/rspec/core/rake_task_spec.rb b/spec/rspec/core/rake_task_spec.rb
-index 6ba16af..1bdf50a 100644
---- a/spec/rspec/core/rake_task_spec.rb
-+++ b/spec/rspec/core/rake_task_spec.rb
-@@ -144,16 +144,16 @@ module RSpec::Core
-         @task = RakeTask.new do |t|
-           t.pattern = File.join(@tmp_dir, "*spec.rb")
-         end
--        ["first_spec.rb", "second_\"spec.rb", "third_'spec.rb"].each do |file_name|
-+        ["first_spec.rb", "second_\"spec.rb", "third_\'spec.rb"].each do |file_name|
-           FileUtils.touch(File.join(@tmp_dir, file_name))
-         end
-       end
- 
-       it "escapes the quotes" do
--        @task.__send__(:files_to_run).should eq([
-+        @task.__send__(:files_to_run).sort.should eq([
-           File.join(@tmp_dir, "first_spec.rb"),
-           File.join(@tmp_dir, "second_\\\"spec.rb"),
--          File.join(@tmp_dir, "third_\\'spec.rb") 
-+          File.join(@tmp_dir, "third_\\\'spec.rb") 
-         ])
-       end
-     end
--- 
-1.7.4
-
diff --git a/dev-ruby/rspec-mocks/ChangeLog b/dev-ruby/rspec-mocks/ChangeLog
index c314b9ca1662..2d21d2fa7b4a 100644
--- a/dev-ruby/rspec-mocks/ChangeLog
+++ b/dev-ruby/rspec-mocks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/rspec-mocks
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/ChangeLog,v 1.88 2014/11/18 11:54:23 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/ChangeLog,v 1.89 2014/11/18 12:00:00 mrueg Exp $
+
+  18 Nov 2014; Manuel Rüger <mrueg@gentoo.org>
+  -files/rspec-mocks-2.4.0-no-cucumber.patch:
+  Cleanup patches.
 
   18 Nov 2014; Manuel Rüger <mrueg@gentoo.org> -rspec-mocks-2.12.1.ebuild:
   Cleanup old.
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 3747317ab13b..6d96b59bbed5 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -1,8 +1,7 @@
-AUX rspec-mocks-2.4.0-no-cucumber.patch 2769 SHA256 9681154da4940032c3cadf176936d9bd951a474f68fc9010ee67fbc6819b79c0 SHA512 a195649901307acafc57f4236493d01ed9ff976d2d889b03bc677cf13b2e47e903d44293bf3ef1d72d8e916b01ab02d7930b86cd6014e450b3e5b2540000e05c WHIRLPOOL 855afbe4e17d1175da748fa9a5ed1bbf193db8c9dbbd1a8ebc32c172db7f8b8af7a8897bbb26266ae0f0d8d025082a6a71e78bb24917ee90c6253686473de4c5
 DIST rspec-mocks-2.14.6-git.tgz 94286 SHA256 2453766688b33a5cd743f4ebc3ffccd4277e3daca069828c7206bd0f12d5fee4 SHA512 a079c0b860c7ca4b4da366fa131617ddcb636918cd0c065ef3d8d585938228f442bb58ab5fcd2cd84b590bf6ab468d637fa7ab0181864a59c131f0a890e46702 WHIRLPOOL d29599bf4465c38433d7ddf70a12c43a523c289fd9857aadeb41610aef4980d8ea43cd1aef48d3d1d736e67a201bba131ea151a0ecb297e887fac51baf35655b
 DIST rspec-mocks-2.99.2-git.tgz 101731 SHA256 fad961e30ef67e014625fb6b4bb62db0f6f101142a897b4cad31e60f8faf8c57 SHA512 dd3b9394d56de8d3089db7777cda1e1a5bbdc46486876a99a8a83b602b84ba0320913d8e8dabe5e0367645eb01b943607b93e67d87cc26e380c8db6e048e4e0d WHIRLPOOL 06e8c3dd38fa17fbd82c97fe1c19928450234c761185cf636556955df9a081f4685d002a8fe501690c5457c63014ce8a60c5aca32b7c4bc24eb368368e5e33c3
 EBUILD rspec-mocks-2.14.6-r1.ebuild 1223 SHA256 0a1a53e1c0e46d4e80b42c1e8df4098ebc1f3352f716cabd7eb9a3fd8d58d91d SHA512 aef456c4f969d7f85162eeb4ddcb1f690bee51b86d387bae5eee94ea2033894532805f861f1af4e8ef2cffc382eddcf4844e23edd2bc430fdf2a96f9eab89c87 WHIRLPOOL 87cf4d47083e969efe9a524ca696933419d8402814c164e0b09c4c51fc5cd0404d5c1a448dcec1469c13e4daec272f6d0da9bd4659125923aee1152be8cc25e2
 EBUILD rspec-mocks-2.14.6.ebuild 1203 SHA256 1ac85372373ce9740616b587f6b613cbadbd9e394d8b1981cabae847bc2757f1 SHA512 6ff99bb2a801e4125c79dd67e3d7321eba6d178c43b08fbb38116af8f27c487f87fc8edc737482020cc5ee659c40bd7d2d61e937bba31338cb23b032efb68604 WHIRLPOOL 8a8413e1d9295951e099d964e20af67bc2ac3ff789c82c85f449986f18745cdb52a229ffc015c449ae1fcd252e6db3fdd5225cfc199b56fadcca55cd6a374bb8
 EBUILD rspec-mocks-2.99.2.ebuild 1395 SHA256 25be7b835756742424c3961232e25f9b327b7825f4fcd3d483621839ee192734 SHA512 d70fbddc9c33097d12092ec34c7f117ee1c172c7b8be735226fe3f4f75dd835a40194ba1d3bb057bac7db6de685dbf4b08166d94a1cbbc95e1f362f2fc9aff5a WHIRLPOOL 682d79832bf5d7124d2d1e48893ee55e4a98b9dc25b77570270aae54a14964c788b31cd64745425445649fc4b4273b8589f5ccf0f374e0b6ef977cb6e1953e6f
-MISC ChangeLog 11499 SHA256 8b330f483420d13ebfbf52616da1224ab91576bc28f086d096ce25859a5c6d6c SHA512 6efaaf1a624c54c9e2809c1e73de5518fa8a3086eabed50609446c6c9f79adb2f92d7fc0c6d705f07913e88a9d9ed688da463dd8bd2b1bb1d78d947d513bf1dc WHIRLPOOL 0b147069ae5e78fa4b86c987b8cdc8ba2d4437c70cc530a6baddf3bb724dcc05dacc0df5f37d79b8cc791e9ac5b7b352dc553aedd539790c818899f2e1534b0a
+MISC ChangeLog 11613 SHA256 ec05d2ecc639f1645c5c2367774dc8ecb9c26dc617efbb84dda6620e84c4b1ce SHA512 bf6cc8993c6f3665dfd7a9ec3e51e0eeb84c98b4fcef9d8ec155817c4d0e44d5250e4fd74fd4878a291ffdab04fde8b0be4998b47a84946243c768f166ac31d3 WHIRLPOOL 3dbb1f9153b7a87fc7249d1ace2e0a9f16fef899e5c7c5364711ce2d63df62fb46840322aad6cf865745d323b02a984fd9a071490aac12ccc3dce2e0b597c64c
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/rspec-mocks/files/rspec-mocks-2.4.0-no-cucumber.patch b/dev-ruby/rspec-mocks/files/rspec-mocks-2.4.0-no-cucumber.patch
deleted file mode 100644
index be4894ee5894..000000000000
--- a/dev-ruby/rspec-mocks/files/rspec-mocks-2.4.0-no-cucumber.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 3bb79545449eda5361af6b6d1902e70833659445 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Wed, 2 Feb 2011 15:02:26 +0100
-Subject: [PATCH] Don't force cucumber presence on Rakefile.
-
-Only define the cucumber tasks if cucumber is available, allowing for the
-Rakefile to work without Cucumber installed.
----
- Rakefile |   49 +++++++++++++++++++++++++++----------------------
- 1 files changed, 27 insertions(+), 22 deletions(-)
-
-diff --git a/Rakefile b/Rakefile
-index 8171c40..7197927 100644
---- a/Rakefile
-+++ b/Rakefile
-@@ -5,15 +5,6 @@ Bundler::GemHelper.install_tasks
- require 'rake'
- require 'rspec/core/rake_task'
- require 'rspec/mocks/version'
--require 'cucumber/rake/task'
--
--class Cucumber::Rake::Task::ForkedCucumberRunner
--  # When cucumber shells out, we still need it to run in the context of our
--  # bundle.
--  def run
--    sh "bundle exec #{RUBY} " + args.join(" ")
--  end
--end
- 
- task :cleanup_rcov_files do
-   rm_rf 'coverage.data'
-@@ -24,8 +15,6 @@ RSpec::Core::RakeTask.new(:spec) do |t|
-   t.rspec_opts = %w[--color]
- end
- 
--Cucumber::Rake::Task.new(:cucumber)
--
- namespace :spec do
-   desc "Run all examples using rcov"
-   RSpec::Core::RakeTask.new :rcov => :cleanup_rcov_files do |t|
-@@ -35,17 +24,35 @@ namespace :spec do
-   end
- end
- 
--namespace :cucumber do
--  desc "Run cucumber features using rcov"
--  Cucumber::Rake::Task.new :rcov => :cleanup_rcov_files do |t|
--    t.cucumber_opts = %w{--format progress}
--    t.rcov = true
--    t.rcov_opts =  %[-Ilib -Ispec --exclude "gems/*,features"]
--    t.rcov_opts << %[--text-report --sort coverage --aggregate coverage.data]
-+task :default => :spec
-+
-+begin
-+  require 'cucumber/rake/task'
-+
-+  class Cucumber::Rake::Task::ForkedCucumberRunner
-+    # When cucumber shells out, we still need it to run in the context of our
-+    # bundle.
-+    def run
-+      sh "bundle exec #{RUBY} " + args.join(" ")
-+    end
-   end
--end
- 
--task :default => [:spec, :cucumber]
-+  Cucumber::Rake::Task.new(:cucumber)
-+
-+  namespace :cucumber do
-+    desc "Run cucumber features using rcov"
-+    Cucumber::Rake::Task.new :rcov => :cleanup_rcov_files do |t|
-+      t.cucumber_opts = %w{--format progress}
-+      t.rcov = true
-+      t.rcov_opts =  %[-Ilib -Ispec --exclude "gems/*,features"]
-+      t.rcov_opts << %[--text-report --sort coverage --aggregate coverage.data]
-+    end
-+  end
-+
-+  task :default => :cucumber
-+rescue LoadError
-+  $stderr.puts "unable to load cucumber, some tasks unavailable"
-+end
- 
- task :clobber do
-   rm_rf 'pkg'
-@@ -66,5 +73,3 @@ task :relish, :version do |t, args|
-   raise "rake relish[VERSION]" unless args[:version]
-   sh "relish push rspec/rspec-mocks:#{args[:version]}"
- end
--
--task :default => [:spec, :cucumber]
--- 
-1.7.4
-
diff --git a/dev-ruby/ruby-gettext/ChangeLog b/dev-ruby/ruby-gettext/ChangeLog
index 568c9e276b3b..69f60654e87a 100644
--- a/dev-ruby/ruby-gettext/ChangeLog
+++ b/dev-ruby/ruby-gettext/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/ruby-gettext
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gettext/ChangeLog,v 1.150 2014/11/18 11:52:33 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gettext/ChangeLog,v 1.151 2014/11/18 12:00:22 mrueg Exp $
+
+  18 Nov 2014; Manuel Rüger <mrueg@gentoo.org>
+  -files/ruby-gettext-rubygems-load-path.patch:
+  Cleanup patches.
 
   18 Nov 2014; Manuel Rüger <mrueg@gentoo.org> -ruby-gettext-2.3.3.ebuild,
   -ruby-gettext-2.3.8.ebuild, -ruby-gettext-3.1.3.ebuild:
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index 19c86d4aa930..ee599eb9b09a 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1,9 +1,8 @@
-AUX ruby-gettext-rubygems-load-path.patch 655 SHA256 968be86509d4fa9cbaebc2ffc6cbbfd2a4ab3fb6ca54aca084e811bb5fdeaa6e SHA512 c542d7b8390e620a9c2b2233e63e2faf9e5999aa32ddc7f42e4a31910ddaf287feff284d4837f18f8a90e31524226ce66d171e9ef5b9d78080a23f55721899c1 WHIRLPOOL 30b255720c50f221bb096f2eeb212a62a35f6e36e2d199b4f2d44fb2a62c354d5d18f55f42926cf6b2c9634ec7125cb0aac603cea73043fd9812da76b98360a8
 DIST gettext-3.1.1.gem 221184 SHA256 323a1b07db0863e032436f6935a0e63a5ab7475ac8c387d2632065ee7bafc12a SHA512 b59462fd5c75aa64c1671fd54248ff86325be9aa53df2b4e720e663ae04d40febe83205c6ec75f6200dcf75abfdefe23db1effe838dc1149154457acc2fadc05 WHIRLPOOL 445999cff5241654252073b027388b058f272ffbaaa7d844208908996275cc22ed15c7055bd99a89977737192e60af84e0539bd6461b2da748bf97d41d5744f3
 DIST gettext-3.1.2.gem 224768 SHA256 1ed987d0a46448cfc76617b486ad9a991e0d48501855e49eacb781aa531df6eb SHA512 14fbccf1d853bd58ae3ecbda3188294147404fb8473a54caeac505b93ffa25f96098786bd1171449aa1f0f74c4116e93b5d2f7c0705930dd014b210720667479 WHIRLPOOL 5a31bf87b38370276bf4c61886025f8721a7cb297012fbe6d1947abf82d1d35d779838506f5e56adbdda090a0ae20d4e5c74b9c4a08a4c782998d78b3a7c1768
 DIST gettext-3.1.4.gem 270848 SHA256 6bc35f2a7ce237caecc83d43d971536c12e3170ab94d7abb44f8da29e45cd63d SHA512 3f8e8eb27436fdddfcc980bbac0a05ceeb98b67a8b181b184faa928c1d9f96bea71d4128a055659843b04da9fb0407532eac4134ae62b435ddea9719d51af20d WHIRLPOOL 20f65ecb13c4df54e102300fb0558c89cf2a33849e1cc0290c40d16c3aae6d13c6289e667d0deb4844214b4d9320cb24554153a9a2713e8d2d05d3b5ed88e5e6
 EBUILD ruby-gettext-3.1.1.ebuild 1628 SHA256 1b354ff6e8794502e92f2ae90af694c4436336087c3affc242735e309f44c4aa SHA512 1b52efddcd970ba344bd9bb7cfb7fc35b44cd07983cfb4c2254952a01b132bca6f2d14be3f2a095d237de894f4b2a1545c8188341b2beb7a0847bf550df86f84 WHIRLPOOL baa982eab907b0a4c3dcc220a0d04b26a7d79b065f81d09849f9a9bfecc0ec1feaabbf801f3f58e6d0ffa47091c5840bda1aefab49b87c536b42d518244d9094
 EBUILD ruby-gettext-3.1.2.ebuild 1640 SHA256 66dd02c1724aae689ad64378889db2b02182ed8ef529e2cd313789a0da37466a SHA512 7f806e0d129b68ce8d7adb41c64c13889b94413289d12fb564f7fdd120b5a9bd268ae6ed888be367478da807ac61f69d41d58719952b9fc084a57e0f0097b471 WHIRLPOOL 77e006124ebea87c9f29c2454bbd709270372a53a184254b1f7df2703a25625211c06da7f3495c2bc905f3633ce099451803fe5c23b1add1d0a025cfa660893e
 EBUILD ruby-gettext-3.1.4.ebuild 1651 SHA256 57b3af644422e49d9e8c1b3f46a02900471bcd29e129a7f442389dea1d970d03 SHA512 d2f59433d6a7989e328374fdbd7d982c75caf7dcd8350b323294de0c5c33675493854879259e889c432a4facc92536b0a859d65d473865cde4e5d57fbea4b0d6 WHIRLPOOL d812c86d79c3ed183c8bd45e7275397151a84867769aff093ca60eddf4ad067819101da98810025dbfd6517aa1c3103d71ebd082750f0485526e9dc7e788fdb1
-MISC ChangeLog 20335 SHA256 58c1bcfd777fc19621967e122d53592e69eec2e75f08728dbb267f29074e15c3 SHA512 b1aa001c4416e90b2b3ba52d3391a01fc4bf9a7a3f10318e1fa4643cb2a1553c2c5d904c62ff553f76575e0902bf9513160665289ed9165714eb4c51a57fa918 WHIRLPOOL 932b453437feeb533d27251e0db28d67092921ccb6b68f918dcb647e15a13dd3c911c5dc4b19db5b6200beae2c4716c36f84db1887ff519d97c94f5000e78564
+MISC ChangeLog 20451 SHA256 c6a77fe2c31e9aa50f7411fe5a2365f4536386e45ed0b22ecded842f5da49797 SHA512 873009226b97f5a597c83135ef68d607f30bf9a217156b139863c5e3e21b1d5f66a48b47f67162c35b2e14d41564b897ac1d49f7d50c64fa1e0a766820b0f4ff WHIRLPOOL e21ea5d8c8ca472427f10c892ea062d1595c7a3a43447f3acd644c18e3004a1aee999c7ffeba79b334adfc5463d1b0bba9381bf7fe580b487881523e6b8bf77e
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/ruby-gettext/files/ruby-gettext-rubygems-load-path.patch b/dev-ruby/ruby-gettext/files/ruby-gettext-rubygems-load-path.patch
deleted file mode 100644
index 8ee97702e0a1..000000000000
--- a/dev-ruby/ruby-gettext/files/ruby-gettext-rubygems-load-path.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fix compatibility with newer rubygems versions. Patch provided by
-Tomoh K. in bug 391059.
-
---- lib/gettext/runtime/locale_path.rb.orig
-+++ lib/gettext/runtime/locale_path.rb
-@@ -52,7 +52,14 @@
-        
-         load_path = $LOAD_PATH.dup
-         if defined? ::Gem
--          load_path += Gem.all_load_paths
-+          begin
-+            load_path +=Gem::Specification.map{|s|s.gem_dir}
-+          rescue NoMethodError
-+            begin
-+              load_path +=Gem.all_load_paths
-+            rescue NoMethodError
-+            end
-+          end
-         end
-         load_path.map!{|v| v.match(/(.*?)(\/lib)*?$/); $1}
-         load_path.each {|path|
diff --git a/dev-ruby/session/ChangeLog b/dev-ruby/session/ChangeLog
index 4812eab88a66..44b953151bf2 100644
--- a/dev-ruby/session/ChangeLog
+++ b/dev-ruby/session/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/session
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/session/ChangeLog,v 1.49 2014/11/18 11:50:20 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/session/ChangeLog,v 1.50 2014/11/18 11:58:54 mrueg Exp $
+
+  18 Nov 2014; Manuel Rüger <mrueg@gentoo.org> -files/session-2.4.0-jruby.patch:
+  Cleanup patches.
 
   18 Nov 2014; Manuel Rüger <mrueg@gentoo.org> -session-3.1.0-r1.ebuild:
   Cleanup old.
diff --git a/dev-ruby/session/Manifest b/dev-ruby/session/Manifest
index 9a788fdd7ffc..ffa7d12270fe 100644
--- a/dev-ruby/session/Manifest
+++ b/dev-ruby/session/Manifest
@@ -1,8 +1,7 @@
-AUX session-2.4.0-jruby.patch 2184 SHA256 fcd11849744be46bf0c0a88f751bff8f874a2dbb39876a2e67796aff83b0e303 SHA512 9ea67ae24172005dfe83c1a569ada9c554b0f979a88dfee9ac42d41111e3d55603b08c63115c1d85a281716e6b9a7580cf3276e95117671328fab1fb8bc96ca7 WHIRLPOOL 2958d5e32622f0e0ba831eded183a390ecf7fe7e7a79810138dfbf6ac075c9d3808f4f6a9e564a19b1e8318224b6c9016dcb014bb0d46cb3a670d0bf305667b1
 AUX session-3.1.0-jruby.patch 950 SHA256 dabfbff72320eeb75191df06b49010ba3f47120476618238d9e94c2e9058675d SHA512 c2245eceb8895d1c81bcaae71e388a78c1c3ca393ae0085921105bfda4d1a0726f21817177ece289a869ebaf59da1d22ee51c05cbf7ce637b389408844ee724b WHIRLPOOL bc28886bf047a932e434ef5151e26664abd85d4a2c26ffcea26be87bae754b6eccc39d09c417c341663f0d639ddb165223ee6eaa69bd99939f62c1d112354aa6
 DIST session-3.1.2.gem 17920 SHA256 4fd787c21b622e65867082187434e15a4cc5c8a1e895c347242e230655621d9c SHA512 ef0e8aac6776ffec6ead18079148a9ff65f5bd2699344680dec4d1ca1695e6e159d9e8174fabae7d629c5b019d9571d50930fd6af89e1f221d6662b56ae63e16 WHIRLPOOL bb45b43f27beb222d195ad9e9c86421089da2e4e803f5b0f91feca9042ef8b5c727972ed90fb3232231eb96f5f1d61bace30155c38af4ab68281120b78fb79ad
 DIST session-3.2.0.gem 18432 SHA256 e9d97adff2662aef3fb9524b62ac2fd9c09ad48ee01bb9287b77331e1566fb08 SHA512 57c0676fb4a4254e86dbe68e36309c8eb85515dd659de73a87e1ae2e8e5dc7f979192ef665135e75182c26e2a5c847d61daf855639772da7c66af888ed0dc91a WHIRLPOOL d71b084471a57d3401385b2781b547d00ee934a5eca0270bb4ded636683a8f1afb0a271e787d0daecb663241d04b425678f7a54671e2604e2a6ae6bc9525fd9e
 EBUILD session-3.1.2.ebuild 1334 SHA256 66896cfbaaf48c10406d138de2952336b73418df90dc3d208d362d3b6b2caf67 SHA512 57986288161e9c67746e5d91c47838943d3e7e3965cb100b632acaa75292dd2e8e0cdb39484f1d6392af435985628598168174a947c5f153fd7223913cd6c2bc WHIRLPOOL b77b8273ad6f8338c189ac7fbb4af9e8d078e6c8045c6b4d90fc0e9442abf4852a7cd4ed400e67efebf6835452a817f904d8847a2c56b1cf6772a7ad6f082d6b
 EBUILD session-3.2.0.ebuild 1352 SHA256 8555db3d0460ddc36e7a8177cae0416d1f962e40a6d214092da3d064c6c953d9 SHA512 c4fcc9cf7c50a823896d9f5a858afbf5e051c4485145f8039641ec1c297b1eaa998ba246fb6575b75c5bc667dcefb855529c9e8f0c3d42c43e9ee76833215b82 WHIRLPOOL 96c7c1d75b44c40aedcee240f6df84dc5f966f866ea2513d78b192e8aedf0e9aa164b0aef8c630017d598af0d862adf6d55eac9ab4bbab245fa80b79dbaff8e8
-MISC ChangeLog 6164 SHA256 0385dd93715fef4786988c3fd89e36b1f03831f1e37902288fe447f92161b977 SHA512 a2a2c61d242e4921bb2ea592d2d52d553951ce88805b842872597b4f938746c77bf35225cfc18cac6f731c7a5582deea1f084138cb296c2c75b3ac0212758c91 WHIRLPOOL 89d0574438efdd4ad5fe31fcc956e8ff2a4055d4354e944830170e27598d51e8dc62c2c7d539fc55ba7b137f53e22c5c4eb060511ed7d947a5fd49a10a31fa75
+MISC ChangeLog 6266 SHA256 8f3868c829a29da074e8a0636beb898dbb6322a708489ff3c27e326c5c76f0f0 SHA512 d87f5cfad616bfbdc86de36d2d15d865965e25595d1fc3b46294ac612f0e260f4b308ff3cd4afc50c5258e98741b1016ebbdb6720a51c55822606f537b546328 WHIRLPOOL 852aa4ace9b791e04b8e77bf788ab6b4ff709773d1f5b54c52c0724c60295f6184d59dd530baf5a16bb4c477be101028a97ae70e5bfe1f0500115b8ada0b71ab
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/session/files/session-2.4.0-jruby.patch b/dev-ruby/session/files/session-2.4.0-jruby.patch
deleted file mode 100644
index 5827d4e1d08b..000000000000
--- a/dev-ruby/session/files/session-2.4.0-jruby.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 879f701c35699d194890c288a036b0037f6b3424 Mon Sep 17 00:00:00 2001
-From: Charles Oliver Nutter <headius@headius.com>
-Date: Thu, 14 Jan 2010 15:23:57 -0600
-Subject: [PATCH] Modifications to get session tests running green under JRuby.
-
----
- lib/session.rb  |   16 +++++++++++-----
- test/session.rb |    3 +++
- 2 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/lib/session.rb b/lib/session.rb
-index dffa1f3..824c76f 100755
---- a/lib/session.rb
-+++ b/lib/session.rb
-@@ -86,7 +86,9 @@ module Session
-     class << self
-       def default_prog
-         return @default_prog if defined? @default_prog and @default_prog
--        if defined? self::DEFAULT_PROG
-+        # Workaround for http://jira.codehaus.org/browse/JRUBY-4479
-+        if (self::DEFAULT_PROG rescue nil)
-+#        if defined? self::DEFAULT_PROG
-           return @default_prog = self::DEFAULT_PROG 
-         else
-           @default_prog = ENV["SESSION_#{ self }_PROG"]
-@@ -150,10 +152,14 @@ module Session
-       @use_spawn = self.class::use_spawn unless self.class::use_spawn.nil?
-       @use_spawn = getopt('use_spawn', opts) if hasopt('use_spawn', opts)
- 
--      @use_open3 = nil
--      @use_open3 = Session::use_open3 unless Session::use_open3.nil?
--      @use_open3 = self.class::use_open3 unless self.class::use_open3.nil?
--      @use_open3 = getopt('use_open3', opts) if hasopt('use_open3', opts) 
-+      if defined? JRUBY_VERSION
-+        @use_open3 = true
-+      else
-+        @use_open3 = nil
-+        @use_open3 = Session::use_open3 unless Session::use_open3.nil?
-+        @use_open3 = self.class::use_open3 unless self.class::use_open3.nil?
-+        @use_open3 = getopt('use_open3', opts) if hasopt('use_open3', opts)
-+      end
- 
-       @debug = nil
-       @debug = Session::debug unless Session::debug.nil?
-diff --git a/test/session.rb b/test/session.rb
-index 0b0f265..46fe19b 100644
---- a/test/session.rb
-+++ b/test/session.rb
-@@ -17,6 +17,9 @@ Session::debug = true
- class TimeoutError < StandardError; end
- def timeout n
- #{{{
-+  # JRuby does not support fork, so we stub out timeout here
-+  return yield if defined? JRUBY_VERSION
-+
-   ret = nil
-   cid = fork 
-   unless cid
--- 
-1.6.6
-