gentoo auto-resync : 08:04:2023 - 23:33:13

5 files changed, 66 insertions, 3 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 28fa1f309d39..ab6f6f3ae98c 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/pre-commit/Manifest b/dev-vcs/pre-commit/Manifest
index 7ce294af8e92..a13fd6916a43 100644
--- a/dev-vcs/pre-commit/Manifest
+++ b/dev-vcs/pre-commit/Manifest
@@ -2,6 +2,8 @@ AUX pre-commit-2.20.0-tests_git_file_transport.patch 2021 BLAKE2B 764b353d326817
 AUX pre-commit-3.1.1-tests_git_file_transport.patch 1527 BLAKE2B 18d047f3b8a6fdc3da77aa5b8d9f60970ab5b69adc3790489ceffc17839a4cd21ed46428c5e2e98b50278b2c4dc49e35a09dd778000546828327ae96f910f95b SHA512 36cb194250dc0fefad2900452447ab590f678e6cd5edf07a7f072363733c263b7cb1167297c465a9372d4a38ab77a6c057046c66b872a958132a97d1a937d029
 DIST pre-commit-3.0.4.gh.tar.gz 264952 BLAKE2B 3c45da675d5a1a1fc115db0ef7186c1ec1e5a6d6d9353c5a53dba85a14de2c94bafe0ef9e8d0b04bae55ded81890d726997e695c95889719096205e1b212a237 SHA512 d51aca29b50f67ae42aa70d849939e6af96ff64c6fb214cddbc5a35cacebb8a54a4911110d0615a1a499516fcc2a06bb47d7e11da84ef636c3fcfdc8d2cbe343
 DIST pre-commit-3.2.1.gh.tar.gz 267233 BLAKE2B 39843fa9f7529ee38670b3c7ebea1e29b080db47ae3db73d5a218455fd51b7bf86bb1ab1a979946a57bf6417f8a4e7050e8ba34f873bf4d76fa49fa76358964e SHA512 5e2c114049d84eae2ec6cbf123c8e3976d8e9e392a6e04f78d446ad85758a78fb912c0f6070b9c506f8c1bb87e1fd1ecbe763deb8d1430e1d3d8f296dd0cc389
+DIST pre-commit-3.2.2.gh.tar.gz 267269 BLAKE2B b3b245b2ac0f0f4012e2612515e376aaaf5b4de0b5494c02a2b38b1b9b8584ae3fa7d9ee482ee19bbf6eb5ac1d5f9ec187e44c4bb7bb6046488b178628af850e SHA512 bf2602508425482e57c2e1b1ca2b36085560fa0e51e5d559b6c715a0534f182897eb54831a17a60a713cea0301a7521bb75c03881e8cb8527fbc565259a23ddf
 EBUILD pre-commit-3.0.4.ebuild 1711 BLAKE2B 3c1f5768aedd958ed6a9ccbb9396076084255f645e7339cc04b73d3fd4e976f4b1562a405125a40c941bb02adfde3e1926700e45c1fd29d2fcda55aa64a41645 SHA512 8790c810a8dfb7fd489536e45ba148c22e106c8cdb6641cd7a936124a3777e907163ad801b0252707273320505dbb9233161d3a5d7fd60e6c2b1fe0d434e1c01
 EBUILD pre-commit-3.2.1.ebuild 1728 BLAKE2B e55f817324e23771d2d3d9ae8ea2bda01819844b55928ceba829afd6e21dd4f975b9c31ff2cdcba1ab4e087d5dd8ee31ecb08d6c3337f8968d592a89bf207269 SHA512 a9bbb524938132e475c4d74084c7f1527406d6c732a32e212ed672d9a3eee2ef907ad4bf6cc9989c14e6dffa55653f301fd4325768f9cb528f53d9108c10adb4
+EBUILD pre-commit-3.2.2.ebuild 1728 BLAKE2B e55f817324e23771d2d3d9ae8ea2bda01819844b55928ceba829afd6e21dd4f975b9c31ff2cdcba1ab4e087d5dd8ee31ecb08d6c3337f8968d592a89bf207269 SHA512 a9bbb524938132e475c4d74084c7f1527406d6c732a32e212ed672d9a3eee2ef907ad4bf6cc9989c14e6dffa55653f301fd4325768f9cb528f53d9108c10adb4
 MISC metadata.xml 380 BLAKE2B 99842a97367e91700c6f714f427b7b3d4b7212c401abae5ab715dfaa724776f02fe250184a33504d3433bb58cd5679af59a32ec21a7e7432481160dab36a4d95 SHA512 45330930d1e58fc1de0fd0ba55cd488dee96579ceab3be5073b91ff8f4f2b9adefff533dbfa5b0e8b23fbb648d45c0b7b4073a1ec57b586600cc2bf6347e0bbb
