Cleanup patches.

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

3 files changed, 6 insertions, 249 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