[gentoo-commits] repo/gentoo:master commit in: dev-python/enzyme/

["Ian Delaney" <idella4@gentoo.org>]

commit:     5e96ac7f819b5bcce7305ef851a4903a8cca27af
Author:     Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Wed May 11 04:37:28 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Thu May 12 11:39:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e96ac7f

dev-python/enzyme: revbump to 0.4.1-r1

Bump EAPI to 6, add missing and fix existing deps.
Update 9999 ebuild accordingly.

Package-Manager: portage-2.2.28

Signed-off-by: Ian Delaney <idella4 <AT> gentoo.org>

 .../{enzyme-9999.ebuild => enzyme-0.4.1-r1.ebuild}   | 20 +++++++++++---------
 dev-python/enzyme/enzyme-9999.ebuild                 | 19 ++++++++++++-------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/dev-python/enzyme/enzyme-9999.ebuild b/dev-python/enzyme/enzyme-0.4.1-r1.ebuild
similarity index 68%
copy from dev-python/enzyme/enzyme-9999.ebuild
copy to dev-python/enzyme/enzyme-0.4.1-r1.ebuild
index 51ac2e1..76c1719 100644
--- a/dev-python/enzyme/enzyme-9999.ebuild
+++ b/dev-python/enzyme/enzyme-0.4.1-r1.ebuild
@@ -1,30 +1,32 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-EGIT_REPO_URI="https://github.com/Diaoul/enzyme.git"
 
-inherit distutils-r1 git-2
+inherit distutils-r1
 
 DESCRIPTION="Python video metadata parser"
 HOMEPAGE="https://github.com/Diaoul/enzyme https://pypi.python.org/pypi/enzyme"
-SRC_URI="test? ( http://downloads.sourceforge.net/project/matroska/test_files/matroska_test_w1_1.zip )"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? ( http://downloads.sourceforge.net/project/matroska/test_files/matroska_test_w1_1.zip )
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-RDEPEND=""
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
+		app-arch/unzip
 		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
 	)
-	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 
 python_prepare_all() {

diff --git a/dev-python/enzyme/enzyme-9999.ebuild b/dev-python/enzyme/enzyme-9999.ebuild
index 51ac2e1..9a62290 100644
--- a/dev-python/enzyme/enzyme-9999.ebuild
+++ b/dev-python/enzyme/enzyme-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-EGIT_REPO_URI="https://github.com/Diaoul/enzyme.git"
 
-inherit distutils-r1 git-2
+inherit distutils-r1 git-r3
 
 DESCRIPTION="Python video metadata parser"
 HOMEPAGE="https://github.com/Diaoul/enzyme https://pypi.python.org/pypi/enzyme"
+EGIT_REPO_URI="git://github.com/Diaoul/${PN}.git"
 SRC_URI="test? ( http://downloads.sourceforge.net/project/matroska/test_files/matroska_test_w1_1.zip )"
 
 LICENSE="Apache-2.0"
@@ -18,15 +18,20 @@ SLOT="0"
 KEYWORDS=""
 IUSE="test"
 
-RDEPEND=""
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
+		app-arch/unzip
 		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
 	)
-	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 
+src_unpack() {
+	default_src_unpack
+	git-r3_src_unpack
+}
+
 python_prepare_all() {
 	if use test; then
 		mkdir enzyme/tests/test_{parsers,mkv} || die