gentoo resync : 26.11.2017

3 files changed, 98 insertions, 7 deletions

diff --git a/app-arch/ipkg-utils/Manifest b/app-arch/ipkg-utils/Manifest
index d0c1a786c046..5c79c8c7894f 100644
--- a/app-arch/ipkg-utils/Manifest
+++ b/app-arch/ipkg-utils/Manifest
@@ -1,7 +1,7 @@
-AUX ipkg-utils-1.7.050831-hashlib.patch 614 SHA256 1f4dc0c84d080b3c89fbd956eb1d5e1fc7db2b1fd7ead0e237b8a7858fcfb35c SHA512 919773062c52d4f5474d75a0b603d4d20c11936db1c3603695caa3d7d9793715ccca6b90f272bb9cf1ba74052fa160df03cebc7e1d189f20832b482d46891736 WHIRLPOOL 72898b07d0073c917fc83e5c1b90df7affc4880246e21727e70d572551fb250ea020de25de4a97cfa99ed79b97b49d707883af5299bf4fc71e8daf04c70960f6
-AUX ipkg-utils-tar_call_fixes.patch 1500 SHA256 b0183d519f886056d7f79b65182aaed557d5e86e8f5d7a3911235e661d40e79d SHA512 8b16b81241e9634696917b9c24dc890e1b03ea37d1130f5894b72d0e475616d6ac9e03cf299243c426651af1b45e29b38ef355905cbfab92c614f32c54964b3f WHIRLPOOL 3486a7cdcbcd5d4fb045230ef141ee4ca34c0ceef094eb6256f64781a1134590af9c5318f2de41397df38b65708f3bdf55c9d20d9ecb2b319ca168680a8c9e38
-DIST ipkg-utils-050831.tar.gz 29175 SHA256 1dde1111fbca85977855db9acb557097a32a5133d8764a05ea36a89a1205394b SHA512 7375c4815225eb755699954d3005dfa88bc0f0e6c2678b7bad565f63204a32735d483dbef23e7b9b75c5f0428ff04c13744b8a10e68bb69fedb96a59c069e1aa WHIRLPOOL 7bd8b42aad219862c0211006954e027dd5b933fe13953932fa767f9fb35745d715c982f93c7ea636be23c5a27d7a460c2fc636963724e06547a4f093594355c1
-EBUILD ipkg-utils-1.7.050831-r2.ebuild 1442 SHA256 10ed2643e68ba4443126073f8d91c8aa9c859e0ee1f5bb62ad849b2dff089980 SHA512 a34676119df3073b7f0f3b53d852e7e9404adf99278205d052bc06a72a4f13a3eac95c2fafbd6c97e22f83b3217c7fc8efa3cd95f1fe7e6d64ddca3a28ef223c WHIRLPOOL 6383adb38e04d872de5fb29d7fda0bcd937089adffdffba36c128594c6b21c23b534374d1d3b2ee019e9a7c4087a487c1991003e8716c29a6a1ffa1db33da6f8
-MISC ChangeLog 3043 SHA256 7809d1b3caf833b6ee9cfb9341a0c23b8393c96bc152c3385b99d526bc4142c1 SHA512 e2ef3c49fed25c662b41f75a7c37e729d47d4bc945689b880efc86cb804cab5dea8b10324ea73f49b5ffdc45999ebd405adb3b57dbc6ddde2a5fcf06450212de WHIRLPOOL 83d363042b0ecffeddc571ced9a8a1ede4032d91adb1c3c9542bfc27db974610e4f809f4a5e6bf394f5d454e107757391f9800afdcc7b478763864a3f2161f16
-MISC ChangeLog-2015 3093 SHA256 afe61f9256371b2dbcec1f28a4a17c28f4a6bf8ab2b15014f270e9c5ad52ec66 SHA512 cdb14f96f835db26fe22c7eda8dc1e60949afdc8e162dcb89789a785c156eec47109f17c8a068067a71a34daa7ce7b46cea2cb3c3eb2965f8a8049e215c2aaa4 WHIRLPOOL 82e6d54c68a02b679b33f45d2d3e71b3ffd5460f99bb9af0efbe2306c9706415df9166730b2018c8fe42aa10ac32be4ea0aa6bca2f2a0e9e8a63d3057d960474
-MISC metadata.xml 517 SHA256 50b63f64073b8c832729db381d60fd25363bb27d16056f2cf99b14b0e021c18e SHA512 afb20c89d817a0f8c27d022b6f5fc810f9747ca270d81cd9ce396a41d9edcff09ebe1cb987371f441b1666576f13dd9734030c96627fff5fe2bb8366fb48c4ba WHIRLPOOL 5d935585d182370757aed15259ac880f52b9f1c8bbedb4620159bd5226d2b9a11d4b523b988c9d7e98b78533d6b73c2ab8d61583a80316ce9c4ec49d26ce467f
+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 517 BLAKE2B 0da60b3eca9e4258d8937133ab96c711b891748d5e29761723ea93850e28cb9e175081b94d2ebd56d0bae99d1412cff9beea40aff57a4bd060c5f82f2d6aa5b1 SHA512 afb20c89d817a0f8c27d022b6f5fc810f9747ca270d81cd9ce396a41d9edcff09ebe1cb987371f441b1666576f13dd9734030c96627fff5fe2bb8366fb48c4ba
diff --git a/app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib-r2.patch b/app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib-r2.patch
new file mode 100644
index 000000000000..3cdd35bd81c6
--- /dev/null
+++ b/app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib-r2.patch
@@ -0,0 +1,25 @@
+diff --git i/ipkg.py w/ipkg.py
+index 02aab22..145686c 100644
+--- i/ipkg.py
++++ w/ipkg.py
+@@ -36,10 +36,10 @@ import tempfile
+ import os
+ import sys
+ import glob
+-import md5
+ import re
+ import string
+ import commands
++from hashlib import md5
+ from stat import ST_SIZE
+ 
+ class Version:
+@@ -136,7 +136,7 @@ class Package:
+ 
+             # 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/ipkg-utils-1.7.050831-r3.ebuild b/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r3.ebuild
new file mode 100644
index 000000000000..649d7001ed2d
--- /dev/null
+++ b/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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}"
+
+PATCHES=("${FILESDIR}/${P}-hashlib-r2.patch")
+
+src_prepare() {
+	default
+
+	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)"
+}
+
+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
+
+	dobin ipkg-compare-versions
+}
+
+pkg_postinst() {
+	elog "Consider installing sys-apps/fakeroot for use with the ipkg-build "
+	elog "command, that makes it possible to build packages as a normal user."
+}