From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 28 Apr 2019 09:54:45 +0100 Subject: gentoo resync : 28.04.2019 --- app-arch/ipkg-utils/Manifest | 3 -- .../files/ipkg-utils-1.7.050831-hashlib.patch | 30 ----------- .../files/ipkg-utils-tar_call_fixes.patch | 28 ---------- .../ipkg-utils/ipkg-utils-1.7.050831-r2.ebuild | 63 ---------------------- 4 files changed, 124 deletions(-) delete mode 100644 app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib.patch delete mode 100644 app-arch/ipkg-utils/files/ipkg-utils-tar_call_fixes.patch delete mode 100644 app-arch/ipkg-utils/ipkg-utils-1.7.050831-r2.ebuild (limited to 'app-arch/ipkg-utils') diff --git a/app-arch/ipkg-utils/Manifest b/app-arch/ipkg-utils/Manifest index 70a5c39bf8bb..14effd0316a9 100644 --- a/app-arch/ipkg-utils/Manifest +++ b/app-arch/ipkg-utils/Manifest @@ -1,7 +1,4 @@ AUX ipkg-utils-1.7.050831-hashlib-r2.patch 534 BLAKE2B d1e1dd0ca3f332f372de1a0e471ac74e7a1eda58527fcb9e34318fd279e809578ad407ab812eb2966033892fb55920b9426e41481db703334b89511602e30e9d SHA512 88a1d2bd32c696953943136d30ab5d4cc8efb280b7c39e142880b05cb6b233d95530331c989e75afad607e3b2d3ee94840ac403e14d97c30865ead63fc098180 -AUX ipkg-utils-1.7.050831-hashlib.patch 614 BLAKE2B 270c85ec7b744510534335d1282f2f843f8e9277348b2638468471f73b1dfc23deb888c89fa50b0b7d4a9ec2f248ba2e96e74768576ec96544bf9d17e9d550c8 SHA512 919773062c52d4f5474d75a0b603d4d20c11936db1c3603695caa3d7d9793715ccca6b90f272bb9cf1ba74052fa160df03cebc7e1d189f20832b482d46891736 -AUX ipkg-utils-tar_call_fixes.patch 1500 BLAKE2B 602c2f2aa68411e966b966490a0c83ff33ae966d6ee44794adaa6d12d77acc2eb6322ef49cd4eaa5bba08e98a609f8aef8c5080ae4c755a5e3adc674f37d51f3 SHA512 8b16b81241e9634696917b9c24dc890e1b03ea37d1130f5894b72d0e475616d6ac9e03cf299243c426651af1b45e29b38ef355905cbfab92c614f32c54964b3f DIST ipkg-utils-050831.tar.gz 29175 BLAKE2B 4f1d4b5efb7f808e6987a7b62f830463e28fca998c49b4d6683a58c2d2225e24820e6f2b47642e5cceafa34e0ab3ff8172267ef734bbbf1c8f94b8777172efc8 SHA512 7375c4815225eb755699954d3005dfa88bc0f0e6c2678b7bad565f63204a32735d483dbef23e7b9b75c5f0428ff04c13744b8a10e68bb69fedb96a59c069e1aa -EBUILD ipkg-utils-1.7.050831-r2.ebuild 1442 BLAKE2B 521b0a10e8412933f157879ac0dd93969c1e7a87be05ce81e0fef28146312267824f1c1f08d20422f8a4e1ac21fbf810f24b6ce0ddbfe11a87dfd102c50f32ab SHA512 a34676119df3073b7f0f3b53d852e7e9404adf99278205d052bc06a72a4f13a3eac95c2fafbd6c97e22f83b3217c7fc8efa3cd95f1fe7e6d64ddca3a28ef223c EBUILD ipkg-utils-1.7.050831-r3.ebuild 1417 BLAKE2B 3982d150af3b1d8aaa8e16f48b46acf2e818d44eefc143504c259db3d745cfb9678ff195548080538a1db910f26cf0660c24878df61f9a9dfa30cfb91b3a830c SHA512 50b8bf15728512dce830c09045543cafa434d39b001f996e57b624a24303225bdc060228b2068e570303f5addef4fcc3fc371340d684f854edec386b09f0254b MISC metadata.xml 440 BLAKE2B f58f839dd54a3d68454f781aa5a2ccc2ec21a0418fa6de240f084568a4d8853ab191e4de2ed5d26761412109dd57564188aadc141f73646ae4ac93d31dad175f SHA512 ba8bf9b429d587c2fad985c311a8107a08d4362c161a72bc1243a8a14ba842d0c7ee7cc08a0278881a9d61a05702e3cf5817db34234e31761ad7e518d74d29de 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 e7cdf2de8c82..000000000000 --- 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 da1e02b4fddb..000000000000 --- 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] diff --git a/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r2.ebuild b/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r2.ebuild deleted file mode 100644 index 4833a4dc6cfc..000000000000 --- a/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 eutils toolchain-funcs versionator - -MY_P="${PN}-$(get_version_component_range 3)" - -DESCRIPTION="Tools for working with the ipkg binary package format" -HOMEPAGE="http://www.openembedded.org/" -SRC_URI="http://handhelds.org/download/packages/ipkg-utils/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86" -IUSE="minimal" - -DEPEND=" - !minimal? ( - app-crypt/gnupg - net-misc/curl - )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - epatch "${FILESDIR}/${PN}-tar_call_fixes.patch" - epatch "${FILESDIR}/${P}-hashlib.patch" - - sed '/python setup.py build/d' -i Makefile - - if use minimal; then - elog "ipkg-upload is not installed when the \`minimal' USE flag is set. If you" - elog "need ipkg-upload then rebuild this package without the \`minimal' USE flag." - fi -} - -src_compile() { - distutils-r1_src_compile - emake CC="$(tc-getCC)" || die "emake failed" -} - -python_install() { - distutils-r1_python_install - - if use minimal; then - rm "${ED}usr/bin/ipkg-upload" \ - "${D}$(python_get_scriptdir)/ipkg-upload" || die - fi -} - -src_install() { - distutils-r1_src_install -} - -pkg_postinst() { - elog "Consider installing sys-apps/fakeroot for use with the ipkg-build command," - elog "that makes it possible to build packages as a normal user." -} -- cgit v1.2.3