diff --git a/dev-vcs/pre-commit/pre-commit-3.2.2.ebuild b/dev-vcs/pre-commit/pre-commit-3.2.2.ebuild
new file mode 100644
index 000000000000..5f06fdcab423
--- /dev/null
+++ b/dev-vcs/pre-commit/pre-commit-3.2.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+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}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+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="test? (
+	$(python_gen_cond_dep '
+		dev-python/pytest-env[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
+	')
+	sys-apps/coreutils[-multicall]
+)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.1-tests_git_file_transport.patch
+)
+
+DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )
+
+# The former two 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.
+# The latter 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.
+EPYTEST_DESELECT=(
+	tests/languages/
+	tests/repository_test.py
+	tests/main_test.py::test_all_cmds
+	tests/main_test.py::test_hook_stage_migration
+	tests/main_test.py::test_try_repo
+)
+
+distutils_enable_tests pytest
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 21790e1a34b1..26dc688270f8 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -5,5 +5,5 @@ AUX svnserve.initd3 575 BLAKE2B 4bc540dd8693c792fca8fd1061a49608ce7ee9a82d79fc43
 AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa604a5eff8e0f34c8763056bf1ea92b11be4f4d4ac5af3fa191b24d4c2040c3a41458103015e24bf09e SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae
 DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
 DIST subversion-1.14.2.tar.bz2 8606570 BLAKE2B cf15c61b932823fb18b52f83d84907386f068d2d40e14dbab94c42ad9d4c0fdf35d82db78036d7c1f2be47c2d51cdd27bfb966eb7607a52a21e072aeff76fb38 SHA512 20ada4688ca07d9fb8da4b7d53b5084568652a3b9418c65e688886bae950a16a3ff37710fcfc9c29ef14a89e75b2ceec4e9cf35d5876a7896ebc2b512cfb9ecc
-EBUILD subversion-1.14.2-r1.ebuild 12414 BLAKE2B 300d330f3224691dd695d317c7427e862b5979b3544871e30288aa743ad997e560525387c9a83400fa7f0f8d220c82532d56cbe7264e0bca17fd276531099743 SHA512 b2ddfc04a4f173c1d4bbb2c057e5fe116a182231541373958f9f1eff7e04f4ea45198bfb494b5364d0ed82e052ce7d86b3be2093257fa8e905e75147ab49e4e5
+EBUILD subversion-1.14.2-r1.ebuild 12476 BLAKE2B 7c57efb352124c3caf6073b32cb4d858c9c6278d229a5efb9c647c26da4cab2047719185fc84d35966cfde5086ab97a1e8e85dd28dec928e63a801a80ac9882a SHA512 3a671fabf3268f3c38f65a3e0dbfb872106d4c5aa8e4bf7b03939f892dfa23c23092e4e885b51f544d07423a6a1977c5de83ec1e01457cd6d1661b930bfcab13
 MISC metadata.xml 819 BLAKE2B 1c4a8bd42cc1030719952aac2c72c40f175a22bd6eaf7e4d40638833d7a2d4c39f9da8a04bb57e1a6bcf99ade22fe7208e218f8f50d75501d835092d5ef4c105 SHA512 830789bd4225a2c5565466d8857c0cc184071962572e466bd8918ecd12b986d0017c2d6016d7d70d9a6dbbe15abce8497a2a31a5dd5e3feea5695533c417b11e
diff --git a/dev-vcs/subversion/subversion-1.14.2-r1.ebuild b/dev-vcs/subversion/subversion-1.14.2-r1.ebuild
index 863ce516964b..b5d43cf56b8c 100644
--- a/dev-vcs/subversion/subversion-1.14.2-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.14.2-r1.ebuild
@@ -78,7 +78,6 @@ BDEPEND="
 	virtual/pkgconfig
 	!!<sys-apps/sandbox-1.6
 	doc? ( app-doc/doxygen )
-	kwallet? ( kde-frameworks/kdelibs4support:5 )
 	nls? ( sys-devel/gettext )
 	perl? ( dev-lang/swig )
 	ruby? ( dev-lang/swig )
@@ -185,7 +184,6 @@ src_configure() {
 		$(use_with gnome-keyring)
 		$(use_enable java javahl)
 		$(use_with java jdk "${JAVA_HOME}")
-		$(use_with kwallet)
 		$(use_enable nls)
 		$(use_enable plaintext-password-storage)
 		$(use_with sasl)
@@ -199,6 +197,12 @@ src_configure() {
 		--enable-svnxx
 	)
 
+	if use kwallet ; then
+		myconf+=( "--with-kwallet=/usr/include/:/usr/$(get_libdir)/" )
+	else
+		myconf+=( --without-kwallet )
+	fi
+
 	if use perl || use ruby; then
 		myconf+=( --with-swig )
 	else