gentoo resync : 20.03.2022

4 files changed, 2 insertions, 122 deletions

diff --git a/dev-vcs/pre-commit/Manifest b/dev-vcs/pre-commit/Manifest
index 014753d06000..44b6909e8b4a 100644
--- a/dev-vcs/pre-commit/Manifest
+++ b/dev-vcs/pre-commit/Manifest
@@ -1,7 +1,3 @@
-DIST pre-commit-2.15.0.tar.gz 255545 BLAKE2B 8fbb1fd6b1298ff1c5a6884dae53c79d108e8c4b74d05d6be36d562327fd024432d60e6df4570217e1b3f4ad8e33ee4d0d54a5d940f4833a46d4e9cb59698b3c SHA512 b87985aa625509d7a21e31e5774f259c264ec74fef88fc5e290cbac0326cdbadc37ab54b5bf3048d815cf9bc6d4adb71619fcb84c955c1bc9741da8dfd34251c
-DIST pre-commit-2.16.0.tar.gz 256930 BLAKE2B e515dcc9109c91cc7ab5ce60f662ebd62cce4f23e32676b7c295332c959fa10a34c320a197d15d7307b94aee53e7ade5da62aed8bbe122262db15d88d82e9757 SHA512 c9eb14a40e25e8408c2b2b5687eba4908d609bbb7bcf58a0153326696d272bca555156fd75f3ec5f0dec219aeeb4084df77f329f47cf190e40052c11e92fe185
 DIST pre-commit-2.17.0.tar.gz 261131 BLAKE2B 114fac379690ee4c1c60970a1b0fbcd20faea785837c174514c3fc3d247ec79f52fb5f14c96a762921395d682017a9cc406dc59b3042fc955cd65019fb781a3f SHA512 54b5af9088083ad0c57fab09c06c35bd5921b29348454fc8fc16081d3c6a2e0add13f8a18f06b7408a0e06babc5e15659b37ab53797edd3514d516059e2343a8
-EBUILD pre-commit-2.15.0.ebuild 2055 BLAKE2B 118b92db9ad79a4ee2478255906e7f4c4f311f02d4b381a6a169da37ab0bf384defae18275bbf72d1ea4139fa3df2cf559fc98ed6fd33ff5f609333ef7ce5474 SHA512 146c889595830f1c6e90c1785d18a544bf2c72fe538f451412968942653c4227d74a2879a85bd52ed0eadbe18224f4d9238d3f9ca05630a8e1c061451d7d5368
-EBUILD pre-commit-2.16.0.ebuild 2088 BLAKE2B 992c8a5dd400f442469abd5b53dadef3ede090b3dd3087b4a231bcb52da61c0fd7857cbe5b61935966971b25c5f06cb78731e81ebfd9d2aa1fbc03c2ed541459 SHA512 18017370fde8385652e9c0a0f4ba0b3856d22322503f3e0cc77b0aa3a8b94b3ca7e4541907c24979cdc42c551cea250a5bf17dc360cfa1c9469afa01aaa595bd
-EBUILD pre-commit-2.17.0.ebuild 1600 BLAKE2B 6b9a7d9e7e640ffa62a7f797cfc8fec15e4cfb9fe1fe207694e67920f723eb4471f980d0b7a8b71776ec914fdba7d5c417db01384f63e075492ba6d8ddd94de3 SHA512 3ac9c85151f10089e0170ac8e922bba85eb71701b020890d03e8e0ed0c08de40058af7de73eb96ba3e73b680384436ca0164bfcb00affed9d807013fa84b682e
+EBUILD pre-commit-2.17.0.ebuild 1598 BLAKE2B 4ce3456da8315ca58792da3ad9d78ee0395d2090b02e505fb43a1ed6a87f1d5ac7a73ce5bc2e27063a045acebc4c1593cd20b0490c25779b3ac3b5f5b2ac5552 SHA512 d2a746ce673958c7985531299281b4b475db2c46edc17716ac72ee3f513deefa15185bd48a6532cdffaefd09ecf8743b42b4dad273f4e54cbf8caec7399dac94
 MISC metadata.xml 380 BLAKE2B 99842a97367e91700c6f714f427b7b3d4b7212c401abae5ab715dfaa724776f02fe250184a33504d3433bb58cd5679af59a32ec21a7e7432481160dab36a4d95 SHA512 45330930d1e58fc1de0fd0ba55cd488dee96579ceab3be5073b91ff8f4f2b9adefff533dbfa5b0e8b23fbb648d45c0b7b4073a1ec57b586600cc2bf6347e0bbb
