Version bump to 0.4.1 and updated live ebuild; fixes bug #493458, proxied commit for Nikoli.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 87 insertions, 17 deletions

diff --git a/dev-python/enzyme/ChangeLog b/dev-python/enzyme/ChangeLog
index 5869889300b8..4472d83604d9 100644
--- a/dev-python/enzyme/ChangeLog
+++ b/dev-python/enzyme/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/enzyme
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enzyme/ChangeLog,v 1.3 2013/10/13 10:22:32 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enzyme/ChangeLog,v 1.4 2013/12/07 08:47:21 tomwij Exp $
+
+*enzyme-0.4.1 (07 Dec 2013)
+
+  07 Dec 2013; Tom Wijsman <TomWij@gentoo.org> +enzyme-0.4.1.ebuild,
+  enzyme-9999.ebuild:
+  Version bump to 0.4.1 and updated live ebuild; fixes bug #493458, proxied
+  commit for Nikoli.
 
   13 Oct 2013; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
   Updated Nikoli's e-mail address for easier automatic assignment.
diff --git a/dev-python/enzyme/Manifest b/dev-python/enzyme/Manifest
index 2c97f47ff761..c2e3a3e44cb6 100644
--- a/dev-python/enzyme/Manifest
+++ b/dev-python/enzyme/Manifest
@@ -2,18 +2,21 @@
 Hash: SHA256
 
 DIST enzyme-0.2.tar.gz 75520 SHA256 6b146184d06aba79bf9b70f58770a46870a00fef89e45c0c0e54c24be03ff50a SHA512 a9eec867840248edab6f830c454ae371f1da98a06ffb7b1d6357827164b395e9bfd621f9d3df93a587a682370b7282bc8d76698597d21271d8efabb32f02d72a WHIRLPOOL a820aa0e7e75136a09d48c29ae250698c52b699e4425f14178c6aca8fc9fb1132512732f42d32db96b96f9f2d1d391d4ed03b9456e7e496c2ef64c8813679689
+DIST enzyme-0.4.1.tar.gz 47953 SHA256 f2167fa97c24d1103a94d4bf4eb20f00ca76c38a37499821049253b2059c62bb SHA512 62a85c076a7eb320249a507dcc9dd26572e3a9b9643e0a960ed114a80c75213e6e5028a726fbcdd0c2c46c53af980a69828a54a66af9a17af3210273376395b3 WHIRLPOOL 5055306ce3747b1aa2f6a9bf5ac85c705426e1eaa1e946780f626cbda2cf26d508baf9f6781faeb62d09266df00e6b2c7942493d9139e82eda502cc175cb711c
+DIST matroska_test_w1_1.zip 184550509 SHA256 d86f96e165e695e6cf5324ebca184f2df723872f02965b565820d265b53004eb SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f WHIRLPOOL 3d0a16871fc7df0a3ef3f34f7c496eff188400a9796a2ad66667112ef0de7deecf025196898bd24ea395f8c44e75156a8b8c09d40a92e98d833d995473eefa9e
 EBUILD enzyme-0.2.ebuild 601 SHA256 1345508bf5ae74c4e7fcea24fdabfb4cd89785feb66853b2eb9de7442ec906e2 SHA512 08d71c5361a493f5b06aea4528e429690fc73e3ff12dbecf55f7cf812b645aaab7a072df8de86959db94f1ab4046b278fe592ca973145a7ac0edefe28cd1c34a WHIRLPOOL e2617162aca559efd808a71d5feb8814224c7c159a8df6e87877ec08285ee2ab7a3352e867d98ea7ae1c9cfd67b26351c3e5bd0b66385f70b302d5899aa6aefc
