From c31f575f39c1e387f18f630fb01d3a89c2339fdf Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 5 Feb 2024 17:43:10 +0000
Subject: gentoo auto-resync : 05:02:2024 - 17:43:10

---
 dev-python/ffmpeg-python/Manifest                  |  3 +-
 .../ffmpeg-python-0.2.0_p20220711-r1.ebuild        | 52 ++++++++++++++++++++
 .../ffmpeg-python-0.2.0_p20220711.ebuild           | 56 ----------------------
 .../files/ffmpeg-python-0.2.0-collections.patch    | 14 ++++++
 4 files changed, 68 insertions(+), 57 deletions(-)
 create mode 100644 dev-python/ffmpeg-python/ffmpeg-python-0.2.0_p20220711-r1.ebuild
 delete mode 100644 dev-python/ffmpeg-python/ffmpeg-python-0.2.0_p20220711.ebuild
 create mode 100644 dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-collections.patch

(limited to 'dev-python/ffmpeg-python')

diff --git a/dev-python/ffmpeg-python/Manifest b/dev-python/ffmpeg-python/Manifest
index ce6b3e1a9f33..bd0de89deeff 100644
--- a/dev-python/ffmpeg-python/Manifest
+++ b/dev-python/ffmpeg-python/Manifest
@@ -1,4 +1,5 @@
+AUX ffmpeg-python-0.2.0-collections.patch 292 BLAKE2B e5840ddea5bc5062a3aea67269f21c89b0e61d072dcdbfe8b9d4904461ffa72d9aadad7c6d09ca479baff1878ea4bb89516db1ffa5b00405459519e3faa8fc49 SHA512 70bfa3b19e6875cda8374c010c435888a5be4f511d984f67eb86a1cabb115114538eb2cea6033e45bfc146c46f0e0c7e76483b97b87ce011576895e3c5f4c54a
 AUX ffmpeg-python-0.2.0-no-future-795.patch 6088 BLAKE2B 259372f7b0ab18eecc387ccda08b9ef668c7323ce7685ac397c086f8de4d3299b4822b1307b44a1fa0cec7ddf5095ef4b9d388303c36ada6e87e56c2f0399db6 SHA512 cd1e666de2f64b6b9955dc351e694aa8a40cb3de3cfc36fae2cd8bfeb8c0d9c82230151586a6085261a4c4fdb9f4547aac6284956162c8ab958019a577677023
 DIST ffmpeg-python-0.2.0_p20220711.gh.tar.gz 3286678 BLAKE2B f2dd4445f43ebf2a867d528e24e80b137ddc099770069e1fdf081b640f8ea192ee0b17c26d9ee3d8a69a9c7bbd61d0b75cc3468aa5da4fdd809e50126dff4e06 SHA512 81f20e5cad819500b941d9ac579fe01efb4292f61e6279c6d560d70c11143d7c04146a8ccf9ae8ab6985cf04e6b7cc05849ec67df646caa75764f3a2c5761cde
-EBUILD ffmpeg-python-0.2.0_p20220711.ebuild 1408 BLAKE2B 1fbd8c4eab3fa4e73e384015ab6b3834624ef4ba090f1da2b3a1f379dbee18178a7cf76df8fd61e043a079fdb0dab6a84e4923b47d03f03d7de597f87fd48e3f SHA512 23ead994c3a07155db8e9e485a72d6d6ecc20abc30dbcea2f3801042e3069823be255caba8b6b2063c768a7b4996b1b8a187a2c5fed22b49c8a7e434393e3a71
+EBUILD ffmpeg-python-0.2.0_p20220711-r1.ebuild 1113 BLAKE2B 6f6c6b8d04da261b8a2757c1057bdf72c19bce75d7624eb5ef354b7a7c63f6b4766f7d1f5829ff273eab388f56ca4ecde68fe07626db5f0217908f7e8bcd1e65 SHA512 d9be7427b7cfd2ff66eaa1feb1c115ed2e0026e426e8db0729becc65d719ede762c42002c1b21fa15b778483e77e5f6696a881d1eb7c5fee9e3a06dc661b51ff
 MISC metadata.xml 577 BLAKE2B b155f565cf1946c705d3e9ad1a6f350235eebbb065bd109e53825cac7103c266f5fe675795daeeee960c36857e7ba88e72694ea42a7f5630117194bb9a72891d SHA512 aad6a67315534a72e86b1cf3146f7f43612c1e3a3782a681541e4ed4e6d5be70b2f1d46167fd0dd7efbe3bb07699787423b609b5da27a13e65081014adcd1653
