6 files changed, 82 insertions, 78 deletions
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 2fdf84bfc2d6..16ba52cfc847 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index c68e034075ae..d2ae9aed4df6 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,10 +1,8 @@
 AUX README.gentoo 227 BLAKE2B 828266fe46d9eb866250b57921df446055c7835cce3c3d17014563451acfc100f0e3ade6805514d620852273f011c12a8dd581ad90ffa135e5ab168a87790d46 SHA512 9e8b672fe6998a255dea761e186d5a9031895e8ec0eb14d4942c81a462a238ef1eec0431671da8be3ee4bbacd7f81cec6ec1f9e75e2f4429c3472faad5ba2c2d
 DIST git-cola-4.10.1.tar.gz 1265278 BLAKE2B 3c2ff0f25b5f75340f24577b5109fcbc3ce89122df88a097b1578c193bf37e832c2825ec25dcac720145230c879ba473a7db35ea2e9e1f476c937b14e3649c7c SHA512 582842a861726b4ed6e9f966afc47cb4817cecd82740bb446e39b6f3d03fb96523401267ebdef64960ef60b55cc3e7f42d8023a738b9ff660b9f0d9ea07f201b
 DIST git-cola-4.11.0.tar.gz 1268000 BLAKE2B d6e2b52244ea63bf166f84e5f2e86e4b85e03e1f20c57bcb90a5f6e7689645fdaa0491e583bfc03812ed5df7970cd22c41962c8872abd58f13c774ba74330f30 SHA512 ce0d9bf3865d7e023bf61a9b846cb764661e07b9d72b25f36c25fa5a3b428c0d490e2382ab3715f5f7b2aaa07824096002351d84d5d9c8545e6e2b678a22c0f5
-DIST git-cola-4.8.2.tar.gz 1251173 BLAKE2B 758b34e271883c5493e9a219e7f9970c1ca2e0cdb97bbab50828ea53ae2bae223692a06c353d0b017af2e82b3855708ebd2937d9656b373b8d45ab457ac50b7b SHA512 0b924837e8e5dcaa9687ffdff779bd3ed9f629713826f6c537d6470fdaed84bab3cec793aa9f1cf0e7bce3c4dae60c838822005efa93236b5964c8be74ef33cc
-DIST git-cola-4.9.0.tar.gz 1261512 BLAKE2B 51994539e79d1f3db5876b64c10bf84fd2ac7f90cab05227c23831b0f0a6771cead11bf3bcb76863eb0e6e26c245a735143306d55f1773a697036652d7a1084e SHA512 8abb30c8263170c185dc66061b8271dfb73a0173a29337ef704cc0d206a218bfb5ede528966ea55c64fc68121162973f9345ff112b7f8d7093f602a7774b72e0
+DIST git-cola-4.12.0.tar.gz 1269313 BLAKE2B 447ca9b4db2de5c157aea78d1668c0a4325bb816e031f188342a646e85ae5880ed5ed7bec0d863740975c2860e9a4199f7f34099a23b8a86138a64cc6964988f SHA512 110db6c9a2cdc70eab942aa4965704081fc2d920a9a9a188a91f5a9e76927f02d9c8a4141f6921cb708ea00f676319820f9403e32da6798c0118ab87d388c8c2
 EBUILD git-cola-4.10.1.ebuild 1831 BLAKE2B 1913456d91d8feb45a6161cc37237e7cccda8081e4c339e61ff6cdaf72690504adef3320b1341ab6a2c4ce0f094ac4a4f3a142d12be1c17befd9328da67daa0c SHA512 717a6897f582eca5af8eca1014dc1ba2ba918d7ae7bea4f2601388cb0c8c841ad2f764ee7164b49db44a14ffabda3421184a5150ba3b3aac1d8dd050bc77693b
 EBUILD git-cola-4.11.0.ebuild 1833 BLAKE2B 8bb6f89bdbf7dcf3e6733238e694fce469cdc82d0b927ec3935220adbc30f098d458dca4339edd927403a120b629414dec2e91ffb590735266879c4dff54bb81 SHA512 02f8ee32c2763746f578d567002acccd2027b49c69217dce2c013b17046db22a88119c3ced8798a43bf77a82e0dcb01da4cb8fbe3eb8182d1f03c6c01dfe2888
-EBUILD git-cola-4.8.2-r1.ebuild 1662 BLAKE2B 37148482e3215efe9046cf81d6338fb391c27e7d1c7faf19240ad29415549afe645abd5a7d4ee64d9a797100d56ea7cda995eb402c236feafe6153909a8bfb7a SHA512 33fb39030622eb025cd3506ff87866a5b011a51b4e23d428f48f88935dc54b6118a83dd00bf921c5aa276756d549446bb58f2000b13fbb2d5e4e0ea924fdaa40
-EBUILD git-cola-4.9.0.ebuild 1833 BLAKE2B 6c86d40221638709f86c867f907188c0054f2ef3a709bba37b8bb2519790e559347578cb1a8e39e65e6d4c44af9d2af9fd881077d023b58e983e69c76666385c SHA512 0e5e3e736b6f7de95b78bc7abeb5763dbf4590fdbb053d5112d62ed877e56d3a36bacbd3ed363ee44b7d0ac0fbb4a5404d278e8f349469c091c3b7327d15bef8
+EBUILD git-cola-4.12.0.ebuild 1833 BLAKE2B 746c17f8bc4466957b8a8ad5e9964bae46c9ea514df0724d80222ff18314447ec3bbce0751516de9f17e08ff77f6d2cd7399fce5c4a29ddd042a572569893643 SHA512 5175b1d46ee9368b5bf7a901a91955755172207d960717c8246e7594beb1cbf1a8de49602211b511f8b10c348fce449f2ebf8dcb9781dfc3290bbb3c5ec7e2ba
 MISC metadata.xml 595 BLAKE2B a1a74266c1afcbcf94bcb95b8218669f09ce709d0803e37cca482b2e89dee176d1d898236ba024e7266106133d1bfb3008fd1ff3ce11793c606fc7dcffb408e6 SHA512 fe44a4445bf71d09eaa6be66af2370d3c0e94dada507ace584ffe9dd8b5edafd472355cee7aceb554c31b0bafbd29faeb318e853d0d165fb1d2a7f8f8bf86379