-EBUILD enzyme-9999.ebuild 570 SHA256 6ba0975147b01c660c66a485c092fc6ec527f98cecaf7606f859935654b1dec4 SHA512 6437d2d6e318089de87bd67cc15113a35ca5d7546f10ce47c82e41c88854274a5ad761e3cde766a2a26e73dd33ade8a3db5fc07aa7a491b5854bd2a826b07da4 WHIRLPOOL 0cea9829a574d3d4a0c19069b495a9796fcb1640d46e04d794945603e02c752c49217a2d7e73088ef8dc0c55f571246435eedd78fe6bf1464b8c1d1beb5b8edc
-MISC ChangeLog 642 SHA256 7ec6b4c7fc3872973d5d536e581b89684d89bc79a5bc4f0ed3a869749795fe70 SHA512 7d8af60e2d42029abeadbcda15c90da588c67c785d32694a7bcb41d7386af3a94ec9e29f662a31fabb0078225940593c29633a50758743b0f88941a417de9b7e WHIRLPOOL dde3b369ceab88ad3d70ed03ba855eb8a4eba1018a20f3586fe427d29d455bb3f6fc491ec2de46bc014b602e23c9c4e52cc77394e265cba50f1302615aa8b641
+EBUILD enzyme-0.4.1.ebuild 1069 SHA256 39869bf42ae144e5bc3908e2e9ac03a3e3b389ed50be404febc16c247d77f0c2 SHA512 2c2285464de8130a917cb5bf47ce31759fe4be6506f810b3c9ba608d250c463f9b0bbb7bbcfb01ea5f70dcf11c24ec33257b0ddeea673e4b889fa2242e6599f1 WHIRLPOOL 5d7762203a586b3fe42ff01b24685cdb052e2f26ca572e886370881c8fcfecd325131bdc8baf4ccee6b4980ec60408e4599db55a2580f3a5ccdf7480baecc3ad
+EBUILD enzyme-9999.ebuild 1073 SHA256 54b91fc68f478949c4a855ec18af59b18ef241d1921557cc927b493711db7573 SHA512 a09f2516eb39968688905b90472ef3c76fca5f99beb3583dba952901f1def81a7bbfc924e2f3815725902cee47187fef7e60005fdbbc8f767579c6535ed2d9e3 WHIRLPOOL f2106b072b45982930cc9f82e89f59608665ba4fb5375ea27f982e6f516a87d87e5d0668c2ad89e51c3640d8a46f001d2cbee5218d917cf425df1183d3caf4e0
+MISC ChangeLog 860 SHA256 3c9911512907d7dac1d0c488babb44312328b0bfa05bf8f32e5abc3b619f6840 SHA512 88ffb6536e0a8c4c8ddbd808a1e1a80fc24e3e53a51c07ae5e2449eeb8e312605abedf4b8545c356754f8b5a0e70adc616a2afa65968ac8902415e2e4c3b533c WHIRLPOOL 0f988088f06de28961ffba9cd09a0ffd9e313eb3531a56667b42e3d3af460ab5af3fd030a6d95d230e26096f5b39ff911d9795043a76fae62614dda21ba826bb
 MISC metadata.xml 253 SHA256 75f391456f4a730b3f3ae0ed04cd74165228b2189253e018a518c4330ddb2161 SHA512 fbbd056d1532bb6ad58f2aadeacc6d0dd5ee4d8754fb1cf49bade788460de4c415c70bb966491e3d8d84c3a6adbf0d2a3b446f19eabba0bf8b1cf0576d6d6759 WHIRLPOOL e75ba1c4078ea28137b01250dd45436ce6fb2cbf0ee74d4bb7baca671e6fd89e91c60407e0b55085110cec694b0855bdb90c5949e67c35dd1eecca8e7d73eacf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSWnRtAAoJEJWyH81tNOV91Z8H/iEHsgJeX4DjkAHZPExiUotg
-3PFOxTGvCf9R3wgBXdemuY81pilNxEGOxhGIT/J5AeYlWwkTo1QzWNt+ZtqttJ7D
-X+OlD03ZtLl/qgP0AfZiOfUxw2j1QRt6eze0HcgW4sle9W5J9gKBMNXGJnr11uO3
-hTVzr7wwg1WvEZuQONeYwZU7rku8+Wts4FwYsYVecz7+QGZz/U/FWmgJgwMJls6p
-hxC8HZGBwAx74ms3mpeanEOgHiBx9yhQacD9mc0ItWsI1OTfrhQbvKLhy5rn8e1P
-A+etWYSEEn4jNyHHCdhW45JUpq/tyDsh5N5uEDz2iES2le3pIk5tLyVlMXR4lqk=
-=A/Tj
+iQEcBAEBCAAGBQJSouCfAAoJEJWyH81tNOV9wkgH/RdmuK4yQkaS3E1Pf+KcvIue
+QScg0/VnCkeA9XyKfmWmP56O99aO0hGmoosmt7JXxz1jwHyjCixkG/w5WCJo7JlR
+sHcbxfWbL0pPdlFRZxxBAjNOqPbNk4Z72bFVUOL8AEAp3lrd9o2RgcGqoK3i2x6z
+R/iOvvwBZPtzJHVzBqlEdQMkMgTnT2p0pYFEEII5Eo3D1tLDcs9KsGIVbj+QrF79
+tn0lyCEUYrgozHKw+gdBodcUI38XI3yvT0oAtgH/9cgBE7w5/zJNqH5T5n8+f87d
+Ibv9HSuznOzgBWHUGBOtoeavmFSmCkW5vMYEmYy5hQKrZ32Smi9IP4Yt2tgH7JU=
+=poUE
 -----END PGP SIGNATURE-----
diff --git a/dev-python/enzyme/enzyme-0.4.1.ebuild b/dev-python/enzyme/enzyme-0.4.1.ebuild
new file mode 100644
index 000000000000..e6d065951738
--- /dev/null
+++ b/dev-python/enzyme/enzyme-0.4.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enzyme/enzyme-0.4.1.ebuild,v 1.1 2013/12/07 08:47:21 tomwij Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3} )
+
+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=""
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+	dev-python/setuptools[${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 6e21bc972d3d..a11bf2af504d 100644
--- a/dev-python/enzyme/enzyme-9999.ebuild
+++ b/dev-python/enzyme/enzyme-9999.ebuild
@@ -1,22 +1,41 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enzyme/enzyme-9999.ebuild,v 1.1 2013/04/24 07:02:39 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enzyme/enzyme-9999.ebuild,v 1.2 2013/12/07 08:47:21 tomwij Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python{2_7,3_3} )
+EGIT_REPO_URI="https://github.com/Diaoul/enzyme.git"
 
 inherit distutils-r1 git-2
 
-DESCRIPTION="Python module to parse metadata in video files"
-HOMEPAGE="https://github.com/Diaoul/enzyme"
-EGIT_REPO_URI="git://github.com/Diaoul/enzyme.git"
+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 )"
 
-LICENSE="GPL-3"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="test"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
 	dev-python/setuptools[${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
+}