diff --git a/dev-python/ffmpeg-python/ffmpeg-python-0.2.0_p20220711-r1.ebuild b/dev-python/ffmpeg-python/ffmpeg-python-0.2.0_p20220711-r1.ebuild
new file mode 100644
index 000000000000..c7249195f193
--- /dev/null
+++ b/dev-python/ffmpeg-python/ffmpeg-python-0.2.0_p20220711-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+[[ "${PV}" == *_p20220711 ]] && COMMIT=df129c7ba30aaa9ffffb81a48f53aa7253b0b4e6
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for FFmpeg with complex filtering support"
+HOMEPAGE="https://github.com/kkroening/ffmpeg-python/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/kkroening/${PN}.git"
+else
+	SRC_URI="https://github.com/kkroening/${PN}/archive/${COMMIT}.tar.gz
+		-> ${P}.gh.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+
+	KEYWORDS="amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-video/ffmpeg
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2.0-no-future-795.patch"
+	"${FILESDIR}/${PN}-0.2.0-collections.patch"
+)
+
+EPYTEST_DESELECT=(
+	ffmpeg/tests/test_ffmpeg.py::test__probe
+	ffmpeg/tests/test_ffmpeg.py::test_pipe
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc/src
diff --git a/dev-python/ffmpeg-python/ffmpeg-python-0.2.0_p20220711.ebuild b/dev-python/ffmpeg-python/ffmpeg-python-0.2.0_p20220711.ebuild
deleted file mode 100644
index 751957b2d60f..000000000000
--- a/dev-python/ffmpeg-python/ffmpeg-python-0.2.0_p20220711.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-[[ "${PV}" == *_p20220711 ]] && COMMIT=df129c7ba30aaa9ffffb81a48f53aa7253b0b4e6
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for FFmpeg with complex filtering support"
-HOMEPAGE="https://github.com/kkroening/ffmpeg-python/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/kkroening/${PN}.git"
-else
-	SRC_URI="https://github.com/kkroening/${PN}/archive/${COMMIT}.tar.gz
-		-> ${P}.gh.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}"
-
-	KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-video/ffmpeg
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.2.0-no-future-795.patch"
-)
-
-EPYTEST_DESELECT=(
-	ffmpeg/tests/test_ffmpeg.py::test__get_filter_complex_input
-	ffmpeg/tests/test_ffmpeg.py::test__input__start_time
-	ffmpeg/tests/test_ffmpeg.py::test__multi_output_edge_label_order
-	ffmpeg/tests/test_ffmpeg.py::test__probe
-	ffmpeg/tests/test_ffmpeg.py::test__probe__extra_args
-	ffmpeg/tests/test_ffmpeg.py::test_fluent_complex_filter
-	ffmpeg/tests/test_ffmpeg.py::test_pipe
-	ffmpeg/tests/test_ffmpeg.py::test_repeated_args
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc/src
diff --git a/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-collections.patch b/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-collections.patch
new file mode 100644
index 000000000000..fe905e9670b7
--- /dev/null
+++ b/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-collections.patch
@@ -0,0 +1,14 @@
+--- a/ffmpeg/_utils.py
++++ b/ffmpeg/_utils.py
+@@ -3,6 +3,11 @@ from builtins import str
+ import hashlib
+ import sys
+ 
++try:
++    from collections.abc import Iterable
++except ImportError:
++    from collections import Iterable
++
+ 
+ def with_metaclass(meta, *bases):
+     class metaclass(meta):
-- 
cgit v1.2.3