gentoo resync : 25.08.2020

7 files changed, 61 insertions, 142 deletions

diff --git a/media-video/subliminal/Manifest b/media-video/subliminal/Manifest
index 17d545f18eea..c5237624cf15 100644
--- a/media-video/subliminal/Manifest
+++ b/media-video/subliminal/Manifest
@@ -1,10 +1,7 @@
-AUX subliminal-2.0.5-add-missing-comma.patch 1196 BLAKE2B 1042b22bf4c6f488ada97c628d98c79e6733816ffe094af9ae45be632edfd0547086911fd3e2154cc13c5ca609bb436a3d73f6825bd8242074be323cee969192 SHA512 82cabee6a7bdc701f73e7115edc975fbde8f0008dff2e4dcf7fcb27b9203dc9efd42b54aa31a632501e3e3ed405638fcb3fb273eff4bf19cbc8085d710d3763b
 AUX subliminal-2.1.0-fix-pytest-warning.patch 315 BLAKE2B e04d8f7d9dca768cb805f8b0a5ec3872c7a758c12adc1d3aba931ebc545fcfdfcdbac19cfccef6d2efc6fb5951d6336f3ab97432e18aa7dad4a87f815af1015b SHA512 c3d03c1ed84c8964b04ac4999e8383a31d4d931753f674f10ef1948b581986f2f8bf4a665921c8900ccd441c564e839ef43f3cdcd7f92a5ae3252ee260ff15f7
 DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3d322c4e933aad10afb3aa6f69bb3469114c4400d161e53d8a7618b818b22465177460003804a7ac3e69fa4f4db000d SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f
-DIST subliminal-2.0.5-r2.tar.gz 4442435 BLAKE2B ea2139bd61344d6a0cb4b48a2b75cbfd29905adc81bca25a332443725fff80bc03b58704d0e6289d44ddc26104e15744f67acb7e0e4eafae584098b02fb4c007 SHA512 b0f99c6b2fa6bc3860c86592bb428c7b4b34836df7a619b19d69b15532a68b4d05369f724131e120d4b390bd91f430aea442aef72ebc00ae8e3d31a457925eec
 DIST subliminal-2.1.0.tar.gz 5480458 BLAKE2B 249bdd027d99dfb0b81d939af2dc08f62b52dca2c8618f1006ca76eee41c2443b450076eddc1aa533997beca8cdf9016b884d7eceeebbf4e48ced91dae1a2361 SHA512 9b26ae594895470830547eed604aa5b28b75f590e5be12c2d5a478c5daf798d405f209639bd54dce0565b0e27d1b0daa5bef87dfa8590af61f2ab1e287c41060