diff --git a/dev-vcs/pre-commit/pre-commit-2.15.0.ebuild b/dev-vcs/pre-commit/pre-commit-2.15.0.ebuild
deleted file mode 100644
index 46bca801fe4a..000000000000
--- a/dev-vcs/pre-commit/pre-commit-2.15.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="A framework for managing and maintaining multi-language Git pre-commit hooks"
-HOMEPAGE="https://pre-commit.com/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
-
-# TODO: figure out why these tests - all of which invoke git - fail:
-#  - tests/main_test.py::test_all_cmds[autoupdate,hook-impl,install,install-hooks,migrate-config,run,uninstall],
-#    tests/main_test.py::test_try_repo:
-#     Calling "git rev-parse" fails with "fatal: not a git repository (or any of the parent directories): .git".
-#     NOT a sandbox issue it seems, as disabling it does not help.
-#  - tests/commands/install_uninstall_test.py::test_environment_not_sourced:
-#      Unexpected error "/usr/bin/env: 'python3.8': No such file or directory" - but only if pre-commit
-#      has previously been installed.
-#  - tests/commands/install_uninstall_test.py::test_installed_from_venv:
-#     the function invoking "git commit" returns 1 instead of 0, no details.
-RESTRICT="test"
-
-RDEPEND="dev-vcs/git
-	$(python_gen_cond_dep '
-		dev-python/cfgv[${PYTHON_USEDEP}]
-		dev-python/identify[${PYTHON_USEDEP}]
-		dev-python/nodeenv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-20.0.8[${PYTHON_USEDEP}]
-	')"
-BDEPEND="test? (
-	$(python_gen_cond_dep '
-		dev-python/pytest-env[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-	')
-)"
-
-DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )
-
-distutils_enable_tests --install pytest
-
-src_prepare() {
-	default
-
-	# These tests require a boatload of dependencies (e.g. Conda, Go, R and more) in order to run
-	# and while some of them do include "skip if not found" logic, most of them do not.
-	rm -rf tests/languages tests/repository_test.py
-}
diff --git a/dev-vcs/pre-commit/pre-commit-2.16.0.ebuild b/dev-vcs/pre-commit/pre-commit-2.16.0.ebuild
deleted file mode 100644
index a75c6d3fd4cb..000000000000
--- a/dev-vcs/pre-commit/pre-commit-2.16.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="A framework for managing and maintaining multi-language Git pre-commit hooks"
-HOMEPAGE="https://pre-commit.com/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-# TODO: figure out why these tests - all of which invoke git - fail:
-#  - tests/main_test.py::test_all_cmds[autoupdate,hook-impl,install,install-hooks,migrate-config,run,uninstall],
-#    tests/main_test.py::test_try_repo:
-#     Calling "git rev-parse" fails with "fatal: not a git repository (or any of the parent directories): .git".
-#     NOT a sandbox issue it seems, as disabling it does not help.
-#  - tests/commands/install_uninstall_test.py::test_environment_not_sourced:
-#      Unexpected error "/usr/bin/env: 'python3.8': No such file or directory" - but only if pre-commit
-#      has previously been installed.
-#  - tests/commands/install_uninstall_test.py::test_installed_from_venv:
-#     the function invoking "git commit" returns 1 instead of 0, no details.
-RESTRICT="test"
-
-RDEPEND="dev-vcs/git
-	$(python_gen_cond_dep '
-		>=dev-python/cfgv-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/identify-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/nodeenv-0.11.1[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-20.0.8[${PYTHON_USEDEP}]
-	')"
-BDEPEND="test? (
-	$(python_gen_cond_dep '
-		dev-python/pytest-env[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-	')
-)"
-
-DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )
-
-distutils_enable_tests --install pytest
-
-src_prepare() {
-	default
-
-	# These tests require a boatload of dependencies (e.g. Conda, Go, R and more) in order to run
-	# and while some of them do include "skip if not found" logic, most of them do not.
-	rm -rf tests/languages tests/repository_test.py
-}
diff --git a/dev-vcs/pre-commit/pre-commit-2.17.0.ebuild b/dev-vcs/pre-commit/pre-commit-2.17.0.ebuild
index 2794cad11571..3d2b9177deee 100644
--- a/dev-vcs/pre-commit/pre-commit-2.17.0.ebuild
+++ b/dev-vcs/pre-commit/pre-commit-2.17.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
 
 RDEPEND="dev-vcs/git
 	$(python_gen_cond_dep '