gentoo auto-resync : 30:12:2023 - 17:41:14

7 files changed, 2 insertions, 303 deletions

diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 212d73108296..a9f9e314436a 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,11 +1,3 @@
-AUX isort-5.12.0-py312.patch 1563 BLAKE2B 719905427e91895261aa7282cc9f56759b47ec71f8459d3959dfff1f9e254ae7a906d4fc1bfdb241bc20249cd45563854496f6bf1efd1a9cfb74203dc7ba137d SHA512 ecd2b1cb734cfea8a169b5412f221279c226938ec9d18b98b81b6f3fbf122124875236a46f0ac8bb3213f4331c888553d036e6835b826be78fe9dc300bfa1fdb
-AUX isort-5.13.0-poetry.patch 485 BLAKE2B 8ac8d53e2fdf6db49cfac8f6949fec21d92e730c13cc3fcd2b140acd4ef0fe203e83377a429da34b05b076c96df431e84428ae3b48d1a1557900681cf9cab50c SHA512 5eff8369c98fc236085431fed2bc44c958259cf422e12134a88f271af968b83d0ab2361f3c91626d98f075c7c442c2b72cdb84ae0c1095e11ec556a8b4e7bf5a
-DIST isort-5.12.0.gh.tar.gz 743141 BLAKE2B a7f8deef02b57162eebe15b35e71382c654372a80dedba7eee63d0c9b0899c053fb517401585af17014db3cf9ed44089f6cbd1e2b0ed17393cc667de06bfbddd SHA512 ceb861d1a077be6fecd82fde775bded1fb676c77135e2004c92a6221762e0b3ff6c1071d17957e1add4062ec26ba6c9264e4905724f2c659339cbd0601f4b45e
-DIST isort-5.13.0.gh.tar.gz 753826 BLAKE2B 074e8b762b304618a2291d96dc9e18061e5303f3e6772479e8eda42c687cf289c12c73ce585c869df754b244bf14d59c6d2eba10877756287d88f27a3d470939 SHA512 3c5a170b1526ec58f1c774e4b55e2227df0af23eebd7a387d61cd3eaa0a698b5ad22a0be81a87d4e6a026030ffbdaea0f23331a43e28b5df98bf33b7afe2a42d
-DIST isort-5.13.1.gh.tar.gz 754890 BLAKE2B 53168670d38efa9fba549a32235c47781e200e7ee36289514acc19b127fa5a99d9d97305fbeff1afa9dd6f8f57385f0b01ce57b4bd0ee64e255bcfe144fadbbf SHA512 23a5f7579e327f109575454e5443ee039c207aa0b6f6ad35509cf514b45a7a3fcae116fd8ee40c96d717694cfd85bd7f431481b1a456b7390f914abec2460f42
 DIST isort-5.13.2.gh.tar.gz 755256 BLAKE2B 4cc8a0209ba954d93c030e6ad038933b50aa2f17b173762f598bc8038f36f72ecd1e7a3f6e73398bbfc99f464d14927f77044ca68126815023a8d456497985a1 SHA512 fe2bd27f0aa6219d44c3124782d400338a801a911d6a09ad51e7f80cbcbce250838350ad6cc80a35f641e0a319778ddcfb4dc61c8c76999ebc63a5147953e378
