gentoo resync : 03.03.2021

5 files changed, 2 insertions, 131 deletions

diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index d67904f965c3..b52fd036d198 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,8 +1,3 @@
-AUX isort-4.3.21_p1-tests.patch 1301 BLAKE2B c56ffa6dad9605def443bd1f714cd3a88e77b79aa5095a428c29a2420ca0308b88ede5070d827fcd5ac5815895f9dcfa846dfd2d983640134343e89b2079ef37 SHA512 6e32001e2f3fdc97da37f82dbe37ab293b1a7489d5c533f276583161028384da623bc3ea51e90e7440a866c28c6828eed272e27821a3f101d0e3e635f809efd0
-DIST isort-4.3.21_p2.tar.gz 158539 BLAKE2B 316703ca754c939e4af0db4a1060fb13a5164797a672b3faeb585a81fa0c86453fb0f1953b789661588cd0f04267a28837d46a88093a838391f752afa43e9f8b SHA512 fc2aa00c87196864864d2516b8be7acdedcf40d71d1931510e4b878dbd2b6da0b579661b50221f03f4aa5560c8bf23d5e1e10a2694d2b741ca09a92e40a4c687
-DIST isort-5.6.3.tar.gz 161712 BLAKE2B ffbc2977016807d2bd5b1644377efad021af2ad27fd0e27feae1e5dfdfd112c7b5bf4b296ebf47ea6bfcbfe7f56cf3bfa8e1e7cf03963935660e678223397afb SHA512 fa2d9be306d03fc802aab3915bee2c41f4fe0c28353d9d99aa6604755e1602027cd81afca92b4302f80497c88a9dcb2701ec02ca55a5f9a2866669a68368d957
 DIST isort-5.7.0.tar.gz 169353 BLAKE2B bafd6a0ce81ed80a3c1ad53ce320361ef11bc01a78211ad13b7947aafddd4d9bb5a4fbf65ec01d4c90dce7ebd0a2e3b1c4dcad729b1e27b1dd2c5c90c802eecf SHA512 ae5ff56394f495f6bd86f7581e0f8a67264671553b344b9dc2c5ba0b37f483ae500ebba9882ff5c315b913a689901b17de2eac403e0b4240f913c9e1864bab9f
-EBUILD isort-4.3.21_p2-r1.ebuild 822 BLAKE2B 35de749fa138eec4367a0e8a65bba0e2bb9e8367da0f75e44f3b02ad4247f4f79e98357a47347f8cf07a109e8d6915d017b112a5f808000e2acbc998ca783ba9 SHA512 047a020bc731a829729bc196984afdff65d48e4c6cccc7b39efdd8f2001fe085d991275adae9480dfea5c84c03d4c0cf4d1c5f527a860e30664cd8b5c8175ec0
-EBUILD isort-5.6.3.ebuild 1706 BLAKE2B 55086f0ce409bf2e4f0bfc6cb1c2271bd79c228843c91a7da9410dbfd2eecc2cedf8c18972e9ad8714f5930c0086b31be71d372d50a7aa8819bc09606436b614 SHA512 e8919533c647fdf22347d68946d03632379655129866674a2894599d5191b50d2b12f64a759db3b28d0ce2f9e071c5446ce2c9ca7bc2f4aff2f1c4e3afbdbefd
-EBUILD isort-5.7.0.ebuild 1713 BLAKE2B 22ff043ca3a2d2786b17eb8279dc9de41501148f9139bcace19cdaa27003e50836facf3c110fc5b1811d7b00c01596e71390f53ca3ed1383fffe62ec6f59b0ab SHA512 b506de00524e61b590b8a4f1f47e2e90cacfa8eca56e7ee9178ba1dd3381a1251268fe26a0e2e292448f430e677d0886ab9dfc3d1ebdcb7d09482b4724dd0234
+EBUILD isort-5.7.0.ebuild 1706 BLAKE2B 55086f0ce409bf2e4f0bfc6cb1c2271bd79c228843c91a7da9410dbfd2eecc2cedf8c18972e9ad8714f5930c0086b31be71d372d50a7aa8819bc09606436b614 SHA512 e8919533c647fdf22347d68946d03632379655129866674a2894599d5191b50d2b12f64a759db3b28d0ce2f9e071c5446ce2c9ca7bc2f4aff2f1c4e3afbdbefd
 MISC metadata.xml 573 BLAKE2B 025e9dc210ba42b2d385c75897d233aec2fa2810b5a2699339d1f33da94a8b5057001af48fe68af1a1c0a201c1ef73971433498e7f8c72cafaf306b51af17375 SHA512 369e47a3727a5c48720f9275ee6dd6b3dc5ee2fa05391da8bcb256d4c35af8a76bf33149a63eeae2a7259f59632f6cd56f32910ab10d652752c481609429238f