-EBUILD subliminal-2.0.5-r2.ebuild 2178 BLAKE2B 59863aa347ee4be036ae707fefc8de0b4f29cf2210696a2ddea3dc76244134a3ff4747a21c5da99125b078715f908ff6eabce995f14fbfde3087568819c4d656 SHA512 089ad52eaece2c2a5b4e669481ecd7b1ddaefa96b839d0fba3e73c1aff9ab03dd89f42304b992bcd4909239dc64b2fb23917c7a6b3842ad9f80ee7a9dbe55840
-EBUILD subliminal-2.0.5-r3.ebuild 2198 BLAKE2B cc26d4de0039cda500b6d21caa6583d7de6a5bd7c90444151244248166710f323e1fe224d859c64cc5377947b5b9228515f93c5f3bbf2d3ffb51f453367a1a8f SHA512 2f65f2053917a075aa4f3dd91bf5613d46c5422bdc518583ea08c32f30628315c8721afb8b875bd45af0e1fee4ec2c90cdcca9060d773aa04f0001a5cfbde386
-EBUILD subliminal-2.1.0.ebuild 2742 BLAKE2B a69c41f8810aff9c34def02ac21576a29f277837fbed6c9e2d418b3ae47870a87ef83f7830f140458f6dc47cec144ecdf852b168bd81f01b0207eb55f6e9775e SHA512 35e79f688f05b84cd01bfef1fa2095f200a8ff6d345367c83eef530e699fa6e076934b51b178af2edc3c8122f363f6c75b160069189bbec58e6fc92c4ea73d9e
-EBUILD subliminal-9999.ebuild 2719 BLAKE2B bc1135d128c01069313c58fb91e434468042d27f29fb70a1c2eac10b8416d21e2f9b73094143e1e721ce7873599d937924f4359c7292ea93bbfface88c520ecd SHA512 4a2dbf310039818a90cb12b9be5c67089ea1c11ebe82059798cf0fb9f98599475851a1651da8d2939b27fbbce5db17a296c258577b6af3718345b5c142abb5b5
-MISC metadata.xml 539 BLAKE2B 024a8de9820963db06195cd86c53e3f641da2c8592cd493a05b3d30e223067a9222f69b3008d52d2fe37f487dde746fc1c0e6c84da3ed2b6d75e5d8a07bd6f49 SHA512 de6763fbbdddb92a57451ba85dc229f0564415d0f635f7a5ac74046529dbbe44b6c9a42f6d00b015ed06751d95b02163a21f7d029a3b36f6a520d29dabbe6a73
+EBUILD subliminal-2.1.0-r1.ebuild 2686 BLAKE2B 43505d2294961bd670e895d18892895f20d4156e5390aab96cc6ae88a41f927f60f727cbea4223f25e6ca9f43665518d7af218b2d655f70b3d85481d937188ee SHA512 5ba1c2e74268f4faa74b8ad25eff2a4b7a7dee7915012f8f1899c4b429376574fc02a1af2439544b7193abe8289cf6c7c2110cddb52135c64ea5afd8a7f86670
+EBUILD subliminal-2.1.0.ebuild 2734 BLAKE2B 3f8f3ecab0d6c7ebe3bfde78a5d153f756088fa28769ed8bcd781976778bff03f471e1cfc9b68778bc6745265848a50aaef2bc2898ca3d80901c638ae25cb794 SHA512 f19d33f491fd65c3dd8e7880356a72051a09b0f68c46b0a81eb15f965b4c5cb167a35d872e1cb47ec8f96970ea748b4b447badf31e32ee209a20c6d56b9279a2
+EBUILD subliminal-9999.ebuild 2670 BLAKE2B 39ff4c726f698a6787458d2bf663affcd2a1adbf0e9a20c8228eace9806774d6c45fa3f29a49de2a3352a0e0a276c99f4c0ffe261290c11b12a7cfcfb2177dc7 SHA512 4d3f5f2a77b6151f0e328a8bb4e13a9453801c514bf91a4e24b74c2cee53dd126d194488f79b8ddbb8a674f6ce8cfc56d2b3a405a786f497ce3ce67919917dbb
+MISC metadata.xml 446 BLAKE2B 41fe81b3e05395bd7e23e081358069335f4ea6eb7aea9c345de035c5595985a76153ca0f7792be40ec0f039e09905bd788043ed2b6efdcadc5b1d8742cdc21a6 SHA512 22f6b1198815e6ed85456fa498a8b3b2fbb5649b872482ab6b78dff643e3fd2a24a99594685504e4491772be67dae2bda08852dbe9a89de7f2f6a3435357301a
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
deleted file mode 100644
index 148307781b71..000000000000
--- a/media-video/subliminal/files/subliminal-2.0.5-add-missing-comma.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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/metadata.xml b/media-video/subliminal/metadata.xml
index 996822fb8bf0..cd2bfaa916c2 100644
--- a/media-video/subliminal/metadata.xml
+++ b/media-video/subliminal/metadata.xml
@@ -2,13 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>sam@cmpct.info</email>
+		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">Diaoul/subliminal</remote-id>
 		<remote-id type="pypi">subliminal</remote-id>
diff --git a/media-video/subliminal/subliminal-2.0.5-r2.ebuild b/media-video/subliminal/subliminal-2.0.5-r2.ebuild
deleted file mode 100644
index 553544eeb7c5..000000000000
--- a/media-video/subliminal/subliminal-2.0.5-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-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.org/project/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}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		app-arch/unzip
-		>=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/sympy[${PYTHON_USEDEP}]
-	)
-"
-
-# Tests don't work in 2.0.5. Recheck in later versions. See Gentoo bug 630114.
-RESTRICT=test
-
-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
-}
diff --git a/media-video/subliminal/subliminal-2.0.5-r3.ebuild b/media-video/subliminal/subliminal-2.1.0-r1.ebuild
index 1f8be45ef01b..4bba8befdc11 100644
--- a/media-video/subliminal/subliminal-2.0.5-r3.ebuild
+++ b/media-video/subliminal/subliminal-2.1.0-r1.ebuild
@@ -3,23 +3,35 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='xml(+)'
-COMMIT_ID='dd74383d1cba82829ce720f2e439a65d13ffe7ef'
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Diaoul/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://github.com/Diaoul/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
 DESCRIPTION="Python library to search and download subtitles"
 HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal/"
