gentoo auto-resync : 02:12:2024 - 02:07:07

6 files changed, 89 insertions, 10 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 20411416a787..7b1c94038bf6 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest
index 37ffc097493b..9d321eaea21b 100644
--- a/dev-vcs/git-lfs/Manifest
+++ b/dev-vcs/git-lfs/Manifest
@@ -1,8 +1,8 @@
-DIST git-lfs-3.4.0-deps.tar.xz 19912396 BLAKE2B 0e2e50e7b7566fe93d87f86c4b3a3a3f5f0cefc734af83516a5d3122d101333df5ed65cf848e727a1b7593ffdffeee72108221951313f47775b265f4fbdcb1be SHA512 50f7eba5abd4a3ad83e1cd74d7d413e8f708b796b67d60d404af512823423532e1bbbfaa5385ee668cbdd6ec0bce89b862db571c76e5a3f0d0cee5097ccc73d2
-DIST git-lfs-3.4.0.tar.gz 674499 BLAKE2B 8232c7492a453fc5a8855b13cfbf95c64a9c614d740bebebefcc44f6a7e2daddaee0dee3f8d8ba653999b8516c47a491af6449b5daf5e3861f3530d372b213e4 SHA512 ff0d624bc48d9ab4332943af8212652d9959e8f9d6a356a3722047903e01bc1dcf04178b97d58a327d0a381569854034c4a1dc2baea9976a8f20d97d7e637f31
 DIST git-lfs-3.5.1-deps.tar.xz 21401028 BLAKE2B a011061ebae15c7d80d908d46051c95462b617073623be83c067cfc9b028eb8f803f53dcb17a6e19d8e1bfd9c2349db9f7a000d91008b1c375bfc73de4793b25 SHA512 1879624ee84e5d138f8dcb9cb626822d0a2e063705cb424db5c9f9d609af496104655ebb878ec950112b8b39d147141ff86b6474ad8210384dd93318034c19a4
 DIST git-lfs-3.5.1.tar.gz 683872 BLAKE2B c99d85474cb8544ea2fca7daa6fc57affeabeb7bde517366c885360f613012c3b852d95abd647adfda806f0a057c6df355db0cf49f8d408460c0e2498b836ab5 SHA512 7755f8fbf18d5870eb95d13e1af763e9c8b127ecace67c95d54100eb9d735df41b649d1777f7051ba018eacba34f732a51b3bf5f1376dedf4778b5ae0c81cf40
-EBUILD git-lfs-3.4.0-r1.ebuild 2683 BLAKE2B 006f9dcc94771ef8e4cd9978d94d04f617f745717b5191de7c412ce2e8fa81657f0992f8e962a501962b611db95e5b5a60405eea0b91a256d80a2c4881d7de4a SHA512 500ce38e21b836806a61b4f3b660991066d6d3f99c1d4056dbd583280c9410e16bbdb461eb6576f18f1e93eccbee63e52fb61f52b084cfca6a608f5816c57eb9
+DIST git-lfs-3.6.0-deps.tar.xz 21227652 BLAKE2B 40418960f2d63c0f1eed7b3de77d532e3c7fd9437e584b3f6aa1e699f13b133b0dbe489bfcc776de63f2420f3f9b00ea96b6129cae450ee7bdfd65c534bcf7e1 SHA512 568c8a625620529c4a2a47cc12943f3929c7a4d54aa8f8d3ea5c93a8ab27f72518d1a252d3e048231eeda08126c5665aaa618e0e535b0b254ed81500d8594def
+DIST git-lfs-3.6.0.tar.gz 694653 BLAKE2B 3d04b43b5c06c4b9270116a49b156fbf4435a407b7b35c9d96279fe3360efc7310e64ad91bf3347ccd2f61f27cf3e39687de4f3387d196f1e053cbeb8306f298 SHA512 27ee4413f66b60094e1a2bdc47e621013d8c7ef72ac96bd9705226237619701a8e382510c166ec91bf5590acfc7c01b01a3ff53970128f343f7474625a47ff2e
 EBUILD git-lfs-3.5.1.ebuild 2741 BLAKE2B 614e48064d00eb7ad4025416457ebf8f0aa8eb10ca9b5d77b1b08d221e60c078c525d6f55c8847483b2c18381c6f5e2b816a835480ab0e435e38e02f4f33aa68 SHA512 17b1d3b416d4748c727d937a699c47fa9a81b23d83b46a2d17ea3a024a2bb528b3cf832bf8f8dbe07424159210384de269e211864077435b63773348e8ffc839
