gentoo auto-resync : 15:07:2024 - 12:27:33

3 files changed, 113 insertions, 42 deletions

diff --git a/media-video/subliminal/Manifest b/media-video/subliminal/Manifest
index 9802838646be..38b6f464e270 100644
--- a/media-video/subliminal/Manifest
+++ b/media-video/subliminal/Manifest
@@ -2,6 +2,8 @@ AUX subliminal-2.1.0-fix-pytest-warning.patch 315 BLAKE2B e04d8f7d9dca768cb805f8
 AUX subliminal-2.1.0-rarfile-4.0-compat.patch 971 BLAKE2B a26cd6ef8e2602abdcd8f4fa2d188e7a76a5b3a18c556adfb4b4218a852f976c0e85c83ff9e953151a09ac995b48170713ac399a1f89fe6e43f2b3aa215cff57 SHA512 eae1852b7d75f77783bb11f6e77082e3317dbc4be62e1fa04ad5138125a70e100eee42726b0f23d0baed83e973b0d98ac382096c3dc64bafb8b95db2d8a33a3e
 DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3d322c4e933aad10afb3aa6f69bb3469114c4400d161e53d8a7618b818b22465177460003804a7ac3e69fa4f4db000d SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f
 DIST subliminal-2.1.0.tar.gz 5480458 BLAKE2B 249bdd027d99dfb0b81d939af2dc08f62b52dca2c8618f1006ca76eee41c2443b450076eddc1aa533997beca8cdf9016b884d7eceeebbf4e48ced91dae1a2361 SHA512 9b26ae594895470830547eed604aa5b28b75f590e5be12c2d5a478c5daf798d405f209639bd54dce0565b0e27d1b0daa5bef87dfa8590af61f2ab1e287c41060
+DIST subliminal-2.2.1.gh.tar.gz 3165965 BLAKE2B 9b69547540773d1434117a0e81bebcb3da49f97c145285a2bb2349ff8d6a4cb35f42f8fa8c306d2afedaf0ccff275908526a0f6d6c7ba7846aea6acd2b154b92 SHA512 4e59ccfe42419bb33df395aad6c2255ad03cfe7311fc754ea591be7c9e33ef5cc3e980a1da2839afe79e3b22024b3e7b458b03b4e6270ea8bcadc0337d7e37bf
 EBUILD subliminal-2.1.0-r2.ebuild 2745 BLAKE2B 288c4b2344576e480cff2eb3119e2ff6dfd371aee22d94d1bba9f26a65341a8b314aa68f3247095bae583fd2a1af1d2fbed6f7d0219b005a0826f7f195f91eea SHA512 67151fb4aad8038deb2b8636a00cb504c0f9262cb7caa9373b59a055757455b002c135430db32db1207a2152166288583391ecedb2f013c46ec62a003d868538
-EBUILD subliminal-9999.ebuild 2746 BLAKE2B a6c2ed19d9e8986a9992c895677c8214bee8478ad4e266a9dc47958b06ccf9d75f4d8d841dbc86f5d4a1e2292e099cf92049e0fe3688adcd04cf62f07983ac42 SHA512 823fea7ff8521831096a768c9e9c810878ad4e37dbe68e2b6e11bafd0412601b1d92ca8bfc93275132b3a10e575392fb1e16e56326ebebfb0a7265d39804ae1c
+EBUILD subliminal-2.2.1.ebuild 2257 BLAKE2B 01209be0c19e0a3be5fc96a7d21ed5d994a768bdfe274fdb5fb9e5fb14fa8765de114dffdea5a8e9b7281deac3c2331e111298f989819b8a7be821842b108315 SHA512 7715ea0360da92e39f78823983f8507cf95f25b3aa100c916fad16f6310172acc6c3a75a517cbe56e7a259c6b0a62bf6f006cfebbd133b5f347a1d094afc55a9
+EBUILD subliminal-9999.ebuild 2250 BLAKE2B 272763ffa8d84987d4eeb716d0149d1b9339140c7f6576067ab66a3c603ad88742fbd6d1aeb8a7438337352410fb96fe18caec53d31eabddd57c8a1a5bc5ebcc SHA512 67001ae785e7c27adfee96baa867c09efd7042f10304a7270b163216964777c04715b9687e4931c538573e1da6630ea8c59fa5d5cb30cb37a2fa01407057a266
 MISC metadata.xml 447 BLAKE2B 42fac15336ea05ed85313259c5571f8e4101a39157973a2c43bc1a77bdb1e6610e9373646d485f8e5a5df1420b8fb3c780393e3191d4069a4e2ec5296733adc1 SHA512 fa0256091da7f65f41cfdd1b4ebd7e485c15c8a72cd916d553003e0d8beca479b0d0d877ad90c6c986b5c24070a89994d359f4672d2dfac513d06e9a8683d826
