gentoo auto-resync : 23:02:2025 - 19:24:09

9 files changed, 68 insertions, 29 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 995537b0a8cd..0a82264805e9 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 7594ba682771..1f96731c23b7 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -3,6 +3,7 @@ AUX git-2.37.0_rc1-optional-cvs.patch 14373 BLAKE2B b835715468cff979fdefcc42aeb7
 AUX git-2.37.2-unsafe-directory.patch 367 BLAKE2B 433c4b39777d1f24fbebb0b08dc09672c059c01bbd8930b3a235d66d2990dcc5e3f17e758ff7860ce3d37d778db1a8792fd847ad110fef730095e52430fb0c19 SHA512 f23b0c29977e33596daa4eab60fcc1f64522dac93f6baa39aea9c627740363073176aabf29fe680a9802be34d9c3948713e17ce798000895cec787ccb40f56a7
 AUX git-2.46.2-unsafe-directory.patch 429 BLAKE2B 5e6be22e89250d434e0b62b27d90619a2d3379c2829dee9390d5e3413eb803a0547164e4e12c7f144812b394ee5238f9f1ee087f8c8f553766e473689ad2abda SHA512 8ad143cb0221c83d0c13606354e4c46f7169877a7d901cd1cd3f25e41efbc9ba57feaab626c6e1a19e9f52a084af629f9a2686eaaa76ec9e03569a1013087878
 AUX git-2.48.0-doc-deps.patch 1431 BLAKE2B df7168b1098748ba0ae8e73f77b3dd3398478dd39aa4ed39f66568ef24a5c26c83132d7f4b5da23fe60c03a58be0126232d3bc7fdac61461bd8fc0d3d128e43c SHA512 bdee20f82d7b3ec8a91c1a62eda0f97d18ea28a7a1e48117b069fc49a039b00be900c3216fef1e71c3f588f490272fc8d5f0e6d1d116639abd8616d946c8315d
+AUX git-2.48.1-macos-no-fsmonitor.patch 1328 BLAKE2B 3d126f9462d8ac7544c3c0780dba78cdd01dd95e286ee5dfe5dfbf8d3ba02aeb404bea0e2462f5de6270145a335d0f6cc2616eb7f9ffba49bafce0b3bd69a20d SHA512 70f9b98b89b5253211d32b0c1ba5826dbd2bcd4ce8d0315ff8404cb6361b09e8289eeafd6ed2c5798ca9b2cfea555114c7179716c76ed970de2664cb6ee19940
 AUX git-2.48.1-parallel-build.patch 2869 BLAKE2B d159e1f81b44904b0a0aef8597026eb3ebd2d33b0bfc04145ae132619b3a3f856583f4e2a7e043adaf9daaf97a051cea5e3259d1b1c517c4807b71fe15553889 SHA512 c206756c19fc22832a20e869aa919a4d968275fc3a5e67e671cb5c4707a06958ddcc664ae1d630ac49a70562c04e60bd80a1f8748fbf24672e4b2e5a2b0c900a
 AUX git-daemon-r2.initd 378 BLAKE2B 1e4e553f550ee1cb428bec21dbaeede12daa87ef89664bfed0ab7c1ec15d32cf738f7adde23db7f76e9a7a2aeadc132affa3c42709e2ed789745240f8f72096b SHA512 a78043543e540a814eb1d1c76fbde7fd5cbc9f6dbe7486bc21a0cbb24a613f7a8661acb5460df474a7a0c5284b61bc9e700fa384163db6fc423645f699cc119a
 AUX git-daemon.confd 710 BLAKE2B aee2e1493bb67c09b87497724df90cb74e9a5a7f123101ae96374145eb81076cc2018e73141aa9dc8c4e50b7f1087e8265f4bcd56d761c60375607268d470437 SHA512 fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec
@@ -20,9 +21,9 @@ DIST git-manpages-2.45.3.tar.xz 576480 BLAKE2B 61eeccea65dcae72e0151459ad4a225d4
 DIST git-manpages-2.48.1.tar.xz 590608 BLAKE2B 54ff646cd1d5ce93e8e37eef4682e81a1c95f99903b2d760f70e51f2c9f02378f6de5464a5fcca24c08f8327ec114cdd1684eee07fd2512af7e9615c47104a99 SHA512 b086ac89e77b1af58beff26576fb5c3a1dfe8641315ab0b60819dcf0ba9e5be4173deaa77fa1f95d8594895a583ed629c469714b0a5e87fecd36e5be397ba8f5
 EBUILD git-2.45.2.ebuild 16448 BLAKE2B eecc66b8793b6a99e40c28fea1ef68bbb25902981bf18a09d7e8f2e6c00a27133b3fc2318f9460acba64d341cf6ad8970d2e855e6c4baffc982ec8830db8d2f8 SHA512 47dd7ec8dbd7256bfcdcb810abd6d47aababde17e68343cf5941dd529232ca0ecd321c2d1aa23f17ce8bd501203d39ddfa1bf3e4bb63c84f9c06e5c76fff5179
 EBUILD git-2.45.3.ebuild 16448 BLAKE2B 849adc38c76ee0dba0523cad77db4a06b74b891815555578dff3a40db29b91a17f2cdd6e0727cbf842781bb3f5c215cf880f7949f157fc2f9dfbd13afc2768b9 SHA512 f1ebde7f07478fd40aedc5eca9826e1fc4684f1f808dbd29e2cbdd620df130646a5acf5f54cf160b92bb4aa1fe31afddde3101814ebb9c4a5505021806f1d23b
-EBUILD git-2.48.1.ebuild 11921 BLAKE2B 3cfe273d1d3f936bf515b9074ccbd6ec39ac64ce87c6614efba6c1be3e8ad7e5a1be0106440a385b12e43810caba18a820ba45b0d167b84a7bc1b98587d4c25a SHA512 f219819eb293a155bc2b8a36b691863a219a77313360d694b31ec50b7a455c3f0fc22cefb25409c2a845e1c02f85406ef20e7c11f9a90fd88be2c0bfc3f79e70
+EBUILD git-2.48.1.ebuild 12078 BLAKE2B 2ac2d37274f6cf7dab7ab2b3185442a06d77705921f1460e172b7c36a1f1894e25f980bad424397524ffd6314d921ea995973539fa38a0e8204d810e271a15c7 SHA512 a7281c6841465ca537dcf0a79c41cb5abca3f3875c261a083c628fef194bd556a22582441a0a3f9c2746087c4689c6b663bb96f593ff7e9d9fb5dee9b2c38fa0
 EBUILD git-9999-r1.ebuild 11872 BLAKE2B 92a624df4df88a3643f8195d05e22cfbef5a06b65f9585b1f5321fb4445aaafbfbfa0671aa618ebe7c05ded4c2d494e876e87cc4f49c6b60118ce5b66e2cc711 SHA512 75275bb877781c96fbccf0c590d3001104137ee4683de16a6f5e8447e73adbaa867ae50bd70fe73e9ac28eaf83992abb03a3d7472ee59d5a4c536df2d86a2f06
 EBUILD git-9999-r2.ebuild 11872 BLAKE2B 92a624df4df88a3643f8195d05e22cfbef5a06b65f9585b1f5321fb4445aaafbfbfa0671aa618ebe7c05ded4c2d494e876e87cc4f49c6b60118ce5b66e2cc711 SHA512 75275bb877781c96fbccf0c590d3001104137ee4683de16a6f5e8447e73adbaa867ae50bd70fe73e9ac28eaf83992abb03a3d7472ee59d5a4c536df2d86a2f06
-EBUILD git-9999-r3.ebuild 11872 BLAKE2B 92a624df4df88a3643f8195d05e22cfbef5a06b65f9585b1f5321fb4445aaafbfbfa0671aa618ebe7c05ded4c2d494e876e87cc4f49c6b60118ce5b66e2cc711 SHA512 75275bb877781c96fbccf0c590d3001104137ee4683de16a6f5e8447e73adbaa867ae50bd70fe73e9ac28eaf83992abb03a3d7472ee59d5a4c536df2d86a2f06
+EBUILD git-9999-r3.ebuild 11909 BLAKE2B f84e78cc57a931d46bf030f3841e21ab096a651499e7306e6df9cf747c8563a680bcb3559137fcd98bc5831c41850251fc77dee65707e08b91e65f66584a3a1c SHA512 7124b6a329846f44ca6690109534439ac7374a83c0abdb2b42c839ec902b735ac4cad087f8ac6b353a274e6e23f16192f63f14e1531452628ebadd59a3491d85
 EBUILD git-9999.ebuild 11872 BLAKE2B 92a624df4df88a3643f8195d05e22cfbef5a06b65f9585b1f5321fb4445aaafbfbfa0671aa618ebe7c05ded4c2d494e876e87cc4f49c6b60118ce5b66e2cc711 SHA512 75275bb877781c96fbccf0c590d3001104137ee4683de16a6f5e8447e73adbaa867ae50bd70fe73e9ac28eaf83992abb03a3d7472ee59d5a4c536df2d86a2f06
 MISC metadata.xml 2041 BLAKE2B 309964a6982f6f14cecc40b4021d96d2e28c49789480bc4037879375cb5277c2eb500ff36800657e783c36f541265db20b464fc39ce2ac39ff4cda881854662f SHA512 a8dd2f76985690cded8555a0b82e5004b4d93ccc45988fdc04ef8ed3e17ef73d2b83dc9fb6b913e5f9d2b78ebe715e9eb32bfce607318d0e8c0834987eabe5b6
diff --git a/dev-vcs/git/files/git-2.48.1-macos-no-fsmonitor.patch b/dev-vcs/git/files/git-2.48.1-macos-no-fsmonitor.patch
new file mode 100644
index 000000000000..f1b89e736f46
--- /dev/null
+++ b/dev-vcs/git/files/git-2.48.1-macos-no-fsmonitor.patch
@@ -0,0 +1,39 @@
+meson.build: allow to disable fsmonitor backend for macOS
+
+Gentoo Prefix toolchain and setup does not enable CoreServices Framework
+by default, so simply allow to disable the fsmonitor backend
+
+Signed-off-by: Fabian Groffen <grobian@gentoo.org>
+
+--- a/meson.build
++++ b/meson.build
+@@ -1117,11 +1117,13 @@
+ endif
+ 
+ fsmonitor_backend = ''
+-if host_machine.system() == 'windows'
+-  fsmonitor_backend = 'win32'
+-elif host_machine.system() == 'darwin'
+-  fsmonitor_backend = 'darwin'
+-  libgit_dependencies += dependency('CoreServices')
++if get_option('fsmonitor')
++  if host_machine.system() == 'windows'
++    fsmonitor_backend = 'win32'
++  elif host_machine.system() == 'darwin'
++    fsmonitor_backend = 'darwin'
++    libgit_dependencies += dependency('CoreServices')
++  endif
+ endif
+ if fsmonitor_backend != ''
+   libgit_c_args += '-DHAVE_FSMONITOR_DAEMON_BACKEND'
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -57,6 +57,8 @@
+ # Build tweaks.
+ option('macos_use_homebrew_gettext', type: 'boolean', value: true,
+   description: 'Use gettext from Homebrew instead of the slightly-broken system-provided one.')
++option('fsmonitor', type: 'boolean', value: true,
++  description: 'Build fsmonitor backend on supported platforms.')
+ 
+ # gitweb configuration.
+ option('gitweb_config', type: 'string', value: 'gitweb_config.perl')
diff --git a/dev-vcs/git/git-2.48.1.ebuild b/dev-vcs/git/git-2.48.1.ebuild
index 12b9dd2011c3..99cdc1b16654 100644
--- a/dev-vcs/git/git-2.48.1.ebuild
+++ b/dev-vcs/git/git-2.48.1.ebuild
@@ -150,6 +150,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.48.0-doc-deps.patch
 	"${FILESDIR}"/${PN}-2.48.1-parallel-build.patch