-EBUILD git-lfs-9999.ebuild 2684 BLAKE2B 9299001c5d8620bf2a850a8336ebd50329d9d0fcb865a2023bb34865eff3190b651d859f74ca9eb65dcfb9a61671f4be93a6c8ab50ef437e20d8f1a129c0bb09 SHA512 0d56bd6d3d42006749d21d18c96c601b74fc5f62b930c611164917b12522f562258796cd1047bfef4d4d1ee60e866cf0163869e1ea8513799d096d9f3cf63d1b
+EBUILD git-lfs-3.6.0.ebuild 2741 BLAKE2B 085266c2a5c363c274bdaadae7ed4b6f7c81b1c9168c877c3038fe7b399367cd715693e7fc2abc8753c1b3b71c6ec456e52e9f3e950a6179bce9668442f658ef SHA512 8de389f5e5d19ea7bddc3114c250fde5a4ce6ef21e9a6083af1537ecb90d252a52f28641bc5ad93a2512a7471464cdaacd8cbba776504135b6c0ec0e079040e9
+EBUILD git-lfs-9999.ebuild 2644 BLAKE2B 2c3d8466dda60d4d1345b3664ef629c173e7cdad180a1234aed02b2b5ab1896de5e537f816fd38dda46199f746e907d80483c61144351d8ef4ccd6831f931420 SHA512 4eda325f3268aebc7694abf41c24318fd356148a0caadb57a8d4370088d716d2f7451ccaae6d62c99553ae5e18721a4ac98bc8910c849b6f65e9c3703ad6622b
 MISC metadata.xml 477 BLAKE2B f26242dee1117690332342dbd12f3739eeff572ff6e64ffb979a18c6fe7fca5e305beb08c9aab02ceb4c9dd1cbab6401a3a31d326f5d25d1ee30fb62fd711673 SHA512 9ae6594f42265b3f33cb977eaceab2a5fbb45f3e6a7c64c7cd4cfb88b8d56da0cc6f9d7564beda45969bb525f537e7a3e7d3b764456f3210c3e4c16e9d7545bb
diff --git a/dev-vcs/git-lfs/git-lfs-3.4.0-r1.ebuild b/dev-vcs/git-lfs/git-lfs-3.6.0.ebuild
index d5730d780bd6..9450b9a36dbe 100644
--- a/dev-vcs/git-lfs/git-lfs-3.4.0-r1.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-3.6.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2017-2023 Gentoo Authors
+# Copyright 2017-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 EGO_PN=github.com/git-lfs/git-lfs
 # Update the ID as it's included in each build.
-COMMIT_ID="d06d6e9efd78ff4f958b072146ce167d87f60285"
+COMMIT_ID="6340befc60876f4f039f215479d9d5a945f817e1"
 
 inherit go-module shell-completion
 
@@ -24,15 +24,16 @@ else
 	# 2) Compress the archive using XZ limiting decompression memory for
 	#    pretty constraint systems.
 	# Use something like:
+	# GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
 	# tar cf $P-deps.tar go-mod \
 	#	--mtime="1970-01-01" --sort=name --owner=portage --group=portage
 	# xz -k -9eT0 --memlimit-decompress=256M $P-deps.tar
 	SRC_URI+=" https://files.holgersson.xyz/gentoo/distfiles/golang-pkg-deps/${P}-deps.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0 BSD BSD-2 BSD-4 ISC MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/dev-vcs/git-lfs/git-lfs-9999.ebuild b/dev-vcs/git-lfs/git-lfs-9999.ebuild
index cbd1a55aa124..0e65c61d5b22 100644
--- a/dev-vcs/git-lfs/git-lfs-9999.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2017-2023 Gentoo Authors
+# Copyright 2017-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 EGO_PN=github.com/git-lfs/git-lfs
 # Update the ID as it's included in each build.
-COMMIT_ID="d06d6e9efd78ff4f958b072146ce167d87f60285"
+COMMIT_ID=""
 
 inherit go-module shell-completion
 
@@ -28,11 +28,11 @@ else
 	#	--mtime="1970-01-01" --sort=name --owner=portage --group=portage
 	# xz -k -9eT0 --memlimit-decompress=256M $P-deps.tar
 	SRC_URI+=" https://files.holgersson.xyz/gentoo/distfiles/golang-pkg-deps/${P}-deps.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0 BSD BSD-2 BSD-4 ISC MIT"
 SLOT="0"
