gentoo resync : 29.12.2022

5 files changed, 63 insertions, 66 deletions

diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index 80f79db7f71e..1fd55a2125db 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,10 +1,8 @@
 AUX 2.3.3-tests.patch 623 BLAKE2B 2f474f0ff9900668576a49beb34e43daaf93bce64f5dbe326b6d7ab7ade35a2be3dd77b384e9ca6f17513d59f886b0286272b2e7903d494cb44a7a9a767c5570 SHA512 4999af720eb5c48fad216c1462af493bbfa83480ada57cc80e6bae109bb1a4f1121cd1a7c5529a33c3baf793a37731489974588f4fb5dc9851ab399120372548
 AUX binwalk-2.2.0-disable-test-coverage.patch 378 BLAKE2B e1da360562eaa99fba1e5d3971fb9c7b2024b46319ec196a1408e8fc2d893e880749619595a884efab293842779b3745d071d5de9a30c0c411278595cefc56cd SHA512 0cac9b0714365196769a4e42e5cfcead7dad318b9bd60a737b6f25e3476d4127070d5ecab1ace155af4f3ba3f6c9a41be811c05c5ddf46390e7d49ca6bada94d
-DIST binwalk-2.2.0.tar.gz 39594514 BLAKE2B 899a919647258759f16c2e59766b0db68d1a78edf0f5c3755c2a987695199a1851deed2820e6323d82d8af85d294a6f1fcafb655e5d2257d49b673ddae49da67 SHA512 5f3ed31c0b5f9ca3057f86e82787a73b06f9f73747b51dd72130a78e4d69cf43a0207bffc495d177e97811de5bf835b3d0507f314b7a0c960eddf6d1efe0f0f9
-DIST binwalk-2.3.1.tar.gz 39603558 BLAKE2B c3de5baaec18242d3db2b9492edadb3607a45fbc1237185223bf7bb04afcf0f8936607f9e0f4a99bd1796f5c7acfaef318855fe2c3ff05ae0676961bf60cc6c9 SHA512 3c9057c6f56d4bb1d604d3a361b0e682622a93d6d36c67a9f831ae7b17139c4684f52e96ce204d1d1256b79c4a3b806e7a78e2069b6c62eec188fa1586839670
+AUX binwalk-2.3.3-syntax-fix.patch 1581 BLAKE2B d60d265cbb54343c08f16a9ea212e938059d2bc9eda43458a95d6255c2ce55f8ba205322e0903c8f910c7e6475df3d8bd4a005b119cff057c6a6109e060d6031 SHA512 0f3e4f4b21e31d79c3a91b436029c4c3261d7abfc823caace0218f19b6ad6c3b02fac9270f21ac37c13aa2e8df46326225b404d1d1c8b45cfc355527598b43e9
 DIST binwalk-2.3.3.tar.gz 39723775 BLAKE2B d29b709dae0ae406e0ef6142e878a2bbbf0ddb3bd8f49d3335dd1e7ab385c331c021489b3d96b3c2364038b870c1aae53c8d82e7a3d9ab1983ff4520e20f6e73 SHA512 d7e8d576cfc92b1488ceda7d4577aeaaefb2a251a5aca0b4a497da0dff7c6e6e862e0a77346593c77fb4e54b7de3d3a0c1c8c9421ecec8f06aabbc4b336920c5
