gentoo auto-resync : 29:01:2024 - 12:57:49

5 files changed, 2 insertions, 78 deletions

diff --git a/dev-python/ffmpeg-python/Manifest b/dev-python/ffmpeg-python/Manifest
index bb6aca640d2d..ce6b3e1a9f33 100644
--- a/dev-python/ffmpeg-python/Manifest
+++ b/dev-python/ffmpeg-python/Manifest
@@ -1,8 +1,4 @@
-AUX ffmpeg-python-0.2.0-_run.py-collections.patch 507 BLAKE2B 6e503e627656775c4cc665ff68adf4afd8ed36131b2d55cdd00d420aefbb69d1585ddc8ec6513b64ddcea1a20d0d522d9d9d0d885c1d03e7d11de3741543782c SHA512 571087d23eec2880de37cec5799f967a2cb498b56e1109e086ead82cf65f8fac94cbc9c63953954f7ab3b59970285ecc18f5c446fc930a0c09ac8552251d47ec
 AUX ffmpeg-python-0.2.0-no-future-795.patch 6088 BLAKE2B 259372f7b0ab18eecc387ccda08b9ef668c7323ce7685ac397c086f8de4d3299b4822b1307b44a1fa0cec7ddf5095ef4b9d388303c36ada6e87e56c2f0399db6 SHA512 cd1e666de2f64b6b9955dc351e694aa8a40cb3de3cfc36fae2cd8bfeb8c0d9c82230151586a6085261a4c4fdb9f4547aac6284956162c8ab958019a577677023
-AUX ffmpeg-python-0.2.0-setup.py-pytest-runner.patch 366 BLAKE2B 874898215b2102406fa11ab4e2289671dc03a8b40a8831aa6958048b94c64a5cd1cd34d326539144ebe549046cb0df074e6ffb4b37a72aaa44d94c0bc161cfb6 SHA512 627bfc39b3f0feef02306d73d8dc113673483e0e1aa5182cada9d12195413d7638b94071a76b546092061d6916d45575a42aa5d949c8bd9df737c34b1b62ea71
-DIST ffmpeg-python-0.2.0.tar.gz 3267771 BLAKE2B 8bca4a24434b6c7a542e3c178cb7bf1e5650f9763636d5378f9652cdd07ef19b0e96007d6bb71fdf1664efb6e33d597844c7d6a44dc8dcb1c083e21f53649469 SHA512 933ed958d61536bbbc0e0b08e19521c4b1f7df1cfe97de0b3d149a2748c5bd74915a3134861e8ecb1f92d5860315228b76aefcd087fcf07e188a56c651f5e301
 DIST ffmpeg-python-0.2.0_p20220711.gh.tar.gz 3286678 BLAKE2B f2dd4445f43ebf2a867d528e24e80b137ddc099770069e1fdf081b640f8ea192ee0b17c26d9ee3d8a69a9c7bbd61d0b75cc3468aa5da4fdd809e50126dff4e06 SHA512 81f20e5cad819500b941d9ac579fe01efb4292f61e6279c6d560d70c11143d7c04146a8ccf9ae8ab6985cf04e6b7cc05849ec67df646caa75764f3a2c5761cde
-EBUILD ffmpeg-python-0.2.0.ebuild 1362 BLAKE2B a4de875270a6828e1daca329421ced60179fa07f88257e4bd0b047736b5f44e977ed73a7cdc0c858e522184295e8771c94bf641758467d92336e96587d4b44e8 SHA512 f337a2b35f737bd93ef765e04ddcdbfdbccd29bf079c6d9b266021cb9cd8c7e13ff3dc58e5b101bd5deedccb89fa334b1dc989f470ffe9fe531c187c3f71ccc3
-EBUILD ffmpeg-python-0.2.0_p20220711.ebuild 1409 BLAKE2B 8cf02ec06819c3fbb60586b2c608c6a3f427a127838f7badd658a9ba9a2d06f06a83b1a3010dab4378a592de786c86d528b22e55e334564cdadc072ba7fa05ca SHA512 38562a541681e01bf19a4751479b811defa86448799e0e7dfd6574139c96753aca707e19384d1ad22426b1874c2ba889c4af39197b3c94f92a51507cc792e53e
+EBUILD ffmpeg-python-0.2.0_p20220711.ebuild 1408 BLAKE2B 1fbd8c4eab3fa4e73e384015ab6b3834624ef4ba090f1da2b3a1f379dbee18178a7cf76df8fd61e043a079fdb0dab6a84e4923b47d03f03d7de597f87fd48e3f SHA512 23ead994c3a07155db8e9e485a72d6d6ecc20abc30dbcea2f3801042e3069823be255caba8b6b2063c768a7b4996b1b8a187a2c5fed22b49c8a7e434393e3a71
 MISC metadata.xml 577 BLAKE2B b155f565cf1946c705d3e9ad1a6f350235eebbb065bd109e53825cac7103c266f5fe675795daeeee960c36857e7ba88e72694ea42a7f5630117194bb9a72891d SHA512 aad6a67315534a72e86b1cf3146f7f43612c1e3a3782a681541e4ed4e6d5be70b2f1d46167fd0dd7efbe3bb07699787423b609b5da27a13e65081014adcd1653
diff --git a/dev-python/ffmpeg-python/ffmpeg-python-0.2.0.ebuild b/dev-python/ffmpeg-python/ffmpeg-python-0.2.0.ebuild
deleted file mode 100644
index fd18cd92f295..000000000000
--- a/dev-python/ffmpeg-python/ffmpeg-python-0.2.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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_{9..11} )
-
-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/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-video/ffmpeg
-"
-BDEPEND="test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-_run.py-collections.patch
-	"${FILESDIR}"/${P}-setup.py-pytest-runner.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/ffmpeg-python-0.2.0_p20220711.ebuild b/dev-python/ffmpeg-python/ffmpeg-python-0.2.0_p20220711.ebuild
index ad656ad67636..751957b2d60f 100644
--- a/dev-python/ffmpeg-python/ffmpeg-python-0.2.0_p20220711.ebuild
+++ b/dev-python/ffmpeg-python/ffmpeg-python-0.2.0_p20220711.ebuild
@@ -21,7 +21,7 @@ else
 		-> ${P}.gh.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-_run.py-collections.patch b/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-_run.py-collections.patch
deleted file mode 100644
index 6231ba17b86e..000000000000
--- a/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-_run.py-collections.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-index afc504d..bf43c06 100644
---- a/ffmpeg/_run.py
-+++ b/ffmpeg/_run.py
-@@ -137,7 +137,7 @@ def _get_output_args(node, stream_name_map):
-     if 'video_size' in kwargs:
-         video_size = kwargs.pop('video_size')
-         if not isinstance(video_size, basestring) and isinstance(
--            video_size, collections.Iterable
-+            video_size, collections.abc.Iterable
-         ):
-             video_size = '{}x{}'.format(video_size[0], video_size[1])
-         args += ['-video_size', video_size]
diff --git a/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-setup.py-pytest-runner.patch b/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-setup.py-pytest-runner.patch
deleted file mode 100644
index 67fbb2308a37..000000000000
--- a/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-setup.py-pytest-runner.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-index 0282c67..2011d2c 100644
---- a/setup.py
-+++ b/setup.py
-@@ -60,7 +60,6 @@ keywords = misc_keywords + file_formats
- setup(
-     name='ffmpeg-python',
-     packages=['ffmpeg'],
--    setup_requires=['pytest-runner'],
-     tests_require=['pytest', 'pytest-mock'],
-     version=version,
-     description='Python bindings for FFmpeg - with complex filtering support',