From: Hans de Graaff <graaff@gentoo.org>
Date: Sat, 20 Aug 2011 08:14:30 +0000 (+0000)
Subject: Remove unused patch.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1ef4e79753f2b77a5b960fdfe83c888f77848cbd;p=gentoo.git

Remove unused patch.

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

diff --git a/dev-ruby/bundler/ChangeLog b/dev-ruby/bundler/ChangeLog
index a4d5f47fc66f..2eef288dd2ba 100644
--- a/dev-ruby/bundler/ChangeLog
+++ b/dev-ruby/bundler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/bundler
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/ChangeLog,v 1.25 2011/08/10 04:51:41 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/ChangeLog,v 1.26 2011/08/20 08:14:30 graaff Exp $
+
+  20 Aug 2011; Hans de Graaff <graaff@gentoo.org>
+  -files/bundler-0.9.26-gentoo.patch:
+  Remove unused patch.
 
 *bundler-1.0.17 (10 Aug 2011)
 
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index b56920e123cd..13ae6b008896 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -1,18 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX bundler-0.9.26-gentoo.patch 2227 RMD160 d3df1628921499a9237d66afbfb83dc35e1c63a6 SHA1 bf61fe9ef235dd9c054dd50b9d7586a8ed254453 SHA256 cfeb392734886cf8325b3bb73e644f6bd2f44703d05debe87e805a8fa5861cba
 AUX bundler-1.0.3-gentoo.patch 604 RMD160 3f673efb4913679a0f925f2d446de246e0b6b3ea SHA1 9edbc0f114120577785f4f13ce2f827df81edc6d SHA256 a21e789e1c8268673aaab471567b83e187475fd23a2303756488b75d2f3df9a0
 DIST bundler-1.0.15.gem 164864 RMD160 f1eecbcfa34053dfd2df40cc64ff47023b0fa2df SHA1 a82410b2c06732aaa7bb66c84533500d472649a5 SHA256 37f36b76cb19463738616f098c53610f654b0b246c8b72b3f9694cb28013d11f
 DIST bundler-1.0.17.gem 175104 RMD160 85695544c986b502faad8400d061a7debce3a72e SHA1 8e19ec7fb7723d086534901a02be7b7cc1fb2ea7 SHA256 c2351609c768eb981fbb748eddd3e7d1b9ab01e150941430f366f741a327ccb0
 EBUILD bundler-1.0.15.ebuild 1442 RMD160 50b435982ecb9a9a0a661e0e7bfc5d1812c3f26e SHA1 4c5c51378e119baccd828bde21473b08250826c7 SHA256 da72e49796f7b6312a0647780f89a114e97478794c655f2c1fa9eeeae9b3378d
 EBUILD bundler-1.0.17.ebuild 1441 RMD160 4faa838dcf34b93a37e90c3e0b08c484448eb914 SHA1 690f3162bb04d97f025604ce74f599672fccbd71 SHA256 beff08b6dd51ce06a293486097f9777d8e6630808171be39a8d155701d2fea20
-MISC ChangeLog 3654 RMD160 58e4c74daa34681da9806b8e805f500467349a20 SHA1 8a960a2a577137bbebcaed65e872235766aef325 SHA256 e4a94769f66fce8247f065c76ae2ad7fb1af4fc245fbc06859ea5e89201384e5
+MISC ChangeLog 3766 RMD160 aef46cf9ae773b7f50ffb6233333dce4ae3529fb SHA1 28db40f0ef4d285c6b05fb7799cbc4577e5f4086 SHA256 24982e972cc6fc7cecc94b20fa027c5e7d68c28b461863fcdf0a495443c631bd
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5CDmoACgkQiIP6VqMIqNe5WAD/XDM4nFCqHnzxoNRikRqEG1Ri
-b68HL+sAOj9PdoZkJBcA/jeSePkl+sESQ3sn9CwjpMscQzmpQEG1eCfWv0PcpCv4
-=eUEA
+iF4EAREIAAYFAk5PbPMACgkQiIP6VqMIqNdKFwD/Vq4wGShsR+y4vJLhysp96YdN
+ZanzfQFycmEli/N/hcEA/RQat+y6rik97z2K7IoRC0IfHbMqXuIqJ+46uSYPg3P4
+=9hkO
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/bundler/files/bundler-0.9.26-gentoo.patch b/dev-ruby/bundler/files/bundler-0.9.26-gentoo.patch
deleted file mode 100644
index 19d9568e9f04..000000000000
--- a/dev-ruby/bundler/files/bundler-0.9.26-gentoo.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/bin/bundle b/bin/bundle
-index d2e5081..17db3f0 100755
---- a/bin/bundle
-+++ b/bin/bundle
-@@ -1,9 +1,14 @@
- #!/usr/bin/env ruby
- 
- # Check if an older version of bundler is installed
-+mybasedir = __FILE__.gsub(/\/bin\/bundle/, '')
-+
- require 'bundler'
- $:.each do |path|
--  if path =~ %r'/bundler-0.(\d+)' && $1.to_i < 9
-+  # ignore the directory we're running from, in the tests
-+  path = path.gsub(%r"^#{mybasedir}", '')
-+
-+  if path =~ %r'/bundler-0\.(\d+)' && $1.to_i < 9
-     abort "Please remove older versions of bundler. This can be done by running `gem cleanup bundler`."
-   end
- end
-diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb
-index bf74a60..c800827 100644
---- a/lib/bundler/rubygems_ext.rb
-+++ b/lib/bundler/rubygems_ext.rb
-@@ -26,7 +26,7 @@ module Gem
-     def git_version
-       if @loaded_from && File.exist?(File.join(full_gem_path, ".git"))
-         sha = Dir.chdir(full_gem_path){ `git rev-parse HEAD`.strip }
--        branch = full_gem_path.split("-")[3]
-+        branch = full_gem_path.match(/gems\/.*/).to_s.split("-")[3]
-         (branch && branch != sha) ? " #{branch}-#{sha[0...6]}" : " #{sha[0...6]}"
-       end
-     end
-diff --git a/spec/install/git_spec.rb b/spec/install/git_spec.rb
-index a732caa..4c1fc1a 100644
---- a/spec/install/git_spec.rb
-+++ b/spec/install/git_spec.rb
-@@ -301,7 +301,7 @@ describe "bundle install with git sources" do
-     should_be_installed "forced 1.1"
- 
-     Dir.chdir(lib_path('forced-1.0')) do
--      `git reset --hard head^`
-+      `git reset --hard HEAD^`
-     end
-     bundle :install
-     should_be_installed "forced 1.0"
-diff --git a/spec/runtime/environment_rb_spec.rb b/spec/runtime/environment_rb_spec.rb
-index 73a388c..34417dc 100644
---- a/spec/runtime/environment_rb_spec.rb
-+++ b/spec/runtime/environment_rb_spec.rb
-@@ -204,6 +204,11 @@ describe "environment.rb file" do
-     end
- 
-     it "warns you if it's from an old bundler but read-only" do
-+      if Process.euid == 0
-+        pending "this test cannot succeed as root"
-+        return
-+      end
-+
-       env_file(env_file.read.gsub("by Bundler #{Bundler::VERSION}", "by Bundler 0.9.0"))
-       FileUtils.chmod 0444, env_file
-       ruby <<-R, :expect_err => true