gentoo resync : 02.09.2020

3 files changed, 2 insertions, 103 deletions

diff --git a/media-video/subliminal/Manifest b/media-video/subliminal/Manifest
index c5237624cf15..f90ece6262cd 100644
--- a/media-video/subliminal/Manifest
+++ b/media-video/subliminal/Manifest
@@ -1,7 +1,6 @@
 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.1.0.tar.gz 5480458 BLAKE2B 249bdd027d99dfb0b81d939af2dc08f62b52dca2c8618f1006ca76eee41c2443b450076eddc1aa533997beca8cdf9016b884d7eceeebbf4e48ced91dae1a2361 SHA512 9b26ae594895470830547eed604aa5b28b75f590e5be12c2d5a478c5daf798d405f209639bd54dce0565b0e27d1b0daa5bef87dfa8590af61f2ab1e287c41060
-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-2.1.0-r1.ebuild 2685 BLAKE2B 94bbdf35376366027b4c2dfe5c017569b28a53a3b099aeea2f89dd2829613db11ea1fb009da144ba26b0348e5906ae071497cb356891591b1680883826395536 SHA512 ea7f5b0955cc3778735a80171e8e6744de3627800478de31d5de9fcf602a98d77f68d23a3092a09a738891855599d207c803ec077cc98843dd06a834b189e505
 EBUILD subliminal-9999.ebuild 2670 BLAKE2B 39ff4c726f698a6787458d2bf663affcd2a1adbf0e9a20c8228eace9806774d6c45fa3f29a49de2a3352a0e0a276c99f4c0ffe261290c11b12a7cfcfb2177dc7 SHA512 4d3f5f2a77b6151f0e328a8bb4e13a9453801c514bf91a4e24b74c2cee53dd126d194488f79b8ddbb8a674f6ce8cfc56d2b3a405a786f497ce3ce67919917dbb
 MISC metadata.xml 446 BLAKE2B 41fe81b3e05395bd7e23e081358069335f4ea6eb7aea9c345de035c5595985a76153ca0f7792be40ec0f039e09905bd788043ed2b6efdcadc5b1d8742cdc21a6 SHA512 22f6b1198815e6ed85456fa498a8b3b2fbb5649b872482ab6b78dff643e3fd2a24a99594685504e4491772be67dae2bda08852dbe9a89de7f2f6a3435357301a
diff --git a/media-video/subliminal/subliminal-2.1.0-r1.ebuild b/media-video/subliminal/subliminal-2.1.0-r1.ebuild
index 4bba8befdc11..2176be52fa51 100644
--- a/media-video/subliminal/subliminal-2.1.0-r1.ebuild
+++ b/media-video/subliminal/subliminal-2.1.0-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI+=" test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.z
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/media-video/subliminal/subliminal-2.1.0.ebuild b/media-video/subliminal/subliminal-2.1.0.ebuild
deleted file mode 100644
index c5d5ae29caa4..000000000000
--- a/media-video/subliminal/subliminal-2.1.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-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"
-	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+=" test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.3[${PYTHON_USEDEP}]
-	>=dev-python/babelfish-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.4.0:4[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/click-4.0[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/enzyme-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/guessit-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pysrt-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2012c[${PYTHON_USEDEP}]
-	>=dev-python/rarfile-2.7[compressed,${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	>=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}/${P}-fix-pytest-warning.patch"
-)
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	# Needed to unpack the test data
-	default
-
-	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
-
-	# 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() {
-	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}"
-}