gentoo resync : 27.03.2021

3 files changed, 46 insertions, 11 deletions

diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index db0e462cdee2..ac3eb6ee99e4 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,5 +1,7 @@
 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.0.tar.gz 39603727 BLAKE2B abdb9909cf92a6cb35035c98467162dab2b009f5eab4bf255bba14ce82c2748cbd648977a54f276f2c141897b4e7a592d0adbde77a3c0f4164b04b7c328bc7e5 SHA512 74c25858eccaeff1bbf238cdff92df4cbec37dfff77204739bd82c35e4fd2329a8d0b13850b8b05900f756a99b898ebbbfb8ac44a26f37ca3ffb16c72402f9d6
 EBUILD binwalk-2.2.0.ebuild 1102 BLAKE2B c24cbc2f774b5c56bbe5b6cec8f4b0e31a2befd87824586436c9668fa21fb891597aadb84e7c8fb404b72f5ecece719966d7ed3f3f1bf18acb037460e7ff3c3d SHA512 28108b09384d868909f2bd842554f39a34b68af4274dcae3c1dc7dac934ca47231e19dfa765d4180a1c08cbefc66e406045bc6843758a53cac9a3cbaf427887f
-EBUILD binwalk-9999.ebuild 1089 BLAKE2B 9749014009bb0d2089dedb95f67fa594c299db27a79f917c8c974842f2a3d7dc7137aaaba48493423d250a5ddc75277836436f64d980e933283c51ab25cf0cb8 SHA512 25017f7e1bb1c6f0609312fa06953e16ab9b936b0a5cebb4029f57b1a884faf502a5e985384e7d71742fc2df60c37a4c270bb63bf8ced47bdebd1125bab6d34a
+EBUILD binwalk-2.3.0.ebuild 1021 BLAKE2B 2e14fc2b5f02e1ce8c541581d979fa7e6d4adfc34a3bdd0933449b85efcef138be6313cc8a018f05953ab0dc2b36b5e59f76cb411657ce5eb48a31115ef185a8 SHA512 729971c090b72c3308f65c382bd7b6e21069168ae1d1ae8948cfa8294432a9dd65f5dbd063c6474ae828a1acf8952a76520aa1621674b535de453152021189b5
+EBUILD binwalk-9999.ebuild 1021 BLAKE2B 2e14fc2b5f02e1ce8c541581d979fa7e6d4adfc34a3bdd0933449b85efcef138be6313cc8a018f05953ab0dc2b36b5e59f76cb411657ce5eb48a31115ef185a8 SHA512 729971c090b72c3308f65c382bd7b6e21069168ae1d1ae8948cfa8294432a9dd65f5dbd063c6474ae828a1acf8952a76520aa1621674b535de453152021189b5
 MISC metadata.xml 910 BLAKE2B 2be4408e8546fec32d55527a3cda95fe5d2dba9a08db3700155b317a6a3c634d20ab9862e0459efc0a0bc4563a026b600d50d6a058bbb404c8edee83b73e3e84 SHA512 b080a492253731e1048dc6e263b257b601a6e20851e1399ae6e95b8794433ae7b8fd304f00d276582b2b1fd6ff605b45d3c370130293bc3488d57d557f2aad9a
diff --git a/app-misc/binwalk/binwalk-2.3.0.ebuild b/app-misc/binwalk/binwalk-2.3.0.ebuild
new file mode 100644
index 000000000000..d819647e95dc
--- /dev/null
+++ b/app-misc/binwalk/binwalk-2.3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+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"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.2.0-disable-test-coverage.patch )
+
+distutils_enable_tests --install nose
+
+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-9999.ebuild b/app-misc/binwalk/binwalk-9999.ebuild
index 9aae5e3d511f..d819647e95dc 100644
--- a/app-misc/binwalk/binwalk-9999.ebuild
+++ b/app-misc/binwalk/binwalk-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_USE_SETUPTOOLS=bdepend
 PYTHON_COMPAT=( python3_{7..9} pypy3 )
 
 inherit distutils-r1
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ReFirmLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="A tool for identifying files embedded inside firmware images"
@@ -21,16 +21,10 @@ 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
-}
+distutils_enable_tests --install nose
 
 python_install_all() {
 	local DOCS=( API.md INSTALL.md README.md )