+#KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/dev-vcs/pre-commit/Manifest b/dev-vcs/pre-commit/Manifest
index c0f76984ddee..5903cb3a6f62 100644
--- a/dev-vcs/pre-commit/Manifest
+++ b/dev-vcs/pre-commit/Manifest
@@ -1,4 +1,6 @@
 AUX pre-commit-3.1.1-tests_git_file_transport.patch 1527 BLAKE2B 18d047f3b8a6fdc3da77aa5b8d9f60970ab5b69adc3790489ceffc17839a4cd21ed46428c5e2e98b50278b2c4dc49e35a09dd778000546828327ae96f910f95b SHA512 36cb194250dc0fefad2900452447ab590f678e6cd5edf07a7f072363733c263b7cb1167297c465a9372d4a38ab77a6c057046c66b872a958132a97d1a937d029
 DIST pre-commit-3.8.0.gh.tar.gz 270925 BLAKE2B febb7b6bb2e43aec096e454b064b01b0973cd9d04b2d792a4ce7cef9df4f9c9c2e3bf1200f584e163c829c12ca17f57761375b297ab5c3d97dce569d5c219bdd SHA512 b6970ac00c5033938462675c20ea5e13c0439dc4f70cd627f11b22b0f87fb0a3590e9b3e9c677bfb66e4b3420f40de66ca7ccbc969847ee5fa8994532a558cd1
+DIST pre-commit-4.0.1.gh.tar.gz 286821 BLAKE2B 2d38ef4ad06744e11a75a9faddcf90f1fbb60f597d85782bf8065e90e746e62de0f7396ad09e3d03502208114ed75ed57f05ae143470b349a9b1dd6860ba72bd SHA512 93c01e4d64aa1010bdaac6e1774497fe38f757cc6b67b7546332c5fe3846583fc5ac71f70bb257e5bbe24062e060307b49abdcb539538ccedeb2cdf2243908a4
 EBUILD pre-commit-3.8.0-r1.ebuild 2132 BLAKE2B 5bda58bacf4e98a4328db604a058e70399ed91ad4413f40a849149931eafd28005b5bf944aff4205ecda081e65b6ee5370faf5a9bebf88e3bcd45d13b9b28c74 SHA512 7ea6a4c5d5a21f485d8cf06269d7ef591b97771650c92be31cfb7388852020f461f7ce2d09af5d6465366e790de9dcb15f19ba74dd08b049243cae488b98d65e
+EBUILD pre-commit-4.0.1.ebuild 2134 BLAKE2B aea31c2c617e4cfa2f3f4b621b4128329cc88146148c25531963b6bf62f9caed64ca3629b94f92be459ae4cc47ae9f250d7786d3dca6f12a045f49576c5dfeee SHA512 4740b091fa3a851a7d6fd519d8e6d3bcc3ef0f4d56a51a616fe572324129c0469a27dbb8eac4e9548e6e014bb5f0be33f85b6e58f86458e07b9c459f29b00e92
 MISC metadata.xml 391 BLAKE2B 08aea5db96326e51f252d2392f655100d2721dfa8eedfbb361221d92b0b0e0645152b8e1c2ccc11e8b50f24b59869fa2e1fc7dfaa42fdb23614ddbc963e9f102 SHA512 799e0df03afd4baef6296590b9133b45487d1e41f09e933a738367f0bcb3c6510ec8e26547b16ea5c07525d99b026ba1848d21e4001505c33a564b14746897c6
diff --git a/dev-vcs/pre-commit/pre-commit-4.0.1.ebuild b/dev-vcs/pre-commit/pre-commit-4.0.1.ebuild
new file mode 100644
index 000000000000..27a86ca9beb6
--- /dev/null
+++ b/dev-vcs/pre-commit/pre-commit-4.0.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL="ON"
+DISTUTILS_USE_PEP517="setuptools"
+
+inherit distutils-r1
+
+DESCRIPTION="A framework for managing and maintaining multi-language Git pre-commit hooks"
+HOMEPAGE="https://pre-commit.com/
+	https://github.com/pre-commit/pre-commit/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+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/virtualenv-20.10.0[${PYTHON_USEDEP}]
+	')
+"
+# coreutils requirement, see bug #885559
+BDEPEND="
+	sys-apps/coreutils[-multicall]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pytest-env[${PYTHON_USEDEP}]
+			dev-python/re-assert[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-3.1.1-tests_git_file_transport.patch" )
+
+EPYTEST_DESELECT=(
+	# All of these 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.
+	tests/languages/
+	tests/repository_test.py
+
+	# These three consistently fail with
+	#     Calling "git rev-parse" fails with "fatal:
+	#     not a git repository (or any of the parent directories): .git".
+	# including with the sandbox disabled.
+	tests/main_test.py::test_all_cmds
+	tests/main_test.py::test_hook_stage_migration
+	tests/main_test.py::test_try_repo
+
+	# These two fail if pre-commit is already installed (Bug #894502)
+	tests/commands/install_uninstall_test.py::test_environment_not_sourced
+	tests/commands/install_uninstall_test.py::test_installed_from_venv
+)
+
+distutils_enable_tests pytest
+
+DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )