[gentoo-commits] repo/proj/guru:dev commit in: media-video/ffsubsync/, media-video/ffsubsync/files/

[gentoo-commits] repo/proj/guru:dev commit in: media-video/ffsubsync/, media-video/ffsubsync/files/

[Nicola Smaniotto]

commit:     1fa7080ab3ebd16d6086f94774300d59208bfbe6
Author:     Nicola Smaniotto <smaniotto.nicola <AT> gmail <DOT> com>
AuthorDate: Tue Feb  7 09:23:31 2023 +0000
Commit:     Nicola Smaniotto <smaniotto.nicola <AT> gmail <DOT> com>
CommitDate: Tue Feb  7 09:38:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1fa7080a

media-video/ffsubsync: add 0.4.23, drop 0.4.19-r1

Signed-off-by: Nicola Smaniotto <smaniotto.nicola <AT> gmail.com>

 media-video/ffsubsync/Manifest                     |   2 +-
 ...nc-0.4.19-r1.ebuild => ffsubsync-0.4.23.ebuild} |  22 ++-
 ...fsubsync-0.4.19-remove-future_annotations.patch | 176 ---------------------
 3 files changed, 10 insertions(+), 190 deletions(-)

diff --git a/media-video/ffsubsync/Manifest b/media-video/ffsubsync/Manifest
index 5f34b4def..ea0c796d7 100644
--- a/media-video/ffsubsync/Manifest
+++ b/media-video/ffsubsync/Manifest
@@ -1,3 +1,3 @@
-DIST ffsubsync-0.4.19.tar.gz 3821580 BLAKE2B 0e34ab0c4426dc6c0319cd3ccee9ade3b1ebef5bf807511d96cd08a9e492d3e2f7220eb4c3bf80815643b52b0f23d44c04d014f909685e9d999ca5df25cfca12 SHA512 48b1810afa4f081a08932d85cdebbfba46de2adc452085d3191576a3b34c921145e6911508d09e4485b31e8ddfceeb5e8b9aaf1ee24d23a46608b4cba09fd4a7
 DIST ffsubsync-0.4.20.tar.gz 3822265 BLAKE2B e478f4ca0305353d43dbefbc220f7b29ae50a6bfbdadd7716703b72c202de759ffab07ab99f8af3fdc3172c6e5c4f528713ae1bc1db25c28c04d0f8484235755 SHA512 96898316daaf01f4d892ecf3b1907799d621d751acc9467d63837295d5498381acee1745c24bd20cc7b0e63e5dbd6e14d73ac08b1d6fae6f67531af00451209e
 DIST ffsubsync-0.4.22.tar.gz 3822889 BLAKE2B 3df9e52b38fc3d25243924e5a0005fa2332c4bfed93dc5538446e17f197f578a60f28de41c0496be91c258286f321ac1f72589c923b77c807e10abcf1b3a75b4 SHA512 4d4ef4b1e4c99a7d8810f84a9b494632bc374e6a91db037d79f76495a77f5243a48428cdcf679db03968616ebe5c81c9fc5550160125910c3332b4f4afd3f728
+DIST ffsubsync-0.4.23.tar.gz 3823053 BLAKE2B 0ee91bb0cf634a651285be3e5edbdbc3fc799211d2a3c8a279a95426e3d944501874279e3b545b0d6b53ab1d25333e36aa785d0e379bb838fc4a35a40b94b212 SHA512 408f735b52f1a875cb18b11a2809df03dd5e905c7c25de21feead7fe17e95708ffa7bc5f24ddde909b5957160dbf7ff8981bbb8ba7f499bb2621de042236e1e4

diff --git a/media-video/ffsubsync/ffsubsync-0.4.19-r1.ebuild b/media-video/ffsubsync/ffsubsync-0.4.23.ebuild
similarity index 71%
rename from media-video/ffsubsync/ffsubsync-0.4.19-r1.ebuild
rename to media-video/ffsubsync/ffsubsync-0.4.23.ebuild
index bcd9f94f9..736a3085e 100644
--- a/media-video/ffsubsync/ffsubsync-0.4.19-r1.ebuild
+++ b/media-video/ffsubsync/ffsubsync-0.4.23.ebuild
@@ -1,8 +1,9 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1
 
@@ -16,9 +17,13 @@ KEYWORDS="~amd64"
 
 RDEPEND="
 	~dev-python/auditok-0.1.5[${PYTHON_USEDEP}]
-	dev-python/cchardet[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/cchardet[${PYTHON_USEDEP}]
+	' python3_{8..10})
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/charset_normalizer[${PYTHON_USEDEP}]
 	dev-python/ffmpeg-python[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
+	>=dev-python/future-0.18.2[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.12.0[${PYTHON_USEDEP}]
 	>=dev-python/pysubs2-1.2.0[${PYTHON_USEDEP}]
 	dev-python/rich[${PYTHON_USEDEP}]
@@ -29,13 +34,4 @@ RDEPEND="
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
 
-PATCHES=(
-	"${FILESDIR}"/"${P}"-remove-future_annotations.patch
-)
-
 distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed "/argparse/d" -i requirements.txt || die
-	distutils-r1_python_prepare_all
-}

diff --git a/media-video/ffsubsync/files/ffsubsync-0.4.19-remove-future_annotations.patch b/media-video/ffsubsync/files/ffsubsync-0.4.19-remove-future_annotations.patch
deleted file mode 100644
index c8e743adc..000000000
--- a/media-video/ffsubsync/files/ffsubsync-0.4.19-remove-future_annotations.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-Removes the dependency from future-annotations, since the ebuild does
-not support <dev-lang/python-3.7, using the __future__ module instead.
-Patch by Nicola Smaniotto.
-
-diff --git a/ffsubsync/__init__.py b/ffsubsync/__init__.py
-index 1ce6e51..965cb46 100644
---- a/ffsubsync/__init__.py
-+++ b/ffsubsync/__init__.py
-@@ -1,4 +1,4 @@
--# -*- coding: future_annotations -*- 
-+from __future__ import annotations 
- import logging
- import sys
- 
-diff --git a/ffsubsync/aligners.py b/ffsubsync/aligners.py
-index 6c7afc7..d777eff 100644
---- a/ffsubsync/aligners.py
-+++ b/ffsubsync/aligners.py
-@@ -1,4 +1,4 @@
--# -*- coding: future_annotations -*- 
-+from __future__ import annotations 
- import logging
- import math
- from typing import TYPE_CHECKING
-diff --git a/ffsubsync/constants.py b/ffsubsync/constants.py
-index 99d08e9..176e786 100644
---- a/ffsubsync/constants.py
-+++ b/ffsubsync/constants.py
-@@ -1,4 +1,4 @@
--# -*- coding: future_annotations -*-
-+from __future__ import annotations
- from typing import TYPE_CHECKING
- 
- if TYPE_CHECKING:
-diff --git a/ffsubsync/ffmpeg_utils.py b/ffsubsync/ffmpeg_utils.py
-index ee96da3..10dd923 100644
---- a/ffsubsync/ffmpeg_utils.py
-+++ b/ffsubsync/ffmpeg_utils.py
-@@ -1,4 +1,4 @@
--# -*- coding: future_annotations -*-
-+from __future__ import annotations
- import logging
- import os
- import platform
-diff --git a/ffsubsync/ffsubsync.py b/ffsubsync/ffsubsync.py
-index d10e969..6005b5c 100755
---- a/ffsubsync/ffsubsync.py
-+++ b/ffsubsync/ffsubsync.py
-@@ -1,5 +1,5 @@
- #!/usr/bin/env python
--# -*- coding: future_annotations -*-
-+from __future__ import annotations
- import argparse
- from datetime import datetime
- import logging
-diff --git a/ffsubsync/ffsubsync_gui.py b/ffsubsync/ffsubsync_gui.py
-index a8c7ba1..b29607c 100755
---- a/ffsubsync/ffsubsync_gui.py
-+++ b/ffsubsync/ffsubsync_gui.py
-@@ -1,5 +1,5 @@
- #!/usr/bin/env python
--# -*- coding: future_annotations -*-
-+from __future__ import annotations
- import logging
- import os
- import sys
-diff --git a/ffsubsync/file_utils.py b/ffsubsync/file_utils.py
-index cfb3867..2aa7a9a 100644
---- a/ffsubsync/file_utils.py
-+++ b/ffsubsync/file_utils.py
-@@ -1,4 +1,4 @@
--# -*- coding: future_annotations -*- 
-+from __future__ import annotations 
- import six
- import sys
- 
-diff --git a/ffsubsync/generic_subtitles.py b/ffsubsync/generic_subtitles.py
-index 65c3729..a293eab 100644
---- a/ffsubsync/generic_subtitles.py
-+++ b/ffsubsync/generic_subtitles.py
-@@ -1,4 +1,4 @@
--# -*- coding: future_annotations -*-
-+from __future__ import annotations
- import copy
- from datetime import timedelta
- import logging
-diff --git a/ffsubsync/sklearn_shim.py b/ffsubsync/sklearn_shim.py
-index d127e6a..f9d060d 100644
---- a/ffsubsync/sklearn_shim.py
-+++ b/ffsubsync/sklearn_shim.py
-@@ -1,4 +1,4 @@
--# -*- coding: future_annotations -*-
-+from __future__ import annotations
- """
- This module borrows and adapts `Pipeline` from `sklearn.pipeline` and
- `TransformerMixin` from `sklearn.base` in the scikit-learn framework
-diff --git a/ffsubsync/speech_transformers.py b/ffsubsync/speech_transformers.py
-index 21a042a..ead16de 100644
---- a/ffsubsync/speech_transformers.py
-+++ b/ffsubsync/speech_transformers.py
-@@ -1,4 +1,4 @@
--# -*- coding: future_annotations -*-
-+from __future__ import annotations
- from contextlib import contextmanager
- import logging
- import io
-diff --git a/ffsubsync/subtitle_parser.py b/ffsubsync/subtitle_parser.py
-index 92a01db..74a7b5b 100755
---- a/ffsubsync/subtitle_parser.py
-+++ b/ffsubsync/subtitle_parser.py
-@@ -1,4 +1,4 @@
--# -*- coding: future_annotations -*-
-+from __future__ import annotations
- from datetime import timedelta
- import logging
- from typing import TYPE_CHECKING
-diff --git a/ffsubsync/subtitle_transformers.py b/ffsubsync/subtitle_transformers.py
-index fbb498b..f18151d 100644
---- a/ffsubsync/subtitle_transformers.py
-+++ b/ffsubsync/subtitle_transformers.py
-@@ -1,4 +1,4 @@
--# -*- coding: future_annotations -*-
-+from __future__ import annotations
- from datetime import timedelta
- import logging
- import numbers
-diff --git a/ffsubsync/version.py b/ffsubsync/version.py
-index fadd2c7..ef01e83 100644
---- a/ffsubsync/version.py
-+++ b/ffsubsync/version.py
-@@ -1,4 +1,4 @@
--# -*- coding: future_annotations -*-
-+from __future__ import annotations
- import os
- from ffsubsync.constants import SUBSYNC_RESOURCES_ENV_MAGIC
- from ffsubsync._version import get_versions
-diff --git a/tests/test_alignment.py b/tests/test_alignment.py
-index 13d60d0..9aa476e 100644
---- a/tests/test_alignment.py
-+++ b/tests/test_alignment.py
-@@ -1,4 +1,4 @@
--# -*- coding: future_annotations -*- 
-+from __future__ import annotations 
- import pytest
- from ffsubsync.aligners import FFTAligner, MaxScoreAligner
- 
-diff --git a/tests/test_integration.py b/tests/test_integration.py
-index dd470a5..7f36769 100644
---- a/tests/test_integration.py
-+++ b/tests/test_integration.py
-@@ -1,4 +1,4 @@
--# -*- coding: future_annotations -*-
-+from __future__ import annotations
- 
- import filecmp
- import os
-diff --git a/tests/test_misc.py b/tests/test_misc.py
-index 135f4ae..3168493 100644
---- a/tests/test_misc.py
-+++ b/tests/test_misc.py
-@@ -1,4 +1,4 @@
--# -*- coding: future_annotations -*-
-+from __future__ import annotations
- import pytest
- from ffsubsync.version import make_version_tuple
- 
-diff --git a/tests/test_subtitles.py b/tests/test_subtitles.py
-index ae6f42b..29ffa21 100644
---- a/tests/test_subtitles.py
-+++ b/tests/test_subtitles.py
-@@ -1,4 +1,4 @@
--# -*- coding: future_annotations -*- 
-+from __future__ import annotations 
- import itertools
- from io import BytesIO
- from datetime import timedelta