Cleanup unused patches.

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

3 files changed, 6 insertions, 180 deletions

diff --git a/dev-ruby/ruby-net-ldap/ChangeLog b/dev-ruby/ruby-net-ldap/ChangeLog
index c442b9940c95..dddea945a7eb 100644
--- a/dev-ruby/ruby-net-ldap/ChangeLog
+++ b/dev-ruby/ruby-net-ldap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/ruby-net-ldap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-net-ldap/ChangeLog,v 1.19 2014/11/05 07:00:16 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-net-ldap/ChangeLog,v 1.20 2014/11/18 13:50:28 mrueg Exp $
+
+  18 Nov 2014; Manuel Rüger <mrueg@gentoo.org>
+  -files/ruby-net-ldap-0.6.1-fix-test.patch:
+  Cleanup unused patches.
 
   05 Nov 2014; Hans de Graaff <graaff@gentoo.org> -ruby-net-ldap-0.6.1.ebuild,
   -ruby-net-ldap-0.6.1-r1.ebuild:
diff --git a/dev-ruby/ruby-net-ldap/Manifest b/dev-ruby/ruby-net-ldap/Manifest
index 4ba68619cc4d..f7f8bb03745a 100644
--- a/dev-ruby/ruby-net-ldap/Manifest
+++ b/dev-ruby/ruby-net-ldap/Manifest
@@ -1,17 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX ruby-net-ldap-0.6.1-fix-test.patch 7099 SHA256 8ab3e538d107ac88ae6d1f47fdb0161e032b12c39052220baa8f5466021348bc SHA512 13bcc0b6b172d70e58647a2bfd3bc08d883ae69e3fb53e0a8cdc2e300190cafb6337456b6ed93db45c6d8eda7462adfea9e61d13699d1152ca3a571517944b4a WHIRLPOOL 9db6c7e6d77d6561b860fd8e60d4be6ebbe30b7380b34398982614113e648baaf5c16918645ead9ac647919209473d5e62b31c03e28bc7bf3f824d45370908bb
 DIST net-ldap-0.7.0.gem 70656 SHA256 d39d341c992abb7273d8b83cbe32a38e69fdeb4eab684dbd2db1232e4065a4b4 SHA512 71000b05bcf7db8a3c40f6311e16385f2569df12c5b193c454dc2ebd043af0183d650626d8805c0e58e59aa842091da1fba37e35cdb58789279ef5b93ad13e7f WHIRLPOOL 6fbbe9a6ffe1832db61d2eb5cacba4675be9cf9bb7dc9d7102e3c04f244dc7572e2a19d96c62b5e6c77b64467d6efe0e76ad9fcc74837b2404387f2ea8c5ea94
 DIST net-ldap-0.8.0.gem 72704 SHA256 e1b7f21b58a4c2ff6f2c3361f584342017f46d4a965f377f192b4cd8855b0242 SHA512 3083a9bb61a048213d524d9795ac61b38d07abd4788b5504b9d642062f9fcf947120c98e10a76d8e3be0dc91b680bae50b056bd9fcd75cdb4a1af2e907953cf9 WHIRLPOOL e6767bc2985faa6262743d9a6273abe2d693c4d12b21fb5dcc256a49634b059fc2bf831a21ce37128158ff18045e8630790eea2bbda8106dca262b392533ddfa
 EBUILD ruby-net-ldap-0.7.0.ebuild 1002 SHA256 d1abd978f714ba8920fd9cc205af84310ae84ce7fb8e8d9eddc43a3fcc9075fa SHA512 05e5a06477340b662a9101dfcbebc893b0b64f1d7fe16b1835e45b96ef6bd119cd6f34f059baf951801f2fb56ede421bb78d2e9981c9af1d9e694ef6a0f5db5a WHIRLPOOL 575e140311b4d84fc5796967557008e426241a7f8c48c2caf4f411f2be3d9e13490fcedf2288f2e067323c9eaf8b763fc179fea24a5d5467698f2121879043bf
 EBUILD ruby-net-ldap-0.8.0.ebuild 1098 SHA256 e842d4c5202d491930f8b6e5111313e2a75274b0b19250885cd802884f0ef8e1 SHA512 40817ac8d85cc15331b6da07364615aa24ce86f71e4766fbbcb4a459760c6718338483f5ac1443ffa8faf391c451cbe268b9bd933dcc91b2cce78e2847475471 WHIRLPOOL 35d75a3a3a59060c0f01554bd7b6c3c50630c2a291125cad57bb0256837de6ec839366f0d2f38330df6a00f56f86a50d0bc7080c9107eeb55ca9ee688cb9a42a
