From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9CD31139694 for ; Wed, 26 Apr 2017 06:24:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 299BEE0DC8; Wed, 26 Apr 2017 06:24:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E4401E0DC6 for ; Wed, 26 Apr 2017 06:24:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CE3A533BE61 for ; Wed, 26 Apr 2017 06:24:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 02D1C7445 for ; Wed, 26 Apr 2017 06:24:02 +0000 (UTC) From: "Tim Harder" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tim Harder" Message-ID: <1493187777.63d0659dc276e8062f6f724701dd0e1d468542f4.radhermit@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/binwalk/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/binwalk/binwalk-2.1.1.ebuild app-misc/binwalk/binwalk-9999.ebuild X-VCS-Directories: app-misc/binwalk/ X-VCS-Committer: radhermit X-VCS-Committer-Name: Tim Harder X-VCS-Revision: 63d0659dc276e8062f6f724701dd0e1d468542f4 X-VCS-Branch: master Date: Wed, 26 Apr 2017 06:24:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 380fb36e-5343-4905-bf81-224070c9f110 X-Archives-Hash: 3c191787d92cc451a7fe70f0113f3fda commit: 63d0659dc276e8062f6f724701dd0e1d468542f4 Author: Tim Harder gentoo org> AuthorDate: Wed Apr 26 05:53:23 2017 +0000 Commit: Tim Harder gentoo 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