From bdc651f9f8425f33c8249a83b3d76929e404cf94 Mon Sep 17 00:00:00 2001
From: Nicola Smaniotto <smaniotto.nicola@gmail.com>
Date: Mon, 4 Oct 2021 16:05:31 +0200
Subject: [PATCH] media-video/ffsubsync: bump to 0.4.18

The patch removes the dependency from future-annotations, since those
features are available in the __future__ module since python 3.7

Closes: https://bugs.gentoo.org/805260
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Nicola Smaniotto <smaniotto.nicola@gmail.com>
---
 media-video/ffsubsync/Manifest                |   2 +-
 ...-0.4.11.ebuild => ffsubsync-0.4.18.ebuild} |   4 +
 ...ync-0.4.18-remove-future_annotations.patch | 176 ++++++++++++++++++
 3 files changed, 181 insertions(+), 1 deletion(-)
 rename media-video/ffsubsync/{ffsubsync-0.4.11.ebuild => ffsubsync-0.4.18.ebuild} (93%)
 create mode 100644 media-video/ffsubsync/files/ffsubsync-0.4.18-remove-future_annotations.patch

diff --git a/media-video/ffsubsync/Manifest b/media-video/ffsubsync/Manifest
index 2a956b3594..c439335e71 100644
--- a/media-video/ffsubsync/Manifest
+++ b/media-video/ffsubsync/Manifest
@@ -1 +1 @@
-DIST ffsubsync-0.4.11.tar.gz 3818585 BLAKE2B 2f17da90306b4060553508b445c59eff4d73dfebf57754924a0836d791054a41e5f84e34813d85ea528136d8d1c64e71dd41e843b752015b9de6fac1edb38689 SHA512 decb4ff110c723228271961692bb12eac12c0e8c7b574d23d22fe760f0bcee3ad44811ce8ef8a7ee03a68ae9d15721ede363e6b0389ff44d48f521b045489ccb
+DIST ffsubsync-0.4.18.tar.gz 3821259 BLAKE2B 79c1d7ed1316b1c91f23de442988c0234c89f3f51a605f3982aa32c880f2bb33f0bd280906d3b2ea3c3f9de4b1453b0c053b16cd382ee55ea24f692f81b6cd04 SHA512 be3243b8a24c163509f519105e509a26e8fac76ba2305b07c413ade1c645043bc90f9d0c862f346d911e5897bc1b97f5c34d9c210146df0aab24345b0541204b
diff --git a/media-video/ffsubsync/ffsubsync-0.4.11.ebuild b/media-video/ffsubsync/ffsubsync-0.4.18.ebuild
similarity index 93%
rename from media-video/ffsubsync/ffsubsync-0.4.11.ebuild
rename to media-video/ffsubsync/ffsubsync-0.4.18.ebuild
index 84410fb6e4..789c74400e 100644
--- a/media-video/ffsubsync/ffsubsync-0.4.11.ebuild
+++ b/media-video/ffsubsync/ffsubsync-0.4.18.ebuild
@@ -28,6 +28,10 @@ RDEPEND="
 	dev-python/webrtcvad[${PYTHON_USEDEP}]
 "
 
+PATCHES=(
+	"${FILESDIR}"/"${P}"-remove-future_annotations.patch
+)
+
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/media-video/ffsubsync/files/ffsubsync-0.4.18-remove-future_annotations.patch b/media-video/ffsubsync/files/ffsubsync-0.4.18-remove-future_annotations.patch
new file mode 100644
index 0000000000..c8e743adc2
--- /dev/null
+++ b/media-video/ffsubsync/files/ffsubsync-0.4.18-remove-future_annotations.patch
@@ -0,0 +1,176 @@
+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