[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/, dev-vcs/git/

["Sam James" <sam@gentoo.org>]

commit:     9301c2f9d1cb966ab4fd292a9e5973fff40792d5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 19 01:05:32 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 19 01:05:32 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9301c2f9

dev-vcs/git: fix USE=doc build issue

Pull in the patch Eli sent upstream and applt it to 2.48.1 and 2.49.0;
for 2.48.1, I've rebased it as credential_helper didn't exist then.

Closes: https://bugs.gentoo.org/949247
Thanks-to: Eli Schwartz <eschwartz <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git/files/git-2.48.1-docs.patch | 49 +++++++++++++++++++++++++++++++++
 dev-vcs/git/files/git-2.49.0-docs.patch | 49 +++++++++++++++++++++++++++++++++
 dev-vcs/git/git-2.48.1.ebuild           |  1 +
 dev-vcs/git/git-2.49.0-r1.ebuild        |  1 +
 4 files changed, 100 insertions(+)

diff --git a/dev-vcs/git/files/git-2.48.1-docs.patch b/dev-vcs/git/files/git-2.48.1-docs.patch
new file mode 100644
index 000000000000..db9aeae7862d
--- /dev/null
+++ b/dev-vcs/git/files/git-2.48.1-docs.patch
@@ -0,0 +1,49 @@
+[This is the same as git-2.49.1-docs.patch, but modified to apply to 2.48.1.]
+
+https://public-inbox.org/git/20250316060605.166364-1-eschwartz@gentoo.org/T/
+
+From: Eli Schwartz <eschwartz@gentoo.org>
+To: git@vger.kernel.org
+Cc: Patrick Steinhardt <ps@pks.im>,
+        Sam James <sam@gentoo.org>
+Subject: [PATCH] meson: fix perl detection when docs are enabled, but perl bindings aren't
+Date: Sun, 16 Mar 2025 02:06:05 -0400
+Message-ID: <20250316060605.166364-1-eschwartz@gentoo.org>
+X-Mailer: git-send-email 2.48.1
+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-Transfer-Encoding: 8bit
+
+The `perl` variable in meson.build is assigned to a program lookup,
+which may have the value "not-found object" if configuring with
+`-Dperl=disabled`.
+
+There is already a list of other cases where we do need a perl command,
+even when not building perl bindings. Building documentation should be
+one of those cases, but was missing from the list. Add it.
+
+Fixes:
+
+```
+$ meson setup builddir/ -Ddocs=man -Dperl=disabled -Dtests=false
+[...]
+Documentation/meson.build:308:22: ERROR: Tried to use not-found external program in "command"
+```
+
+Bug: https://bugs.gentoo.org/949247
+Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
+--- a/meson.build
++++ b/meson.build
+@@ -749,7 +749,7 @@ endif
+ # features. It is optional if you want to neither execute tests nor use any of
+ # these optional features.
+ perl_required = get_option('perl')
+-if get_option('tests') or get_option('gitweb').enabled()
++if get_option('tests') or get_option('gitweb').enabled() or get_option('docs') != []
+   perl_required = true
+ endif
+ 

diff --git a/dev-vcs/git/files/git-2.49.0-docs.patch b/dev-vcs/git/files/git-2.49.0-docs.patch
new file mode 100644
index 000000000000..13ea597cfbcb
--- /dev/null
+++ b/dev-vcs/git/files/git-2.49.0-docs.patch
@@ -0,0 +1,49 @@
+https://public-inbox.org/git/20250316060605.166364-1-eschwartz@gentoo.org/T/
+
+From: Eli Schwartz <eschwartz@gentoo.org>
+To: git@vger.kernel.org
+Cc: Patrick Steinhardt <ps@pks.im>,
+	Sam James <sam@gentoo.org>
+Subject: [PATCH] meson: fix perl detection when docs are enabled, but perl bindings aren't
+Date: Sun, 16 Mar 2025 02:06:05 -0400
+Message-ID: <20250316060605.166364-1-eschwartz@gentoo.org>
+X-Mailer: git-send-email 2.48.1
+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-Transfer-Encoding: 8bit
+
+The `perl` variable in meson.build is assigned to a program lookup,
+which may have the value "not-found object" if configuring with
+`-Dperl=disabled`.
+
+There is already a list of other cases where we do need a perl command,
+even when not building perl bindings. Building documentation should be
+one of those cases, but was missing from the list. Add it.
+
+Fixes:
+
+```
+$ meson setup builddir/ -Ddocs=man -Dperl=disabled -Dtests=false
+[...]
+Documentation/meson.build:308:22: ERROR: Tried to use not-found external program in "command"
+```
+
+Bug: https://bugs.gentoo.org/949247
+Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
+--- a/meson.build
++++ b/meson.build
+@@ -772,7 +772,7 @@ endif
+ # features. It is optional if you want to neither execute tests nor use any of
+ # these optional features.
+ perl_required = get_option('perl')
+-if get_option('tests') or get_option('gitweb').enabled() or 'netrc' in get_option('credential_helpers')
++if get_option('tests') or get_option('gitweb').enabled() or 'netrc' in get_option('credential_helpers') or get_option('docs') != []
+   perl_required = true
+ endif
+ 
+-- 
+2.48.1

diff --git a/dev-vcs/git/git-2.48.1.ebuild b/dev-vcs/git/git-2.48.1.ebuild
index 38036e16bda6..a65507786715 100644
--- a/dev-vcs/git/git-2.48.1.ebuild
+++ b/dev-vcs/git/git-2.48.1.ebuild
@@ -151,6 +151,7 @@ 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
+	"${FILESDIR}"/${PN}-2.48.1-docs.patch
 )
 
 pkg_setup() {

diff --git a/dev-vcs/git/git-2.49.0-r1.ebuild b/dev-vcs/git/git-2.49.0-r1.ebuild
index e5f4bb671f79..9675dd25cdec 100644
--- a/dev-vcs/git/git-2.49.0-r1.ebuild
+++ b/dev-vcs/git/git-2.49.0-r1.ebuild
@@ -150,6 +150,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.48.1-macos-no-fsmonitor.patch
 	"${FILESDIR}"/${PN}-2.49.0-meson-use-test_environment-conditionally.patch
+	"${FILESDIR}"/${PN}-2.49.0-docs.patch
 )
 
 pkg_setup() {