[gentoo-commits] repo/gentoo:master commit in: app-misc/binwalk/, app-misc/binwalk/files/

[Tim Harder]

commit:     23687f976a125f9b24231d9d8511843083461612
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 26 05:54:28 2017 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 06:22:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23687f97

app-misc/binwalk: remove old

 app-misc/binwalk/Manifest                          |  1 -
 app-misc/binwalk/binwalk-2.0.1.ebuild              | 42 ---------------
 app-misc/binwalk/files/binwalk-2.0.1-libs.patch    | 14 -----
 .../binwalk/files/binwalk-2.0.1-makefile.patch     | 61 ----------------------
 4 files changed, 118 deletions(-)

diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index b31bff91ce3..546afb57108 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,2 +1 @@
-DIST binwalk-2.0.1.tar.gz 2234469 SHA256 90ee8426d71e91b62dfe4a1446c457bc7835b475b28717859e275a0494403959 SHA512 de223f61a0a212469c21b8e36d02cadc83f1cdb96a0f6114490d15d8dc12c93a86b46ef74379acb96b32b305e75ca66e940d7a18a8dc3b5036ebe8946dcca0f3 WHIRLPOOL c66ea461132417629f59e3f7562330f038263a0d522aca1db1e85f0bad5e9564d8baa27125acfb67404f0ee8045bd8da71faedcf3d2e352303ca8b0295a2767d
 DIST binwalk-2.1.1.tar.gz 263977 SHA256 1b70a5b03489d29f60fef18008a2164974234874faab48a4f47ec53d461d284a SHA512 373e276a4d6ec845952f1091f85f953d3b0d52d561d9b74a54000ebdef85d13cafc997a4f8f76f25842db8b76fdcd1e602d4d81792a3ea01c9dea6c6ed5c2168 WHIRLPOOL 3cb8faedd02c6a4859467c285efe00e73ea3e52c48ce2b55e0344853e8a5b7884f9d15eb502ab16bba7262e38dfdb0cbcfadc7d3af4015e4357d9d2d248e6113

diff --git a/app-misc/binwalk/binwalk-2.0.1.ebuild b/app-misc/binwalk/binwalk-2.0.1.ebuild
deleted file mode 100644
index ac89f6c5272..00000000000
--- a/app-misc/binwalk/binwalk-2.0.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool for identifying files embedded inside firmware images"
-HOMEPAGE="https://github.com/devttys0/binwalk"
-SRC_URI="https://github.com/devttys0/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="graph"
-
-RDEPEND="
-	app-crypt/ssdeep
-	sys-apps/file[${PYTHON_USEDEP}]
-	graph? ( dev-python/pyqtgraph[opengl,${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-makefile.patch
-	"${FILESDIR}"/${P}-libs.patch
-)
-
-python_configure_all() {
-	econf --disable-bundles
-}
-
-python_compile_all() {
-	emake
-}
-
-python_install_all() {
-	local DOCS=( API.md INSTALL.md )
-	distutils-r1_python_install_all
-
-	dolib.so src/C/*/*.so
-}

diff --git a/app-misc/binwalk/files/binwalk-2.0.1-libs.patch b/app-misc/binwalk/files/binwalk-2.0.1-libs.patch
deleted file mode 100644
index 5a746a4176f..00000000000
--- a/app-misc/binwalk/files/binwalk-2.0.1-libs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Don't install C libs by default since we don't need to install them for
-every python version since they aren't linked with libpython.
-
---- binwalk-2.0.1/setup.py
-+++ binwalk-2.0.1/setup.py
-@@ -134,7 +134,7 @@
- 
- # The data files to install along with the module
- data_dirs = ["magic", "config", "plugins", "modules", "core"]
--install_data_files = [os.path.join("libs", "*.so")]
-+install_data_files = []
- 
- for data_dir in data_dirs:
-     install_data_files.append("%s%s*" % (data_dir, os.path.sep))

diff --git a/app-misc/binwalk/files/binwalk-2.0.1-makefile.patch b/app-misc/binwalk/files/binwalk-2.0.1-makefile.patch
deleted file mode 100644
index e70f096ea6b..00000000000
--- a/app-misc/binwalk/files/binwalk-2.0.1-makefile.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Don't build python via the makefile and fix parallel make jobs.
-
---- binwalk-2.0.1/Makefile.in
-+++ binwalk-2.0.1/Makefile.in
-@@ -33,21 +33,20 @@
- 	$(PYTHON) ./setup.py install $(PREFIX)
- 
- build:
--	if [ "$(BUILD_C_LIBS)" -eq "1" ]; then make -C $(SRC_C_DIR); fi
--	if [ "$(BUILD_BUNDLES)" -eq "1" ]; then make -C $(SRC_BUNDLES_DIR); fi
--	$(PYTHON) ./setup.py build
-+	if [ "$(BUILD_C_LIBS)" -eq "1" ]; then $(MAKE) -C $(SRC_C_DIR); fi
-+	if [ "$(BUILD_BUNDLES)" -eq "1" ]; then $(MAKE) -C $(SRC_BUNDLES_DIR); fi
- 
- deps:
- 	./deps.sh
- 
- clean:
--	if [ "$(BUILD_C_LIBS)" -eq "1" ]; then make -C $(SRC_C_DIR) clean; fi
--	if [ "$(BUILD_BUNDLES)" -eq "1" ]; then make -C $(SRC_BUNDLES_DIR) clean; fi
-+	if [ "$(BUILD_C_LIBS)" -eq "1" ]; then $(MAKE) -C $(SRC_C_DIR) clean; fi
-+	if [ "$(BUILD_BUNDLES)" -eq "1" ]; then $(MAKE) -C $(SRC_BUNDLES_DIR) clean; fi
- 	$(PYTHON) ./setup.py clean
- 
- distclean: clean
--	if [ "$(BUILD_C_LIBS)" -eq "1" ]; then make -C $(SRC_C_DIR) distclean; fi
--	if [ "$(BUILD_BUNDLES)" -eq "1" ]; then make -C $(SRC_BUNDLES_DIR) distclean; fi
-+	if [ "$(BUILD_C_LIBS)" -eq "1" ]; then $(MAKE) -C $(SRC_C_DIR) distclean; fi
-+	if [ "$(BUILD_BUNDLES)" -eq "1" ]; then $(MAKE) -C $(SRC_BUNDLES_DIR) distclean; fi
- 	rm -rf Makefile config.* *.cache
- 
- uninstall:
---- binwalk-2.0.1/src/C/Makefile
-+++ binwalk-2.0.1/src/C/Makefile
-@@ -3,9 +3,9 @@
- .PHONY: all clean_libs clean distclean
- 
- all:
--	make -C miniz
-+	$(MAKE) -C miniz
- 	cp miniz/*.$(SOEXT) $(LIB_DIR)
--	make -C compress
-+	$(MAKE) -C compress
- 	cp compress/*.$(SOEXT) $(LIB_DIR)
- 
- clean_libs:
-@@ -13,10 +13,10 @@
- 	rm -f $(LIB_DIR)/libcompress42.$(SOEXT)
- 
- clean: clean_libs
--	make -C miniz clean
--	make -C compress clean
-+	$(MAKE) -C miniz clean
-+	$(MAKE) -C compress clean
- 
- distclean: clean_libs
--	make -C miniz distclean
--	make -C compress distclean
-+	$(MAKE) -C miniz distclean
-+	$(MAKE) -C compress distclean
-