-EBUILD binwalk-2.2.0.ebuild 1102 BLAKE2B c24cbc2f774b5c56bbe5b6cec8f4b0e31a2befd87824586436c9668fa21fb891597aadb84e7c8fb404b72f5ecece719966d7ed3f3f1bf18acb037460e7ff3c3d SHA512 28108b09384d868909f2bd842554f39a34b68af4274dcae3c1dc7dac934ca47231e19dfa765d4180a1c08cbefc66e406045bc6843758a53cac9a3cbaf427887f
-EBUILD binwalk-2.3.1.ebuild 1017 BLAKE2B f7d4cc3be7f3c0831d38cae2886a3b7bdeede846c60ba2708e6b3503802352d9916b5b396eb04e71888221b434854d861d2326fa11cdbb123e7a10de7c22dc8d SHA512 1683871aba7147e332e1681a870a5bb6f02092ef644b256c6bf75128ae235fd849e1d6bf35e64bfe2128013b24e52689d0c0315fb12b856252b8ab10a4e9667c
+EBUILD binwalk-2.3.3-r1.ebuild 1095 BLAKE2B c4330689e1546bbaf48371da6755fb6fedd49af3653f9058ef9a78975bbc63ea012cc9916996bfb116387bc84318007e9494b7bf21feb756597efcc8a5300d52 SHA512 43e7ff4a7d9d5c9a0fc3cef0df387614a79ba6c3c91a023a7ae011fd966653d23dacd5eac2b500b28dbcd1f7c794d967f58f842158e34654d7ebb7167099a3da
 EBUILD binwalk-2.3.3.ebuild 1060 BLAKE2B 0a381ca09d60e4e2e3b24c03c23001c5204afa976bf074ce95a1e61ad23c2c6919a2119fb4522df60b4b95265a1708a77eb4398afbd8ad21a9bb722006de68ee SHA512 57f448934b2cbea2903112c390621308a3ad1de1e2f18a8fdfa8a36ed767fddac0f470bb1bcc402211a6b31a25eff233ba78ed44ccd73bc22fe49f8a45cc7726
-EBUILD binwalk-9999.ebuild 1021 BLAKE2B 2e14fc2b5f02e1ce8c541581d979fa7e6d4adfc34a3bdd0933449b85efcef138be6313cc8a018f05953ab0dc2b36b5e59f76cb411657ce5eb48a31115ef185a8 SHA512 729971c090b72c3308f65c382bd7b6e21069168ae1d1ae8948cfa8294432a9dd65f5dbd063c6474ae828a1acf8952a76520aa1621674b535de453152021189b5
+EBUILD binwalk-9999.ebuild 1018 BLAKE2B 317a40a5ca4b3fe483d3c423b4f803d6921165159436520579872d0a14518921c59afaab658ed53feac34ddd604e4748e3be7405d58a86760951e52f919ed7b9 SHA512 3557d827ca5a58923e810c617e057071c932d0f4ead6724b68053cd7bd461d9e1bf145d39c37caab19cb292ad4c87c8ace62922272d71dac0fe5430abc2afc38
 MISC metadata.xml 911 BLAKE2B 6487e4f869597e44106ca7041da5881e8e9c1e2ee4231dfbe3606bcc51257818da35b77a425a815ae7fbc39b71915985559510331f70b2d8b7162599328977c9 SHA512 49e0ad3a76def389ac5657aec056d48d6534d66376623c9cde4751e7e8d52a15b4edb300f07c507ef9e54b4e84d7ec51f5f205d25440f8b1f562980b797ef255
diff --git a/app-misc/binwalk/binwalk-2.2.0.ebuild b/app-misc/binwalk/binwalk-2.2.0.ebuild
deleted file mode 100644
index 6ddc96152b65..000000000000
--- a/app-misc/binwalk/binwalk-2.2.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ReFirmLabs/binwalk.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/ReFirmLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~x64-macos"
-fi
-
-DESCRIPTION="A tool for identifying files embedded inside firmware images"
-HOMEPAGE="https://github.com/ReFirmLabs/binwalk"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.2.0-disable-test-coverage.patch )
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( API.md INSTALL.md README.md )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "binwalk has many optional dependencies to automatically"
-		elog "extract/decompress data, see INSTALL.md for more details."
-	fi
-}
diff --git a/app-misc/binwalk/binwalk-2.3.1.ebuild b/app-misc/binwalk/binwalk-2.3.3-r1.ebuild
index 8d08a674a9ba..a78f873523be 100644
--- a/app-misc/binwalk/binwalk-2.3.1.ebuild
+++ b/app-misc/binwalk/binwalk-2.3.3-r1.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/ReFirmLabs/binwalk.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ReFirmLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="A tool for identifying files embedded inside firmware images"
@@ -22,9 +22,14 @@ HOMEPAGE="https://github.com/ReFirmLabs/binwalk"
 LICENSE="MIT"
 SLOT="0"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.2.0-disable-test-coverage.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.0-disable-test-coverage.patch