-EBUILD isort-5.12.0.ebuild 1691 BLAKE2B 9899ef315fca3c2d591f6b99ce9d84230690631f873216bea8fa5d36b51d2fbb7f813cffc7efe1d7bbefb947b14a6ae1049cc3914e7da8a6cd2f22582283ae91 SHA512 dae89599e7f4ca3e3056411f0435ae5fe84c90dd7f0c9f8554032bc8d98567972c82be70f1abc180e4a1342d776330423606af83b3e04c42b89403739a325c44
-EBUILD isort-5.13.0-r2.ebuild 1829 BLAKE2B 886b08fce805ff6474289680a6fb44483c67c534c17dd70e213dcf9acb886e2812bbe9360e7538a29dc32626affe5c3dc7a7cc3512b2846f12d24ebf4a1f19da SHA512 52c1522afe8d1b838ca0c3320b4638f3164568e854bdf16f71a099ea4f00ced7135105ea56986cada6a6f540d226ad6d480b07c023a1f93e6b51b098295146c4
-EBUILD isort-5.13.1.ebuild 1643 BLAKE2B 3364bd78e222177acead6d78d7bcbafc6cbe00bba3570de8b2ea6d3e706799d1443ba2c2cd90e8ad2496d013872097596ced7d78898f9e36cf5774e47052f2de SHA512 015b7872e058774f5db4338be732f9f712a4fe6a1dd9610fb3cc348d8bb8ed3911b0fb2a2695bc81b31d9fc2f1c283897520118973373a3df1b9f9baebe73561
-EBUILD isort-5.13.2.ebuild 1643 BLAKE2B 3364bd78e222177acead6d78d7bcbafc6cbe00bba3570de8b2ea6d3e706799d1443ba2c2cd90e8ad2496d013872097596ced7d78898f9e36cf5774e47052f2de SHA512 015b7872e058774f5db4338be732f9f712a4fe6a1dd9610fb3cc348d8bb8ed3911b0fb2a2695bc81b31d9fc2f1c283897520118973373a3df1b9f9baebe73561
+EBUILD isort-5.13.2.ebuild 1635 BLAKE2B 6dfe768ab77eb35c0d8564b643526bbbc445ae7100a148e30560f7a3dffba8706e12f7bb8b92507021f86462d21ea7f2744cbf5452fb49e6982507caaefd7a88 SHA512 fdb963e6ae8ccd85945e19d021354d83351426974183cebb1f2c368d85dec2a9efb317dcf13bf43709876e1b403753361c99c051ac65623bacb2f552b9380691
 MISC metadata.xml 574 BLAKE2B db8aac55351f15190d9b71508268f26b12a781b3b4f0f6836a30efc954b46b71da496129a9641655db483730435b44a5c5283132521dc3cc93279c57735a1ba4 SHA512 c8116bf66155ffeb7ac8d68822559e18252210dae604b4984aa5e6a3fb7161d785cbd235dc6f656513b5bab326f6e579489245bcef9d0a5dfadc34d7477758fb
