media-video/subliminal: revbump to 2.0.5-r1 to sync with 9999

This revbump is mostly to fix tests, but as a reward users will get one
fix backported. Also change tarball to fetch sources with the monstrous
patch from SRC_URI already applied.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

3 files changed, 97 insertions, 0 deletions

diff --git a/media-video/subliminal/Manifest b/media-video/subliminal/Manifest
index 32bedee79e08..5be66a3b9800 100644
--- a/media-video/subliminal/Manifest
+++ b/media-video/subliminal/Manifest
@@ -1,4 +1,5 @@
 DIST matroska_test_w1_1.zip 184550509 SHA256 d86f96e165e695e6cf5324ebca184f2df723872f02965b565820d265b53004eb SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f WHIRLPOOL 3d0a16871fc7df0a3ef3f34f7c496eff188400a9796a2ad66667112ef0de7deecf025196898bd24ea395f8c44e75156a8b8c09d40a92e98d833d995473eefa9e
 DIST subliminal-2.0.3.tar.gz 4428821 SHA256 12ad058d8bfdb0471d2021f8a486c2a11d2470e845bec1e71f698e4523ddc8fe SHA512 ed014ac25ab867cf1d7d16c1ecc19364a1b1281893c3e1aa1e678176d6df12623fc29f6a8159984cd2d621bf2f708655382ae7e0cf41c92956fc2d803f1b5c37 WHIRLPOOL 39a20b595660a78c3a48efa7affc973e4349f2912b5d077583d75d05e4bad8675b5d5594512e739398fff641fdc76a08afdc1deec6f54bba5b02b3f5014ea531
 DIST subliminal-2.0.5-fix-tests.patch 377419 SHA256 d5280c3ede7a195ca21707a57b801bdcf3401bc6d54eebb82db90836a1e5c566 SHA512 35a59dec59a0075d51f00147661d9a949019069a00b4882492f7dab4bb2af35d61f4aad70d49094d16128538677907ed154dbb2e2da5959188f3996fb6200d2e WHIRLPOOL a320ce105288de78cdeeb897706fb9e622c1d82cfe582225e5d08f4b4de3781ba6a4bcdfe6b7875396bee6f8c60e25945a73474be5563755601abd195031ebef
+DIST subliminal-2.0.5-r1.tar.gz 4442435 SHA256 b7a54377937810842cf9e9f06d9c9affd1e02c591f3f9a1ddf76c25a9b51a434 SHA512 b0f99c6b2fa6bc3860c86592bb428c7b4b34836df7a619b19d69b15532a68b4d05369f724131e120d4b390bd91f430aea442aef72ebc00ae8e3d31a457925eec WHIRLPOOL eae38af4612576fa6903ab23aeab6d1c769ee1c3a95709c23e265819159d83e0624c53527cf86d58e059aca51f2ba7f27820e413ac9dcb584c58d0066a38067a
 DIST subliminal-2.0.5.tar.gz 4440754 SHA256 b956f02ae0286ad04be5bbf1c5570964aa17bb53c99fcce067e8334d99516ae2 SHA512 e2f563fa86fea286a172aa4a6a846d997e777cf69666fb39f3f73e3073ce5b5467474561ced4468d51708c0b1559f97b314f2f9ffb3d5e61978ad635c00ba0f8 WHIRLPOOL cb57c8d553eb0164a21d2ea1c81129aef78b425748d52be6d73444fc111b227eeae5e3321253d163c2df46acfa274d6c0852d5aa7153b3ee2ba3c311c56dfd2d
diff --git a/media-video/subliminal/files/subliminal-2.0.5-add-missing-comma.patch b/media-video/subliminal/files/subliminal-2.0.5-add-missing-comma.patch
new file mode 100644
index 000000000000..148307781b71
--- /dev/null
+++ b/media-video/subliminal/files/subliminal-2.0.5-add-missing-comma.patch
@@ -0,0 +1,19 @@
+commit 9c2cfa23b3eedad64cfd4133c40bb73e6be0139f
+Author: Fernando <fernandog@users.noreply.github.com>
+Date:   Thu Sep 29 22:57:51 2016 -0300
+
+Fix missing comma
+
+diff --git a/subliminal/video.py b/subliminal/video.py
+index 00304e9..b79570f 100644
+--- a/subliminal/video.py
++++ b/subliminal/video.py
+@@ -13,7 +13,7 @@ VIDEO_EXTENSIONS = ('.3g2', '.3gp', '.3gp2', '.3gpp', '.60d', '.ajp', '.asf', '.
+                     '.bix', '.box', '.cam', '.dat', '.divx', '.dmf', '.dv', '.dvr-ms', '.evo', '.flc', '.fli',
+                     '.flic', '.flv', '.flx', '.gvi', '.gvp', '.h264', '.m1v', '.m2p', '.m2ts', '.m2v', '.m4e',
+                     '.m4v', '.mjp', '.mjpeg', '.mjpg', '.mkv', '.moov', '.mov', '.movhd', '.movie', '.movx', '.mp4',
+-                    '.mpe', '.mpeg', '.mpg', '.mpv', '.mpv2', '.mxf', '.nsv', '.nut', '.ogg', '.ogm' '.ogv', '.omf',
++                    '.mpe', '.mpeg', '.mpg', '.mpv', '.mpv2', '.mxf', '.nsv', '.nut', '.ogg', '.ogm', '.ogv', '.omf',
+                     '.ps', '.qt', '.ram', '.rm', '.rmvb', '.swf', '.ts', '.vfw', '.vid', '.video', '.viv', '.vivo',
+                     '.vob', '.vro', '.wm', '.wmv', '.wmx', '.wrap', '.wvx', '.wx', '.x264', '.xvid')
+
diff --git a/media-video/subliminal/subliminal-2.0.5-r1.ebuild b/media-video/subliminal/subliminal-2.0.5-r1.ebuild
new file mode 100644
index 000000000000..bad06d484aac
--- /dev/null
+++ b/media-video/subliminal/subliminal-2.0.5-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE='xml(+)'
+COMMIT_ID='dd74383d1cba82829ce720f2e439a65d13ffe7ef'
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python library to search and download subtitles"
+HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.python.org/pypi/subliminal"
+SRC_URI="
+	https://github.com/Diaoul/${PN}/archive/${COMMIT_ID}.tar.gz -> ${PF}.tar.gz
+	test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/guessit-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/babelfish-0.5.2[${PYTHON_USEDEP}]
+	>=dev-python/enzyme-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-4.4.0:4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	>=dev-python/click-4.0[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pysrt-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3[${PYTHON_USEDEP}]
+	>=dev-python/rarfile-2.7[compressed,${PYTHON_USEDEP}]
+	>=dev-python/pytz-2012c[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		app-arch/unzip
+		>=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/sympy[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-add-missing-comma.patch" )
+
+S="${WORKDIR}/${PF}"
+
+python_prepare_all() {
+	# Disable code checkers as they require unavailable dependencies.
+	sed -i -e 's/--\(pep8\|flakes\)//g' pytest.ini || die
+	sed -i -e "s/'pytest-\(pep8\|flakes\)',//g" setup.py || die
+
+	# Disable unconditional dependency on dev-python/pytest-runner.
+	sed -i -e "s|'pytest-runner'||g" setup.py || die
+
+	if use test; then
+		mkdir -p tests/data/mkv || die
+		ln -s "${WORKDIR}"/test*.mkv tests/data/mkv/ || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}