diff --git a/dev-vcs/git-cola/git-cola-4.9.0.ebuild b/dev-vcs/git-cola/git-cola-4.12.0.ebuild
index 28ccc24bce13..c052fd0a6ae3 100644
--- a/dev-vcs/git-cola/git-cola-4.9.0.ebuild
+++ b/dev-vcs/git-cola/git-cola-4.12.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
 DISTUTILS_SINGLE_IMPL=true
 DISTUTILS_USE_PEP517=setuptools
 inherit desktop distutils-r1 optfeature readme.gentoo-r1 virtualx xdg
diff --git a/dev-vcs/git-cola/git-cola-4.8.2-r1.ebuild b/dev-vcs/git-cola/git-cola-4.8.2-r1.ebuild
deleted file mode 100644
index cc31ca4ed9c8..000000000000
--- a/dev-vcs/git-cola/git-cola-4.8.2-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-DISTUTILS_SINGLE_IMPL=true
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/polib[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/qtpy[pyqt6,gui,network,${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-	')
-	dev-vcs/git
-"
-BDEPEND="
-	sys-devel/gettext
-	$(python_gen_cond_dep "
-		dev-python/setuptools-scm[\${PYTHON_USEDEP}]
-		test? (
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/qtpy[pyqt6,gui,network,\${PYTHON_USEDEP}]
-		)
-	")
-"
-
-distutils_enable_sphinx docs \
-	'dev-python/rst-linker'
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die
-	# remove bundled qtpy and polib
-	rm -Rf qtpy cola/polib.py || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	cd "${T}" || die
-	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
-	epytest "${S}"/test
-}
-
-src_compile() {
-	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# patch the binaries to use desired qtpy backend
-	sed -i "s|import sys|import sys\nimport os\nos.environ['QT_API'] = 'pyqt6'\n|" "${D}"/usr/bin/* || die
-
-	readme.gentoo_create_doc
-}
diff --git a/dev-vcs/pre-commit/Manifest b/dev-vcs/pre-commit/Manifest
index 5c48b8d4a2d9..d05f9a97f164 100644
--- a/dev-vcs/pre-commit/Manifest
+++ b/dev-vcs/pre-commit/Manifest
@@ -1,6 +1,8 @@
 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
+DIST pre-commit-4.1.0.gh.tar.gz 289203 BLAKE2B 8a3264dcbc01f6a7544b7f8425f320e701eb8aad63a4be9843bec5c95cda3bc47a8458b94967eaf4fad5d24c5b86062c999de0e482386293d6562aa5b4244631 SHA512 d10f90da9c8b2130cd6c17d337787648fb28774e5b4df4017cd57264530dca87b03a07e549b46cc2e5c8f292c34c0890c4940f03ed132a7a274176c45f387607
 EBUILD pre-commit-3.8.0-r1.ebuild 2132 BLAKE2B 5bda58bacf4e98a4328db604a058e70399ed91ad4413f40a849149931eafd28005b5bf944aff4205ecda081e65b6ee5370faf5a9bebf88e3bcd45d13b9b28c74 SHA512 7ea6a4c5d5a21f485d8cf06269d7ef591b97771650c92be31cfb7388852020f461f7ce2d09af5d6465366e790de9dcb15f19ba74dd08b049243cae488b98d65e
 EBUILD pre-commit-4.0.1.ebuild 2132 BLAKE2B c233a203b615392a7353dff694a688cbda116c59682436e57e7abb5265c0b7069ab34514e8aa1bf6d2fc772fc5107da3161ad433f57c39e9aa1d64bd55ead82b SHA512 3070bde4aa45c6150caee6a26ddc80e8480745ce3948165606d7f643627df43fb5db8e87e6c7ae71f5380f0f966c5d9902ab346c25460ed0443724e92f69d7a4
+EBUILD pre-commit-4.1.0.ebuild 2134 BLAKE2B f8162246bdf41b1048c8aa011bff1bdce3cd2bf3237c4598ba457b022314c8214555f57a3ad8265e530c378ebbda8539dff0549d2008ae047a72175f0bc14959 SHA512 04316936c870e305de31cd297c378ae1d3073a4fbd6e9bd2bcfa998e3bde930563222335f61f7262c908c4aaa1351363b53ebffcd8c2f36a5a7d6b21c0fac0f8
 MISC metadata.xml 391 BLAKE2B 08aea5db96326e51f252d2392f655100d2721dfa8eedfbb361221d92b0b0e0645152b8e1c2ccc11e8b50f24b59869fa2e1fc7dfaa42fdb23614ddbc963e9f102 SHA512 799e0df03afd4baef6296590b9133b45487d1e41f09e933a738367f0bcb3c6510ec8e26547b16ea5c07525d99b026ba1848d21e4001505c33a564b14746897c6
diff --git a/dev-vcs/pre-commit/pre-commit-4.1.0.ebuild b/dev-vcs/pre-commit/pre-commit-4.1.0.ebuild
new file mode 100644
index 000000000000..dfe27ae8cc08
--- /dev/null
+++ b/dev-vcs/pre-commit/pre-commit-4.1.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2025 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 )