5 files changed, 3 insertions, 116 deletions
diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index d803937b5e48..06a40e900ec8 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,8 +1,5 @@
-AUX 0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch 2295 BLAKE2B 42ceab5a3b276d9bb0206fc71a4d95e93a1ea8b93e623c7bdac3f846d957586b7522bc6b4a36d24ef182a8fc8623665b17abe0a8ebd529f12d55dd34b200786f SHA512 ad0a89521948ea381fef71c53f2a85e692ac46666fd93a18955f568fca583f5b5685a024152cd774a33df30e9b965513a57139d43db8357836e145d22710c006
 AUX binwalk-2.2.0-disable-test-coverage.patch 378 BLAKE2B e1da360562eaa99fba1e5d3971fb9c7b2024b46319ec196a1408e8fc2d893e880749619595a884efab293842779b3745d071d5de9a30c0c411278595cefc56cd SHA512 0cac9b0714365196769a4e42e5cfcead7dad318b9bd60a737b6f25e3476d4127070d5ecab1ace155af4f3ba3f6c9a41be811c05c5ddf46390e7d49ca6bada94d
-DIST binwalk-2.1.1.tar.gz 263977 BLAKE2B 8fd5f20dcdb22a6528131fbebc1454cc496079bfeafa63ddb0679c7c7b5d5c29d81dccd4f52e8f6f7d8881d9e672d691c2b2ef367f2bf3180ffbb4ad22dca021 SHA512 373e276a4d6ec845952f1091f85f953d3b0d52d561d9b74a54000ebdef85d13cafc997a4f8f76f25842db8b76fdcd1e602d4d81792a3ea01c9dea6c6ed5c2168
 DIST binwalk-2.2.0.tar.gz 39594514 BLAKE2B 899a919647258759f16c2e59766b0db68d1a78edf0f5c3755c2a987695199a1851deed2820e6323d82d8af85d294a6f1fcafb655e5d2257d49b673ddae49da67 SHA512 5f3ed31c0b5f9ca3057f86e82787a73b06f9f73747b51dd72130a78e4d69cf43a0207bffc495d177e97811de5bf835b3d0507f314b7a0c960eddf6d1efe0f0f9
-EBUILD binwalk-2.1.1.ebuild 1019 BLAKE2B fa9d822762dcabdda9ec271a7b040f546e6f85aada1ac743117a36236a513a0882e46c85fb0a79b5b1dae044ff4121ccfd07749d00ca0f93fcfc6cf935beecbc SHA512 62f213c19d46e87edc08f5e2814ca920751205e3c2a5f53ea47968e734ab9db7670ebeb2d390ec698c89112007f02831c32d0665fdaed59821751b098241f252
-EBUILD binwalk-2.2.0.ebuild 1057 BLAKE2B a84a9a5644597b76a8dc65eb59820a622fcb5dff0f7208d5478c8c929fa00cad33e66465d742817a6eeb01a7e5baf4fadbf59c82972bbc655d5c5a86c9daa6e5 SHA512 5b61d02913d0c83bf2b251d9c702975d81290129f3e948f4a994ca47049a6a15d8c31fa8bb552c180082430f40898fc15c77f1077ea8737a28078bfba6bb328b
+EBUILD binwalk-2.2.0.ebuild 1056 BLAKE2B 83b30456d4444816fe357d8997a3bdfb2f635515c0654f67bcaf7bc4d0308e436e23cde886b035cbb0a02d728b7bfa9201049d9336e1b80f5f2a73fbf949b397 SHA512 b031563d255a21e6eeef2d766495677e76bfe953c3303476b7ce635138189f08a627a36802e584ac1d096ad0ffa4066874ecf72c60213da2fe9ec5f0d205f5c3
 EBUILD binwalk-9999.ebuild 1059 BLAKE2B 6396a80d093b73c5fb6d853bd224a45ed059e672bb93e572396e9f657ef3443a50773a36a2ec612b004a34f50abe65548ab3f451c0167fda0d9d381201d0600e SHA512 d98ef1db2e644f31b2ab4a6879b1de928c347cb4ff2d10565fb8f3ebb263fd106b76b6476f386c663b538aac12181109eef7f345d9e39b01817702a7a79264a0
-MISC metadata.xml 998 BLAKE2B 619184d84a2afb44abb2d51f7504e0d6b5c6907930469078a4eccabae4219b2e99bdbcec2347e55732691fcd8c84cc455f6de594f70cb3364c07d988b95d7a9c SHA512 0afb8270a8f36361743b74008e7add19efcf793742595dfab580adb9cbbaa39ba15c427ab91e8e6179df7ebb60a6261bde9e4d8f1f1448e50025b18dd2e361f8
+MISC metadata.xml 910 BLAKE2B 2be4408e8546fec32d55527a3cda95fe5d2dba9a08db3700155b317a6a3c634d20ab9862e0459efc0a0bc4563a026b600d50d6a058bbb404c8edee83b73e3e84 SHA512 b080a492253731e1048dc6e263b257b601a6e20851e1399ae6e95b8794433ae7b8fd304f00d276582b2b1fd6ff605b45d3c370130293bc3488d57d557f2aad9a
diff --git a/app-misc/binwalk/binwalk-2.1.1.ebuild b/app-misc/binwalk/binwalk-2.1.1.ebuild
deleted file mode 100644
index c69739d3e4da..000000000000
--- a/app-misc/binwalk/binwalk-2.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-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 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="graph"
-
-RDEPEND="
-	graph? ( dev-python/pyqtgraph[opengl,${PYTHON_USEDEP}] )
-"
-
-PATCHES=( "${FILESDIR}"/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch )
-
-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.2.0.ebuild b/app-misc/binwalk/binwalk-2.2.0.ebuild
index cb74823a4db2..a235696e14ba 100644
--- a/app-misc/binwalk/binwalk-2.2.0.ebuild
+++ b/app-misc/binwalk/binwalk-2.2.0.ebuild
@@ -11,7 +11,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 ppc64 x86 ~x64-macos"
 fi
 
 DESCRIPTION="A tool for identifying files embedded inside firmware images"
diff --git a/app-misc/binwalk/files/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch b/app-misc/binwalk/files/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch
deleted file mode 100644
index 708498060bc7..000000000000
--- a/app-misc/binwalk/files/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 95bce4edcc6e92c9517b80ccb1fb956f591e0738 Mon Sep 17 00:00:00 2001
-From: Craig Heffner <heffnercj@gmail.com>
-Date: Tue, 5 Jan 2016 13:28:24 -0500
-Subject: [PATCH] Added check for backports.lzma when importing lzma module
-
----
- src/binwalk/modules/compression.py | 5 ++++-
- src/binwalk/plugins/lzmaextract.py | 6 +++++-
- src/binwalk/plugins/lzmavalid.py   | 5 ++++-
- 3 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/src/binwalk/modules/compression.py b/src/binwalk/modules/compression.py
-index 97ca68d..e919f7e 100644
---- a/src/binwalk/modules/compression.py
-+++ b/src/binwalk/modules/compression.py
-@@ -2,11 +2,14 @@
- 
- import os
- import zlib
--import lzma
- import struct
- import binwalk.core.compat
- import binwalk.core.common
- from binwalk.core.module import Option, Kwarg, Module
-+try:
-+    import lzma
-+except ImportError:
-+    from backports import lzma
- 
- class LZMAHeader(object):
-     def __init__(self, **kwargs):
-diff --git a/src/binwalk/plugins/lzmaextract.py b/src/binwalk/plugins/lzmaextract.py
-index 137b4cc..93f6240 100755
---- a/src/binwalk/plugins/lzmaextract.py
-+++ b/src/binwalk/plugins/lzmaextract.py
-@@ -12,7 +12,11 @@ class LZMAExtractPlugin(binwalk.core.plugin.Plugin):
-             # lzma package in Python 2.0 decompress() does not handle multiple
-             # compressed streams, only first stream is extracted.
-             # backports.lzma package could be used to keep consistent behaviour.
--            import lzma
-+            try:
-+                import lzma
-+            except ImportError:
-+                from backports import lzma
-+
-             self.decompressor = lzma.decompress
- 
-             # If the extractor is enabled for the module we're currently loaded
-diff --git a/src/binwalk/plugins/lzmavalid.py b/src/binwalk/plugins/lzmavalid.py
-index a343656..62e15b9 100644
---- a/src/binwalk/plugins/lzmavalid.py
-+++ b/src/binwalk/plugins/lzmavalid.py
-@@ -17,7 +17,10 @@ class LZMAPlugin(binwalk.core.plugin.Plugin):
- 
-     def init(self):
-         try:
--            import lzma
-+            try:
-+                import lzma
-+            except ImportError:
-+                from backports import lzma
-             self.decompressor = lzma.decompress
-         except ImportError as e:
-             self.decompressor = None
--- 
-2.12.2
-
diff --git a/app-misc/binwalk/metadata.xml b/app-misc/binwalk/metadata.xml
index 12e5ca8a3e8a..6064ade4c2bd 100644
--- a/app-misc/binwalk/metadata.xml
+++ b/app-misc/binwalk/metadata.xml
@@ -18,7 +18,4 @@
 	<upstream>
 		<remote-id type="github">ReFirmLabs/binwalk</remote-id>
 	</upstream>
-	<use>
-		<flag name="graph">Enable support for generating entropy graphs</flag>
-	</use>
 </pkgmetadata>