+	"${FILESDIR}"/${PN}-2.48.1-macos-no-fsmonitor.patch
 )
 
 pkg_setup() {
@@ -205,9 +206,12 @@ src_configure() {
 		$(meson_feature perl)
 		$(meson_feature perforce python)
 		$(meson_use test tests)
+		-Dmacos_use_homebrew_gettext=false
 		-Dperl_cpan_fallback=false
 	)
 
+	[[ ${CHOST} == *-darwin* ]] && emesonargs+=( -Dfsmonitor=false )
+
 	# For non-live, we use a downloaded docs tarball instead.
 	if [[ ${PV} == *9999 ]] || use doc ; then
 		emesonargs+=(
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index f90f10f55f15..b9d2fdd44259 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -204,6 +204,7 @@ src_configure() {
 		$(meson_feature perl)
 		$(meson_feature perforce python)
 		$(meson_use test tests)
+		-Dmacos_use_homebrew_gettext=false
 		-Dperl_cpan_fallback=false
 	)
 
diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index 9a24610b9a43..5ae0e9be8a2f 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -1,6 +1,6 @@
 DIST 5df2b817255ee919991da6c310239e08c8fcc1ae.patch 4115 BLAKE2B 8f364eba7a1f3788ae6aacb76946d9cf963609ac3e6f093eedf4d5e17467eba0ceb88b5b4bbf3acc72ec17e6626f52836805ac07f6044d7712efcb499d0237ff SHA512 5098a82c860370edeec7c41cb71d0f10e6c03b3d1996f163e882d84ea64903d64e866bb67af45380f658870e2715cc805155380c96994854847b06a6db3e111d
 DIST gitolite-gentoo-3.6.13.1.tar.bz2 168862 BLAKE2B 39619ca8d02e91320f19aa33e32cfcaf9d64519fe63b8389cec459adbe07aa816685a19ebe4d138ae251438f085c6f5e2ee97cc8e984ce716d12269e18ad9240 SHA512 8e250e8d71a3494564cda062a9ef3618b90f2643f0d868989ae3930ddd076a776d78ad058fadd1373d0efc281d5608512df6ebe49de30c59c4c661961f436610
 DIST gitolite-gentoo-3.6.6.1.tar.bz2 155262 BLAKE2B 3dfa89223824ea04be6c0598abad3c6fb982c0031507aa2ab4ad8ecb9cfc5b64846e48f1710cf4436b4947d2f7288398b2603ac8f9a732902cf17a9a168e6b3d SHA512 76765972b06e985879bd3384be62e4b57676d0d67e6d55b56a63a2d802fe3ee76576e0da20896f11764a311dfcde0bfaf4309105ddc8c55c0c09bb098ed6a1bb
-EBUILD gitolite-gentoo-3.6.13.1.ebuild 2780 BLAKE2B 1fe1faa20245ab95252f30d98da65098500425f6d01d5dbd509c9709ee8644c6241bf09212bcd6c7e76ae068be08bef9c162faefe1057f175f67def91ca48876 SHA512 8bed53a5e798cc3d9d7855c865109b7740b4a89f4fefb2cab078497d2c70a6f41e6f401d8845f6a379f464b8fd919c0b4d108ca71e30e39a0e499400447ceb10
+EBUILD gitolite-gentoo-3.6.13.1.ebuild 2711 BLAKE2B a3aaa2d34fb7e8405dd74374940a53290d5e31da8338a2e39fb11f1e6dcdf5049ac9cf88e314d946eb335c0f9ff8e3b5fc4c9e7ea2766b661ab4df47a2eab567 SHA512 11de9f3fb3373c0896a48c141a9f2b66b100f2ebfc821e11fde9baea1099219ce1fc4816a02c26d563cc2df7c69688a72d7d4d402acacc7e9943d760cdeb2da0
 EBUILD gitolite-gentoo-3.6.6.1-r3.ebuild 2860 BLAKE2B 1980bc08482a8e685e103cffd4df65b4503d8db85f510421d42d2620ab76b04e8031742d5facd817096bfe7371cb45e5a3e50b47b06f20ef0c78361d4cdda163 SHA512 c8aeb496e0a34a80bad48a8b5dffefdc83272a08dc8beb9bff2c231863e29f9cfd771fbbf7f8a8ec24e07ebc915be93322902fc290847e0269e48c95e62164b0
 MISC metadata.xml 419 BLAKE2B 5d3723cd4cca89ecc3c8d7b2b3d3137d4ab3057d1e6247a2f5e826e56ab34c4504b947ef35eda3d791d13ef38c85ade2b5941aaa3df61bccffc313b83d7f583d SHA512 45c81176984268aef059164a2d3d7cf82c966256e1aaf8348ae715073bb675fa87d63a8567441bc093e5266ac2f74598f0025f52bdf2c06bca8d6b68497cc655
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.13.1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.13.1.ebuild
index e90dabd49472..599aa38e7548 100644
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.13.1.ebuild
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ EAPI=7
 EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
 EGIT_MASTER=master
 
-inherit perl-module ${SCM}
+inherit eapi9-ver perl-module ${SCM}
 
 DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
 HOMEPAGE="https://cgit.gentoo.org/fork/gitolite-gentoo.git/"
@@ -85,19 +85,16 @@ src_install() {
 }
 
 pkg_postinst() {
-	local old_ver
-	for old_ver in ${REPLACING_VERSIONS}; do
-		if ver_test ${old_ver} -lt "3" ; then
-			ewarn
-			elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-			elog "Please read http://gitolite.com/gitolite/migr.html first!"
-			ewarn
-			elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
-			elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
-			elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
-			ewarn
-		fi
-	done
+	if ver_replacing -lt "3" ; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
 
 	# bug 352291
 	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
index 8947ce405ade..1faa36ead2c8 100644
--- a/dev-vcs/gitolite/Manifest
+++ b/dev-vcs/gitolite/Manifest
@@ -1,3 +1,3 @@
 DIST gitolite-3.6.13.tar.gz 204615 BLAKE2B f4a6f5ea106695371b75837fc8ff39a62f0464247781abcaa79bc779cd72a2c2483c2436cbd9cb1091689e51b09a3a9ee17bcce5bdab02b6cb641b1c8bab7066 SHA512 95c232dd117b8849b205946b6427422abadbfb0d59fdb72f1de75813cbe3fbf63cbc0f5f5f2de4e761797c0cf5423c94805a55af87b7ff78a2d9ea9f2406dfcb
-EBUILD gitolite-3.6.13.ebuild 2356 BLAKE2B 64f409c80de239d60fe2697783492a4b7f9f1c2f492f33c6e6d36287451e689829ffead65de69f1d63f002520505cc496ee7daba35594392acd53d162b9dfc11 SHA512 22533e2d4560bf85ef51f014c7c2f5c5e18fb13ec0263832ae161a1e268e57d977c001dce979d57304e35dbc30b6774a1fa13b22b9500f5c962c08218406b3d3
+EBUILD gitolite-3.6.13.ebuild 2292 BLAKE2B 1c1de2f662120468b256e1c5cd9ef72f65b664e9e20128c710fb0a60c074c3a783920d335f6fc9be2a1c2d140fc328a5fbab7eb2b0ec11860df47315748c8f1d SHA512 1901e42fa484b0bafa90616ca67b932d1b52fcf6afbc3dd56f6ce80798b63b04c7923d96d99bcc592b247e19aaa57735ad25f44db67583b75f663e15f930ae32
 MISC metadata.xml 721 BLAKE2B 4198be195336ba39aa8fb959e84d468e6106b29186ca8d5afa19a83d1b3b79f7de9a8e3f6de2b1e1b801e873e46d0101cdf37951b427f6661259565f37e571dd SHA512 46e981d1269964bb609cf0b0d38bf2b0bfbd5edbd74fdda066845ec1c2425a8ecd16295e27e0168dc0e09c596fc4ad1e5e32454cdac3543e96e836bd1d992d87
diff --git a/dev-vcs/gitolite/gitolite-3.6.13.ebuild b/dev-vcs/gitolite/gitolite-3.6.13.ebuild
index 3d1b50b369fb..827acd25398a 100644
--- a/dev-vcs/gitolite/gitolite-3.6.13.ebuild
+++ b/dev-vcs/gitolite/gitolite-3.6.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit perl-module
+inherit eapi9-ver perl-module
 
 DESCRIPTION="Highly flexible server for git directory version tracker"
 HOMEPAGE="https://github.com/sitaramc/gitolite"
@@ -84,14 +84,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	local old_ver
-	for old_ver in ${REPLACING_VERSIONS}; do
-		if ver_test ${old_ver} -lt "3" ; then
-			ewarn
-			elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-			elog "Please read http://gitolite.com/gitolite/migr/index.html first!"
-		fi
-	done
+	if ver_replacing -lt "3" ; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr/index.html first!"
+	fi
 
 	# bug 352291
 	ewarn