diff --git a/media-video/subliminal/subliminal-2.2.1.ebuild b/media-video/subliminal/subliminal-2.2.1.ebuild
new file mode 100644
index 000000000000..4a01589227ac
--- /dev/null
+++ b/media-video/subliminal/subliminal-2.2.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE='xml(+)'
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to search and download subtitles"
+HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal/"
+
+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}.gh.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+SRC_URI+=" test? ( https://downloads.sourceforge.net/matroska/test_files/matroska_test_w1_1.zip )"
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="
+	test? (
+		app-arch/unzip
+		dev-python/sympy[${PYTHON_USEDEP}]
+		>=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/babelfish-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup4-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-5.0[${PYTHON_USEDEP}]
+	>=dev-python/click-8.0[${PYTHON_USEDEP}]
+	>=dev-python/click-option-group-0.5.6[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-1.0[${PYTHON_USEDEP}]
+	>=dev-python/enzyme-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/guessit-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-4.2[${PYTHON_USEDEP}]
+	>=dev-python/pysubs2-1.7[${PYTHON_USEDEP}]
+	>=dev-python/rarfile-2.7[compressed,${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	>=dev-python/srt-3.5[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2[${PYTHON_USEDEP}]
+"
+
+EPYTEST_DESELECT=(
+	# Needs network
+	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
+
+	# TODO
+	tests/test_core.py::test_refine_video_metadata
+)
+
+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() {
+	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
+}
diff --git a/media-video/subliminal/subliminal-9999.ebuild b/media-video/subliminal/subliminal-9999.ebuild
index 87f5bf683f90..1aa8338f1813 100644
--- a/media-video/subliminal/subliminal-9999.ebuild
+++ b/media-video/subliminal/subliminal-9999.ebuild
@@ -4,31 +4,28 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE='xml(+)'
 
 inherit distutils-r1
 
+DESCRIPTION="Python library to search and download subtitles"
+HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal/"
+
 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"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	SRC_URI="https://github.com/Diaoul/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64"
 fi
 
-DESCRIPTION="Python library to search and download subtitles"
-HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal/"
 SRC_URI+=" test? ( https://downloads.sourceforge.net/matroska/test_files/matroska_test_w1_1.zip )"
 
 LICENSE="MIT"
 SLOT="0"
 
-# The cassettes have bitrotted a bit as of 2024-06-01 but there's
-# a lot of movement upstream on the 'develop' branch towards a new release.
-RESTRICT="test"
-
 BDEPEND="
 	test? (
 		app-arch/unzip
@@ -37,26 +34,33 @@ BDEPEND="
 	)
 "
 RDEPEND="
-	>=dev-python/appdirs-1.3[${PYTHON_USEDEP}]
-	>=dev-python/babelfish-0.5.2[${PYTHON_USEDEP}]
+	>=dev-python/babelfish-0.6.1[${PYTHON_USEDEP}]
 	>=dev-python/beautifulsoup4-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/click-4.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-5.0[${PYTHON_USEDEP}]
+	>=dev-python/click-8.0[${PYTHON_USEDEP}]
+	>=dev-python/click-option-group-0.5.6[${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/dogpile-cache-1.0[${PYTHON_USEDEP}]
+	>=dev-python/enzyme-0.5.0[${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/platformdirs-4.2[${PYTHON_USEDEP}]
+	>=dev-python/pysubs2-1.7[${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}]
+	>=dev-python/srt-3.5[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2[${PYTHON_USEDEP}]
 "
 
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-pytest-warning.patch
-	"${FILESDIR}"/${PN}-2.1.0-rarfile-4.0-compat.patch
+EPYTEST_DESELECT=(
+	# Needs network
+	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
+
+	# TODO
+	tests/test_core.py::test_refine_video_metadata
 )
 
 distutils_enable_tests pytest
@@ -71,12 +75,6 @@ src_unpack() {
 }
 
 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
@@ -84,16 +82,3 @@ python_prepare_all() {
 
 	distutils-r1_python_prepare_all
 }
-
-python_test() {
-	EPYTEST_DESELECT=(
-		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
-		# NotImplementedError
-		tests/test_core.py::test_save_subtitles
-	)
-
-	epytest
-}