gentoo auto-resync : 30:01:2025 - 22:43:19

3 files changed, 88 insertions, 1 deletions

diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 5383d3cfa776..7594ba682771 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-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
 AUX git-daemon.socket 116 BLAKE2B 0fbf31de87810ac737adfab21acf87b0d95f62df5208fea3d79ebe010a4971b731ba1684852f3b926ecc7e23bcb9a386b2e612801701299c64d4c6390ed4befe SHA512 e383d358999ea0c7201c1709015a9b7c4dd9dd71287605640aca837fac1e2ee33a5a1684e1c3414c08742605f185b722f4864afd5be8b79a9f0d8f7ae0f9b701
@@ -19,7 +20,7 @@ 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 11872 BLAKE2B 92a624df4df88a3643f8195d05e22cfbef5a06b65f9585b1f5321fb4445aaafbfbfa0671aa618ebe7c05ded4c2d494e876e87cc4f49c6b60118ce5b66e2cc711 SHA512 75275bb877781c96fbccf0c590d3001104137ee4683de16a6f5e8447e73adbaa867ae50bd70fe73e9ac28eaf83992abb03a3d7472ee59d5a4c536df2d86a2f06
+EBUILD git-2.48.1.ebuild 11921 BLAKE2B 3cfe273d1d3f936bf515b9074ccbd6ec39ac64ce87c6614efba6c1be3e8ad7e5a1be0106440a385b12e43810caba18a820ba45b0d167b84a7bc1b98587d4c25a SHA512 f219819eb293a155bc2b8a36b691863a219a77313360d694b31ec50b7a455c3f0fc22cefb25409c2a845e1c02f85406ef20e7c11f9a90fd88be2c0bfc3f79e70
 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
diff --git a/dev-vcs/git/files/git-2.48.1-parallel-build.patch b/dev-vcs/git/files/git-2.48.1-parallel-build.patch
new file mode 100644
index 000000000000..fb10f59b2d0f
--- /dev/null
+++ b/dev-vcs/git/files/git-2.48.1-parallel-build.patch
@@ -0,0 +1,85 @@
+https://bugs.gentoo.org/948865
+https://lore.kernel.org/git/20250122-b4-pks-meson-additions-v3-4-5a51eb5d3dcd@pks.im/
+
+From: Patrick Steinhardt <ps@pks.im>
+Date: Wed, 22 Jan 2025 13:05:47 +0100
+Subject: [PATCH v3 04/11] meson: fix dependencies for generated headers
+Precedence: bulk
+X-Mailing-List: git@vger.kernel.org
+List-Id: <git.vger.kernel.org>
+List-Subscribe: <mailto:git+subscribe@vger.kernel.org>
+List-Unsubscribe: <mailto:git+unsubscribe@vger.kernel.org>
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 7bit
+Message-Id: <20250122-b4-pks-meson-additions-v3-4-5a51eb5d3dcd@pks.im>
+References: <20250122-b4-pks-meson-additions-v3-0-5a51eb5d3dcd@pks.im>
+In-Reply-To: <20250122-b4-pks-meson-additions-v3-0-5a51eb5d3dcd@pks.im>
+To: git@vger.kernel.org
+Cc: Evan Martin <evan.martin@gmail.com>, 
+ Eli Schwartz <eschwartz@gentoo.org>, Junio C Hamano <gitster@pobox.com>, 
+ M Hickford <mirth.hickford@gmail.com>, Toon Claes <toon@iotcl.com>
+X-Mailer: b4 0.14.2
+
+We generate a couple of headers from our documentation. These headers
+are added to the libgit sources, but two of them aren't used by the
+library, but instead by our builtins. This can cause parallel builds to
+fail because the builtin object may be compiled before the header was
+generated.
+
+Fix the issue by adding both "config-list.h" and "hook-list.h" to the
+list of builtin sources. While "command-list.h" is generated similarly,
+it is used by "help.c" and thus part of the libgit sources indeed.
+
+Reported-by: Evan Martin <evan.martin@gmail.com>
+Signed-off-by: Patrick Steinhardt <ps@pks.im>
+---
+ meson.build | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 213998986e..4053024dad 100644
+--- a/meson.build
++++ b/meson.build
+@@ -487,6 +487,13 @@ libgit_sources = [
+   'xdiff/xutils.c',
+ ]
+ 
++libgit_sources += custom_target(
++  input: 'command-list.txt',
++  output: 'command-list.h',
++  command: [shell, meson.current_source_dir() + '/generate-cmdlist.sh', meson.current_source_dir(), '@OUTPUT@'],
++  env: script_environment,
++)
++
+ builtin_sources = [
+   'builtin/add.c',
+   'builtin/am.c',
+@@ -614,14 +621,7 @@ builtin_sources = [
+   'builtin/write-tree.c',
+ ]
+ 
+-libgit_sources += custom_target(
+-  input: 'command-list.txt',
+-  output: 'command-list.h',
+-  command: [shell, meson.current_source_dir() + '/generate-cmdlist.sh', meson.current_source_dir(), '@OUTPUT@'],
+-  env: script_environment,
+-)
+-
+-libgit_sources += custom_target(
++builtin_sources += custom_target(
+   output: 'config-list.h',
+   command: [
+     shell,
+@@ -632,7 +632,7 @@ libgit_sources += custom_target(
+   env: script_environment,
+ )
+ 
+-libgit_sources += custom_target(
++builtin_sources += custom_target(
+   input: 'Documentation/githooks.txt',
+   output: 'hook-list.h',
+   command: [
+
+-- 
+2.48.1.321.gbf1f004a4a.dirty
diff --git a/dev-vcs/git/git-2.48.1.ebuild b/dev-vcs/git/git-2.48.1.ebuild
index f90f10f55f15..12b9dd2011c3 100644
--- a/dev-vcs/git/git-2.48.1.ebuild
+++ b/dev-vcs/git/git-2.48.1.ebuild
@@ -149,6 +149,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.48.0-doc-deps.patch
+	"${FILESDIR}"/${PN}-2.48.1-parallel-build.patch
 )
 
 pkg_setup() {