commit: 63d0659dc276e8062f6f724701dd0e1d468542f4
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 26 05:53:23 2017 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 06:22:57 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d0659d
app-misc/binwalk: add live ebuild and py36 support
app-misc/binwalk/binwalk-2.1.1.ebuild | 14 ++++++++++----
.../{binwalk-2.1.1.ebuild => binwalk-9999.ebuild} | 16 ++++++++++------
2 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/app-misc/binwalk/binwalk-2.1.1.ebuild
b/app-misc/binwalk/binwalk-2.1.1.ebuild
index 031f4169fe8..cb146865c5a 100644
--- a/app-misc/binwalk/binwalk-2.1.1.ebuild
+++ b/app-misc/binwalk/binwalk-2.1.1.ebuild
@@ -1,18 +1,24 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/devttys0/binwalk.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/devttys0/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
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="
diff --git a/app-misc/binwalk/binwalk-2.1.1.ebuild
b/app-misc/binwalk/binwalk-9999.ebuild
similarity index 70%
copy from app-misc/binwalk/binwalk-2.1.1.ebuild
copy to app-misc/binwalk/binwalk-9999.ebuild
index 031f4169fe8..4b5c50dcc0b 100644
--- a/app-misc/binwalk/binwalk-2.1.1.ebuild
+++ b/app-misc/binwalk/binwalk-9999.ebuild
@@ -1,18 +1,24 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/devttys0/binwalk.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/devttys0/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
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="
@@ -20,8 +26,6 @@ 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