From d4e7658a9488679258dc7ebf75d5b30bd4460ea3 Mon Sep 17 00:00:00 2001 From: "D. Ben Knoble" Date: Tue, 4 Nov 2025 08:47:39 -0500 Subject: [PATCH] dev-vcs/git: use new htmldir meson option to control GIT_HTML_PATH This makes packaging the HTML docs easier, but more importantly means that "git --html-path" reports the correct directory. Signed-off-by: D. Ben Knoble Part-of: https://github.com/gentoo/gentoo/pull/44462 Closes: https://github.com/gentoo/gentoo/pull/44462 Signed-off-by: Sam James --- dev-vcs/git/git-9999-r1.ebuild | 6 +----- dev-vcs/git/git-9999-r2.ebuild | 6 +----- dev-vcs/git/git-9999-r3.ebuild | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index 3de51238c45fc..68a5ad083ceca 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -245,6 +245,7 @@ src_configure() { if [[ ${PV} == *9999 ]] || use doc ; then emesonargs+=( -Ddocs="man$(usev doc ',html')" + -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html" ) fi @@ -334,11 +335,6 @@ src_test() { src_install() { meson_src_install - 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] diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 3de51238c45fc..68a5ad083ceca 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -245,6 +245,7 @@ src_configure() { if [[ ${PV} == *9999 ]] || use doc ; then emesonargs+=( -Ddocs="man$(usev doc ',html')" + -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html" ) fi @@ -334,11 +335,6 @@ src_test() { src_install() { meson_src_install - 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] diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index 3de51238c45fc..68a5ad083ceca 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -245,6 +245,7 @@ src_configure() { if [[ ${PV} == *9999 ]] || use doc ; then emesonargs+=( -Ddocs="man$(usev doc ',html')" + -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html" ) fi @@ -334,11 +335,6 @@ src_test() { src_install() { meson_src_install - 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]