gentoo auto-resync : 12:01:2025 - 06:41:42

12 files changed, 127 insertions, 54 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 086a31d079f4..698b39c9f348 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-absorb/Manifest b/dev-vcs/git-absorb/Manifest
index ffea78afc5d2..2dcd60de8d1b 100644
--- a/dev-vcs/git-absorb/Manifest
+++ b/dev-vcs/git-absorb/Manifest
@@ -100,6 +100,6 @@ DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e
 DIST windows_x86_64_gnullvm-0.52.4.crate 433358 BLAKE2B ffd55fba15ef713bd48caec5ed5f32936e05ac4897b721bd2b041229bc8c7beeca77ca018c3258dcdb09495629aa359d1dadaaf5112d38e7ea54670309d0ddf4 SHA512 f153d86b01e47f17ef08271b69becf7883bab92f96d40cdb1d74432f2bc6a7a65aa4ed931d8f6f4c2679e360bbd8d12037dc2a74a6a444fcaec5e4c784c54c74
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
 DIST windows_x86_64_msvc-0.52.4.crate 828019 BLAKE2B 08163b63d934114457cd64b1c372f8a0cfc1ebf48a2efb41d79031c58ea64e023acd32d2f5075b8b78536998188138562e584ece95f2021b4bc71087ac45f026 SHA512 0671fa3c0463c6d65b525ece8bc91eab2f75cb534de86ba2b1e854d4136fcb439717441881206dba7cfb602493bc24d2aefa96abf8977f5a0fe38d41eadc90f1
-EBUILD git-absorb-0.6.16.ebuild 3147 BLAKE2B bb2f39eea09d61409714d7d40c6a4c5f38650e3f94b25d02e9e24f3b9894149ea11db2d0c70d737c90bbe0086494c28595514b1214c38e940188d9a8850c7091 SHA512 fdc1b107b455dcbb48efc2579fe9303000a6439651f14ced2b3a1660218ed04a933910067334dfa327ca8940c5fdd15fd0610b3c2def9994192975d90fbfe30d
-EBUILD git-absorb-0.6.17.ebuild 3063 BLAKE2B 92265061a8e52162dbbfb59b10ae7ee116447136b7bbf9564d573d790eef425a3b4af6b6f206a9e8d05553ed642795a7c04cb353ea5cf8236fc45698e87aab0c SHA512 2143269bedcd9d9a1145c1bc8a3bcb8f0ddec336623521e2d99ca75f4dae938d69eaec3c8ecd9a795333a33f1c4be18a77bb557272c4c06d2012d32741b7da4e
+EBUILD git-absorb-0.6.16-r1.ebuild 3175 BLAKE2B a4985ba35f4cec6b49c69899d7027cc1a59415fe9bad5c9321eb385a9014b159ea6e71048389c3f8a1721bbbff1180779fc5d56f36b42076219fa9479f3d555b SHA512 f5563c18139476beba2143f7f17adb130a0883b30ec0fa8759d7eeab541e6204ba36ec61b608d4094f0297df5a33e7139b95de4cce56beed2af660c0bd77599f
+EBUILD git-absorb-0.6.17-r1.ebuild 3087 BLAKE2B 4087c955bd1d2fb437c7edcef65e1fce99a70bd30eb91b3b0860432895d4d337ab19d159dd9485c0bf22808d0ea90374ba5bdfd6b790f2701fdac01ac33e99ac SHA512 5b42fdc2270d92dbaae72bb0a8c960e5a2f5ded1057568d3d7097be4774f6fc16e5d842308337bae7b8b8f392f71a212530a402f0d64a11504756dde6a1258cd
 MISC metadata.xml 326 BLAKE2B 1ce61af807d0db7a5decbffc79fc653d7213c40b44fc1fe7441a0e787034e408ee167d5d2c4adc3f004b90c6ec520952504d66add287bbd540b3418c36f47de4 SHA512 9e288f04912600a55bbf5464eed414de2ea8911ce5bef9fe92d99e5d2a872652b3638d00235fea858151eebbf46905ed9108003297276202d4a1bd80ac0fc720
diff --git a/dev-vcs/git-absorb/git-absorb-0.6.16.ebuild b/dev-vcs/git-absorb/git-absorb-0.6.16-r1.ebuild
index c032fdba1197..0b767704df93 100644
--- a/dev-vcs/git-absorb/git-absorb-0.6.16.ebuild
+++ b/dev-vcs/git-absorb/git-absorb-0.6.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Autogenerated by pycargoebuild 0.13.3
@@ -121,6 +121,7 @@ KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
 	>=dev-libs/libgit2-1.8:=
+	<dev-libs/libgit2-1.9
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-vcs/git-absorb/git-absorb-0.6.17.ebuild b/dev-vcs/git-absorb/git-absorb-0.6.17-r1.ebuild
index a95b9e691e70..b45149cfc67e 100644
--- a/dev-vcs/git-absorb/git-absorb-0.6.17.ebuild
+++ b/dev-vcs/git-absorb/git-absorb-0.6.17-r1.ebuild
@@ -117,6 +117,7 @@ KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
 	>=dev-libs/libgit2-1.8:=
+	<dev-libs/libgit2-1.10
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-vcs/git-delete-merged-branches/Manifest b/dev-vcs/git-delete-merged-branches/Manifest
index 9e93baf93307..cc11f977a05c 100644
--- a/dev-vcs/git-delete-merged-branches/Manifest
+++ b/dev-vcs/git-delete-merged-branches/Manifest
@@ -2,5 +2,5 @@ DIST git_delete_merged_branches-7.4.1.tar.gz 41639 BLAKE2B 527c849d92f0dcfbeebee
 DIST git_delete_merged_branches-7.4.2.tar.gz 41632 BLAKE2B 4af195011fda93272baf5b11db3872cdd5db9d782b653986c1dd80f02882d0c665114b9ca61666fa317bbc5ad527905be7b2441fa376e34af3ec05fe442bc1e6 SHA512 2f2c3356037afca482a61f2de4a955e24598bff75b7d436a54a8e16c8648339cfe9c00a594dc01d03782bd0f5d4471a935396291daaad45f26be104ff10a2550
 EBUILD git-delete-merged-branches-7.4.1-r1.ebuild 981 BLAKE2B ca9485ced1c4200748a6364238b6c9ba63733d1feaa872905052cd26c38671a7acbee340d7b4d80beb88287054d59d529e8ab068de53e4c9a0635c4bfb1b87a4 SHA512 ef65415b3dd5d0abf1446f1f7364530cc531cdb9e84d9c1115bd0f729d1de374a4108e1dc58ceb48b9c445c3dc030ef2b1edbe3805a15b35ef3b4f9bdf17ace3
 EBUILD git-delete-merged-branches-7.4.1.ebuild 980 BLAKE2B d1dcfb3de87e7a823a3832cf75742c296582bae869fbf387b466502fdec10728c8d089454199f7ff9a1345ed38165df2b2fc14812c6e78884ebe52a13325b699 SHA512 ffd847be77a20692d6c2e88d7a7cdc8a1e47d6c077f7551c827b6b287ed91fda1e451290115ca62c1c6040b8ffca8738ef3112126ce7adeea7aa8bca60e20c0c
-EBUILD git-delete-merged-branches-7.4.2.ebuild 981 BLAKE2B ca9485ced1c4200748a6364238b6c9ba63733d1feaa872905052cd26c38671a7acbee340d7b4d80beb88287054d59d529e8ab068de53e4c9a0635c4bfb1b87a4 SHA512 ef65415b3dd5d0abf1446f1f7364530cc531cdb9e84d9c1115bd0f729d1de374a4108e1dc58ceb48b9c445c3dc030ef2b1edbe3805a15b35ef3b4f9bdf17ace3
+EBUILD git-delete-merged-branches-7.4.2.ebuild 980 BLAKE2B 5668e644c8b452ffa1de7622f22eb6614a56e9b874b51bdc4eea10193d4ead8ff3002a4ae0672658fe01eef0bcd14a900c338a5b1fbb2e03bf78f69c21601bdb SHA512 6606d6952d562637a78114c87c7a245fecf6e1f209b4edc6cca35210cc5c387387672d3613a9b4e35ab57139e7ab1cd521df03e6ea0fb6338e3c1897e4dd0a65
 MISC metadata.xml 582 BLAKE2B 45e782537ad6d6a54a50ae84e5e1ab46ad9d06297397d30c2314bd15b39c4099f755a2884ccb072e4516499bba240814cffa727862db5a5fc1472b45d7ef7cbd SHA512 e99038593f4bdebdd3874e88f50f4f73dca01272024e2e2d998559b53c1c755d33592865ec4706e99202f2d1f4293578dda7c3812e991a3e7b7da9d1d78dc76c
diff --git a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.2.ebuild b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.2.ebuild
index 33ddb9d11f84..2cbad0f88b14 100644
--- a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.2.ebuild
+++ b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.2.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=8
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/hartwork/git-delete-merged-branches"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="full-name-executable test"
 
 COMMON_DEPEND="
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 0c93e45f8167..ba0f202ab82f 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -2,6 +2,7 @@ AUX git-2.21.0-quiet-submodules-testcase.patch 1233 BLAKE2B 45a9660d584e0bf928df
 AUX git-2.37.0_rc1-optional-cvs.patch 14373 BLAKE2B b835715468cff979fdefcc42aeb7a48986c4ebba95f3e7ab033bc1b9c29eee9ded0b47a2c6d6831d4ece0662dd244f41a670d0805e1a5c8bd8c25531fcfb3493 SHA512 3c076c2865e930cfe2f0c9d01fb8e272037aeed99b46063e88942b89b1191e8149fd87ecbcbdb2d23ea37d556a971434938d7f4e4e2eef0e26e1b250534cc0e2
 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.0_rc2-meson-deps.patch 2866 BLAKE2B d08429ad04c2a96e2d20443548185a0331777eedf05a06d9cd591a6870612d396a871da39cff3ef8c7b6681fbc75df1fa4591c3bff51e795b2a30bc32da168ed SHA512 7b874520fe7937e34f4f74d2ecda98cc42c985f10c8542ed7f90fad0aad46b56bc294206adaffa3fac9bc07411f839bfd938c72cf485d7a53bd475491943582b
 AUX git-daemon-r2.initd 378 BLAKE2B 1e4e553f550ee1cb428bec21dbaeede12daa87ef89664bfed0ab7c1ec15d32cf738f7adde23db7f76e9a7a2aeadc132affa3c42709e2ed789745240f8f72096b SHA512 a78043543e540a814eb1d1c76fbde7fd5cbc9f6dbe7486bc21a0cbb24a613f7a8661acb5460df474a7a0c5284b61bc9e700fa384163db6fc423645f699cc119a
 AUX git-daemon.confd 710 BLAKE2B aee2e1493bb67c09b87497724df90cb74e9a5a7f123101ae96374145eb81076cc2018e73141aa9dc8c4e50b7f1087e8265f4bcd56d761c60375607268d470437 SHA512 fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec
@@ -27,9 +28,9 @@ EBUILD git-2.44.2.ebuild 16300 BLAKE2B 39fc9cdc25a8e9ff53081c6992c53889d9023ba83
 EBUILD git-2.45.2.ebuild 16448 BLAKE2B eecc66b8793b6a99e40c28fea1ef68bbb25902981bf18a09d7e8f2e6c00a27133b3fc2318f9460acba64d341cf6ad8970d2e855e6c4baffc982ec8830db8d2f8 SHA512 47dd7ec8dbd7256bfcdcb810abd6d47aababde17e68343cf5941dd529232ca0ecd321c2d1aa23f17ce8bd501203d39ddfa1bf3e4bb63c84f9c06e5c76fff5179
 EBUILD git-2.46.2.ebuild 16800 BLAKE2B 6c37df1d123aae231ecbcf4c5bb93364c78f89c1a10d81a5954da536c8148c28696ad1d43d5cce04743eadc9cd1045e3acfccc11bd4f7acb97289395199c9dee SHA512 89d20136a0f0d4d10b5a2a8eef067d631b708a7abdd887992d7553a2a5296abfa666c5be5499d19b02c94412a40aaa671b8c4bfc7b63b178a5e85867867877be
 EBUILD git-2.47.1.ebuild 16915 BLAKE2B 730dda1235d73fe06861ac16587ee72669b620888ecc52e32ef5f1a77fde5af852f6f8a38374cdd4283e8fe3d1223bae1eae58f16c1e7117832c58c8589702a6 SHA512 09576e9f95be72705005762dcd41091d030acaadd2b56cc814b45fd471202790eaaeae05893b1d2eeb8d2362fdb24847764c2e8e5d8353b28b63a9442934e274
-EBUILD git-2.48.0.ebuild 11173 BLAKE2B c35d659168fa0fdf254fa0deefb2eb62351e64b93c5810cd26eb78ac039bc716cb631dadf5590518929716f1b37d840ad8929928773a27f94fb23deec26c0dda SHA512 3c2b1d67542f20967b1693d56a00fe4cb5062c2a6025d64fc2f16b6c340bf0035b1e3189067af809f2eaeaac7efc2dd3ded818c1f8f881615fd887fa7a1a4c1b
-EBUILD git-9999-r1.ebuild 11235 BLAKE2B c4c5d987fece04d851c584d82e77bab4c1c6bea84fa3d1bdae83eec31dad5c63f642f70f1101ef9eaef7fa95983824f712cc56b0da2857686709f7d69d91e12a SHA512 75525ddf4baaeb74e5e227740634f710b7ac6235b20c42d91a77267687ba6ad7215f1e27569c569399787bab9bffa75c229b724dfeb52b0fb85aba1468bb9c97
-EBUILD git-9999-r2.ebuild 11235 BLAKE2B c4c5d987fece04d851c584d82e77bab4c1c6bea84fa3d1bdae83eec31dad5c63f642f70f1101ef9eaef7fa95983824f712cc56b0da2857686709f7d69d91e12a SHA512 75525ddf4baaeb74e5e227740634f710b7ac6235b20c42d91a77267687ba6ad7215f1e27569c569399787bab9bffa75c229b724dfeb52b0fb85aba1468bb9c97
-EBUILD git-9999-r3.ebuild 11235 BLAKE2B c4c5d987fece04d851c584d82e77bab4c1c6bea84fa3d1bdae83eec31dad5c63f642f70f1101ef9eaef7fa95983824f712cc56b0da2857686709f7d69d91e12a SHA512 75525ddf4baaeb74e5e227740634f710b7ac6235b20c42d91a77267687ba6ad7215f1e27569c569399787bab9bffa75c229b724dfeb52b0fb85aba1468bb9c97
+EBUILD git-2.48.0.ebuild 11526 BLAKE2B aeafcf4527bb0951f3c250b91c941a157ffbbdf9abe99765b6418988550769db61030b09df60a288d0b863c2284383fcef38abe9216055711d5e32f7ad3128fe SHA512 e7e00d86137b530d06b95dc7ded4294fbd9d65908519e56273e6453cb1523a19cbfc516daae6e7b576a54f7cc7b4c0fd56d711d66a8cdb27205f05e01217b990
+EBUILD git-9999-r1.ebuild 11470 BLAKE2B a2aa2a6fe581243075e29fded76bc8ccdc4cf649983cbdf9230b291c678c3b07ffa82c2883e58f32f7e70978bfa2f1dee96879c1b55c4cb58ae9b8908d25abad SHA512 b86bbec0ec02f1e1f410b0afcacf3b0fa77049f9c293dfd322c4d3ff489071d81a54a182494d6d1cb55074d7fecb583ead720f112339a832149b69f0ac271449
+EBUILD git-9999-r2.ebuild 11470 BLAKE2B a2aa2a6fe581243075e29fded76bc8ccdc4cf649983cbdf9230b291c678c3b07ffa82c2883e58f32f7e70978bfa2f1dee96879c1b55c4cb58ae9b8908d25abad SHA512 b86bbec0ec02f1e1f410b0afcacf3b0fa77049f9c293dfd322c4d3ff489071d81a54a182494d6d1cb55074d7fecb583ead720f112339a832149b69f0ac271449
+EBUILD git-9999-r3.ebuild 11470 BLAKE2B a2aa2a6fe581243075e29fded76bc8ccdc4cf649983cbdf9230b291c678c3b07ffa82c2883e58f32f7e70978bfa2f1dee96879c1b55c4cb58ae9b8908d25abad SHA512 b86bbec0ec02f1e1f410b0afcacf3b0fa77049f9c293dfd322c4d3ff489071d81a54a182494d6d1cb55074d7fecb583ead720f112339a832149b69f0ac271449
 EBUILD git-9999.ebuild 16800 BLAKE2B 6c37df1d123aae231ecbcf4c5bb93364c78f89c1a10d81a5954da536c8148c28696ad1d43d5cce04743eadc9cd1045e3acfccc11bd4f7acb97289395199c9dee SHA512 89d20136a0f0d4d10b5a2a8eef067d631b708a7abdd887992d7553a2a5296abfa666c5be5499d19b02c94412a40aaa671b8c4bfc7b63b178a5e85867867877be
 MISC metadata.xml 2041 BLAKE2B 309964a6982f6f14cecc40b4021d96d2e28c49789480bc4037879375cb5277c2eb500ff36800657e783c36f541265db20b464fc39ce2ac39ff4cda881854662f SHA512 a8dd2f76985690cded8555a0b82e5004b4d93ccc45988fdc04ef8ed3e17ef73d2b83dc9fb6b913e5f9d2b78ebe715e9eb32bfce607318d0e8c0834987eabe5b6
diff --git a/dev-vcs/git/files/git-2.48.0-doc-deps.patch b/dev-vcs/git/files/git-2.48.0-doc-deps.patch
new file mode 100644
index 000000000000..847e96368f08
--- /dev/null
+++ b/dev-vcs/git/files/git-2.48.0-doc-deps.patch
@@ -0,0 +1,42 @@
+https://lore.kernel.org/git/79de1bcf31f708960a889066ce3d986e55155ad8.1736577530.git.sam@gentoo.org/
+
+From 79de1bcf31f708960a889066ce3d986e55155ad8 Mon Sep 17 00:00:00 2001
+Message-ID: <79de1bcf31f708960a889066ce3d986e55155ad8.1736577546.git.sam@gentoo.org>
+From: Sam James <sam@gentoo.org>
+Date: Sat, 11 Jan 2025 06:37:48 +0000
+Subject: [PATCH] meson: fix perl dependencies for Documentation
+
+We need an explicit `depends: documentation_deps` so that all of our
+Documentation targets know they require asciidoc.conf. This shows up
+as parallel build failures with it not yet being available.
+
+Other targets look OK already.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ Documentation/technical/meson.build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Documentation/technical/meson.build b/Documentation/technical/meson.build
+index 21dfb8b5c9..8c93da3566 100644
+--- a/Documentation/technical/meson.build
++++ b/Documentation/technical/meson.build
+@@ -42,6 +42,7 @@ api_index = custom_target(
+     '@OUTPUT@',
+   ],
+   env: script_environment,
++  depends: documentation_deps,
+   input: api_docs,
+   output: 'api-index.txt',
+ )
+@@ -60,6 +61,7 @@ foreach article : api_docs + articles
+     command: asciidoc_html_options,
+     input: article,
+     output: fs.stem(article) + '.html',
++    depends: documentation_deps,
+     install: true,
+     install_dir: get_option('datadir') / 'doc/git-doc/technical',
+   )
+-- 
+2.48.0.rc2
+
diff --git a/dev-vcs/git/git-2.48.0.ebuild b/dev-vcs/git/git-2.48.0.ebuild
index c90d0aa8bf6a..9aea3ab17bb8 100644
--- a/dev-vcs/git/git-2.48.0.ebuild
+++ b/dev-vcs/git/git-2.48.0.ebuild
@@ -148,6 +148,10 @@ REQUIRED_USE="
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.48.0-doc-deps.patch
+)
+
 pkg_setup() {
 	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
 		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
@@ -193,7 +197,7 @@ src_configure() {
 	)
 
 	# For non-live, we use a downloaded docs tarball instead.
-	if [[ ${PV} == *9999 ]] ; then
+	if [[ ${PV} == *9999 ]] || use doc ; then
 		emesonargs+=(
 			-Ddocs="man$(usev doc ',html')"
 		)
@@ -248,8 +252,13 @@ src_compile() {
 		git_emake -C contrib/mw-to-git
 	fi
 
-	git_emake -C contrib/diff-highlight
+	if use doc ; then
+		# Workaround fragments that still use the Makefile and can't
+		# find the bits from Meson's out-of-source build
+		ln -s "${BUILD_DIR}"/Documentation/asciidoc.conf "${S}"/Documentation/asciidoc.conf || die
+	fi
 
+	git_emake -C contrib/diff-highlight
 	git_emake -C contrib/subtree git-subtree
 	# git-subtree.1 requires the full USE=doc dependency stack
 	use doc && git_emake -C contrib/subtree git-subtree.html git-subtree.1
@@ -274,11 +283,17 @@ src_install() {
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
 	fi
 
+	if use doc ; then
+		cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die
+		rm -rf "${ED}"/usr/share/doc/git-doc/ || die
+	fi
+
 	# Depending on the tarball and manual rebuild of the documentation, the
 	# manpages may exist in either OR both of these directories.
 	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
 	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
 	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+
 	use doc && dodir /usr/share/doc/${PF}/html
 	local d
 	for d in / /howto/ /technical/ ; do
@@ -290,8 +305,6 @@ src_install() {
 		fi
 	done
 	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
 
 	newbashcomp contrib/completion/git-completion.bash ${PN}
 	bashcomp_alias git gitk
@@ -317,10 +330,6 @@ src_install() {
 	dodoc git-subtree.txt
 	popd &>/dev/null || die
 
-	if use mediawiki ; then
-		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
-	fi
-
 	# diff-highlight
 	dobin contrib/diff-highlight/diff-highlight
 	newdoc contrib/diff-highlight/README README.diff-highlight
@@ -397,6 +406,10 @@ src_install() {
 		dobin contrib/credential/netrc/git-credential-netrc
 	fi
 
+	if use mediawiki ; then
+		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
+	fi
+
 	if ! use subversion ; then
 		rm -f "${ED}"/usr/libexec/git-core/git-svn \
 			"${ED}"/usr/share/man/man1/git-svn.1*
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 41c0ed848010..6e9f44d049fa 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -148,10 +148,6 @@ REQUIRED_USE="
 
 RESTRICT="!test? ( test )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.48.0_rc2-meson-deps.patch
-)
-
 pkg_setup() {
 	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
 		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
@@ -197,7 +193,7 @@ src_configure() {
 	)
 
 	# For non-live, we use a downloaded docs tarball instead.
-	if [[ ${PV} == *9999 ]] ; then
+	if [[ ${PV} == *9999 ]] || use doc ; then
 		emesonargs+=(
 			-Ddocs="man$(usev doc ',html')"
 		)
@@ -252,8 +248,13 @@ src_compile() {
 		git_emake -C contrib/mw-to-git
 	fi
 
-	git_emake -C contrib/diff-highlight
+	if use doc ; then
+		# Workaround fragments that still use the Makefile and can't
+		# find the bits from Meson's out-of-source build
+		ln -s "${BUILD_DIR}"/Documentation/asciidoc.conf "${S}"/Documentation/asciidoc.conf || die
+	fi
 
+	git_emake -C contrib/diff-highlight
 	git_emake -C contrib/subtree git-subtree
 	# git-subtree.1 requires the full USE=doc dependency stack
 	use doc && git_emake -C contrib/subtree git-subtree.html git-subtree.1
@@ -278,11 +279,17 @@ src_install() {
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
 	fi
 
+	if use doc ; then
+		cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die
+		rm -rf "${ED}"/usr/share/doc/git-doc/ || die
+	fi
+
 	# Depending on the tarball and manual rebuild of the documentation, the
 	# manpages may exist in either OR both of these directories.
 	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
 	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
 	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+
 	use doc && dodir /usr/share/doc/${PF}/html
 	local d
 	for d in / /howto/ /technical/ ; do
@@ -294,8 +301,6 @@ src_install() {
 		fi
 	done
 	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
 
 	newbashcomp contrib/completion/git-completion.bash ${PN}
 	bashcomp_alias git gitk
@@ -321,10 +326,6 @@ src_install() {
 	dodoc git-subtree.txt
 	popd &>/dev/null || die
 
-	if use mediawiki ; then
-		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
-	fi
-
 	# diff-highlight
 	dobin contrib/diff-highlight/diff-highlight
 	newdoc contrib/diff-highlight/README README.diff-highlight
@@ -401,6 +402,10 @@ src_install() {
 		dobin contrib/credential/netrc/git-credential-netrc
 	fi
 
+	if use mediawiki ; then
+		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
+	fi
+
 	if ! use subversion ; then
 		rm -f "${ED}"/usr/libexec/git-core/git-svn \
 			"${ED}"/usr/share/man/man1/git-svn.1*
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 41c0ed848010..6e9f44d049fa 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -148,10 +148,6 @@ REQUIRED_USE="
 
 RESTRICT="!test? ( test )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.48.0_rc2-meson-deps.patch
-)
-
 pkg_setup() {
 	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
 		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
@@ -197,7 +193,7 @@ src_configure() {
 	)
 
 	# For non-live, we use a downloaded docs tarball instead.
-	if [[ ${PV} == *9999 ]] ; then
+	if [[ ${PV} == *9999 ]] || use doc ; then
 		emesonargs+=(
 			-Ddocs="man$(usev doc ',html')"
 		)
@@ -252,8 +248,13 @@ src_compile() {
 		git_emake -C contrib/mw-to-git
 	fi
 
-	git_emake -C contrib/diff-highlight
+	if use doc ; then
+		# Workaround fragments that still use the Makefile and can't
+		# find the bits from Meson's out-of-source build
+		ln -s "${BUILD_DIR}"/Documentation/asciidoc.conf "${S}"/Documentation/asciidoc.conf || die
+	fi
 
+	git_emake -C contrib/diff-highlight
 	git_emake -C contrib/subtree git-subtree
 	# git-subtree.1 requires the full USE=doc dependency stack
 	use doc && git_emake -C contrib/subtree git-subtree.html git-subtree.1
@@ -278,11 +279,17 @@ src_install() {
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
 	fi
 
+	if use doc ; then
+		cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die
+		rm -rf "${ED}"/usr/share/doc/git-doc/ || die
+	fi
+
 	# Depending on the tarball and manual rebuild of the documentation, the
 	# manpages may exist in either OR both of these directories.
 	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
 	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
 	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+
 	use doc && dodir /usr/share/doc/${PF}/html
 	local d
 	for d in / /howto/ /technical/ ; do
@@ -294,8 +301,6 @@ src_install() {
 		fi
 	done
 	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
 
 	newbashcomp contrib/completion/git-completion.bash ${PN}
 	bashcomp_alias git gitk
@@ -321,10 +326,6 @@ src_install() {
 	dodoc git-subtree.txt
 	popd &>/dev/null || die
 
-	if use mediawiki ; then
-		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
-	fi
-
 	# diff-highlight
 	dobin contrib/diff-highlight/diff-highlight
 	newdoc contrib/diff-highlight/README README.diff-highlight
@@ -401,6 +402,10 @@ src_install() {
 		dobin contrib/credential/netrc/git-credential-netrc
 	fi
 
+	if use mediawiki ; then
+		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
+	fi
+
 	if ! use subversion ; then
 		rm -f "${ED}"/usr/libexec/git-core/git-svn \
 			"${ED}"/usr/share/man/man1/git-svn.1*
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 41c0ed848010..6e9f44d049fa 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -148,10 +148,6 @@ REQUIRED_USE="
 
 RESTRICT="!test? ( test )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.48.0_rc2-meson-deps.patch
-)
-
 pkg_setup() {
 	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
 		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
@@ -197,7 +193,7 @@ src_configure() {
 	)
 
 	# For non-live, we use a downloaded docs tarball instead.
-	if [[ ${PV} == *9999 ]] ; then
+	if [[ ${PV} == *9999 ]] || use doc ; then
 		emesonargs+=(
 			-Ddocs="man$(usev doc ',html')"
 		)
@@ -252,8 +248,13 @@ src_compile() {
 		git_emake -C contrib/mw-to-git
 	fi
 
-	git_emake -C contrib/diff-highlight
+	if use doc ; then
+		# Workaround fragments that still use the Makefile and can't
+		# find the bits from Meson's out-of-source build
+		ln -s "${BUILD_DIR}"/Documentation/asciidoc.conf "${S}"/Documentation/asciidoc.conf || die
+	fi
 
+	git_emake -C contrib/diff-highlight
 	git_emake -C contrib/subtree git-subtree
 	# git-subtree.1 requires the full USE=doc dependency stack
 	use doc && git_emake -C contrib/subtree git-subtree.html git-subtree.1
@@ -278,11 +279,17 @@ src_install() {
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
 	fi
 
+	if use doc ; then
+		cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die
+		rm -rf "${ED}"/usr/share/doc/git-doc/ || die
+	fi
+
 	# Depending on the tarball and manual rebuild of the documentation, the
 	# manpages may exist in either OR both of these directories.
 	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
 	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
 	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+
 	use doc && dodir /usr/share/doc/${PF}/html
 	local d
 	for d in / /howto/ /technical/ ; do
@@ -294,8 +301,6 @@ src_install() {
 		fi
 	done
 	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
 
 	newbashcomp contrib/completion/git-completion.bash ${PN}
 	bashcomp_alias git gitk
@@ -321,10 +326,6 @@ src_install() {
 	dodoc git-subtree.txt
 	popd &>/dev/null || die
 
-	if use mediawiki ; then
-		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
-	fi
-
 	# diff-highlight
 	dobin contrib/diff-highlight/diff-highlight
 	newdoc contrib/diff-highlight/README README.diff-highlight
@@ -401,6 +402,10 @@ src_install() {
 		dobin contrib/credential/netrc/git-credential-netrc
 	fi
 
+	if use mediawiki ; then
+		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
+	fi
+
 	if ! use subversion ; then
 		rm -f "${ED}"/usr/libexec/git-core/git-svn \
 			"${ED}"/usr/share/man/man1/git-svn.1*