+	"${FILESDIR}"/2.3.3-tests.patch
+	"${FILESDIR}"/${PN}-2.3.3-syntax-fix.patch
 
-distutils_enable_tests --install nose
+)
+
+distutils_enable_tests nose
 
 python_install_all() {
 	local DOCS=( API.md INSTALL.md README.md )
diff --git a/app-misc/binwalk/binwalk-9999.ebuild b/app-misc/binwalk/binwalk-9999.ebuild
index d819647e95dc..7c288ad1f32b 100644
--- a/app-misc/binwalk/binwalk-9999.ebuild
+++ b/app-misc/binwalk/binwalk-9999.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/ReFirmLabs/binwalk.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ReFirmLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="A tool for identifying files embedded inside firmware images"
@@ -22,9 +22,12 @@ HOMEPAGE="https://github.com/ReFirmLabs/binwalk"
 LICENSE="MIT"
 SLOT="0"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.2.0-disable-test-coverage.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.0-disable-test-coverage.patch
 
-distutils_enable_tests --install nose
+)
+
+distutils_enable_tests nose
 
 python_install_all() {
 	local DOCS=( API.md INSTALL.md README.md )
diff --git a/app-misc/binwalk/files/binwalk-2.3.3-syntax-fix.patch b/app-misc/binwalk/files/binwalk-2.3.3-syntax-fix.patch
new file mode 100644
index 000000000000..5edd530b2293
--- /dev/null
+++ b/app-misc/binwalk/files/binwalk-2.3.3-syntax-fix.patch
@@ -0,0 +1,36 @@
+https://github.com/ReFirmLabs/binwalk/pull/585
+
+From bce53d1bb57c2e6dccf718147ebe9472779b7903 Mon Sep 17 00:00:00 2001
+From: Cameron Katri <me@cameronkatri.com>
+Date: Mon, 3 Jan 2022 15:20:39 -0500
+Subject: [PATCH] Fix SyntaxWarning message
+
+/usr/lib/python3/dist-packages/binwalk/modules/extractor.py:969: SyntaxWarning: "is" with a literal. Did you mean "=="?
+  if child_pid is 0:
+/usr/lib/python3/dist-packages/binwalk/modules/extractor.py:984: SyntaxWarning: "is" with a literal. Did you mean "=="?
+  if child_pid is 0:
+--- a/src/binwalk/modules/extractor.py
++++ b/src/binwalk/modules/extractor.py
+@@ -966,7 +966,7 @@ def shell_call(self, command):
+             
+             # Fork a child process
+             child_pid = os.fork()
+-            if child_pid is 0:
++            if child_pid == 0:
+                 # Switch to the run-as user privileges, if one has been set
+                 if self.runas_uid is not None and self.runas_gid is not None:
+                     os.setgid(self.runas_uid)
+@@ -981,10 +981,10 @@ def shell_call(self, command):
+             rval = subprocess.call(shlex.split(command), stdout=tmp, stderr=tmp)
+ 
+         # A true child process should exit with the subprocess exit value
+-        if child_pid is 0:
++        if child_pid == 0:
+             sys.exit(rval)
+         # If no os.fork() happened, just return the subprocess exit value
+-        elif child_pid is None:
++        elif child_pid == None:
+             return rval
+         # Else, os.fork() happened and we're the parent. Wait and return the child's exit value.
+         else:
+