-SRC_URI="
-	https://github.com/Diaoul/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}-r2.tar.gz
-	test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
-"
+SRC_URI+=" test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+BDEPEND="
+	test? (
+		app-arch/unzip
+		dev-python/sympy[${PYTHON_USEDEP}]
+		>=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}]
+	)
+"
 RDEPEND="
 	>=dev-python/appdirs-1.3[${PYTHON_USEDEP}]
 	>=dev-python/babelfish-0.5.2[${PYTHON_USEDEP}]
@@ -34,40 +46,51 @@ RDEPEND="
 	>=dev-python/pytz-2012c[${PYTHON_USEDEP}]
 	>=dev-python/rarfile-2.7[compressed,${PYTHON_USEDEP}]
 	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
 "
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		app-arch/unzip
-		dev-python/sympy[${PYTHON_USEDEP}]
-		>=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}]
-	)
-"
 
-# Tests don't work in 2.0.5. Recheck in later versions. See Gentoo bug 630114.
-RESTRICT=test
+PATCHES=(
+	"${FILESDIR}/${P}-fix-pytest-warning.patch"
+)
 
-PATCHES=( "${FILESDIR}/${P}-add-missing-comma.patch" )
+distutils_enable_tests pytest
 
-S="${WORKDIR}/${PN}-${COMMIT_ID}"
+src_unpack() {
+	# Needed to unpack the test data
+	default
 
-distutils_enable_tests pytest
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
 
 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
+	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() {
+	local skipped_tests=(
+		tests/test_core.py::test_scan_archive_with_one_video
+		tests/test_core.py::test_scan_archive_with_multiple_videos
+		tests/test_core.py::test_scan_archive_with_no_video
+		tests/test_core.py::test_scan_password_protected_archive
+	)
+
+	# Two tests that list providers rely on entry points
+	# so they need the package to be installed
+	distutils_install_for_testing
+	pytest -vv --ignore ${PN}/test/test_core.py ${skipped_tests[@]/#/--deselect } \
+		|| die "Tests fail with ${EPYTHON}"
+}
diff --git a/media-video/subliminal/subliminal-2.1.0.ebuild b/media-video/subliminal/subliminal-2.1.0.ebuild
index 48473f15489b..c5d5ae29caa4 100644
--- a/media-video/subliminal/subliminal-2.1.0.ebuild
+++ b/media-video/subliminal/subliminal-2.1.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/Diaoul/${PN}.git"
 	EGIT_BRANCH="develop"
 else
-        SRC_URI="https://github.com/Diaoul/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/Diaoul/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="Python library to search and download subtitles"
@@ -25,7 +25,7 @@ SRC_URI+=" test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.z
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-video/subliminal/subliminal-9999.ebuild b/media-video/subliminal/subliminal-9999.ebuild
index 54ade49d6223..5baa2d5e19fc 100644
--- a/media-video/subliminal/subliminal-9999.ebuild
+++ b/media-video/subliminal/subliminal-9999.ebuild
@@ -3,14 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='xml(+)'
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
-SRC_URI=""
-
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Diaoul/${PN}.git"
@@ -25,9 +23,14 @@ SRC_URI+=" test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.z
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
+BDEPEND="
+	test? (
+		app-arch/unzip
+		dev-python/sympy[${PYTHON_USEDEP}]
+		>=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}]
+	)
+"
 RDEPEND="
 	>=dev-python/appdirs-1.3[${PYTHON_USEDEP}]
 	>=dev-python/babelfish-0.5.2[${PYTHON_USEDEP}]
@@ -45,13 +48,6 @@ RDEPEND="
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
 "
-BDEPEND="
-	test? (
-		app-arch/unzip
-		dev-python/sympy[${PYTHON_USEDEP}]
-		>=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}]
-	)
-"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.1.0-fix-pytest-warning.patch"