-MISC ChangeLog 2964 SHA256 407142c2217103a3a57f02712c78797f4ec466128fdbac56868521f34b28b576 SHA512 6be1b8380f53e67b31b3f41a648e5759dfd44a1d13362d6a14a8f2c9556bf442979050f968821940c6abf34172e3968f7a1a4148cea512cc3657b0a8ed943ab5 WHIRLPOOL 8ee1955e8b80383d3e5186849a157acbeaa60d7d75f88c1e61618fc6346e97b289c4c74b8e4b8484a03bc13f4f8a92a71407103687e0ba78e1614170a8b13ece
+MISC ChangeLog 3083 SHA256 8bc03068f77df19897114b7bbd713ad11f7f66d2f7ce68a6b70eb6f36dd946a3 SHA512 a6bfa8a4f1d94f1d066a6c5acc3c0c81716487e990a2a97f59971dac8ead8f34d98819fb5e87a5c0cf2af835e79c73ea5639cdb78524db1f358772e8169660b3 WHIRLPOOL f8126f602b7be76d58330181effd5cf1a12cea098a9ce65bada7bcc33186e3f177474cd6625cc18b1784466551dfdc92993ed6ee9abcee6b4b303229a353088b
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iF4EAREIAAYFAlRZywgACgkQiIP6VqMIqNegcwD/eGcmspC+CqqhEqus2mf6460P
-Ni8EQx8zkZAGuTjTbD0A/jRgyNL9ItoxmMeRkn80uI3LdpTw/ljs3H4hPqNXyGrt
-=ehRe
------END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby-net-ldap/files/ruby-net-ldap-0.6.1-fix-test.patch b/dev-ruby/ruby-net-ldap/files/ruby-net-ldap-0.6.1-fix-test.patch
deleted file mode 100644
index e44ee4c721c1..000000000000
--- a/dev-ruby/ruby-net-ldap/files/ruby-net-ldap-0.6.1-fix-test.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From 0c439a94a2e67136f43a16fba34695120997b49e Mon Sep 17 00:00:00 2001
-From: Shaun Mangelsdorf <s.mangelsdorf@gmail.com>
-Date: Fri, 4 Apr 2014 16:56:40 +1000
-Subject: [PATCH] Add raw_string helper in tests, to repair encoding issues
-
-Strings with raw byte sequences misbehave in Ruby 2.0+ because the
-default encoding for string literals is now UTF-8. The String#b method
-resolves this, and was not previously available.
----
- spec/spec_helper.rb                   |  5 +++++
- spec/unit/ber/ber_spec.rb             | 42 +++++++++++++++++------------------
- spec/unit/ber/core_ext/string_spec.rb |  4 ++--
- spec/unit/ldap/filter_spec.rb         |  4 ++--
- test/test_snmp.rb                     | 11 ++++++---
- 5 files changed, 38 insertions(+), 28 deletions(-)
-
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 5079537..a585398 100644
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -2,4 +2,9 @@
- 
- RSpec.configure do |config|
-   config.mock_with :flexmock
-+
-+  def raw_string(s)
-+    # Conveniently, String#b only needs to be called when it exists
-+    s.respond_to?(:b) ? s.b : s
-+  end
- end
-diff --git a/spec/unit/ber/ber_spec.rb b/spec/unit/ber/ber_spec.rb
-index 48e161a..9806cc8 100644
---- a/spec/unit/ber/ber_spec.rb
-+++ b/spec/unit/ber/ber_spec.rb
-@@ -33,28 +33,28 @@
-   context "numbers" do
-     # Sample based
-     {
--      0           => "\x02\x01\x00", 
--      1           => "\x02\x01\x01", 
--      127         => "\x02\x01\x7F", 
--      128         => "\x02\x01\x80", 
--      255         => "\x02\x01\xFF", 
--      256         => "\x02\x02\x01\x00", 
--      65535       => "\x02\x02\xFF\xFF", 
--      65536       => "\x02\x03\x01\x00\x00", 
--      16_777_215  => "\x02\x03\xFF\xFF\xFF", 
--      0x01000000  => "\x02\x04\x01\x00\x00\x00", 
--      0x3FFFFFFF  => "\x02\x04\x3F\xFF\xFF\xFF", 
--      0x4FFFFFFF  => "\x02\x04\x4F\xFF\xFF\xFF", 
--      
-+      0           => raw_string("\x02\x01\x00"),
-+      1           => raw_string("\x02\x01\x01"),
-+      127         => raw_string("\x02\x01\x7F"),
-+      128         => raw_string("\x02\x01\x80"),
-+      255         => raw_string("\x02\x01\xFF"),
-+      256         => raw_string("\x02\x02\x01\x00"),
-+      65535       => raw_string("\x02\x02\xFF\xFF"),
-+      65536       => raw_string("\x02\x03\x01\x00\x00"),
-+      16_777_215  => raw_string("\x02\x03\xFF\xFF\xFF"),
-+      0x01000000  => raw_string("\x02\x04\x01\x00\x00\x00"),
-+      0x3FFFFFFF  => raw_string("\x02\x04\x3F\xFF\xFF\xFF"),
-+      0x4FFFFFFF  => raw_string("\x02\x04\x4F\xFF\xFF\xFF"),
-+
-       # Some odd samples...
--      5           => "\002\001\005", 
--      500         => "\002\002\001\364", 
--      50_000      => "\x02\x02\xC3P", 
--      5_000_000_000  => "\002\005\001*\005\362\000"
--    }.each do |number, expected_encoding| 
-+      5           => raw_string("\002\001\005"),
-+      500         => raw_string("\002\002\001\364"),
-+      50_000      => raw_string("\x02\x02\xC3P"),
-+      5_000_000_000  => raw_string("\002\005\001*\005\362\000")
-+    }.each do |number, expected_encoding|
-       it "should encode #{number} as #{expected_encoding.inspect}" do
-         number.to_ber.should == expected_encoding
--      end 
-+      end
-     end
- 
-     # Round-trip encoding: This is mostly to be sure to cover Bignums well.
-@@ -79,7 +79,7 @@
-     context "strings" do
-       it "should properly encode UTF-8 strings" do
-         "\u00e5".force_encoding("UTF-8").to_ber.should ==
--          "\x04\x02\xC3\xA5"
-+          raw_string("\x04\x02\xC3\xA5")
-       end
-       it "should properly encode strings encodable as UTF-8" do
-         "teststring".encode("US-ASCII").to_ber.should == "\x04\nteststring"
-@@ -87,7 +87,7 @@
- 			it "should properly encode binary data strings using to_ber_bin" do
- 				# This is used for searching for GUIDs in Active Directory
- 				["6a31b4a12aa27a41aca9603f27dd5116"].pack("H*").to_ber_bin.should == 
--					"\x04\x10" + "j1\xB4\xA1*\xA2zA\xAC\xA9`?'\xDDQ\x16"
-+					raw_string("\x04\x10" + "j1\xB4\xA1*\xA2zA\xAC\xA9`?'\xDDQ\x16")
- 			end
-       it "should not fail on strings that can not be converted to UTF-8" do
-         error = Encoding::UndefinedConversionError
-diff --git a/spec/unit/ber/core_ext/string_spec.rb b/spec/unit/ber/core_ext/string_spec.rb
-index 6eebe05..ef2c498 100644
---- a/spec/unit/ber/core_ext/string_spec.rb
-+++ b/spec/unit/ber/core_ext/string_spec.rb
-@@ -6,7 +6,7 @@
-     context "when passed an ldap bind request and some extra data" do
-       attr_reader :str, :result
-       before(:each) do
--        @str = "0$\002\001\001`\037\002\001\003\004\rAdministrator\200\vad_is_bogus UNCONSUMED" 
-+        @str = raw_string("0$\002\001\001`\037\002\001\003\004\rAdministrator\200\vad_is_bogus UNCONSUMED")
-         @result = str.read_ber!(Net::LDAP::AsnSyntax)
-       end
-       
-@@ -22,7 +22,7 @@
-         before(:each) do
-           stub_exception_class = Class.new(StandardError)
-           
--          @initial_value = "0$\002\001\001`\037\002\001\003\004\rAdministrator\200\vad_is_bogus" 
-+          @initial_value = raw_string("0$\002\001\001`\037\002\001\003\004\rAdministrator\200\vad_is_bogus")
-           @str = initial_value.dup 
- 
-           # Defines a string
-diff --git a/spec/unit/ldap/filter_spec.rb b/spec/unit/ldap/filter_spec.rb
-index 5e4cb8a..06fd3b8 100644
---- a/spec/unit/ldap/filter_spec.rb
-+++ b/spec/unit/ldap/filter_spec.rb
-@@ -83,12 +83,12 @@ def eq(attribute, value)
-   end
- 
-   context 'with a well-known BER string' do
--    ber = "\xa4\x2d" \
-+    ber = raw_string("\xa4\x2d" \
-       "\x04\x0b" "objectclass" \
-       "\x30\x1e" \
-       "\x80\x08" "foo" "*\\" "bar" \
-       "\x81\x08" "foo" "*\\" "bar" \
--      "\x82\x08" "foo" "*\\" "bar"
-+      "\x82\x08" "foo" "*\\" "bar")
- 
-     describe "<- .to_ber" do
-       [
-diff --git a/test/test_snmp.rb b/test/test_snmp.rb
-index 88a619d..065025e 100644
---- a/test/test_snmp.rb
-+++ b/test/test_snmp.rb
-@@ -4,10 +4,15 @@
- require 'net/snmp'
- 
- class TestSnmp < Test::Unit::TestCase
--  SnmpGetRequest = "0'\002\001\000\004\006public\240\032\002\002?*\002\001\000\002\001\0000\0160\f\006\b+\006\001\002\001\001\001\000\005\000"
--  SnmpGetResponse = "0+\002\001\000\004\006public\242\036\002\002'\017\002\001\000\002\001\0000\0220\020\006\b+\006\001\002\001\001\001\000\004\004test"
-+  def self.raw_string(s)
-+    # Conveniently, String#b only needs to be called when it exists
-+    s.respond_to?(:b) ? s.b : s
-+  end
-+
-+  SnmpGetRequest = raw_string("0'\002\001\000\004\006public\240\032\002\002?*\002\001\000\002\001\0000\0160\f\006\b+\006\001\002\001\001\001\000\005\000")
-+  SnmpGetResponse = raw_string("0+\002\001\000\004\006public\242\036\002\002'\017\002\001\000\002\001\0000\0220\020\006\b+\006\001\002\001\001\001\000\004\004test")
- 
--  SnmpGetRequestXXX = "0'\002\001\000\004\006xxxxxx\240\032\002\002?*\002\001\000\002\001\0000\0160\f\006\b+\006\001\002\001\001\001\000\005\000"
-+  SnmpGetRequestXXX = raw_string("0'\002\001\000\004\006xxxxxx\240\032\002\002?*\002\001\000\002\001\0000\0160\f\006\b+\006\001\002\001\001\001\000\005\000")
- 
-   def test_invalid_packet
-     data = "xxxx"
--- 
-1.9.3
-