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@gentoo.org>

diff --git a/dev-python/enzyme/enzyme-0.4.1-r1.ebuild b/dev-python/enzyme/enzyme-0.4.1-r1.ebuild
new file mode 100644 (file)
index 0000000..76c1719
--- /dev/null
+++ b/dev-python/enzyme/enzyme-0.4.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python video metadata parser"
+HOMEPAGE="https://github.com/Diaoul/enzyme https://pypi.python.org/pypi/enzyme"
+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="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+       test? (
+               app-arch/unzip
+               dev-python/pyyaml[${PYTHON_USEDEP}]
+               dev-python/requests[${PYTHON_USEDEP}]
+       )
+"
+
+python_prepare_all() {
+       if use test; then
+               mkdir enzyme/tests/test_{parsers,mkv} || die
+               ln -s "${WORKDIR}"/test* enzyme/tests/test_parsers/ || die
+               ln -s "${WORKDIR}"/test* enzyme/tests/test_mkv/ || die
+       fi
+
+       distutils-r1_python_prepare_all
+}
+
+python_test() {
+       esetup.py test
+}

diff --git a/dev-python/enzyme/enzyme-9999.ebuild b/dev-python/enzyme/enzyme-9999.ebuild
index 51ac2e149435fb79560133cc19ab6629be632eb3..9a62290a9beb3926922f7f195cfa95f5c8264e42 100644 (file)
--- 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