commit: aee6ed936a917bd06758bb51d0e76e94eaa2da50 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Mon Aug 7 15:56:34 2017 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Wed Aug 9 06:21:15 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aee6ed93
dev-ruby/archive-tar-minitar: remove unused patches. .../files/archive-tar-minitar-0.5.2-gentoo.patch | 20 ---------- .../files/archive-tar-minitar-0.5.3-pipes.patch | 44 ---------------------- 2 files changed, 64 deletions(-) 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 deleted file mode 100644 index 789637c68b9..00000000000 --- a/dev-ruby/archive-tar-minitar/files/archive-tar-minitar-0.5.2-gentoo.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: archive-tar-minitar-0.5.2/bin/minitar -=================================================================== ---- archive-tar-minitar-0.5.2.orig/bin/minitar -+++ archive-tar-minitar-0.5.2/bin/minitar -@@ -12,15 +12,6 @@ - # $Id$ - #++ - -- # 1) Try to load Archive::Tar::Minitar from the gem. -- # 2) Try to load Archive::Tar::Minitar from $LOAD_PATH. --begin -- require 'rubygems' -- require_gem 'archive-tar-minitar', '= 0.5.2' --rescue LoadError -- nil --end -- - require 'archive/tar/minitar' - require 'archive/tar/minitar/command' - 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 deleted file mode 100644 index 27b626869f4..00000000000 --- a/dev-ruby/archive-tar-minitar/files/archive-tar-minitar-0.5.3-pipes.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: minitar-0.5.3/lib/archive/tar/minitar.rb -=================================================================== ---- minitar-0.5.3.orig/lib/archive/tar/minitar.rb -+++ minitar-0.5.3/lib/archive/tar/minitar.rb -@@ -486,7 +486,11 @@ module Archive::Tar::Minitar - @devminor = header.devminor - @prefix = header.prefix - @read = 0 -- @orig_pos = @io.pos -+ begin -+ @orig_pos = @io.pos -+ rescue Errno::ESPIPE -+ @orig_pos = 0 -+ end - end - - # Reads +len+ bytes (or all remaining data) from the entry. Returns -@@ -585,7 +589,11 @@ module Archive::Tar::Minitar - # Creates and returns a new Reader object. - def initialize(anIO) - @io = anIO -- @init_pos = anIO.pos -+ begin -+ @init_pos = @io.pos -+ rescue Errno::ESPIPE -+ @init_pos = 0 -+ end - end - - # Iterates through each entry in the data stream. -@@ -621,10 +629,10 @@ module Archive::Tar::Minitar - - skip = (512 - (size % 512)) % 512 - -- if @io.respond_to?(:seek) -- # avoid reading... -+ begin -+ # avoid reading... - @io.seek(size - entry.bytes_read, IO::SEEK_CUR) -- else -+ rescue Errno::ESPIPE, NoMethodError - pending = size - entry.bytes_read - while pending > 0 - bread = @io.read([pending, 4096].min).size
