| 1 |
commit: aee6ed936a917bd06758bb51d0e76e94eaa2da50 |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Aug 7 15:56:34 2017 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 9 06:21:15 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aee6ed93 |
| 7 |
|
| 8 |
dev-ruby/archive-tar-minitar: remove unused patches. |
| 9 |
|
| 10 |
.../files/archive-tar-minitar-0.5.2-gentoo.patch | 20 ---------- |
| 11 |
.../files/archive-tar-minitar-0.5.3-pipes.patch | 44 ---------------------- |
| 12 |
2 files changed, 64 deletions(-) |
| 13 |
|
| 14 |
diff --git a/dev-ruby/archive-tar-minitar/files/archive-tar-minitar-0.5.2-gentoo.patch b/dev-ruby/archive-tar-minitar/files/archive-tar-minitar-0.5.2-gentoo.patch |
| 15 |
deleted file mode 100644 |
| 16 |
index 789637c68b9..00000000000 |
| 17 |
--- a/dev-ruby/archive-tar-minitar/files/archive-tar-minitar-0.5.2-gentoo.patch |
| 18 |
+++ /dev/null |
| 19 |
@@ -1,20 +0,0 @@ |
| 20 |
-Index: archive-tar-minitar-0.5.2/bin/minitar |
| 21 |
-=================================================================== |
| 22 |
---- archive-tar-minitar-0.5.2.orig/bin/minitar |
| 23 |
-+++ archive-tar-minitar-0.5.2/bin/minitar |
| 24 |
-@@ -12,15 +12,6 @@ |
| 25 |
- # $Id$ |
| 26 |
- #++ |
| 27 |
- |
| 28 |
-- # 1) Try to load Archive::Tar::Minitar from the gem. |
| 29 |
-- # 2) Try to load Archive::Tar::Minitar from $LOAD_PATH. |
| 30 |
--begin |
| 31 |
-- require 'rubygems' |
| 32 |
-- require_gem 'archive-tar-minitar', '= 0.5.2' |
| 33 |
--rescue LoadError |
| 34 |
-- nil |
| 35 |
--end |
| 36 |
-- |
| 37 |
- require 'archive/tar/minitar' |
| 38 |
- require 'archive/tar/minitar/command' |
| 39 |
- |
| 40 |
|
| 41 |
diff --git a/dev-ruby/archive-tar-minitar/files/archive-tar-minitar-0.5.3-pipes.patch b/dev-ruby/archive-tar-minitar/files/archive-tar-minitar-0.5.3-pipes.patch |
| 42 |
deleted file mode 100644 |
| 43 |
index 27b626869f4..00000000000 |
| 44 |
--- a/dev-ruby/archive-tar-minitar/files/archive-tar-minitar-0.5.3-pipes.patch |
| 45 |
+++ /dev/null |
| 46 |
@@ -1,44 +0,0 @@ |
| 47 |
-Index: minitar-0.5.3/lib/archive/tar/minitar.rb |
| 48 |
-=================================================================== |
| 49 |
---- minitar-0.5.3.orig/lib/archive/tar/minitar.rb |
| 50 |
-+++ minitar-0.5.3/lib/archive/tar/minitar.rb |
| 51 |
-@@ -486,7 +486,11 @@ module Archive::Tar::Minitar |
| 52 |
- @devminor = header.devminor |
| 53 |
- @prefix = header.prefix |
| 54 |
- @read = 0 |
| 55 |
-- @orig_pos = @io.pos |
| 56 |
-+ begin |
| 57 |
-+ @orig_pos = @io.pos |
| 58 |
-+ rescue Errno::ESPIPE |
| 59 |
-+ @orig_pos = 0 |
| 60 |
-+ end |
| 61 |
- end |
| 62 |
- |
| 63 |
- # Reads +len+ bytes (or all remaining data) from the entry. Returns |
| 64 |
-@@ -585,7 +589,11 @@ module Archive::Tar::Minitar |
| 65 |
- # Creates and returns a new Reader object. |
| 66 |
- def initialize(anIO) |
| 67 |
- @io = anIO |
| 68 |
-- @init_pos = anIO.pos |
| 69 |
-+ begin |
| 70 |
-+ @init_pos = @io.pos |
| 71 |
-+ rescue Errno::ESPIPE |
| 72 |
-+ @init_pos = 0 |
| 73 |
-+ end |
| 74 |
- end |
| 75 |
- |
| 76 |
- # Iterates through each entry in the data stream. |
| 77 |
-@@ -621,10 +629,10 @@ module Archive::Tar::Minitar |
| 78 |
- |
| 79 |
- skip = (512 - (size % 512)) % 512 |
| 80 |
- |
| 81 |
-- if @io.respond_to?(:seek) |
| 82 |
-- # avoid reading... |
| 83 |
-+ begin |
| 84 |
-+ # avoid reading... |
| 85 |
- @io.seek(size - entry.bytes_read, IO::SEEK_CUR) |
| 86 |
-- else |
| 87 |
-+ rescue Errno::ESPIPE, NoMethodError |
| 88 |
- pending = size - entry.bytes_read |
| 89 |
- while pending > 0 |
| 90 |
- bread = @io.read([pending, 4096].min).size |
Archives