[gentoo-commits] repo/gentoo:master commit in: app-arch/ipkg-utils/files/

[gentoo-commits] repo/gentoo:master commit in: app-arch/ipkg-utils/files/

[Aaron Bauman]

commit:     e0b80da48818b78ea4a1d056ec3083e3bf53b503
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Apr 24 17:27:49 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 03:33:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0b80da4

app-arch/ipkg-utils: remove unused patches

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11813
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../files/ipkg-utils-1.7.050831-hashlib.patch      | 30 ----------------------
 .../files/ipkg-utils-tar_call_fixes.patch          | 28 --------------------
 2 files changed, 58 deletions(-)

diff --git a/app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib.patch b/app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib.patch
deleted file mode 100644
index e7cdf2de8c8..00000000000
--- a/app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- ipkg.py
-+++ ipkg.py
-@@ -36,12 +36,17 @@
- import os
- import sys
- import glob
--import md5
- import re
- import string
- import commands
- from stat import ST_SIZE
- 
-+try:
-+    from hashlib import md5
-+except ImportError:
-+    import md5
-+    md5 = md5.new
-+
- class Version:
-     """A class for holding parsed package version information."""
-     def __init__(self, epoch, version):
-@@ -136,7 +141,7 @@
- 
-             # compute the MD5.
-             f = open(fn, "r")
--            sum = md5.new()
-+            sum = md5()
-             while 1:
-                 data = f.read(1024)
-                 if not data: break

diff --git a/app-arch/ipkg-utils/files/ipkg-utils-tar_call_fixes.patch b/app-arch/ipkg-utils/files/ipkg-utils-tar_call_fixes.patch
deleted file mode 100644
index da1e02b4fdd..00000000000
--- a/app-arch/ipkg-utils/files/ipkg-utils-tar_call_fixes.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: ipkg-utils-050831/ipkg.py
-===================================================================
---- ipkg-utils-050831/ipkg.py	{cset c946c633-8984-433c-8beb-a6cf3926b0af}
-+++ ipkg-utils-050831/ipkg.py	{local clone}
-@@ -152,9 +152,9 @@ class Package:
-             self.filename = os.path.basename(fn)
- 	    ## sys.stderr.write("  extracting control.tar.gz from %s\n"% (fn,)) 
-             if self.isdeb:
--                control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - '*control'","r")
-+                control = os.popen("ar p "+fn+" control.tar.gz | gtar xfzO - --wildcards '*control'","r")
-             else:
--                control = os.popen("tar xfzO "+fn+" '*control.tar.gz' | tar xfzO - '*control'","r")
-+                control = os.popen("gtar xfzO "+fn+" --wildcards '*control.tar.gz' | gtar xfzO - --wildcards '*control'","r")
-             line = control.readline()
-             while 1:
-                 if not line: break
-@@ -181,7 +181,7 @@ class Package:
-             if self.isdeb:
-                 data = os.popen("ar p "+fn+" data.tar.gz | tar tfz -","r")
-             else:
--                data = os.popen("tar xfzO "+fn+" '*data.tar.gz' | tar tfz -","r")
-+                data = os.popen("gtar xfzO "+fn+" --wildcards '*data.tar.gz' | gtar tfz -","r")
-             while 1:
-                 line = data.readline()
-                 if not line: break
-# Checksums: MD5
-# 3b32292e44cc49af1d6c599fd8a44fb8  ipkg.py
-# a103926695d45fe3c6d08a841ed6cd99  ipkg.py [diff]