Remove old.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

4 files changed, 5 insertions, 98 deletions

diff --git a/app-misc/binwalk/ChangeLog b/app-misc/binwalk/ChangeLog
index dcd620f433d1..eeaa97460ef2 100644
--- a/app-misc/binwalk/ChangeLog
+++ b/app-misc/binwalk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/binwalk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/binwalk/ChangeLog,v 1.35 2014/11/21 07:40:11 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/binwalk/ChangeLog,v 1.36 2014/12/11 05:48:55 radhermit Exp $
+
+  11 Dec 2014; Tim Harder <radhermit@gentoo.org> -binwalk-1.2.1.ebuild,
+  -binwalk-1.2.2_p1.ebuild, -files/binwalk-1.2-no-deps-check.patch:
+  Remove old.
 
   21 Nov 2014; Tim Harder <radhermit@gentoo.org> binwalk-2.0.1.ebuild:
   Drop old, unused MY_P variable.
diff --git a/app-misc/binwalk/binwalk-1.2.1.ebuild b/app-misc/binwalk/binwalk-1.2.1.ebuild
deleted file mode 100644
index c1b668d3f749..000000000000
--- a/app-misc/binwalk/binwalk-1.2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/binwalk/binwalk-1.2.1.ebuild,v 1.2 2013/10/13 15:08:34 hwoarang Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool for identifying files embedded inside firmware images"
-HOMEPAGE="http://code.google.com/p/binwalk/"
-SRC_URI="http://binwalk.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="graph"
-
-RDEPEND="sys-apps/file[python]
-	graph? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${P}/src
-
-DOCS=( ../docs/README ../docs/API )
-
-PATCHES=( "${FILESDIR}"/${PN}-1.2-no-deps-check.patch )
diff --git a/app-misc/binwalk/binwalk-1.2.2_p1.ebuild b/app-misc/binwalk/binwalk-1.2.2_p1.ebuild
deleted file mode 100644
index 4de459bcec6a..000000000000
--- a/app-misc/binwalk/binwalk-1.2.2_p1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/binwalk/binwalk-1.2.2_p1.ebuild,v 1.1 2013/11/06 06:56:15 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/-}
-DESCRIPTION="A tool for identifying files embedded inside firmware images"
-HOMEPAGE="http://code.google.com/p/binwalk/"
-SRC_URI="http://binwalk.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="graph"
-
-RDEPEND="sys-apps/file[python]
-	graph? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}/src
-
-DOCS=( ../docs/README ../docs/API )
-
-python_configure_all() {
-	mydistutilsargs=( --no-prereq-checks )
-}
diff --git a/app-misc/binwalk/files/binwalk-1.2-no-deps-check.patch b/app-misc/binwalk/files/binwalk-1.2-no-deps-check.patch
deleted file mode 100644
index 67e5094c266d..000000000000
--- a/app-misc/binwalk/files/binwalk-1.2-no-deps-check.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- binwalk-1.2/src/setup.py
-+++ binwalk-1.2/src/setup.py
-@@ -5,39 +5,6 @@
- 
- WIDTH = 115
- 
--# Check for pre-requisite modules
--print "checking pre-requisites"
--try:
--	import magic
--	try:
--		magic.MAGIC_NO_CHECK_TEXT
--	except Exception, e:
--		print "\n", "*" * WIDTH
--		print "Pre-requisite failure:", str(e)
--		print "It looks like you have an old or incompatible magic module installed."
--		print "Please install the official python-magic module, or download and install it from source: ftp://ftp.astron.com/pub/file/"
--		print "*" * WIDTH, "\n"
--		sys.exit(1)
--except Exception, e:
--	print "\n", "*" * WIDTH
--	print "Pre-requisite failure:", str(e)
--	print "Please install the python-magic module, or download and install it from source: ftp://ftp.astron.com/pub/file/"
--	print "*" * WIDTH, "\n"
--	sys.exit(1)
--
--try:
--	import matplotlib.pyplot
--except Exception, e:
--	print "\n", "*" * WIDTH
--	print "Pre-requisite check warning:", str(e)
--	print "To take advantage of this tool's entropy plotting capabilities, please install the python-matplotlib module."
--	print "*" * WIDTH, "\n"
--	
--	if raw_input('Continue installation without this module (Y/n)? ').lower().startswith('n'):
--		print 'Quitting...\n'
--		sys.exit(1)
--		
--
- # Generate a new magic file from the files in the magic directory
- print "generating binwalk magic file"
- magic_files = listdir("magic")