| 1 |
commit: 63d0659dc276e8062f6f724701dd0e1d468542f4 |
| 2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 26 05:53:23 2017 +0000 |
| 4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 26 06:22:57 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d0659d |
| 7 |
|
| 8 |
app-misc/binwalk: add live ebuild and py36 support |
| 9 |
|
| 10 |
app-misc/binwalk/binwalk-2.1.1.ebuild | 14 ++++++++++---- |
| 11 |
.../{binwalk-2.1.1.ebuild => binwalk-9999.ebuild} | 16 ++++++++++------ |
| 12 |
2 files changed, 20 insertions(+), 10 deletions(-) |
| 13 |
|
| 14 |
diff --git a/app-misc/binwalk/binwalk-2.1.1.ebuild b/app-misc/binwalk/binwalk-2.1.1.ebuild |
| 15 |
index 031f4169fe8..cb146865c5a 100644 |
| 16 |
--- a/app-misc/binwalk/binwalk-2.1.1.ebuild |
| 17 |
+++ b/app-misc/binwalk/binwalk-2.1.1.ebuild |
| 18 |
@@ -1,18 +1,24 @@ |
| 19 |
-# Copyright 1999-2016 Gentoo Foundation |
| 20 |
+# Copyright 1999-2017 Gentoo Foundation |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
|
| 23 |
EAPI=6 |
| 24 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
| 25 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
| 26 |
|
| 27 |
inherit distutils-r1 |
| 28 |
|
| 29 |
+if [[ ${PV} == "9999" ]] ; then |
| 30 |
+ EGIT_REPO_URI="https://github.com/devttys0/binwalk.git" |
| 31 |
+ inherit git-r3 |
| 32 |
+else |
| 33 |
+ SRC_URI="https://github.com/devttys0/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 34 |
+ KEYWORDS="~amd64 ~x86" |
| 35 |
+fi |
| 36 |
+ |
| 37 |
DESCRIPTION="A tool for identifying files embedded inside firmware images" |
| 38 |
HOMEPAGE="https://github.com/devttys0/binwalk" |
| 39 |
-SRC_URI="https://github.com/devttys0/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 40 |
|
| 41 |
LICENSE="MIT" |
| 42 |
SLOT="0" |
| 43 |
-KEYWORDS="~amd64 ~x86" |
| 44 |
IUSE="graph" |
| 45 |
|
| 46 |
RDEPEND=" |
| 47 |
|
| 48 |
diff --git a/app-misc/binwalk/binwalk-2.1.1.ebuild b/app-misc/binwalk/binwalk-9999.ebuild |
| 49 |
similarity index 70% |
| 50 |
copy from app-misc/binwalk/binwalk-2.1.1.ebuild |
| 51 |
copy to app-misc/binwalk/binwalk-9999.ebuild |
| 52 |
index 031f4169fe8..4b5c50dcc0b 100644 |
| 53 |
--- a/app-misc/binwalk/binwalk-2.1.1.ebuild |
| 54 |
+++ b/app-misc/binwalk/binwalk-9999.ebuild |
| 55 |
@@ -1,18 +1,24 @@ |
| 56 |
-# Copyright 1999-2016 Gentoo Foundation |
| 57 |
+# Copyright 1999-2017 Gentoo Foundation |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
|
| 60 |
EAPI=6 |
| 61 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
| 62 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
| 63 |
|
| 64 |
inherit distutils-r1 |
| 65 |
|
| 66 |
+if [[ ${PV} == "9999" ]] ; then |
| 67 |
+ EGIT_REPO_URI="https://github.com/devttys0/binwalk.git" |
| 68 |
+ inherit git-r3 |
| 69 |
+else |
| 70 |
+ SRC_URI="https://github.com/devttys0/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 71 |
+ KEYWORDS="~amd64 ~x86" |
| 72 |
+fi |
| 73 |
+ |
| 74 |
DESCRIPTION="A tool for identifying files embedded inside firmware images" |
| 75 |
HOMEPAGE="https://github.com/devttys0/binwalk" |
| 76 |
-SRC_URI="https://github.com/devttys0/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 77 |
|
| 78 |
LICENSE="MIT" |
| 79 |
SLOT="0" |
| 80 |
-KEYWORDS="~amd64 ~x86" |
| 81 |
IUSE="graph" |
| 82 |
|
| 83 |
RDEPEND=" |
| 84 |
@@ -20,8 +26,6 @@ RDEPEND=" |
| 85 |
graph? ( dev-python/pyqtgraph[opengl,${PYTHON_USEDEP}] ) |
| 86 |
" |
| 87 |
|
| 88 |
-PATCHES=( "${FILESDIR}"/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch ) |
| 89 |
- |
| 90 |
python_install_all() { |
| 91 |
local DOCS=( API.md INSTALL.md README.md ) |
| 92 |
distutils-r1_python_install_all |
Archives