1 |
commit: bdc651f9f8425f33c8249a83b3d76929e404cf94 |
2 |
Author: Nicola Smaniotto <smaniotto.nicola <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Oct 4 14:05:31 2021 +0000 |
4 |
Commit: Nicola Smaniotto <smaniotto.nicola <AT> gmail <DOT> com> |
5 |
CommitDate: Mon Oct 4 14:05:54 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bdc651f9 |
7 |
|
8 |
media-video/ffsubsync: bump to 0.4.18 |
9 |
|
10 |
The patch removes the dependency from future-annotations, since those |
11 |
features are available in the __future__ module since python 3.7 |
12 |
|
13 |
Closes: https://bugs.gentoo.org/805260 |
14 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
15 |
Signed-off-by: Nicola Smaniotto <smaniotto.nicola <AT> gmail.com> |
16 |
|
17 |
media-video/ffsubsync/Manifest | 2 +- |
18 |
...bsync-0.4.11.ebuild => ffsubsync-0.4.18.ebuild} | 4 + |
19 |
...fsubsync-0.4.18-remove-future_annotations.patch | 176 +++++++++++++++++++++ |
20 |
3 files changed, 181 insertions(+), 1 deletion(-) |
21 |
|
22 |
diff --git a/media-video/ffsubsync/Manifest b/media-video/ffsubsync/Manifest |
23 |
index 2a956b359..c439335e7 100644 |
24 |
--- a/media-video/ffsubsync/Manifest |
25 |
+++ b/media-video/ffsubsync/Manifest |
26 |
@@ -1 +1 @@ |
27 |
-DIST ffsubsync-0.4.11.tar.gz 3818585 BLAKE2B 2f17da90306b4060553508b445c59eff4d73dfebf57754924a0836d791054a41e5f84e34813d85ea528136d8d1c64e71dd41e843b752015b9de6fac1edb38689 SHA512 decb4ff110c723228271961692bb12eac12c0e8c7b574d23d22fe760f0bcee3ad44811ce8ef8a7ee03a68ae9d15721ede363e6b0389ff44d48f521b045489ccb |
28 |
+DIST ffsubsync-0.4.18.tar.gz 3821259 BLAKE2B 79c1d7ed1316b1c91f23de442988c0234c89f3f51a605f3982aa32c880f2bb33f0bd280906d3b2ea3c3f9de4b1453b0c053b16cd382ee55ea24f692f81b6cd04 SHA512 be3243b8a24c163509f519105e509a26e8fac76ba2305b07c413ade1c645043bc90f9d0c862f346d911e5897bc1b97f5c34d9c210146df0aab24345b0541204b |
29 |
|
30 |
diff --git a/media-video/ffsubsync/ffsubsync-0.4.11.ebuild b/media-video/ffsubsync/ffsubsync-0.4.18.ebuild |
31 |
similarity index 93% |
32 |
rename from media-video/ffsubsync/ffsubsync-0.4.11.ebuild |
33 |
rename to media-video/ffsubsync/ffsubsync-0.4.18.ebuild |
34 |
index 84410fb6e..789c74400 100644 |
35 |
--- a/media-video/ffsubsync/ffsubsync-0.4.11.ebuild |
36 |
+++ b/media-video/ffsubsync/ffsubsync-0.4.18.ebuild |
37 |
@@ -28,6 +28,10 @@ RDEPEND=" |
38 |
dev-python/webrtcvad[${PYTHON_USEDEP}] |
39 |
" |
40 |
|
41 |
+PATCHES=( |
42 |
+ "${FILESDIR}"/"${P}"-remove-future_annotations.patch |
43 |
+) |
44 |
+ |
45 |
distutils_enable_tests pytest |
46 |
|
47 |
python_prepare_all() { |
48 |
|
49 |
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 |
50 |
new file mode 100644 |
51 |
index 000000000..c8e743adc |
52 |
--- /dev/null |
53 |
+++ b/media-video/ffsubsync/files/ffsubsync-0.4.18-remove-future_annotations.patch |
54 |
@@ -0,0 +1,176 @@ |
55 |
+Removes the dependency from future-annotations, since the ebuild does |
56 |
+not support <dev-lang/python-3.7, using the __future__ module instead. |
57 |
+Patch by Nicola Smaniotto. |
58 |
+ |
59 |
+diff --git a/ffsubsync/__init__.py b/ffsubsync/__init__.py |
60 |
+index 1ce6e51..965cb46 100644 |
61 |
+--- a/ffsubsync/__init__.py |
62 |
++++ b/ffsubsync/__init__.py |
63 |
+@@ -1,4 +1,4 @@ |
64 |
+-# -*- coding: future_annotations -*- |
65 |
++from __future__ import annotations |
66 |
+ import logging |
67 |
+ import sys |
68 |
+ |
69 |
+diff --git a/ffsubsync/aligners.py b/ffsubsync/aligners.py |
70 |
+index 6c7afc7..d777eff 100644 |
71 |
+--- a/ffsubsync/aligners.py |
72 |
++++ b/ffsubsync/aligners.py |
73 |
+@@ -1,4 +1,4 @@ |
74 |
+-# -*- coding: future_annotations -*- |
75 |
++from __future__ import annotations |
76 |
+ import logging |
77 |
+ import math |
78 |
+ from typing import TYPE_CHECKING |
79 |
+diff --git a/ffsubsync/constants.py b/ffsubsync/constants.py |
80 |
+index 99d08e9..176e786 100644 |
81 |
+--- a/ffsubsync/constants.py |
82 |
++++ b/ffsubsync/constants.py |
83 |
+@@ -1,4 +1,4 @@ |
84 |
+-# -*- coding: future_annotations -*- |
85 |
++from __future__ import annotations |
86 |
+ from typing import TYPE_CHECKING |
87 |
+ |
88 |
+ if TYPE_CHECKING: |
89 |
+diff --git a/ffsubsync/ffmpeg_utils.py b/ffsubsync/ffmpeg_utils.py |
90 |
+index ee96da3..10dd923 100644 |
91 |
+--- a/ffsubsync/ffmpeg_utils.py |
92 |
++++ b/ffsubsync/ffmpeg_utils.py |
93 |
+@@ -1,4 +1,4 @@ |
94 |
+-# -*- coding: future_annotations -*- |
95 |
++from __future__ import annotations |
96 |
+ import logging |
97 |
+ import os |
98 |
+ import platform |
99 |
+diff --git a/ffsubsync/ffsubsync.py b/ffsubsync/ffsubsync.py |
100 |
+index d10e969..6005b5c 100755 |
101 |
+--- a/ffsubsync/ffsubsync.py |
102 |
++++ b/ffsubsync/ffsubsync.py |
103 |
+@@ -1,5 +1,5 @@ |
104 |
+ #!/usr/bin/env python |
105 |
+-# -*- coding: future_annotations -*- |
106 |
++from __future__ import annotations |
107 |
+ import argparse |
108 |
+ from datetime import datetime |
109 |
+ import logging |
110 |
+diff --git a/ffsubsync/ffsubsync_gui.py b/ffsubsync/ffsubsync_gui.py |
111 |
+index a8c7ba1..b29607c 100755 |
112 |
+--- a/ffsubsync/ffsubsync_gui.py |
113 |
++++ b/ffsubsync/ffsubsync_gui.py |
114 |
+@@ -1,5 +1,5 @@ |
115 |
+ #!/usr/bin/env python |
116 |
+-# -*- coding: future_annotations -*- |
117 |
++from __future__ import annotations |
118 |
+ import logging |
119 |
+ import os |
120 |
+ import sys |
121 |
+diff --git a/ffsubsync/file_utils.py b/ffsubsync/file_utils.py |
122 |
+index cfb3867..2aa7a9a 100644 |
123 |
+--- a/ffsubsync/file_utils.py |
124 |
++++ b/ffsubsync/file_utils.py |
125 |
+@@ -1,4 +1,4 @@ |
126 |
+-# -*- coding: future_annotations -*- |
127 |
++from __future__ import annotations |
128 |
+ import six |
129 |
+ import sys |
130 |
+ |
131 |
+diff --git a/ffsubsync/generic_subtitles.py b/ffsubsync/generic_subtitles.py |
132 |
+index 65c3729..a293eab 100644 |
133 |
+--- a/ffsubsync/generic_subtitles.py |
134 |
++++ b/ffsubsync/generic_subtitles.py |
135 |
+@@ -1,4 +1,4 @@ |
136 |
+-# -*- coding: future_annotations -*- |
137 |
++from __future__ import annotations |
138 |
+ import copy |
139 |
+ from datetime import timedelta |
140 |
+ import logging |
141 |
+diff --git a/ffsubsync/sklearn_shim.py b/ffsubsync/sklearn_shim.py |
142 |
+index d127e6a..f9d060d 100644 |
143 |
+--- a/ffsubsync/sklearn_shim.py |
144 |
++++ b/ffsubsync/sklearn_shim.py |
145 |
+@@ -1,4 +1,4 @@ |
146 |
+-# -*- coding: future_annotations -*- |
147 |
++from __future__ import annotations |
148 |
+ """ |
149 |
+ This module borrows and adapts `Pipeline` from `sklearn.pipeline` and |
150 |
+ `TransformerMixin` from `sklearn.base` in the scikit-learn framework |
151 |
+diff --git a/ffsubsync/speech_transformers.py b/ffsubsync/speech_transformers.py |
152 |
+index 21a042a..ead16de 100644 |
153 |
+--- a/ffsubsync/speech_transformers.py |
154 |
++++ b/ffsubsync/speech_transformers.py |
155 |
+@@ -1,4 +1,4 @@ |
156 |
+-# -*- coding: future_annotations -*- |
157 |
++from __future__ import annotations |
158 |
+ from contextlib import contextmanager |
159 |
+ import logging |
160 |
+ import io |
161 |
+diff --git a/ffsubsync/subtitle_parser.py b/ffsubsync/subtitle_parser.py |
162 |
+index 92a01db..74a7b5b 100755 |
163 |
+--- a/ffsubsync/subtitle_parser.py |
164 |
++++ b/ffsubsync/subtitle_parser.py |
165 |
+@@ -1,4 +1,4 @@ |
166 |
+-# -*- coding: future_annotations -*- |
167 |
++from __future__ import annotations |
168 |
+ from datetime import timedelta |
169 |
+ import logging |
170 |
+ from typing import TYPE_CHECKING |
171 |
+diff --git a/ffsubsync/subtitle_transformers.py b/ffsubsync/subtitle_transformers.py |
172 |
+index fbb498b..f18151d 100644 |
173 |
+--- a/ffsubsync/subtitle_transformers.py |
174 |
++++ b/ffsubsync/subtitle_transformers.py |
175 |
+@@ -1,4 +1,4 @@ |
176 |
+-# -*- coding: future_annotations -*- |
177 |
++from __future__ import annotations |
178 |
+ from datetime import timedelta |
179 |
+ import logging |
180 |
+ import numbers |
181 |
+diff --git a/ffsubsync/version.py b/ffsubsync/version.py |
182 |
+index fadd2c7..ef01e83 100644 |
183 |
+--- a/ffsubsync/version.py |
184 |
++++ b/ffsubsync/version.py |
185 |
+@@ -1,4 +1,4 @@ |
186 |
+-# -*- coding: future_annotations -*- |
187 |
++from __future__ import annotations |
188 |
+ import os |
189 |
+ from ffsubsync.constants import SUBSYNC_RESOURCES_ENV_MAGIC |
190 |
+ from ffsubsync._version import get_versions |
191 |
+diff --git a/tests/test_alignment.py b/tests/test_alignment.py |
192 |
+index 13d60d0..9aa476e 100644 |
193 |
+--- a/tests/test_alignment.py |
194 |
++++ b/tests/test_alignment.py |
195 |
+@@ -1,4 +1,4 @@ |
196 |
+-# -*- coding: future_annotations -*- |
197 |
++from __future__ import annotations |
198 |
+ import pytest |
199 |
+ from ffsubsync.aligners import FFTAligner, MaxScoreAligner |
200 |
+ |
201 |
+diff --git a/tests/test_integration.py b/tests/test_integration.py |
202 |
+index dd470a5..7f36769 100644 |
203 |
+--- a/tests/test_integration.py |
204 |
++++ b/tests/test_integration.py |
205 |
+@@ -1,4 +1,4 @@ |
206 |
+-# -*- coding: future_annotations -*- |
207 |
++from __future__ import annotations |
208 |
+ |
209 |
+ import filecmp |
210 |
+ import os |
211 |
+diff --git a/tests/test_misc.py b/tests/test_misc.py |
212 |
+index 135f4ae..3168493 100644 |
213 |
+--- a/tests/test_misc.py |
214 |
++++ b/tests/test_misc.py |
215 |
+@@ -1,4 +1,4 @@ |
216 |
+-# -*- coding: future_annotations -*- |
217 |
++from __future__ import annotations |
218 |
+ import pytest |
219 |
+ from ffsubsync.version import make_version_tuple |
220 |
+ |
221 |
+diff --git a/tests/test_subtitles.py b/tests/test_subtitles.py |
222 |
+index ae6f42b..29ffa21 100644 |
223 |
+--- a/tests/test_subtitles.py |
224 |
++++ b/tests/test_subtitles.py |
225 |
+@@ -1,4 +1,4 @@ |
226 |
+-# -*- coding: future_annotations -*- |
227 |
++from __future__ import annotations |
228 |
+ import itertools |
229 |
+ from io import BytesIO |
230 |
+ from datetime import timedelta |