From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0F05E138334 for ; Tue, 11 Jun 2019 15:35:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D23A6E0894; Tue, 11 Jun 2019 15:35:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 98DCFE0894 for ; Tue, 11 Jun 2019 15:35:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A0CC3345E71 for ; Tue, 11 Jun 2019 15:35:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 93B37614 for ; Tue, 11 Jun 2019 15:35:41 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1560267310.59768d41256b5eda384f6b9f50b8ecc3b91bf214.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/git/git-2.22.0.ebuild dev-vcs/git/git-9999-r1.ebuild dev-vcs/git/git-9999-r2.ebuild dev-vcs/git/git-9999-r3.ebuild dev-vcs/git/git-9999.ebuild X-VCS-Directories: dev-vcs/git/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 59768d41256b5eda384f6b9f50b8ecc3b91bf214 X-VCS-Branch: master Date: Tue, 11 Jun 2019 15:35:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ddc7fe0e-e66c-4dc6-bf04-5b706a0cd320 X-Archives-Hash: 1b1df6f88f10f8e05dd09a5499ec826c commit: 59768d41256b5eda384f6b9f50b8ecc3b91bf214 Author: Robin H. Johnson gentoo org> AuthorDate: Tue Jun 11 15:25:59 2019 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Tue Jun 11 15:35:10 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59768d41 dev-vcs/git: fix git-subtree.1 build failure Partial revert of commit 56312573763e794982d7a7284e7e7d1a8a9f8eaa Some of the manpages require the full documentation stack. Documentation build is gated behind USE=doc due to the dependencies, so move the manpage behind the conditional as well. As a future action, ask upstream to include git-subtree.1 with the rest of the prebuilt Documentation. Fixes: https://bugs.gentoo.org/687848 See-Also: https://bugs.gentoo.org/517794 Package-Manager: Portage-2.3.67, Repoman-2.3.12 Signed-off-by: Robin H. Johnson gentoo.org> dev-vcs/git/git-2.22.0.ebuild | 10 ++++++---- dev-vcs/git/git-9999-r1.ebuild | 10 ++++++---- dev-vcs/git/git-9999-r2.ebuild | 10 ++++++---- dev-vcs/git/git-9999-r3.ebuild | 10 ++++++---- dev-vcs/git/git-9999.ebuild | 10 ++++++---- 5 files changed, 30 insertions(+), 20 deletions(-) diff --git a/dev-vcs/git/git-2.22.0.ebuild b/dev-vcs/git/git-2.22.0.ebuild index 64663fba9b7..42969a491fb 100644 --- a/dev-vcs/git/git-2.22.0.ebuild +++ b/dev-vcs/git/git-2.22.0.ebuild @@ -384,8 +384,9 @@ src_compile() { fi pushd contrib/subtree &>/dev/null || die - git_emake git-subtree{,.1} - use doc && git_emake git-subtree.html + git_emake git-subtree + # git-subtree.1 requires the full USE=doc dependency stack + use doc && git_emake git-subtree.html git-subtree.1 popd &>/dev/null || die pushd contrib/diff-highlight &>/dev/null || die @@ -451,9 +452,10 @@ src_install() { # git-subtree pushd contrib/subtree &>/dev/null || die - git_emake install install-man || die "Failed to emake install install-man git-subtree" + git_emake install || die "Failed to emake install for git-subtree" if use doc ; then - git_emake install-html || die "Failed to emake install-html git-subtree" + # Do not move git subtree install-man outside USE=doc! + git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" fi newdoc README README.git-subtree dodoc git-subtree.txt diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index 64663fba9b7..42969a491fb 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -384,8 +384,9 @@ src_compile() { fi pushd contrib/subtree &>/dev/null || die - git_emake git-subtree{,.1} - use doc && git_emake git-subtree.html + git_emake git-subtree + # git-subtree.1 requires the full USE=doc dependency stack + use doc && git_emake git-subtree.html git-subtree.1 popd &>/dev/null || die pushd contrib/diff-highlight &>/dev/null || die @@ -451,9 +452,10 @@ src_install() { # git-subtree pushd contrib/subtree &>/dev/null || die - git_emake install install-man || die "Failed to emake install install-man git-subtree" + git_emake install || die "Failed to emake install for git-subtree" if use doc ; then - git_emake install-html || die "Failed to emake install-html git-subtree" + # Do not move git subtree install-man outside USE=doc! + git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" fi newdoc README README.git-subtree dodoc git-subtree.txt diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 64663fba9b7..42969a491fb 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -384,8 +384,9 @@ src_compile() { fi pushd contrib/subtree &>/dev/null || die - git_emake git-subtree{,.1} - use doc && git_emake git-subtree.html + git_emake git-subtree + # git-subtree.1 requires the full USE=doc dependency stack + use doc && git_emake git-subtree.html git-subtree.1 popd &>/dev/null || die pushd contrib/diff-highlight &>/dev/null || die @@ -451,9 +452,10 @@ src_install() { # git-subtree pushd contrib/subtree &>/dev/null || die - git_emake install install-man || die "Failed to emake install install-man git-subtree" + git_emake install || die "Failed to emake install for git-subtree" if use doc ; then - git_emake install-html || die "Failed to emake install-html git-subtree" + # Do not move git subtree install-man outside USE=doc! + git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" fi newdoc README README.git-subtree dodoc git-subtree.txt diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index 64663fba9b7..42969a491fb 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -384,8 +384,9 @@ src_compile() { fi pushd contrib/subtree &>/dev/null || die - git_emake git-subtree{,.1} - use doc && git_emake git-subtree.html + git_emake git-subtree + # git-subtree.1 requires the full USE=doc dependency stack + use doc && git_emake git-subtree.html git-subtree.1 popd &>/dev/null || die pushd contrib/diff-highlight &>/dev/null || die @@ -451,9 +452,10 @@ src_install() { # git-subtree pushd contrib/subtree &>/dev/null || die - git_emake install install-man || die "Failed to emake install install-man git-subtree" + git_emake install || die "Failed to emake install for git-subtree" if use doc ; then - git_emake install-html || die "Failed to emake install-html git-subtree" + # Do not move git subtree install-man outside USE=doc! + git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" fi newdoc README README.git-subtree dodoc git-subtree.txt diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 9a03288ee8b..bf2df79b8ab 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -384,8 +384,9 @@ src_compile() { fi pushd contrib/subtree &>/dev/null || die - git_emake git-subtree{,.1} - use doc && git_emake git-subtree.html + git_emake git-subtree + # git-subtree.1 requires the full USE=doc dependency stack + use doc && git_emake git-subtree.html git-subtree.1 popd &>/dev/null || die pushd contrib/diff-highlight &>/dev/null || die @@ -451,9 +452,10 @@ src_install() { # git-subtree pushd contrib/subtree &>/dev/null || die - git_emake install install-man || die "Failed to emake install install-man git-subtree" + git_emake install || die "Failed to emake install for git-subtree" if use doc ; then - git_emake install-html || die "Failed to emake install-html git-subtree" + # Do not move git subtree install-man outside USE=doc! + git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" fi newdoc README README.git-subtree dodoc git-subtree.txt