diff --git a/dev-python/isort/files/isort-5.12.0-py312.patch b/dev-python/isort/files/isort-5.12.0-py312.patch
deleted file mode 100644
index a6de4a75311b..000000000000
--- a/dev-python/isort/files/isort-5.12.0-py312.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From abfb91fd7da34111828d81a20fe7aeaaab7a58c7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 6 Nov 2023 13:29:21 +0100
-Subject: [PATCH] Fix assertions in `test_git_hook`
-
-Fix `called_once()` assertions in `test_git_hook` to use the correct
-`assert_called_once()` method.  The former does not exist, so it
-evaluates to a mocked method in Python < 3.12, making the assert
-meaningless, and it triggers an error in Python 3.12+.
-
-While at it, split the mock into two because otherwise the test would
-fail because two `hooks.git_hook()` calls imply two mock calls.
----
- tests/unit/test_hooks.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/tests/unit/test_hooks.py b/tests/unit/test_hooks.py
-index 2757f414f..29685f503 100644
---- a/tests/unit/test_hooks.py
-+++ b/tests/unit/test_hooks.py
-@@ -11,7 +11,7 @@ def test_git_hook(src_dir):
-     # Ensure correct subprocess command is called
-     with patch("subprocess.run", MagicMock()) as run_mock:
-         hooks.git_hook()
--        assert run_mock.called_once()
-+        run_mock.assert_called_once()
-         assert run_mock.call_args[0][0] == [
-             "git",
-             "diff-index",
-@@ -21,8 +21,9 @@ def test_git_hook(src_dir):
-             "HEAD",
-         ]
- 
-+    with patch("subprocess.run", MagicMock()) as run_mock:
-         hooks.git_hook(lazy=True)
--        assert run_mock.called_once()
-+        run_mock.assert_called_once()
-         assert run_mock.call_args[0][0] == [
-             "git",
-             "diff-index",
diff --git a/dev-python/isort/files/isort-5.13.0-poetry.patch b/dev-python/isort/files/isort-5.13.0-poetry.patch
deleted file mode 100644
index 31baa2ec08f8..000000000000
--- a/dev-python/isort/files/isort-5.13.0-poetry.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index ae539490..11e229ad 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -41,11 +41,6 @@ include = [
- 
- [tool.poetry.dependencies]
- python = ">=3.8.0"
--pipreqs = {version = "*", optional = true}
--requirementslib = {version = "*", optional = true}
--pip-api = {version = "*", optional = true}
--colorama = {version = ">=0.4.6", optional = true}
--setuptools = {version = "*", optional = true}
- 
- [tool.poetry.extras]
- colors = ["colorama"]
diff --git a/dev-python/isort/isort-5.12.0.ebuild b/dev-python/isort/isort-5.12.0.ebuild
deleted file mode 100644
index 261752344ba9..000000000000
--- a/dev-python/isort/isort-5.12.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="
-	https://github.com/PyCQA/isort/
-	https://pypi.org/project/isort/
-"
-SRC_URI="
-	https://github.com/PyCQA/isort/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/black[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/natsort[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		# https://github.com/PyCQA/isort/pull/2196
-		"${FILESDIR}/${P}-py312.patch"
-	)
-
-	# unbundle tomli
-	sed -i -e 's:from ._vendored ::' isort/settings.py || die
-	rm -r isort/_vendored || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cp -a "${BUILD_DIR}"/{install,test} || die
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	# Install necessary plugins
-	local p
-	for p in example*/; do
-		pushd "${p}" >/dev/null || die
-		distutils_pep517_install "${BUILD_DIR}"/test
-		popd >/dev/null || die
-	done
-
-	local EPYTEST_IGNORE=(
-		# Excluded from upstream's test script
-		tests/unit/test_deprecated_finders.py
-	)
-
-	if ! has_version "dev-python/pylama[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/unit/test_importable.py
-			tests/unit/test_pylama_isort.py
-		)
-	fi
-
-	epytest tests/unit
-}
diff --git a/dev-python/isort/isort-5.13.0-r2.ebuild b/dev-python/isort/isort-5.13.0-r2.ebuild
deleted file mode 100644
index 739fedb19bdc..000000000000
--- a/dev-python/isort/isort-5.13.0-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="
-	https://github.com/PyCQA/isort/
-	https://pypi.org/project/isort/
-"
-SRC_URI="
-	https://github.com/PyCQA/isort/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/black[${PYTHON_USEDEP}]
-		>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/natsort[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		# sigh, can't people just stop using poetry?!
-		# https://github.com/PyCQA/isort/commit/f7a6b0eea57e87155a367e2490b49b40f83c3944
-		"${FILESDIR}/${P}-poetry.patch"
-	)
-
-	# unbundle tomli
-	sed -i -e 's:from ._vendored ::' isort/settings.py || die
-	rm -r isort/_vendored || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cp -a "${BUILD_DIR}"/{install,test} || die
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	# Install necessary plugins
-	local p
-	for p in example*/; do
-		pushd "${p}" >/dev/null || die
-		distutils_pep517_install "${BUILD_DIR}"/test
-		popd >/dev/null || die
-	done
-
-	local EPYTEST_IGNORE=(
-		# Excluded from upstream's test script
-		tests/unit/test_deprecated_finders.py
-	)
-
-	if ! has_version "dev-python/pylama[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/unit/test_importable.py
-			tests/unit/test_pylama_isort.py
-		)
-	fi
-
-	epytest tests/unit
-}
diff --git a/dev-python/isort/isort-5.13.1.ebuild b/dev-python/isort/isort-5.13.1.ebuild
deleted file mode 100644
index 2f75471007a0..000000000000
--- a/dev-python/isort/isort-5.13.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="
-	https://github.com/PyCQA/isort/
-	https://pypi.org/project/isort/
-"
-SRC_URI="
-	https://github.com/PyCQA/isort/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/black[${PYTHON_USEDEP}]
-		>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/natsort[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unbundle tomli
-	sed -i -e 's:from ._vendored ::' isort/settings.py || die
-	rm -r isort/_vendored || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cp -a "${BUILD_DIR}"/{install,test} || die
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	# Install necessary plugins
-	local p
-	for p in example*/; do
-		pushd "${p}" >/dev/null || die
-		distutils_pep517_install "${BUILD_DIR}"/test
-		popd >/dev/null || die
-	done
-
-	local EPYTEST_IGNORE=(
-		# Excluded from upstream's test script
-		tests/unit/test_deprecated_finders.py
-	)
-
-	if ! has_version "dev-python/pylama[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/unit/test_importable.py
-			tests/unit/test_pylama_isort.py
-		)
-	fi
-
-	epytest tests/unit
-}
diff --git a/dev-python/isort/isort-5.13.2.ebuild b/dev-python/isort/isort-5.13.2.ebuild
index 2f75471007a0..836e92445eee 100644
--- a/dev-python/isort/isort-5.13.2.ebuild
+++ b/dev-python/isort/isort-5.13.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '