summaryrefslogtreecommitdiff
path: root/dev-vcs/git
diff options
context:
space:
mode:
Diffstat (limited to 'dev-vcs/git')
-rw-r--r--dev-vcs/git/Manifest9
-rw-r--r--dev-vcs/git/files/git-2.48.0-doc-deps.patch42
-rw-r--r--dev-vcs/git/git-2.48.0.ebuild29
-rw-r--r--dev-vcs/git/git-9999-r1.ebuild29
-rw-r--r--dev-vcs/git/git-9999-r2.ebuild29
-rw-r--r--dev-vcs/git/git-9999-r3.ebuild29
6 files changed, 119 insertions, 48 deletions
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*
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-03 06:51:24 +0000