diff --git a/dev-python/isort/files/isort-4.3.21_p1-tests.patch b/dev-python/isort/files/isort-4.3.21_p1-tests.patch
deleted file mode 100644
index 9ece5ff6de9b..000000000000
--- a/dev-python/isort/files/isort-4.3.21_p1-tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/test_isort.py b/test_isort.py
-index 9d9297c..725b1e1 100644
---- a/test_isort.py
-+++ b/test_isort.py
-@@ -1539,6 +1539,7 @@ def test_custom_sections():
-                            "import p24.shared.media_wiki_syntax as syntax\n")
- 
- 
-+@pytest.mark.skip("Not going to pull in Django for a couple of tests")
- def test_glob_known():
-     """Ensure that most specific placement control match wins"""
-     test_input = ("import os\n"
-@@ -2599,6 +2600,7 @@ def test_new_lines_are_preserved():
-         os.remove(n_newline.name)
- 
- 
-+@pytest.mark.skip("Not going to pull in Django for a couple of tests")
- def test_requirements_finder(tmpdir):
-     subdir = tmpdir.mkdir('subdir').join("lol.txt")
-     subdir.write("flask")
-@@ -2675,6 +2677,7 @@ deal = {editable = true, git = "https://github.com/orsinium/deal.git"}
- """
- 
- 
-+@pytest.mark.skip("Not going to pull in Django for a couple of tests")
- def test_pipfile_finder(tmpdir):
-     pipfile = tmpdir.join('Pipfile')
-     pipfile.write(PIPFILE)
-@@ -2979,6 +2982,7 @@ def test_skip_paths_issue_938(tmpdir):
-     assert b'skipped 1' in results.lower()
- 
- 
-+@pytest.mark.skipif(sys.version_info[0] == 2, reason="Broken on Python 2")
- def test_standard_library_deprecates_user_issue_778():
-     test_input = ('import os\n'
-                   '\n'
diff --git a/dev-python/isort/isort-4.3.21_p2-r1.ebuild b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
deleted file mode 100644
index c07bf368c128..000000000000
--- a/dev-python/isort/isort-4.3.21_p2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_PV="${PV//_p/-}"
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="https://pypi.org/project/isort/"
-SRC_URI="https://github.com/timothycrosley/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-python/pipfile[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/isort-4.3.21_p1-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/isort/isort-5.6.3.ebuild b/dev-python/isort/isort-5.6.3.ebuild
deleted file mode 100644
index 5476eecba44a..000000000000
--- a/dev-python/isort/isort-5.6.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="https://pypi.org/project/isort/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/black[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pylama[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# Some tests run the "isort" command
-	distutils_install_for_testing --via-root
-
-	local skipped_tests=(
-		# Fails without -s, run it separately to avoid unnecessary output
-		tests/unit/test_importable.py
-		# Excluded from upstream's test script
-		tests/unit/test_deprecated_finders.py
-		# Require "example_isort_formatting_plugin", we're not going
-		# to add an example package just to run a few tests
-		tests/unit/test_literal.py::test_value_assignment_list
-		tests/unit/test_ticketed_features.py::test_isort_supports_formatting_plugins_issue_1353
-		tests/unit/test_ticketed_features.py::test_isort_literals_issue_1358
-		# Same here: requires "example_shared_isort_profile"
-		tests/unit/test_ticketed_features.py::test_isort_supports_shared_profiles_issue_970
-	)
-	pytest -s tests/unit/test_importable.py \
-		|| die "Tests failed with ${EPYTHON}"
-	pytest -vv tests/unit ${skipped_tests[@]/#/--deselect } \
-		|| die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/isort/isort-5.7.0.ebuild b/dev-python/isort/isort-5.7.0.ebuild
index aa43c9d530df..5476eecba44a 100644
--- a/dev-python/isort/isort-5.7.0.ebuild
+++ b/dev-python/isort/isort-5.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	test? (